diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 94984a446f..0000000000
--- a/.eslintignore
+++ /dev/null
@@ -1,16 +0,0 @@
-node_modules
-public
-dist
-packages/server/builder
-packages/server/coverage
-packages/worker/coverage
-packages/backend-core/coverage
-packages/server/client
-packages/server/coverage
-packages/builder/.routify
-packages/sdk/sdk
-packages/account-portal/packages/server/build
-packages/account-portal/packages/ui/.routify
-packages/account-portal/packages/ui/build
-**/*.ivm.bundle.js
-packages/server/build/oldClientVersions/**/**
diff --git a/.eslintrc.json b/.eslintrc.json
deleted file mode 100644
index a94ea87704..0000000000
--- a/.eslintrc.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "root": true,
-  "env": {
-    "browser": true,
-    "es6": true,
-    "jest": true,
-    "node": true
-  },
-  "parser": "@babel/eslint-parser",
-  "parserOptions": {
-    "ecmaVersion": 2019,
-    "sourceType": "module",
-    "allowImportExportEverywhere": true
-  },
-  "ignorePatterns": [
-    "node_modules",
-    "dist",
-    "public",
-    "*.spec.js",
-    "bundle.js"
-  ],
-  "extends": ["eslint:recommended"],
-  "plugins": ["import", "eslint-plugin-local-rules"],
-  "overrides": [
-    {
-      "files": ["**/*.svelte"],
-      "extends": "plugin:svelte/recommended",
-      "parser": "svelte-eslint-parser",
-      "parserOptions": {
-        "parser": "@babel/eslint-parser",
-        "ecmaVersion": 2019,
-        "sourceType": "module",
-        "allowImportExportEverywhere": true
-      }
-    },
-    {
-      "files": ["**/*.ts"],
-      "parser": "@typescript-eslint/parser",
-      "plugins": ["@typescript-eslint"],
-      "extends": ["eslint:recommended"],
-      "globals": {
-        "NodeJS": true
-      },
-      "rules": {
-        "no-unused-vars": "off",
-        "local-rules/no-barrel-imports": "error",
-        "local-rules/no-budibase-imports": "error",
-        "local-rules/no-console-error": "error",
-        "@typescript-eslint/no-unused-vars": [
-          "error",
-          {
-            "varsIgnorePattern": "^_",
-            "argsIgnorePattern": "^_",
-            "destructuredArrayIgnorePattern": "^_",
-            "ignoreRestSiblings": true
-          }
-        ],
-        "no-redeclare": "off",
-        "@typescript-eslint/no-redeclare": "error",
-        // have to turn this off to allow function overloading in typescript
-        "no-dupe-class-members": "off"
-      }
-    },
-    {
-      "files": ["**/*.spec.ts"],
-      "parser": "@typescript-eslint/parser",
-      "plugins": ["jest", "@typescript-eslint"],
-      "extends": ["eslint:recommended", "plugin:jest/recommended"],
-      "env": {
-        "jest/globals": true
-      },
-      "globals": {
-        "NodeJS": true
-      },
-      "rules": {
-        "no-unused-vars": "off",
-        "@typescript-eslint/no-unused-vars": [
-          "error",
-          {
-            "varsIgnorePattern": "^_",
-            "argsIgnorePattern": "^_",
-            "destructuredArrayIgnorePattern": "^_",
-            "ignoreRestSiblings": true
-          }
-        ],
-        "local-rules/no-test-com": "error",
-        "local-rules/email-domain-example-com": "error",
-        "no-console": "warn",
-        // We have a lot of tests that don't have assertions, they use our test
-        // API client that does the assertions for them
-        "jest/expect-expect": "off",
-        // We do this in some tests where the behaviour of internal tables
-        // differs to external, but the API is broadly the same
-        "jest/no-conditional-expect": "off",
-        // have to turn this off to allow function overloading in typescript
-        "no-dupe-class-members": "off",
-        "no-redeclare": "off"
-      }
-    },
-    {
-      "files": [
-        "packages/builder/**/*",
-        "packages/client/**/*",
-        "packages/frontend-core/**/*"
-      ],
-      "rules": {
-        "no-console": ["error", { "allow": ["warn", "error", "debug"] }]
-      }
-    }
-  ],
-  "rules": {
-    "no-self-assign": "off",
-    "no-unused-vars": [
-      "error",
-      {
-        "varsIgnorePattern": "^_",
-        "argsIgnorePattern": "^_",
-        "destructuredArrayIgnorePattern": "^_",
-        "ignoreRestSiblings": true
-      }
-    ],
-    "import/no-relative-packages": "error",
-    "import/export": "error",
-    "import/no-duplicates": "error",
-    "import/newline-after-import": "error"
-  },
-  "globals": {
-    "GeolocationPositionError": true
-  }
-}
diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index e894a91703..e81925876b 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -30,7 +30,7 @@ env:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -47,7 +47,7 @@ jobs:
       - run: yarn lint
 
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -64,22 +64,19 @@ jobs:
       - run: yarn --frozen-lockfile
 
       # Run build all the projects
-      - name: Build OSS
-        run: yarn build:oss
-      - name: Build account portal
-        run: yarn build:account-portal
-        if: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
+      - name: Build
+        run: yarn build
       # Check the types of the projects built via esbuild
       - name: Check types
         run: |
           if ${{ env.ONLY_AFFECTED_TASKS }}; then
-            yarn check:types --since=${{ env.NX_BASE_BRANCH }} --ignore @budibase/account-portal-server
+            yarn check:types --since=${{ env.NX_BASE_BRANCH }}
           else
-            yarn check:types --ignore @budibase/account-portal-server
+            yarn check:types
           fi
 
   helm-lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -91,7 +88,7 @@ jobs:
       - run: cd charts/budibase && helm lint .
 
   test-libraries:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -117,13 +114,15 @@ jobs:
       - name: Test
         run: |
           if ${{ env.ONLY_AFFECTED_TASKS }}; then
-            yarn test --ignore=@budibase/worker --ignore=@budibase/server --since=${{ env.NX_BASE_BRANCH }}
+            yarn test -- --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/builder --no-prefix --since=${{ env.NX_BASE_BRANCH }} -- --verbose --reporters=default --reporters=github-actions
+            yarn test -- --scope=@budibase/builder --since=${{ env.NX_BASE_BRANCH }}
           else
-            yarn test --ignore=@budibase/worker --ignore=@budibase/server
+            yarn test -- --ignore=@budibase/worker --ignore=@budibase/server --ignore=@budibase/builder --no-prefix -- --verbose --reporters=default --reporters=github-actions
+            yarn test -- --scope=@budibase/builder --no-prefix
           fi
 
   test-worker:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -141,16 +140,22 @@ jobs:
       - name: Test worker
         run: |
           if ${{ env.ONLY_AFFECTED_TASKS }}; then
-            node scripts/run-affected.js --task=test --scope=@budibase/worker --since=${{ env.NX_BASE_BRANCH }}
-          else
-            yarn test --scope=@budibase/worker
+            AFFECTED=$(yarn --silent nx show projects --affected -t test --base=${{ env.NX_BASE_BRANCH }} -p @budibase/worker)
+            if [ -z "$AFFECTED" ]; then
+              echo "No affected tests to run"
+              exit 0
+            fi
           fi
 
+          cd packages/worker
+          yarn test --verbose --reporters=default --reporters=github-actions
+
   test-server:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
-        datasource: [mssql, mysql, postgres, mongodb, mariadb, oracle, none]
+        datasource:
+          [mssql, mysql, postgres, postgres_legacy, mongodb, mariadb, oracle, sqs, none]
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
@@ -185,6 +190,8 @@ jobs:
             docker pull mariadb@${{ steps.dotenv.outputs.MARIADB_SHA }}
           elif [ "${{ matrix.datasource }}" == "oracle" ]; then
             docker pull budibase/oracle-database:23.2-slim-faststart
+          elif [ "${{ matrix.datasource }}" == "postgres_legacy" ]; then
+            docker pull postgres:9.5.25
           fi
           docker pull minio/minio &
           docker pull redis &
@@ -195,6 +202,20 @@ jobs:
 
       - run: yarn --frozen-lockfile
 
+      - name: Set up PostgreSQL 16
+        if: matrix.datasource == 'postgres'
+        run: |
+          sudo systemctl stop postgresql
+          sudo apt-get remove --purge -y postgresql* libpq-dev
+          sudo rm -rf /etc/postgresql /var/lib/postgresql
+          sudo apt-get autoremove -y
+          sudo apt-get autoclean
+
+          sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list'
+          wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -
+          sudo apt-get update
+          sudo apt-get install -y postgresql-16
+
       - name: Test server
         env:
           DATASOURCE: ${{ matrix.datasource }}
@@ -213,10 +234,10 @@ jobs:
           fi
 
           cd packages/server
-          yarn test --filter $FILTER --passWithNoTests
+          yarn test --filter $FILTER --verbose --reporters=default --reporters=github-actions
 
   check-pro-submodule:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')
     steps:
       - name: Checkout repo and submodules
@@ -274,66 +295,9 @@ jobs:
             echo 'All good, the submodule had been merged and setup correctly!'
           fi
 
-  check-accountportal-submodule:
-    runs-on: ubuntu-latest
-    if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')
-    steps:
-      - name: Checkout repo and submodules
-        uses: actions/checkout@v4
-        with:
-          submodules: true
-          token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
-          fetch-depth: 0
-
-      - uses: dorny/paths-filter@v3
-        id: changes
-        with:
-          filters: |
-            src:
-              - packages/account-portal/**
-
-      - if: steps.changes.outputs.src == 'true'
-        name: Check account portal commit
-        id: get_accountportal_commits
-        run: |
-          cd packages/account-portal
-          accountportal_commit=$(git rev-parse HEAD)
-
-          branch="${{ github.base_ref || github.ref_name  }}"
-          echo "Running on branch '$branch' (base_ref=${{ github.base_ref }}, ref_name=${{ github.head_ref }})"
-
-          base_commit=$(git rev-parse origin/master)
-
-          if [[ ! -z $base_commit ]]; then
-            echo "target_branch=$branch"
-            echo "target_branch=$branch" >> "$GITHUB_OUTPUT"
-            echo "accountportal_commit=$accountportal_commit"
-            echo "accountportal_commit=$accountportal_commit" >> "$GITHUB_OUTPUT"
-            echo "base_commit=$base_commit"
-            echo "base_commit=$base_commit" >> "$GITHUB_OUTPUT"
-          else
-            echo "Nothing to do - branch to branch merge."
-          fi
-
-      - name: Check submodule merged to base branch
-        if: ${{ steps.get_accountportal_commits.outputs.base_commit != '' }}
-        uses: actions/github-script@v7
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          script: |
-            const submoduleCommit = '${{ steps.get_accountportal_commits.outputs.accountportal_commit }}';
-            const baseCommit = '${{ steps.get_accountportal_commits.outputs.base_commit }}';
-
-            if (submoduleCommit !== baseCommit) {
-              console.error('Submodule commit does not match the latest commit on the "${{ steps.get_accountportal_commits.outputs.target_branch }}" branch.');
-              console.error('Refer to the account portal repo to merge your changes: https://github.com/Budibase/account-portal/blob/master/docs/index.md')
-              process.exit(1);
-            } else {
-              console.log('All good, the submodule had been merged and setup correctly!')
-            }
-
   check-lockfile:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
+    if: inputs.run_as_oss != true  && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == 'Budibase/budibase')
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
diff --git a/.github/workflows/readme-openapi.yml b/.github/workflows/readme-openapi.yml
new file mode 100644
index 0000000000..9f42f6141b
--- /dev/null
+++ b/.github/workflows/readme-openapi.yml
@@ -0,0 +1,26 @@
+name: ReadMe GitHub Action 🦉
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  rdme-openapi:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repo
+        uses: actions/checkout@v3
+
+      - name: Use Node.js 20.x
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+          cache: yarn
+      - run: yarn --frozen-lockfile
+
+      - name: Install OpenAPI pkg
+        run: yarn global add openapi
+
+      - name: update specs
+        run: cd packages/server && yarn specs && openapi specs/openapi.yaml --key=${{ secrets.README_API_KEY }} --id=6728a74f5918b50036c61841
diff --git a/.github/workflows/stale_bot.yml b/.github/workflows/stale_bot.yml
index 411a70a463..df222a8483 100644
--- a/.github/workflows/stale_bot.yml
+++ b/.github/workflows/stale_bot.yml
@@ -8,41 +8,15 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
-        with:
-          days-before-stale: 330
-          operations-per-run: 1
-          # stale rules for PRs
-          days-before-pr-stale: 7
-          stale-issue-label: stale
-          exempt-pr-labels: pinned,security,roadmap
-          days-before-pr-close: 7
-          days-before-issue-close: 30
-
-      - uses: actions/stale@v8
-        with:
-          operations-per-run: 3
-          # stale rules for high priority bugs
-          days-before-stale: 30
-          only-issue-labels: bug,High priority
-          stale-issue-label: warn
-          days-before-close: 30
-
-      - uses: actions/stale@v8
-        with:
-          operations-per-run: 3
-          # stale rules for medium priority bugs
-          days-before-stale: 90
-          only-issue-labels: bug,Medium priority
-          stale-issue-label: warn
-          days-before-close: 30
-
-      - uses: actions/stale@v8
-        with:
-          operations-per-run: 3
-          # stale rules for all bugs
-          days-before-stale: 180
-          stale-issue-label: stale
-          only-issue-labels: bug
-          stale-issue-message: "This issue has been automatically marked as stale because it has not had any activity for six months."
-          days-before-close: 30
+    - uses: actions/stale@v8
+      with:
+        # Issues
+        days-before-stale: 180
+        stale-issue-label: stale
+        days-before-close: 30
+        stale-issue-message: "This issue has been automatically marked as stale as there has been no activity for 6 months."
+        # Pull requests
+        days-before-pr-stale: 7
+        days-before-pr-close: 14
+        exempt-pr-labels: pinned,security,roadmap
+        operations-per-run: 100
diff --git a/.gitignore b/.gitignore
index bac643e5df..21637edfbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ packages/server/build/oldClientVersions/**/*
 packages/builder/src/components/deploy/clientVersions.json
 packages/server/src/integrations/tests/utils/*.lock
 packages/builder/vite.config.mjs.timestamp*
+packages/account-portal
 
 # Logs
 logs
@@ -110,4 +111,4 @@ budibase-component
 budibase-datasource
 
 *.iml
-.nx
\ No newline at end of file
+.nx
diff --git a/.gitmodules b/.gitmodules
index cb6d1c5dc8..2dd6ea53f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "packages/pro"]
 	path = packages/pro
 	url = git@github.com:Budibase/budibase-pro.git
-[submodule "packages/account-portal"]
-	path = packages/account-portal
-	url = git@github.com:Budibase/account-portal.git
diff --git a/.prettierignore b/.prettierignore
index 72cdc75a23..b1ee287391 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,8 +9,4 @@ packages/backend-core/coverage
 packages/builder/.routify
 packages/sdk/sdk
 packages/pro/coverage
-packages/account-portal/packages/ui/build
-packages/account-portal/packages/ui/.routify
-packages/account-portal/packages/server/build
-packages/account-portal/packages/server/coverage
 **/*.ivm.bundle.js
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 543d1e6179..2fda61345b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -20,16 +20,6 @@
       "args": ["${workspaceFolder}/packages/worker/src/index.ts"],
       "cwd": "${workspaceFolder}/packages/worker"
     },
-    {
-      "name": "Camunda Worker",
-      "type": "node",
-      "request": "launch",
-      "runtimeArgs": ["--nolazy", "-r", "ts-node/register/transpile-only"],
-      "args": [
-        "${workspaceFolder}/packages/account-portal/packages/server/src/v2/run.ts"
-      ],
-      "cwd": "${workspaceFolder}/packages/account-portal/packages/server"
-    },
     {
       "type": "chrome",
       "request": "launch",
diff --git a/charts/budibase/templates/secrets.yaml b/charts/budibase/templates/secrets.yaml
index a44d2c0d9b..20701d4125 100644
--- a/charts/budibase/templates/secrets.yaml
+++ b/charts/budibase/templates/secrets.yaml
@@ -12,12 +12,12 @@ metadata:
 type: Opaque
 data:
   {{- if $existingSecret }}
-  internalApiKey: {{ index $existingSecret.data "internalApiKey" }}
-  jwtSecret: {{ index $existingSecret.data "jwtSecret" }}
-  objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" }}
-  objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" }}
-  bbEncryptionKey: {{ index $existingSecret.data "bbEncryptionKey" }}
-  apiEncryptionKey: {{ index $existingSecret.data "apiEncryptionKey" }}
+  internalApiKey: {{ index $existingSecret.data "internalApiKey" | quote }}
+  jwtSecret: {{ index $existingSecret.data "jwtSecret" | quote }}
+  objectStoreAccess: {{ index $existingSecret.data "objectStoreAccess" | quote }}
+  objectStoreSecret: {{ index $existingSecret.data "objectStoreSecret" | quote }}
+  bbEncryptionKey: {{ index $existingSecret.data "bbEncryptionKey" | quote }}
+  apiEncryptionKey: {{ index $existingSecret.data "apiEncryptionKey" | quote }}
   {{- else }}
   internalApiKey: {{ template "budibase.defaultsecret" .Values.globals.internalApiKey }}
   jwtSecret: {{ template "budibase.defaultsecret" .Values.globals.jwtSecret }}
diff --git a/eslint-local-rules/index.js b/eslint-local-rules/index.js
index d9d894c33e..9348706399 100644
--- a/eslint-local-rules/index.js
+++ b/eslint-local-rules/index.js
@@ -41,11 +41,12 @@ module.exports = {
           if (
             /^@budibase\/[^/]+\/.*$/.test(importPath) &&
             importPath !== "@budibase/backend-core/tests" &&
-            importPath !== "@budibase/string-templates/test/utils"
+            importPath !== "@budibase/string-templates/test/utils" &&
+            importPath !== "@budibase/client/manifest.json"
           ) {
             context.report({
               node,
-              message: `Importing from @budibase is not allowed, except for @budibase/backend-core/tests and @budibase/string-templates/test/utils.`,
+              message: `Importing from @budibase is not allowed, except for @budibase/backend-core/tests, @budibase/string-templates/test/utils and @budibase/client/manifest.json.`,
             })
           }
         },
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 0000000000..c497974612
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,197 @@
+import globals from "globals"
+import babelParser from "@babel/eslint-parser"
+import svelteParser from "svelte-eslint-parser"
+import tsParser from "@typescript-eslint/parser"
+
+import eslintPluginJest from "eslint-plugin-jest"
+import eslintPluginSvelte from "eslint-plugin-svelte"
+import eslintPluginLocalRules from "eslint-plugin-local-rules"
+import eslintPluginVitest from "@vitest/eslint-plugin"
+
+import eslint from "@eslint/js"
+import tseslint from "typescript-eslint"
+
+export default [
+  eslint.configs.recommended,
+  {
+    ignores: [
+      "**/node_modules",
+      "**/dist",
+      "**/public",
+      "**/bundle.js",
+      "**/coverage",
+      "packages/server/builder",
+      "packages/server/client",
+      "packages/builder/.routify",
+      "packages/sdk/sdk",
+      "**/*.ivm.bundle.js",
+      "packages/server/build/oldClientVersions/**/**/*",
+    ],
+  },
+  {
+    plugins: {
+      "local-rules": eslintPluginLocalRules,
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.jest,
+        ...globals.node,
+        GeolocationPositionError: true,
+      },
+
+      parser: babelParser,
+      ecmaVersion: 2019,
+      sourceType: "module",
+
+      parserOptions: {
+        allowImportExportEverywhere: true,
+      },
+    },
+
+    rules: {
+      "no-self-compare": "error",
+      "no-template-curly-in-string": "error",
+      "no-unmodified-loop-condition": "error",
+      "no-unreachable-loop": "error",
+      "no-implied-eval": "error",
+      "no-extend-native": "error",
+      "no-labels": "error",
+      "no-lone-blocks": "error",
+      "no-new-wrappers": "error",
+      "no-octal-escape": "error",
+      "no-return-assign": "error",
+      "no-useless-concat": "error",
+      "no-useless-constructor": "error",
+      "no-useless-rename": "error",
+      "no-var": "error",
+      "no-void": "error",
+
+      "no-unused-vars": [
+        "error",
+        {
+          varsIgnorePattern: "^_",
+          argsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          ignoreRestSiblings: true,
+          caughtErrors: "none",
+        },
+      ],
+    },
+  },
+  ...eslintPluginSvelte.configs["flat/recommended"].map(config => ({
+    ...config,
+    files: ["**/*.svelte"],
+
+    languageOptions: {
+      parser: svelteParser,
+      ecmaVersion: 2019,
+      sourceType: "script",
+
+      parserOptions: {
+        parser: "@typescript-eslint/parser",
+        allowImportExportEverywhere: true,
+      },
+    },
+  })),
+  ...tseslint.configs.strict.map(config => ({
+    ...config,
+    files: ["**/*.ts"],
+
+    languageOptions: {
+      globals: {
+        NodeJS: true,
+      },
+
+      parser: tsParser,
+    },
+
+    rules: {
+      "local-rules/no-barrel-imports": "error",
+      "local-rules/no-budibase-imports": "error",
+      "local-rules/no-console-error": "error",
+
+      "@typescript-eslint/no-inferrable-types": "error",
+      "@typescript-eslint/adjacent-overload-signatures": "error",
+      "@typescript-eslint/class-literal-property-style": "error",
+      "@typescript-eslint/no-confusing-non-null-assertion": "error",
+      "@typescript-eslint/no-unnecessary-parameter-property-assignment":
+        "error",
+      "@typescript-eslint/no-useless-empty-export": "error",
+
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          varsIgnorePattern: "^_",
+          argsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          ignoreRestSiblings: true,
+          caughtErrors: "none",
+        },
+      ],
+
+      "no-redeclare": "off",
+      "@typescript-eslint/no-redeclare": "error",
+
+      // @typescript-eslint/no-dupe-class-members supersedes no-dupe-class-members
+      "no-dupe-class-members": "off",
+      "@typescript-eslint/no-dupe-class-members": "error",
+
+      "no-useless-constructor": "off",
+      "@typescript-eslint/no-useless-constructor": "error",
+    },
+  })),
+  {
+    files: ["**/*.spec.ts", "**/*.spec.js"],
+
+    plugins: {
+      jest: eslintPluginJest,
+      vitest: eslintPluginVitest,
+    },
+
+    languageOptions: {
+      globals: {
+        ...eslintPluginJest.environments.globals.globals,
+        ...eslintPluginVitest.environments.env.globals,
+        NodeJS: true,
+      },
+
+      parser: tsParser,
+    },
+
+    rules: {
+      ...eslintPluginVitest.configs.recommended.rules,
+      ...eslintPluginJest.configs.recommended.rules,
+
+      "no-console": "warn",
+
+      "vitest/expect-expect": "off",
+
+      "jest/expect-expect": "off",
+      "jest/no-conditional-expect": "off",
+      "jest/no-disabled-tests": "off",
+      "jest/no-standalone-expect": "off",
+
+      "local-rules/no-test-com": "error",
+      "local-rules/email-domain-example-com": "error",
+    },
+  },
+  {
+    files: [
+      "packages/builder/**/*",
+      "packages/client/**/*",
+      "packages/frontend-core/**/*",
+    ],
+
+    rules: {
+      "no-console": [
+        "error",
+        {
+          allow: ["warn", "error", "debug"],
+        },
+      ],
+    },
+  },
+]
diff --git a/examples/nextjs-api-sales/package.json b/examples/nextjs-api-sales/package.json
index f1ef4843a1..d50e7d4eb5 100644
--- a/examples/nextjs-api-sales/package.json
+++ b/examples/nextjs-api-sales/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "bulma": "^0.9.3",
-    "next": "14.2.10",
+    "next": "14.2.21",
     "node-fetch": "^3.2.10",
     "sass": "^1.52.3",
     "react": "17.0.2",
@@ -18,10 +18,10 @@
     "react-notifications-component": "^3.4.1"
   },
   "devDependencies": {
-    "@types/node": "17.0.21",
+    "@types/node": "^20.17.9",
     "@types/react": "17.0.39",
     "eslint": "8.10.0",
     "eslint-config-next": "12.1.0",
-    "typescript": "5.5.2"
+    "typescript": "5.7.2"
   }
 }
diff --git a/examples/nextjs-api-sales/yarn.lock b/examples/nextjs-api-sales/yarn.lock
index 867835a6b7..a10fccb2e9 100644
--- a/examples/nextjs-api-sales/yarn.lock
+++ b/examples/nextjs-api-sales/yarn.lock
@@ -46,10 +46,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@next/env@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.10.tgz#1d3178340028ced2d679f84140877db4f420333c"
-  integrity sha512-dZIu93Bf5LUtluBXIv4woQw2cZVZ2DJTjax5/5DOs3lzEOeKLy7GxRSr4caK9/SCPdaW6bCgpye6+n4Dh9oJPw==
+"@next/env@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-14.2.21.tgz#09ff0813d29c596397e141205d4f5fd5c236bdd0"
+  integrity sha512-lXcwcJd5oR01tggjWJ6SrNNYFGuOOMB9c251wUNkjCpkoXOPkDeF/15c3mnVlBqrW4JJXb2kVxDFhC4GduJt2A==
 
 "@next/eslint-plugin-next@12.1.0":
   version "12.1.0"
@@ -58,50 +58,50 @@
   dependencies:
     glob "7.1.7"
 
-"@next/swc-darwin-arm64@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.10.tgz#49d10ca4086fbd59ee68e204f75d7136eda2aa80"
-  integrity sha512-V3z10NV+cvMAfxQUMhKgfQnPbjw+Ew3cnr64b0lr8MDiBJs3eLnM6RpGC46nhfMZsiXgQngCJKWGTC/yDcgrDQ==
+"@next/swc-darwin-arm64@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.21.tgz#32a31992aace1440981df9cf7cb3af7845d94fec"
+  integrity sha512-HwEjcKsXtvszXz5q5Z7wCtrHeTTDSTgAbocz45PHMUjU3fBYInfvhR+ZhavDRUYLonm53aHZbB09QtJVJj8T7g==
 
-"@next/swc-darwin-x64@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.10.tgz#0ebeae3afb8eac433882b79543295ab83624a1a8"
-  integrity sha512-Y0TC+FXbFUQ2MQgimJ/7Ina2mXIKhE7F+GUe1SgnzRmwFY3hX2z8nyVCxE82I2RicspdkZnSWMn4oTjIKz4uzA==
+"@next/swc-darwin-x64@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.21.tgz#5ab4b3f6685b6b52f810d0f5cf6e471480ddffdb"
+  integrity sha512-TSAA2ROgNzm4FhKbTbyJOBrsREOMVdDIltZ6aZiKvCi/v0UwFmwigBGeqXDA97TFMpR3LNNpw52CbVelkoQBxA==
 
-"@next/swc-linux-arm64-gnu@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.10.tgz#7e602916d2fb55a3c532f74bed926a0137c16f20"
-  integrity sha512-ZfQ7yOy5zyskSj9rFpa0Yd7gkrBnJTkYVSya95hX3zeBG9E55Z6OTNPn1j2BTFWvOVVj65C3T+qsjOyVI9DQpA==
+"@next/swc-linux-arm64-gnu@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.21.tgz#8a0e1fa887aef19ca218af2af515d0a5ee67ba3f"
+  integrity sha512-0Dqjn0pEUz3JG+AImpnMMW/m8hRtl1GQCNbO66V1yp6RswSTiKmnHf3pTX6xMdJYSemf3O4Q9ykiL0jymu0TuA==
 
-"@next/swc-linux-arm64-musl@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.10.tgz#6b143f628ccee490b527562e934f8de578d4be47"
-  integrity sha512-n2i5o3y2jpBfXFRxDREr342BGIQCJbdAUi/K4q6Env3aSx8erM9VuKXHw5KNROK9ejFSPf0LhoSkU/ZiNdacpQ==
+"@next/swc-linux-arm64-musl@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.21.tgz#ddad844406b42fa8965fe11250abc85c1fe0fd05"
+  integrity sha512-Ggfw5qnMXldscVntwnjfaQs5GbBbjioV4B4loP+bjqNEb42fzZlAaK+ldL0jm2CTJga9LynBMhekNfV8W4+HBw==
 
-"@next/swc-linux-x64-gnu@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.10.tgz#086f2f16a0678890a1eb46518c4dda381b046082"
-  integrity sha512-GXvajAWh2woTT0GKEDlkVhFNxhJS/XdDmrVHrPOA83pLzlGPQnixqxD8u3bBB9oATBKB//5e4vpACnx5Vaxdqg==
+"@next/swc-linux-x64-gnu@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.21.tgz#db55fd666f9ba27718f65caa54b622a912cdd16b"
+  integrity sha512-uokj0lubN1WoSa5KKdThVPRffGyiWlm/vCc/cMkWOQHw69Qt0X1o3b2PyLLx8ANqlefILZh1EdfLRz9gVpG6tg==
 
-"@next/swc-linux-x64-musl@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.10.tgz#1befef10ed8dbcc5047b5d637a25ae3c30a0bfc3"
-  integrity sha512-opFFN5B0SnO+HTz4Wq4HaylXGFV+iHrVxd3YvREUX9K+xfc4ePbRrxqOuPOFjtSuiVouwe6uLeDtabjEIbkmDA==
+"@next/swc-linux-x64-musl@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.21.tgz#dddb850353624efcd58c4c4e30ad8a1aab379642"
+  integrity sha512-iAEBPzWNbciah4+0yI4s7Pce6BIoxTQ0AGCkxn/UBuzJFkYyJt71MadYQkjPqCQCJAFQ26sYh7MOKdU+VQFgPg==
 
-"@next/swc-win32-arm64-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.10.tgz#731f52c3ae3c56a26cf21d474b11ae1529531209"
-  integrity sha512-9NUzZuR8WiXTvv+EiU/MXdcQ1XUvFixbLIMNQiVHuzs7ZIFrJDLJDaOF1KaqttoTujpcxljM/RNAOmw1GhPPQQ==
+"@next/swc-win32-arm64-msvc@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.21.tgz#290012ee57b196d3d2d04853e6bf0179cae9fbaf"
+  integrity sha512-plykgB3vL2hB4Z32W3ktsfqyuyGAPxqwiyrAi2Mr8LlEUhNn9VgkiAl5hODSBpzIfWweX3er1f5uNpGDygfQVQ==
 
-"@next/swc-win32-ia32-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.10.tgz#32723ef7f04e25be12af357cc72ddfdd42fd1041"
-  integrity sha512-fr3aEbSd1GeW3YUMBkWAu4hcdjZ6g4NBl1uku4gAn661tcxd1bHs1THWYzdsbTRLcCKLjrDZlNp6j2HTfrw+Bg==
+"@next/swc-win32-ia32-msvc@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.21.tgz#c959135a78cab18cca588d11d1e33bcf199590d4"
+  integrity sha512-w5bacz4Vxqrh06BjWgua3Yf7EMDb8iMcVhNrNx8KnJXt8t+Uu0Zg4JHLDL/T7DkTCEEfKXO/Er1fcfWxn2xfPA==
 
-"@next/swc-win32-x64-msvc@14.2.10":
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.10.tgz#ee1d036cb5ec871816f96baee7991035bb242455"
-  integrity sha512-UjeVoRGKNL2zfbcQ6fscmgjBAS/inHBh63mjIlfPg/NG8Yn2ztqylXt5qilYb6hoHIwaU2ogHknHWWmahJjgZQ==
+"@next/swc-win32-x64-msvc@14.2.21":
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.21.tgz#21ff892286555b90538a7d1b505ea21a005d6ead"
+  integrity sha512-sT6+llIkzpsexGYZq8cjjthRyRGe5cJVhqh12FmlbxHqna6zsDDK8UNaV7g41T6atFHCJUPeLb3uyAwrBwy0NA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -147,10 +147,12 @@
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
 
-"@types/node@17.0.21":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
-  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
+"@types/node@^20.17.9":
+  version "20.17.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.9.tgz#5f141d4b7ee125cdee5faefe28de095398865bab"
+  integrity sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==
+  dependencies:
+    undici-types "~6.19.2"
 
 "@types/prop-types@*":
   version "15.7.4"
@@ -1242,21 +1244,21 @@ ms@^2.1.1:
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 nanoid@^3.3.6:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.7.tgz#d0c301a691bc8d54efa0a2226ccf3fe2fd656bd8"
-  integrity sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==
+  version "3.3.8"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
+  integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
 
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-next@14.2.10:
-  version "14.2.10"
-  resolved "https://registry.yarnpkg.com/next/-/next-14.2.10.tgz#331981a4fecb1ae8af1817d4db98fc9687ee1cb6"
-  integrity sha512-sDDExXnh33cY3RkS9JuFEKaS4HmlWmDKP1VJioucCG6z5KuA008DPsDZOzi8UfqEk3Ii+2NCQSJrfbEWtZZfww==
+next@14.2.21:
+  version "14.2.21"
+  resolved "https://registry.yarnpkg.com/next/-/next-14.2.21.tgz#f6da9e2abba1a0e4ca7a5273825daf06632554ba"
+  integrity sha512-rZmLwucLHr3/zfDMYbJXbw0ZeoBpirxkXuvsJbk7UPorvPYZhP7vq7aHbKnU7dQNCYIimRrbB2pp3xmf+wsYUg==
   dependencies:
-    "@next/env" "14.2.10"
+    "@next/env" "14.2.21"
     "@swc/helpers" "0.5.5"
     busboy "1.6.0"
     caniuse-lite "^1.0.30001579"
@@ -1264,15 +1266,15 @@ next@14.2.10:
     postcss "8.4.31"
     styled-jsx "5.1.1"
   optionalDependencies:
-    "@next/swc-darwin-arm64" "14.2.10"
-    "@next/swc-darwin-x64" "14.2.10"
-    "@next/swc-linux-arm64-gnu" "14.2.10"
-    "@next/swc-linux-arm64-musl" "14.2.10"
-    "@next/swc-linux-x64-gnu" "14.2.10"
-    "@next/swc-linux-x64-musl" "14.2.10"
-    "@next/swc-win32-arm64-msvc" "14.2.10"
-    "@next/swc-win32-ia32-msvc" "14.2.10"
-    "@next/swc-win32-x64-msvc" "14.2.10"
+    "@next/swc-darwin-arm64" "14.2.21"
+    "@next/swc-darwin-x64" "14.2.21"
+    "@next/swc-linux-arm64-gnu" "14.2.21"
+    "@next/swc-linux-arm64-musl" "14.2.21"
+    "@next/swc-linux-x64-gnu" "14.2.21"
+    "@next/swc-linux-x64-musl" "14.2.21"
+    "@next/swc-win32-arm64-msvc" "14.2.21"
+    "@next/swc-win32-ia32-msvc" "14.2.21"
+    "@next/swc-win32-x64-msvc" "14.2.21"
 
 node-domexception@^1.0.0:
   version "1.0.0"
@@ -1746,10 +1748,10 @@ type-fest@^0.20.2:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
-typescript@5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
-  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
+typescript@5.7.2:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 unbox-primitive@^1.0.1:
   version "1.0.1"
@@ -1761,6 +1763,11 @@ unbox-primitive@^1.0.1:
     has-symbols "^1.0.2"
     which-boxed-primitive "^1.0.2"
 
+undici-types@~6.19.2:
+  version "6.19.8"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
+  integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
+
 uri-js@^4.2.2:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
diff --git a/globalSetup.ts b/globalSetup.ts
index 07a0cec5e2..0b0e276b49 100644
--- a/globalSetup.ts
+++ b/globalSetup.ts
@@ -4,13 +4,33 @@ import {
   getContainerRuntimeClient,
 } from "testcontainers"
 import { ContainerInfo } from "dockerode"
-import path from "path"
-import lockfile from "proper-lockfile"
+import * as path from "path"
+import * as lockfile from "proper-lockfile"
+import { execSync } from "child_process"
+
+interface DockerContext {
+  Name: string
+  Description: string
+  DockerEndpoint: string
+  ContextType: string
+  Error: string
+}
+
+function getCurrentDockerContext(): DockerContext {
+  const out = execSync("docker context ls --format json")
+  for (const line of out.toString().split("\n")) {
+    const parsed = JSON.parse(line)
+    if (parsed.Current) {
+      return parsed as DockerContext
+    }
+  }
+  throw new Error("No current Docker context")
+}
 
 async function getBudibaseContainers() {
   const client = await getContainerRuntimeClient()
-  const conatiners = await client.container.list()
-  return conatiners.filter(
+  const containers = await client.container.list()
+  return containers.filter(
     container =>
       container.Labels["com.budibase"] === "true" &&
       container.Labels["org.testcontainers"] === "true"
@@ -27,6 +47,16 @@ async function killContainers(containers: ContainerInfo[]) {
 }
 
 export default async function setup() {
+  process.env.TESTCONTAINERS_RYUK_DISABLED = "true"
+
+  // For whatever reason, testcontainers doesn't always use the correct current
+  // docker context. This bit of code forces the issue by finding the current
+  // context and setting it as the DOCKER_HOST environment
+  if (!process.env.DOCKER_HOST) {
+    const dockerContext = getCurrentDockerContext()
+    process.env.DOCKER_HOST = dockerContext.DockerEndpoint
+  }
+
   const lockPath = path.resolve(__dirname, "globalSetup.ts")
   // If you run multiple tests at the same time, it's possible for the CouchDB
   // shared container to get started multiple times despite having an
@@ -47,6 +77,7 @@ export default async function setup() {
 
   try {
     const couchdb = new GenericContainer("budibase/couchdb:v3.3.3-sqs-v2.1.1")
+      .withName("couchdb_testcontainer")
       .withExposedPorts(5984, 4984)
       .withEnvironment({
         COUCHDB_PASSWORD: "budibase",
@@ -71,6 +102,7 @@ export default async function setup() {
       )
 
     const minio = new GenericContainer("minio/minio")
+      .withName("minio_testcontainer")
       .withExposedPorts(9000)
       .withCommand(["server", "/data"])
       .withTmpFs({ "/data": "rw" })
diff --git a/hosting/scripts/setup.js b/hosting/scripts/setup.js
index c62ac14f29..35ee32bd64 100755
--- a/hosting/scripts/setup.js
+++ b/hosting/scripts/setup.js
@@ -2,7 +2,6 @@
 
 const os = require("os")
 const exec = require("child_process").exec
-const fs = require("fs")
 const platform = os.platform()
 
 const windows = platform === "win32"
@@ -17,10 +16,11 @@ function execute(command) {
 
 async function commandExistsUnix(command) {
   const unixCmd = `command -v ${command} 2>/dev/null && { echo >&1 ${command}; exit 0; }`
-  return execute(command)
+  return execute(unixCmd)
 }
 
 async function commandExistsWindows(command) {
+  // eslint-disable-next-line no-control-regex
   if (/[\x00-\x1f<>:"|?*]/.test(command)) {
     return false
   }
diff --git a/hosting/single/nginx/nginx-default-site.conf b/hosting/single/nginx/nginx-default-site.conf
index d2f8e229c6..f72d33e236 100644
--- a/hosting/single/nginx/nginx-default-site.conf
+++ b/hosting/single/nginx/nginx-default-site.conf
@@ -46,6 +46,11 @@ server {
     }
 
     location ~ ^/api/(system|admin|global)/ {
+        # Enable buffering for potentially large OIDC configs
+        proxy_buffering on;
+        proxy_buffer_size 16k;
+        proxy_buffers 4 32k;
+
         proxy_pass      http://127.0.0.1:4002;
     }
 
diff --git a/lerna.json b/lerna.json
index bd7509fcb3..13040cb50c 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,12 +1,7 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.7",
+  "version": "3.3.1",
   "npmClient": "yarn",
-  "packages": [
-    "packages/*",
-    "!packages/account-portal",
-    "packages/account-portal/packages/*"
-  ],
   "concurrency": 20,
   "command": {
     "publish": {
diff --git a/nx.json b/nx.json
index fb05ea94d0..a71ee6961c 100644
--- a/nx.json
+++ b/nx.json
@@ -2,7 +2,6 @@
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "tasksRunnerOptions": {
     "default": {
-      "runner": "nx-cloud",
       "options": {
         "cacheableOperations": ["build", "test", "check:types"]
       }
@@ -13,7 +12,8 @@
       "inputs": [
         "{workspaceRoot}/scripts/*",
         "{workspaceRoot}/lerna.json",
-        "{workspaceRoot}/.github/workflows/*"
+        "{workspaceRoot}/.github/workflows/*",
+        "{workspaceRoot}/tsconfig.build.json"
       ]
     },
     "test": {
diff --git a/package.json b/package.json
index fc7e202e3d..771d3cefd5 100644
--- a/package.json
+++ b/package.json
@@ -3,31 +3,34 @@
   "private": true,
   "devDependencies": {
     "@babel/core": "^7.22.5",
-    "@babel/eslint-parser": "^7.22.5",
+    "@babel/eslint-parser": "7.25.9",
     "@babel/preset-env": "^7.22.5",
     "@esbuild-plugins/tsconfig-paths": "^0.1.2",
-    "@types/node": "20.10.0",
+    "@types/node": "^20.17.9",
     "@types/proper-lockfile": "^4.1.4",
-    "@typescript-eslint/parser": "6.9.0",
+    "@typescript-eslint/parser": "8.17.0",
+    "@vitest/eslint-plugin": "^1.1.14",
+    "cross-spawn": "7.0.6",
+    "depcheck": "^1.4.7",
     "esbuild": "^0.18.17",
     "esbuild-node-externals": "^1.14.0",
-    "eslint": "^8.52.0",
-    "eslint-plugin-import": "^2.29.0",
-    "eslint-plugin-jest": "^27.9.0",
-    "eslint-plugin-local-rules": "^2.0.0",
-    "eslint-plugin-svelte": "^2.34.0",
+    "eslint": "9.16.0",
+    "eslint-plugin-jest": "28.9.0",
+    "eslint-plugin-local-rules": "3.0.2",
+    "eslint-plugin-svelte": "2.46.1",
     "husky": "^8.0.3",
     "kill-port": "^1.6.1",
     "lerna": "7.4.2",
+    "load-tsconfig": "^0.2.5",
     "madge": "^6.0.0",
     "nx-cloud": "16.0.5",
     "prettier": "2.8.8",
     "prettier-plugin-svelte": "^2.3.0",
     "proper-lockfile": "^4.1.2",
-    "svelte": "^4.2.10",
-    "svelte-eslint-parser": "^0.33.1",
-    "typescript": "5.5.2",
-    "typescript-eslint": "^7.3.1",
+    "svelte": "4.2.19",
+    "svelte-eslint-parser": "0.43.0",
+    "typescript": "5.7.2",
+    "typescript-eslint": "8.17.0",
     "yargs": "^17.7.2"
   },
   "scripts": {
@@ -35,11 +38,10 @@
     "setup": "git config submodule.recurse true && git submodule update && node ./hosting/scripts/setup.js && yarn && yarn build && yarn dev",
     "build": "DISABLE_V8_COMPILE_CACHE=1 NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream",
     "build:apps": "DISABLE_V8_COMPILE_CACHE=1 yarn build --scope @budibase/server --scope @budibase/worker",
-    "build:oss": "DISABLE_V8_COMPILE_CACHE=1 NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --ignore @budibase/account-portal-server --ignore @budibase/account-portal-ui",
     "build:cli": "yarn build --scope @budibase/cli",
-    "build:account-portal": "NODE_OPTIONS=--max-old-space-size=1500 lerna run build --stream --scope @budibase/account-portal-server --scope @budibase/account-portal-ui",
     "build:dev": "lerna run --stream prebuild && yarn nx run-many --target=build --output-style=dynamic --watch --preserveWatchOutput",
-    "check:types": "lerna run --concurrency 2 check:types --ignore @budibase/account-portal-server",
+    "check:types": "yarn check:dependencies && lerna run --concurrency 2 check:types",
+    "check:dependencies": "lerna run --concurrency 2 check:dependencies",
     "build:sdk": "lerna run --stream build:sdk",
     "deps:circular": "madge packages/server/dist/index.js packages/worker/src/index.ts packages/backend-core/dist/src/index.js packages/cli/src/index.js --circular",
     "release": "lerna publish from-package --yes --force-publish --no-git-tag-version --no-push --no-git-reset",
@@ -52,15 +54,12 @@
     "kill-server": "kill-port 4001 4002",
     "kill-accountportal": "kill-port 3001 4003",
     "kill-all": "yarn run kill-builder && yarn run kill-server && yarn kill-accountportal",
-    "dev": "yarn run kill-all && lerna run --parallel prebuild && lerna run --stream dev --ignore=@budibase/account-portal-ui --ignore @budibase/account-portal-server",
-    "dev:noserver": "yarn run kill-builder && lerna run --stream dev:stack:up --ignore @budibase/account-portal-server && lerna run --stream dev --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker --ignore=@budibase/account-portal-ui --ignore @budibase/account-portal-server",
+    "dev": "yarn run kill-all && lerna run --parallel prebuild && lerna run --stream dev",
+    "dev:noserver": "yarn run kill-builder && lerna run --stream dev:stack:up && lerna run --stream dev --ignore @budibase/backend-core --ignore @budibase/server --ignore @budibase/worker",
     "dev:server": "yarn run kill-server && lerna run --stream dev --scope @budibase/worker --scope @budibase/server",
-    "dev:accountportal": "yarn kill-accountportal && lerna run dev --stream --scope @budibase/account-portal-ui --scope @budibase/account-portal-server",
-    "dev:camunda": "./scripts/deploy-camunda.sh",
-    "dev:all": "yarn run kill-all && lerna run --stream dev",
     "dev:built": "yarn run kill-all && cd packages/server && yarn dev:stack:up && cd ../../ && lerna run --stream dev:built",
     "dev:docker": "./scripts/devDocker.sh",
-    "test": "lerna run --concurrency 1 --stream test --stream",
+    "test": "lerna run --concurrency 1 --stream test",
     "test:containers:kill": "./scripts/killTestcontainers.sh",
     "lint:eslint": "eslint packages --max-warnings=0",
     "lint:prettier": "prettier --check \"packages/**/*.{js,ts,svelte}\" && prettier --write \"examples/**/*.{js,ts,svelte}\"",
@@ -78,7 +77,6 @@
     "build:docker:dependencies": "docker build -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest ./hosting",
     "publish:docker:couch": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/couchdb/Dockerfile -t budibase/couchdb:latest -t budibase/couchdb:v3.3.3 -t budibase/couchdb:v3.3.3-sqs-v2.1.1 --push ./hosting/couchdb",
     "publish:docker:dependencies": "docker buildx build --platform linux/arm64,linux/amd64 -f hosting/dependencies/Dockerfile -t budibase/dependencies:latest -t budibase/dependencies:v3.2.1 --push ./hosting",
-    "release:helm": "node scripts/releaseHelmChart",
     "env:multi:enable": "lerna run --stream env:multi:enable",
     "env:multi:disable": "lerna run --stream env:multi:disable",
     "env:selfhost:enable": "lerna run --stream env:selfhost:enable",
@@ -98,32 +96,30 @@
   },
   "workspaces": {
     "packages": [
-      "packages/*",
-      "!packages/account-portal",
-      "packages/account-portal/packages/*"
+      "packages/*"
     ]
   },
   "resolutions": {
-    "@budibase/backend-core": "0.0.0",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/backend-core": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
     "@budibase/pro": "npm:@budibase/pro@latest",
     "tough-cookie": "4.1.3",
     "node-fetch": "2.6.7",
     "semver": "7.5.3",
     "http-cache-semantics": "4.1.1",
     "msgpackr": "1.10.1",
-    "axios": "1.6.3",
+    "axios": "1.7.7",
     "xml2js": "0.6.2",
     "unset-value": "2.0.1",
     "passport": "0.6.0",
     "fast-xml-parser": "4.4.1",
     "@azure/identity": "4.2.1",
-    "kind-of": "6.0.3"
+    "kind-of": "6.0.3",
+    "globals": "15.13.0"
   },
   "engines": {
     "node": ">=20.0.0 <21.0.0"
-  },
-  "dependencies": {}
+  }
 }
diff --git a/packages/account-portal b/packages/account-portal
deleted file mode 160000
index 9bef5d1656..0000000000
--- a/packages/account-portal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9bef5d1656b4f3c991447ded6d65b0eba393a140
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 219ae498aa..1ab05cd14b 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -21,28 +21,34 @@
   "scripts": {
     "prebuild": "rimraf dist/",
     "prepack": "cp package.json dist",
-    "build": "tsc -p tsconfig.build.json --paths null && node ./scripts/build.js",
+    "build": "node ./scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null && tsc -p tsconfig.test.json --paths null",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "build:oss": "node ./scripts/build.js",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
+    "check:dependencies": "node ../../scripts/depcheck.js",
     "test": "bash scripts/test.sh",
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
     "@budibase/nano": "10.1.5",
     "@budibase/pouchdb-replication-stream": "1.2.11",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/shared-core": "*",
+    "@budibase/types": "*",
+    "@techpass/passport-openidconnect": "0.3.3",
     "aws-cloudfront-sign": "3.0.2",
-    "aws-sdk": "2.1030.0",
+    "aws-sdk": "2.1692.0",
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
     "correlation-id": "4.0.0",
-    "dd-trace": "5.2.0",
+    "dd-trace": "5.26.0",
     "dotenv": "16.0.1",
+    "google-auth-library": "^8.0.1",
+    "google-spreadsheet": "npm:@budibase/google-spreadsheet@4.1.5",
     "ioredis": "5.3.2",
     "joi": "17.6.0",
     "jsonwebtoken": "9.0.2",
+    "knex": "2.4.2",
     "koa-passport": "^6.0.0",
     "koa-pino-logger": "4.0.0",
     "lodash": "4.17.21",
@@ -53,17 +59,17 @@
     "pino": "8.11.0",
     "pino-http": "8.3.3",
     "posthog-node": "4.0.1",
-    "pouchdb": "7.3.0",
-    "pouchdb-find": "7.2.2",
+    "pouchdb": "9.0.0",
+    "pouchdb-find": "9.0.0",
     "redlock": "4.2.0",
     "rotating-file-stream": "3.1.0",
     "sanitize-s3-objectkey": "0.0.1",
     "semver": "^7.5.4",
     "tar-fs": "2.1.1",
-    "uuid": "^8.3.2",
-    "knex": "2.4.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@jest/types": "^29.6.3",
     "@shopify/jest-koa-mocks": "5.1.1",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
@@ -72,20 +78,22 @@
     "@types/jest": "29.5.5",
     "@types/lodash": "4.14.200",
     "@types/node-fetch": "2.6.4",
-    "@types/pouchdb": "6.4.0",
+    "@types/pouchdb": "6.4.2",
     "@types/redlock": "4.0.7",
     "@types/semver": "7.3.7",
     "@types/tar-fs": "2.0.1",
     "@types/uuid": "8.3.4",
+    "@types/koa": "2.13.4",
     "chance": "1.1.8",
     "ioredis-mock": "8.9.0",
     "jest": "29.7.0",
     "jest-serial-runner": "1.2.1",
+    "nock": "^13.5.6",
     "pino-pretty": "10.0.0",
     "pouchdb-adapter-memory": "7.2.2",
-    "testcontainers": "^10.7.2",
+    "testcontainers": "10.16.0",
     "timekeeper": "2.2.0",
-    "typescript": "5.5.2"
+    "typescript": "5.7.2"
   },
   "nx": {
     "targets": {
diff --git a/packages/backend-core/src/cache/invite.ts b/packages/backend-core/src/cache/invite.ts
index e3d698bcc6..5d896ba04c 100644
--- a/packages/backend-core/src/cache/invite.ts
+++ b/packages/backend-core/src/cache/invite.ts
@@ -3,18 +3,10 @@ import { Duration } from "../utils"
 import env from "../environment"
 import { getTenantId } from "../context"
 import * as redis from "../redis/init"
+import { Invite, InviteWithCode } from "@budibase/types"
 
 const TTL_SECONDS = Duration.fromDays(7).toSeconds()
 
-interface Invite {
-  email: string
-  info: any
-}
-
-interface InviteWithCode extends Invite {
-  code: string
-}
-
 /**
  * Given an invite code and invite body, allow the update an existing/valid invite in redis
  * @param code The invite code for an invite in redis
diff --git a/packages/backend-core/src/context/mainContext.ts b/packages/backend-core/src/context/mainContext.ts
index 64ba240fa5..e5f20882d3 100644
--- a/packages/backend-core/src/context/mainContext.ts
+++ b/packages/backend-core/src/context/mainContext.ts
@@ -385,17 +385,17 @@ export function getCurrentContext(): ContextMap | undefined {
   }
 }
 
-export function getFeatureFlags<T extends Record<string, any>>(
+export function getFeatureFlags(
   key: string
-): T | undefined {
+): Record<string, boolean> | undefined {
   const context = getCurrentContext()
   if (!context) {
     return undefined
   }
-  return context.featureFlagCache?.[key] as T
+  return context.featureFlagCache?.[key]
 }
 
-export function setFeatureFlags(key: string, value: Record<string, any>) {
+export function setFeatureFlags(key: string, value: Record<string, boolean>) {
   const context = getCurrentContext()
   if (!context) {
     return
diff --git a/packages/backend-core/src/context/types.ts b/packages/backend-core/src/context/types.ts
index 5549a47ff7..23598b951e 100644
--- a/packages/backend-core/src/context/types.ts
+++ b/packages/backend-core/src/context/types.ts
@@ -20,7 +20,7 @@ export type ContextMap = {
     clients: Record<string, GoogleSpreadsheet>
   }
   featureFlagCache?: {
-    [key: string]: Record<string, any>
+    [key: string]: Record<string, boolean>
   }
   viewToTableCache?: Record<string, Table>
 }
diff --git a/packages/backend-core/src/db/couch/DatabaseImpl.ts b/packages/backend-core/src/db/couch/DatabaseImpl.ts
index 83b9b69d0b..98e24e0996 100644
--- a/packages/backend-core/src/db/couch/DatabaseImpl.ts
+++ b/packages/backend-core/src/db/couch/DatabaseImpl.ts
@@ -190,7 +190,7 @@ export class DatabaseImpl implements Database {
     }
   }
 
-  private async performCall<T>(call: DBCallback<T>): Promise<any> {
+  private async performCall<T>(call: DBCallback<T>): Promise<T> {
     const db = this.getDb()
     const fnc = await call(db)
     try {
@@ -289,7 +289,7 @@ export class DatabaseImpl implements Database {
       return
     }
     let errorFound = false
-    let errorMessage: string = "Unable to bulk remove documents: "
+    let errorMessage = "Unable to bulk remove documents: "
     for (let res of response) {
       if (res.error) {
         errorFound = true
@@ -467,7 +467,7 @@ export class DatabaseImpl implements Database {
     } catch (err: any) {
       // didn't exist, don't worry
       if (err.statusCode === 404) {
-        return
+        return { ok: true }
       } else {
         throw new CouchDBError(err.message, err)
       }
diff --git a/packages/backend-core/src/db/couch/connections.ts b/packages/backend-core/src/db/couch/connections.ts
index 5c7d7ec81d..9692b095a8 100644
--- a/packages/backend-core/src/db/couch/connections.ts
+++ b/packages/backend-core/src/db/couch/connections.ts
@@ -1,6 +1,6 @@
 import env from "../../environment"
 
-export const getCouchInfo = (connection?: string) => {
+export const getCouchInfo = (connection?: string | null) => {
   // clean out any auth credentials
   const urlInfo = getUrlInfo(connection)
   let username
@@ -45,7 +45,7 @@ export const getCouchInfo = (connection?: string) => {
   }
 }
 
-export const getUrlInfo = (url = env.COUCH_DB_URL) => {
+export const getUrlInfo = (url: string | null = env.COUCH_DB_URL) => {
   let cleanUrl, username, password, host
   if (url) {
     // Ensure the URL starts with a protocol
diff --git a/packages/backend-core/src/db/couch/utils.ts b/packages/backend-core/src/db/couch/utils.ts
index 270d953320..2200024bb2 100644
--- a/packages/backend-core/src/db/couch/utils.ts
+++ b/packages/backend-core/src/db/couch/utils.ts
@@ -4,7 +4,7 @@ import { checkSlashesInUrl } from "../../helpers"
 
 export async function directCouchCall(
   path: string,
-  method: string = "GET",
+  method = "GET",
   body?: any
 ) {
   let { url, cookie } = getCouchInfo()
@@ -43,7 +43,7 @@ export async function directCouchUrlCall({
 
 export async function directCouchQuery(
   path: string,
-  method: string = "GET",
+  method = "GET",
   body?: any
 ) {
   const response = await directCouchCall(path, method, body)
diff --git a/packages/backend-core/src/db/instrumentation.ts b/packages/backend-core/src/db/instrumentation.ts
index e08bfc0362..0c0056d6ed 100644
--- a/packages/backend-core/src/db/instrumentation.ts
+++ b/packages/backend-core/src/db/instrumentation.ts
@@ -27,7 +27,7 @@ export class DDInstrumentedDatabase implements Database {
 
   exists(docId?: string): Promise<boolean> {
     return tracer.trace("db.exists", span => {
-      span?.addTags({ db_name: this.name, doc_id: docId })
+      span.addTags({ db_name: this.name, doc_id: docId })
       if (docId) {
         return this.db.exists(docId)
       }
@@ -37,15 +37,17 @@ export class DDInstrumentedDatabase implements Database {
 
   get<T extends Document>(id?: string | undefined): Promise<T> {
     return tracer.trace("db.get", span => {
-      span?.addTags({ db_name: this.name, doc_id: id })
+      span.addTags({ db_name: this.name, doc_id: id })
       return this.db.get(id)
     })
   }
 
   tryGet<T extends Document>(id?: string | undefined): Promise<T | undefined> {
-    return tracer.trace("db.tryGet", span => {
-      span?.addTags({ db_name: this.name, doc_id: id })
-      return this.db.tryGet(id)
+    return tracer.trace("db.tryGet", async span => {
+      span.addTags({ db_name: this.name, doc_id: id })
+      const doc = await this.db.tryGet<T>(id)
+      span.addTags({ doc_found: doc !== undefined })
+      return doc
     })
   }
 
@@ -53,13 +55,15 @@ export class DDInstrumentedDatabase implements Database {
     ids: string[],
     opts?: { allowMissing?: boolean | undefined } | undefined
   ): Promise<T[]> {
-    return tracer.trace("db.getMultiple", span => {
-      span?.addTags({
+    return tracer.trace("db.getMultiple", async span => {
+      span.addTags({
         db_name: this.name,
         num_docs: ids.length,
         allow_missing: opts?.allowMissing,
       })
-      return this.db.getMultiple(ids, opts)
+      const docs = await this.db.getMultiple<T>(ids, opts)
+      span.addTags({ num_docs_found: docs.length })
+      return docs
     })
   }
 
@@ -69,12 +73,14 @@ export class DDInstrumentedDatabase implements Database {
     idOrDoc: string | Document,
     rev?: string
   ): Promise<DocumentDestroyResponse> {
-    return tracer.trace("db.remove", span => {
-      span?.addTags({ db_name: this.name, doc_id: idOrDoc })
+    return tracer.trace("db.remove", async span => {
+      span.addTags({ db_name: this.name, doc_id: idOrDoc, rev })
       const isDocument = typeof idOrDoc === "object"
       const id = isDocument ? idOrDoc._id! : idOrDoc
       rev = isDocument ? idOrDoc._rev : rev
-      return this.db.remove(id, rev)
+      const resp = await this.db.remove(id, rev)
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
@@ -83,7 +89,11 @@ export class DDInstrumentedDatabase implements Database {
     opts?: { silenceErrors?: boolean }
   ): Promise<void> {
     return tracer.trace("db.bulkRemove", span => {
-      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      span.addTags({
+        db_name: this.name,
+        num_docs: documents.length,
+        silence_errors: opts?.silenceErrors,
+      })
       return this.db.bulkRemove(documents, opts)
     })
   }
@@ -92,15 +102,21 @@ export class DDInstrumentedDatabase implements Database {
     document: AnyDocument,
     opts?: DatabasePutOpts | undefined
   ): Promise<DocumentInsertResponse> {
-    return tracer.trace("db.put", span => {
-      span?.addTags({ db_name: this.name, doc_id: document._id })
-      return this.db.put(document, opts)
+    return tracer.trace("db.put", async span => {
+      span.addTags({
+        db_name: this.name,
+        doc_id: document._id,
+        force: opts?.force,
+      })
+      const resp = await this.db.put(document, opts)
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
   bulkDocs(documents: AnyDocument[]): Promise<DocumentBulkResponse[]> {
     return tracer.trace("db.bulkDocs", span => {
-      span?.addTags({ db_name: this.name, num_docs: documents.length })
+      span.addTags({ db_name: this.name, num_docs: documents.length })
       return this.db.bulkDocs(documents)
     })
   }
@@ -108,9 +124,15 @@ export class DDInstrumentedDatabase implements Database {
   allDocs<T extends Document | RowValue>(
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>> {
-    return tracer.trace("db.allDocs", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.allDocs(params)
+    return tracer.trace("db.allDocs", async span => {
+      span.addTags({ db_name: this.name, ...params })
+      const resp = await this.db.allDocs<T>(params)
+      span.addTags({
+        total_rows: resp.total_rows,
+        rows_length: resp.rows.length,
+        offset: resp.offset,
+      })
+      return resp
     })
   }
 
@@ -118,57 +140,75 @@ export class DDInstrumentedDatabase implements Database {
     viewName: string,
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>> {
-    return tracer.trace("db.query", span => {
-      span?.addTags({ db_name: this.name, view_name: viewName })
-      return this.db.query(viewName, params)
+    return tracer.trace("db.query", async span => {
+      span.addTags({ db_name: this.name, view_name: viewName, ...params })
+      const resp = await this.db.query<T>(viewName, params)
+      span.addTags({
+        total_rows: resp.total_rows,
+        rows_length: resp.rows.length,
+        offset: resp.offset,
+      })
+      return resp
     })
   }
 
-  destroy(): Promise<void | OkResponse> {
-    return tracer.trace("db.destroy", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.destroy()
+  destroy(): Promise<OkResponse> {
+    return tracer.trace("db.destroy", async span => {
+      span.addTags({ db_name: this.name })
+      const resp = await this.db.destroy()
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
-  compact(): Promise<void | OkResponse> {
-    return tracer.trace("db.compact", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.compact()
+  compact(): Promise<OkResponse> {
+    return tracer.trace("db.compact", async span => {
+      span.addTags({ db_name: this.name })
+      const resp = await this.db.compact()
+      span.addTags({ ok: resp.ok })
+      return resp
     })
   }
 
   dump(stream: Writable, opts?: DatabaseDumpOpts | undefined): Promise<any> {
     return tracer.trace("db.dump", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({
+        db_name: this.name,
+        batch_limit: opts?.batch_limit,
+        batch_size: opts?.batch_size,
+        style: opts?.style,
+        timeout: opts?.timeout,
+        num_doc_ids: opts?.doc_ids?.length,
+        view: opts?.view,
+      })
       return this.db.dump(stream, opts)
     })
   }
 
   load(...args: any[]): Promise<any> {
     return tracer.trace("db.load", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.load(...args)
     })
   }
 
   createIndex(...args: any[]): Promise<any> {
     return tracer.trace("db.createIndex", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.createIndex(...args)
     })
   }
 
   deleteIndex(...args: any[]): Promise<any> {
     return tracer.trace("db.deleteIndex", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.deleteIndex(...args)
     })
   }
 
   getIndexes(...args: any[]): Promise<any> {
     return tracer.trace("db.getIndexes", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name, num_args: args.length })
       return this.db.getIndexes(...args)
     })
   }
@@ -177,22 +217,27 @@ export class DDInstrumentedDatabase implements Database {
     sql: string,
     parameters?: SqlQueryBinding
   ): Promise<T[]> {
-    return tracer.trace("db.sql", span => {
-      span?.addTags({ db_name: this.name })
-      return this.db.sql(sql, parameters)
+    return tracer.trace("db.sql", async span => {
+      span.addTags({ db_name: this.name, num_bindings: parameters?.length })
+      const resp = await this.db.sql<T>(sql, parameters)
+      span.addTags({ num_rows: resp.length })
+      return resp
     })
   }
 
   sqlPurgeDocument(docIds: string[] | string): Promise<void> {
     return tracer.trace("db.sqlPurgeDocument", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({
+        db_name: this.name,
+        num_docs: Array.isArray(docIds) ? docIds.length : 1,
+      })
       return this.db.sqlPurgeDocument(docIds)
     })
   }
 
   sqlDiskCleanup(): Promise<void> {
     return tracer.trace("db.sqlDiskCleanup", span => {
-      span?.addTags({ db_name: this.name })
+      span.addTags({ db_name: this.name })
       return this.db.sqlDiskCleanup()
     })
   }
diff --git a/packages/backend-core/src/db/lucene.ts b/packages/backend-core/src/db/lucene.ts
index 0206bb2140..9d897553dd 100644
--- a/packages/backend-core/src/db/lucene.ts
+++ b/packages/backend-core/src/db/lucene.ts
@@ -279,7 +279,7 @@ export class QueryBuilder<T> {
     let query = allOr ? "" : "*:*"
     let allFiltersEmpty = true
     const allPreProcessingOpts = { escape: true, lowercase: true, wrap: true }
-    let tableId: string = ""
+    let tableId = ""
     if (this.#query.equal!.tableId) {
       tableId = this.#query.equal!.tableId
       delete this.#query.equal!.tableId
diff --git a/packages/backend-core/src/db/tests/pouch.spec.js b/packages/backend-core/src/db/tests/pouch.spec.ts
similarity index 98%
rename from packages/backend-core/src/db/tests/pouch.spec.js
rename to packages/backend-core/src/db/tests/pouch.spec.ts
index f0abc82240..21632cff88 100644
--- a/packages/backend-core/src/db/tests/pouch.spec.js
+++ b/packages/backend-core/src/db/tests/pouch.spec.ts
@@ -1,5 +1,6 @@
 require("../../../tests")
-const getUrlInfo = require("../couch").getUrlInfo
+
+import { getUrlInfo } from "../couch"
 
 describe("pouch", () => {
   describe("Couch DB URL parsing", () => {
diff --git a/packages/backend-core/src/environment.ts b/packages/backend-core/src/environment.ts
index 56d9cd6e10..954fdd4135 100644
--- a/packages/backend-core/src/environment.ts
+++ b/packages/backend-core/src/environment.ts
@@ -134,10 +134,10 @@ const environment = {
   BUDIBASE_ENVIRONMENT: process.env.BUDIBASE_ENVIRONMENT,
   JS_BCRYPT: process.env.JS_BCRYPT,
   JWT_SECRET: process.env.JWT_SECRET
-    ? createSecretKey(Buffer.from(process.env.JWT_SECRET))
+    ? createSecretKey(process.env.JWT_SECRET, "utf8")
     : undefined,
   JWT_SECRET_FALLBACK: process.env.JWT_SECRET_FALLBACK
-    ? createSecretKey(Buffer.from(process.env.JWT_SECRET_FALLBACK))
+    ? createSecretKey(process.env.JWT_SECRET_FALLBACK, "utf8")
     : undefined,
   ENCRYPTION_KEY: process.env.ENCRYPTION_KEY,
   API_ENCRYPTION_KEY: getAPIEncryptionKey(),
diff --git a/packages/backend-core/src/events/identification.ts b/packages/backend-core/src/events/identification.ts
index 69bf7009b2..6117f4b485 100644
--- a/packages/backend-core/src/events/identification.ts
+++ b/packages/backend-core/src/events/identification.ts
@@ -121,7 +121,7 @@ const identifyInstallationGroup = async (
 
 const identifyTenantGroup = async (
   tenantId: string,
-  account: Account | undefined,
+  hosting: Hosting,
   timestamp?: string | number
 ): Promise<void> => {
   const id = await getEventTenantId(tenantId)
@@ -129,26 +129,12 @@ const identifyTenantGroup = async (
   const installationId = await getInstallationId()
   const environment = getDeploymentEnvironment()
 
-  let hosting: Hosting
-  let profession: string | undefined
-  let companySize: string | undefined
-
-  if (account) {
-    profession = account.profession
-    companySize = account.size
-    hosting = account.hosting
-  } else {
-    hosting = getHostingFromEnv()
-  }
-
   const group: TenantGroup = {
     id,
     type,
     hosting,
     environment,
     installationId,
-    profession,
-    companySize,
   }
 
   await identifyGroup(group, timestamp)
diff --git a/packages/backend-core/src/events/processors/Processors.ts b/packages/backend-core/src/events/processors/Processors.ts
index 72de945d44..8fe8034280 100644
--- a/packages/backend-core/src/events/processors/Processors.ts
+++ b/packages/backend-core/src/events/processors/Processors.ts
@@ -2,7 +2,7 @@ import { Event, Identity, Group } from "@budibase/types"
 import { EventProcessor } from "./types"
 
 export default class Processor implements EventProcessor {
-  initialised: boolean = false
+  initialised = false
   processors: EventProcessor[] = []
 
   constructor(processors: EventProcessor[]) {
diff --git a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
index 12d2bb7e2c..6c45da09e6 100644
--- a/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
+++ b/packages/backend-core/src/events/processors/posthog/PosthogProcessor.ts
@@ -13,9 +13,7 @@ const EXCLUDED_EVENTS: Event[] = [
   Event.ROLE_UPDATED,
   Event.DATASOURCE_UPDATED,
   Event.QUERY_UPDATED,
-  Event.TABLE_UPDATED,
   Event.VIEW_UPDATED,
-  Event.VIEW_FILTER_UPDATED,
   Event.VIEW_CALCULATION_UPDATED,
   Event.AUTOMATION_TRIGGER_UPDATED,
   Event.USER_GROUP_UPDATED,
diff --git a/packages/backend-core/src/events/processors/types.ts b/packages/backend-core/src/events/processors/types.ts
index 5256a1bc62..714bf0ef4e 100644
--- a/packages/backend-core/src/events/processors/types.ts
+++ b/packages/backend-core/src/events/processors/types.ts
@@ -1 +1 @@
-export { EventProcessor } from "@budibase/types"
+export type { EventProcessor } from "@budibase/types"
diff --git a/packages/backend-core/src/events/publishers/index.ts b/packages/backend-core/src/events/publishers/index.ts
index 9c92b80499..aaec62f979 100644
--- a/packages/backend-core/src/events/publishers/index.ts
+++ b/packages/backend-core/src/events/publishers/index.ts
@@ -23,3 +23,4 @@ export { default as plugin } from "./plugin"
 export { default as backup } from "./backup"
 export { default as environmentVariable } from "./environmentVariable"
 export { default as auditLog } from "./auditLog"
+export { default as rowAction } from "./rowAction"
diff --git a/packages/backend-core/src/events/publishers/query.ts b/packages/backend-core/src/events/publishers/query.ts
index 48603257d2..3bc8ffa5fd 100644
--- a/packages/backend-core/src/events/publishers/query.ts
+++ b/packages/backend-core/src/events/publishers/query.ts
@@ -12,8 +12,6 @@ import {
   QueriesRunEvent,
 } from "@budibase/types"
 
-/* eslint-disable */
-
 const created = async (
   datasource: Datasource,
   query: Query,
diff --git a/packages/backend-core/src/events/publishers/rowAction.ts b/packages/backend-core/src/events/publishers/rowAction.ts
new file mode 100644
index 0000000000..eac35cc489
--- /dev/null
+++ b/packages/backend-core/src/events/publishers/rowAction.ts
@@ -0,0 +1,13 @@
+import { publishEvent } from "../events"
+import { Event, RowActionCreatedEvent } from "@budibase/types"
+
+async function created(
+  rowAction: RowActionCreatedEvent,
+  timestamp?: string | number
+) {
+  await publishEvent(Event.ROW_ACTION_CREATED, rowAction, timestamp)
+}
+
+export default {
+  created,
+}
diff --git a/packages/backend-core/src/events/publishers/rows.ts b/packages/backend-core/src/events/publishers/rows.ts
index 9608613e89..e19681e5fe 100644
--- a/packages/backend-core/src/events/publishers/rows.ts
+++ b/packages/backend-core/src/events/publishers/rows.ts
@@ -6,8 +6,6 @@ import {
   Table,
 } from "@budibase/types"
 
-/* eslint-disable */
-
 const created = async (count: number, timestamp?: string | number) => {
   const properties: RowsCreatedEvent = {
     count,
diff --git a/packages/backend-core/src/events/publishers/table.ts b/packages/backend-core/src/events/publishers/table.ts
index dc3200291a..77a2c3e1a4 100644
--- a/packages/backend-core/src/events/publishers/table.ts
+++ b/packages/backend-core/src/events/publishers/table.ts
@@ -1,13 +1,14 @@
 import { publishEvent } from "../events"
 import {
   Event,
-  TableExportFormat,
+  FieldType,
   Table,
   TableCreatedEvent,
-  TableUpdatedEvent,
   TableDeletedEvent,
   TableExportedEvent,
+  TableExportFormat,
   TableImportedEvent,
+  TableUpdatedEvent,
 } from "@budibase/types"
 
 async function created(table: Table, timestamp?: string | number) {
@@ -20,14 +21,34 @@ async function created(table: Table, timestamp?: string | number) {
   await publishEvent(Event.TABLE_CREATED, properties, timestamp)
 }
 
-async function updated(table: Table) {
+async function updated(oldTable: Table, newTable: Table) {
+  // only publish the event if it has fields we are interested in
+  let defaultValues, aiColumn
+
+  // check that new fields have been added
+  for (const key in newTable.schema) {
+    if (!oldTable.schema[key]) {
+      const newColumn = newTable.schema[key]
+      if ("default" in newColumn && newColumn.default != null) {
+        defaultValues = true
+      }
+      if (newColumn.type === FieldType.AI) {
+        aiColumn = newColumn.operation
+      }
+    }
+  }
+
   const properties: TableUpdatedEvent = {
-    tableId: table._id as string,
+    tableId: newTable._id as string,
+    defaultValues,
+    aiColumn,
     audited: {
-      name: table.name,
+      name: newTable.name,
     },
   }
-  await publishEvent(Event.TABLE_UPDATED, properties)
+  if (defaultValues || aiColumn) {
+    await publishEvent(Event.TABLE_UPDATED, properties)
+  }
 }
 
 async function deleted(table: Table) {
diff --git a/packages/backend-core/src/events/publishers/view.ts b/packages/backend-core/src/events/publishers/view.ts
index ccbf960b04..503b011373 100644
--- a/packages/backend-core/src/events/publishers/view.ts
+++ b/packages/backend-core/src/events/publishers/view.ts
@@ -1,6 +1,11 @@
 import { publishEvent } from "../events"
 import {
+  CalculationType,
   Event,
+  Table,
+  TableExportFormat,
+  View,
+  ViewCalculation,
   ViewCalculationCreatedEvent,
   ViewCalculationDeletedEvent,
   ViewCalculationUpdatedEvent,
@@ -11,22 +16,20 @@ import {
   ViewFilterDeletedEvent,
   ViewFilterUpdatedEvent,
   ViewUpdatedEvent,
-  View,
-  ViewCalculation,
-  Table,
-  TableExportFormat,
+  ViewV2,
+  ViewJoinCreatedEvent,
 } from "@budibase/types"
 
-/* eslint-disable */
-
-async function created(view: View, timestamp?: string | number) {
+async function created(view: ViewV2, timestamp?: string | number) {
   const properties: ViewCreatedEvent = {
+    name: view.name,
+    type: view.type,
     tableId: view.tableId,
   }
   await publishEvent(Event.VIEW_CREATED, properties, timestamp)
 }
 
-async function updated(view: View) {
+async function updated(view: ViewV2) {
   const properties: ViewUpdatedEvent = {
     tableId: view.tableId,
   }
@@ -48,16 +51,27 @@ async function exported(table: Table, format: TableExportFormat) {
   await publishEvent(Event.VIEW_EXPORTED, properties)
 }
 
-async function filterCreated(view: View, timestamp?: string | number) {
+async function filterCreated(
+  { tableId, filterGroups }: { tableId: string; filterGroups: number },
+  timestamp?: string | number
+) {
   const properties: ViewFilterCreatedEvent = {
-    tableId: view.tableId,
+    tableId,
+    filterGroups,
   }
   await publishEvent(Event.VIEW_FILTER_CREATED, properties, timestamp)
 }
 
-async function filterUpdated(view: View) {
+async function filterUpdated({
+  tableId,
+  filterGroups,
+}: {
+  tableId: string
+  filterGroups: number
+}) {
   const properties: ViewFilterUpdatedEvent = {
-    tableId: view.tableId,
+    tableId: tableId,
+    filterGroups,
   }
   await publishEvent(Event.VIEW_FILTER_UPDATED, properties)
 }
@@ -69,10 +83,16 @@ async function filterDeleted(view: View) {
   await publishEvent(Event.VIEW_FILTER_DELETED, properties)
 }
 
-async function calculationCreated(view: View, timestamp?: string | number) {
+async function calculationCreated(
+  {
+    tableId,
+    calculationType,
+  }: { tableId: string; calculationType: CalculationType },
+  timestamp?: string | number
+) {
   const properties: ViewCalculationCreatedEvent = {
-    tableId: view.tableId,
-    calculation: view.calculation as ViewCalculation,
+    tableId,
+    calculation: calculationType,
   }
   await publishEvent(Event.VIEW_CALCULATION_CREATED, properties, timestamp)
 }
@@ -93,6 +113,13 @@ async function calculationDeleted(existingView: View) {
   await publishEvent(Event.VIEW_CALCULATION_DELETED, properties)
 }
 
+async function viewJoinCreated(tableId: any, timestamp?: string | number) {
+  const properties: ViewJoinCreatedEvent = {
+    tableId,
+  }
+  await publishEvent(Event.VIEW_JOIN_CREATED, properties, timestamp)
+}
+
 export default {
   created,
   updated,
@@ -104,4 +131,5 @@ export default {
   calculationCreated,
   calculationUpdated,
   calculationDeleted,
+  viewJoinCreated,
 }
diff --git a/packages/backend-core/src/features/features.ts b/packages/backend-core/src/features/features.ts
index b3f016e88a..772bcf5860 100644
--- a/packages/backend-core/src/features/features.ts
+++ b/packages/backend-core/src/features/features.ts
@@ -2,9 +2,10 @@ import env from "../environment"
 import * as crypto from "crypto"
 import * as context from "../context"
 import { PostHog, PostHogOptions } from "posthog-node"
-import { FeatureFlag } from "@budibase/types"
 import tracer from "dd-trace"
 import { Duration } from "../utils"
+import { cloneDeep } from "lodash"
+import { FeatureFlagDefaults } from "@budibase/types"
 
 let posthog: PostHog | undefined
 export function init(opts?: PostHogOptions) {
@@ -30,74 +31,6 @@ export function shutdown() {
   posthog?.shutdown()
 }
 
-export abstract class Flag<T> {
-  static boolean(defaultValue: boolean): Flag<boolean> {
-    return new BooleanFlag(defaultValue)
-  }
-
-  static string(defaultValue: string): Flag<string> {
-    return new StringFlag(defaultValue)
-  }
-
-  static number(defaultValue: number): Flag<number> {
-    return new NumberFlag(defaultValue)
-  }
-
-  protected constructor(public defaultValue: T) {}
-
-  abstract parse(value: any): T
-}
-
-type UnwrapFlag<F> = F extends Flag<infer U> ? U : never
-
-export type FlagValues<T> = {
-  [K in keyof T]: UnwrapFlag<T[K]>
-}
-
-type KeysOfType<T, U> = {
-  [K in keyof T]: T[K] extends Flag<U> ? K : never
-}[keyof T]
-
-class BooleanFlag extends Flag<boolean> {
-  parse(value: any) {
-    if (typeof value === "string") {
-      return ["true", "t", "1"].includes(value.toLowerCase())
-    }
-
-    if (typeof value === "boolean") {
-      return value
-    }
-
-    throw new Error(`could not parse value "${value}" as boolean`)
-  }
-}
-
-class StringFlag extends Flag<string> {
-  parse(value: any) {
-    if (typeof value === "string") {
-      return value
-    }
-    throw new Error(`could not parse value "${value}" as string`)
-  }
-}
-
-class NumberFlag extends Flag<number> {
-  parse(value: any) {
-    if (typeof value === "number") {
-      return value
-    }
-
-    if (typeof value === "string") {
-      const parsed = parseFloat(value)
-      if (!isNaN(parsed)) {
-        return parsed
-      }
-    }
-
-    throw new Error(`could not parse value "${value}" as number`)
-  }
-}
-
 export interface EnvFlagEntry {
   tenantId: string
   key: string
@@ -120,7 +53,7 @@ export function parseEnvFlags(flags: string): EnvFlagEntry[] {
   return result
 }
 
-export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
+export class FlagSet<T extends { [name: string]: boolean }> {
   // This is used to safely cache flags sets in the current request context.
   // Because multiple sets could theoretically exist, we don't want the cache of
   // one to leak into another.
@@ -130,34 +63,25 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
     this.setId = crypto.randomUUID()
   }
 
-  defaults(): FlagValues<T> {
-    return Object.keys(this.flagSchema).reduce((acc, key) => {
-      const typedKey = key as keyof T
-      acc[typedKey] = this.flagSchema[key].defaultValue
-      return acc
-    }, {} as FlagValues<T>)
+  defaults(): T {
+    return cloneDeep(this.flagSchema)
   }
 
   isFlagName(name: string | number | symbol): name is keyof T {
     return this.flagSchema[name as keyof T] !== undefined
   }
 
-  async get<K extends keyof T>(key: K): Promise<FlagValues<T>[K]> {
+  async isEnabled<K extends keyof T>(key: K): Promise<T[K]> {
     const flags = await this.fetch()
     return flags[key]
   }
 
-  async isEnabled<K extends KeysOfType<T, boolean>>(key: K): Promise<boolean> {
-    const flags = await this.fetch()
-    return flags[key]
-  }
-
-  async fetch(): Promise<FlagValues<T>> {
+  async fetch(): Promise<T> {
     return await tracer.trace("features.fetch", async span => {
-      const cachedFlags = context.getFeatureFlags<FlagValues<T>>(this.setId)
+      const cachedFlags = context.getFeatureFlags(this.setId)
       if (cachedFlags) {
         span?.addTags({ fromCache: true })
-        return cachedFlags
+        return cachedFlags as T
       }
 
       const tags: Record<string, any> = {}
@@ -189,7 +113,7 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
 
         // @ts-expect-error - TS does not like you writing into a generic type,
         // but we know that it's okay in this case because it's just an object.
-        flagValues[key as keyof FlagValues] = value
+        flagValues[key as keyof T] = value
         tags[`flags.${key}.source`] = "environment"
       }
 
@@ -217,11 +141,11 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
         tags[`readFromPostHog`] = true
 
         const personProperties: Record<string, string> = { tenantId }
-        const posthogFlags = await posthog.getAllFlagsAndPayloads(userId, {
+        const posthogFlags = await posthog.getAllFlags(userId, {
           personProperties,
         })
 
-        for (const [name, value] of Object.entries(posthogFlags.featureFlags)) {
+        for (const [name, value] of Object.entries(posthogFlags)) {
           if (!this.isFlagName(name)) {
             // We don't want an unexpected PostHog flag to break the app, so we
             // just log it and continue.
@@ -229,19 +153,20 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
             continue
           }
 
+          if (typeof value !== "boolean") {
+            console.warn(`Invalid value for posthog flag "${name}": ${value}`)
+            continue
+          }
+
           if (flagValues[name] === true || specificallySetFalse.has(name)) {
             // If the flag is already set to through environment variables, we
             // don't want to override it back to false here.
             continue
           }
 
-          const payload = posthogFlags.featureFlagPayloads?.[name]
-          const flag = this.flagSchema[name]
           try {
-            // @ts-expect-error - TS does not like you writing into a generic
-            // type, but we know that it's okay in this case because it's just
-            // an object.
-            flagValues[name] = flag.parse(payload || value)
+            // @ts-expect-error - TS does not like you writing into a generic type.
+            flagValues[name] = value
             tags[`flags.${name}.source`] = "posthog"
           } catch (err) {
             // We don't want an invalid PostHog flag to break the app, so we just
@@ -262,16 +187,12 @@ export class FlagSet<V extends Flag<any>, T extends { [key: string]: V }> {
   }
 }
 
-// This is the primary source of truth for feature flags. If you want to add a
-// new flag, add it here and use the `fetch` and `get` functions to access it.
-// All of the machinery in this file is to make sure that flags have their
-// default values set correctly and their types flow through the system.
-export const flags = new FlagSet({
-  [FeatureFlag.DEFAULT_VALUES]: Flag.boolean(true),
-  [FeatureFlag.AUTOMATION_BRANCHING]: Flag.boolean(true),
-  [FeatureFlag.AI_CUSTOM_CONFIGS]: Flag.boolean(true),
-  [FeatureFlag.BUDIBASE_AI]: Flag.boolean(true),
-})
+export const flags = new FlagSet(FeatureFlagDefaults)
 
-type UnwrapPromise<T> = T extends Promise<infer U> ? U : T
-export type FeatureFlags = UnwrapPromise<ReturnType<typeof flags.fetch>>
+export async function isEnabled(flag: keyof typeof FeatureFlagDefaults) {
+  return await flags.isEnabled(flag)
+}
+
+export async function all() {
+  return await flags.fetch()
+}
diff --git a/packages/backend-core/src/features/tests/features.spec.ts b/packages/backend-core/src/features/tests/features.spec.ts
index ced874f4af..f918347eea 100644
--- a/packages/backend-core/src/features/tests/features.spec.ts
+++ b/packages/backend-core/src/features/tests/features.spec.ts
@@ -1,5 +1,5 @@
 import { IdentityContext, IdentityType } from "@budibase/types"
-import { Flag, FlagSet, FlagValues, init, shutdown } from "../"
+import { FlagSet, init, shutdown } from "../"
 import * as context from "../../context"
 import environment, { withEnv } from "../../environment"
 import nodeFetch from "node-fetch"
@@ -7,10 +7,8 @@ import nock from "nock"
 import * as crypto from "crypto"
 
 const schema = {
-  TEST_BOOLEAN: Flag.boolean(false),
-  TEST_STRING: Flag.string("default value"),
-  TEST_NUMBER: Flag.number(0),
-  TEST_BOOLEAN_DEFAULT_TRUE: Flag.boolean(true),
+  TEST_BOOLEAN: false,
+  TEST_BOOLEAN_DEFAULT_TRUE: true,
 }
 const flags = new FlagSet(schema)
 
@@ -19,7 +17,7 @@ interface TestCase {
   identity?: Partial<IdentityContext>
   environmentFlags?: string
   posthogFlags?: PostHogFlags
-  expected?: Partial<FlagValues<typeof schema>>
+  expected?: Partial<typeof schema>
   errorMessage?: string | RegExp
 }
 
@@ -83,22 +81,6 @@ describe("feature flags", () => {
       },
       expected: { TEST_BOOLEAN: true },
     },
-    {
-      it: "should be able to read string flags from PostHog",
-      posthogFlags: {
-        featureFlags: { TEST_STRING: true },
-        featureFlagPayloads: { TEST_STRING: "test" },
-      },
-      expected: { TEST_STRING: "test" },
-    },
-    {
-      it: "should be able to read numeric flags from PostHog",
-      posthogFlags: {
-        featureFlags: { TEST_NUMBER: true },
-        featureFlagPayloads: { TEST_NUMBER: "123" },
-      },
-      expected: { TEST_NUMBER: 123 },
-    },
     {
       it: "should not be able to override a negative environment flag from PostHog",
       environmentFlags: "default:!TEST_BOOLEAN",
@@ -177,7 +159,7 @@ describe("feature flags", () => {
             expect(values).toMatchObject(expected)
 
             for (const [key, expectedValue] of Object.entries(expected)) {
-              const value = await flags.get(key as keyof typeof schema)
+              const value = await flags.isEnabled(key as keyof typeof schema)
               expect(value).toBe(expectedValue)
             }
           } else {
diff --git a/packages/backend-core/src/features/tests/utils.ts b/packages/backend-core/src/features/tests/utils.ts
index cc633c083d..b9281b7f19 100644
--- a/packages/backend-core/src/features/tests/utils.ts
+++ b/packages/backend-core/src/features/tests/utils.ts
@@ -1,5 +1,6 @@
-import { FeatureFlags, parseEnvFlags } from ".."
+import { FeatureFlags } from "@budibase/types"
 import { setEnv } from "../../environment"
+import { parseEnvFlags } from "../features"
 
 function getCurrentFlags(): Record<string, Record<string, boolean>> {
   const result: Record<string, Record<string, boolean>> = {}
diff --git a/packages/backend-core/src/index.ts b/packages/backend-core/src/index.ts
index dbdce51c50..d4e6e9a1ec 100644
--- a/packages/backend-core/src/index.ts
+++ b/packages/backend-core/src/index.ts
@@ -1,6 +1,5 @@
 export * as configs from "./configs"
 export * as events from "./events"
-export * as migrations from "./migrations"
 export * as users from "./users"
 export * as userUtils from "./users/utils"
 export * as roles from "./security/roles"
diff --git a/packages/backend-core/src/middleware/auditLog.ts b/packages/backend-core/src/middleware/auditLog.ts
index 9b76bb10b7..d529e8f908 100644
--- a/packages/backend-core/src/middleware/auditLog.ts
+++ b/packages/backend-core/src/middleware/auditLog.ts
@@ -1,6 +1,10 @@
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
+import type { Middleware, Next } from "koa"
 
-export default async (ctx: BBContext | any, next: any) => {
+// this middleware exists purely to be overridden by middlewares supplied by the @budibase/pro library
+const middleware = (async (ctx: Ctx, next: Next) => {
   // Placeholder for audit log middleware
   return next()
-}
+}) as Middleware
+
+export default middleware
diff --git a/packages/backend-core/src/middleware/authenticated.ts b/packages/backend-core/src/middleware/authenticated.ts
index b713f509e0..54d808de86 100644
--- a/packages/backend-core/src/middleware/authenticated.ts
+++ b/packages/backend-core/src/middleware/authenticated.ts
@@ -22,6 +22,7 @@ import {
 } from "@budibase/types"
 import { ErrorCode, InvalidAPIKeyError } from "../errors"
 import tracer from "dd-trace"
+import type { Middleware, Next } from "koa"
 
 const ONE_MINUTE = env.SESSION_UPDATE_PERIOD
   ? parseInt(env.SESSION_UPDATE_PERIOD)
@@ -94,6 +95,14 @@ async function checkApiKey(
   })
 }
 
+function getHeader(ctx: Ctx, header: Header): string | undefined {
+  const contents = ctx.request.headers[header]
+  if (Array.isArray(contents)) {
+    throw new Error("Unexpected header format")
+  }
+  return contents
+}
+
 /**
  * This middleware is tenancy aware, so that it does not depend on other middlewares being used.
  * The tenancy modules should not be used here and it should be assumed that the tenancy context
@@ -106,9 +115,9 @@ export default function (
   }
 ) {
   const noAuthOptions = noAuthPatterns ? buildMatcherRegex(noAuthPatterns) : []
-  return async (ctx: Ctx | any, next: any) => {
+  return (async (ctx: Ctx, next: Next) => {
     let publicEndpoint = false
-    const version = ctx.request.headers[Header.API_VER]
+    const version = getHeader(ctx, Header.API_VER)
     // the path is not authenticated
     const found = matches(ctx, noAuthOptions)
     if (found) {
@@ -116,21 +125,21 @@ export default function (
     }
     try {
       // check the actual user is authenticated first, try header or cookie
-      let headerToken = ctx.request.headers[Header.TOKEN]
+      let headerToken = getHeader(ctx, Header.TOKEN)
 
       const authCookie =
         getCookie<SessionCookie>(ctx, Cookie.Auth) ||
         openJwt<SessionCookie>(headerToken)
-      let apiKey = ctx.request.headers[Header.API_KEY]
+      let apiKey = getHeader(ctx, Header.API_KEY)
 
       if (!apiKey && ctx.request.headers[Header.AUTHORIZATION]) {
         apiKey = ctx.request.headers[Header.AUTHORIZATION].split(" ")[1]
       }
 
-      const tenantId = ctx.request.headers[Header.TENANT_ID]
-      let authenticated: boolean = false,
+      const tenantId = getHeader(ctx, Header.TENANT_ID)
+      let authenticated = false,
         user: User | { tenantId: string } | undefined = undefined,
-        internal: boolean = false,
+        internal = false,
         loginMethod: LoginMethod | undefined = undefined
       if (authCookie && !apiKey) {
         const sessionId = authCookie.sessionId
@@ -243,5 +252,5 @@ export default function (
         ctx.throw(err.status || 403, err)
       }
     }
-  }
+  }) as Middleware
 }
diff --git a/packages/backend-core/src/middleware/csrf.ts b/packages/backend-core/src/middleware/csrf.ts
index cced4d5f7d..907c53a87d 100644
--- a/packages/backend-core/src/middleware/csrf.ts
+++ b/packages/backend-core/src/middleware/csrf.ts
@@ -1,6 +1,7 @@
 import { Header } from "../constants"
 import { buildMatcherRegex, matches } from "./matchers"
-import { BBContext, EndpointMatcher } from "@budibase/types"
+import { Ctx, EndpointMatcher } from "@budibase/types"
+import type { Middleware, Next } from "koa"
 
 /**
  * GET, HEAD and OPTIONS methods are considered safe operations
@@ -36,7 +37,7 @@ export default function (
   opts: { noCsrfPatterns: EndpointMatcher[] } = { noCsrfPatterns: [] }
 ) {
   const noCsrfOptions = buildMatcherRegex(opts.noCsrfPatterns)
-  return async (ctx: BBContext | any, next: any) => {
+  return (async (ctx: Ctx, next: Next) => {
     // don't apply for excluded paths
     const found = matches(ctx, noCsrfOptions)
     if (found) {
@@ -77,5 +78,5 @@ export default function (
     }
 
     return next()
-  }
+  }) as Middleware
 }
diff --git a/packages/backend-core/src/middleware/errorHandling.ts b/packages/backend-core/src/middleware/errorHandling.ts
index 6ceda9cd3a..5a5a25b461 100644
--- a/packages/backend-core/src/middleware/errorHandling.ts
+++ b/packages/backend-core/src/middleware/errorHandling.ts
@@ -32,8 +32,12 @@ export async function errorHandling(ctx: any, next: any) {
     }
 
     if (environment.isTest() && ctx.headers["x-budibase-include-stacktrace"]) {
+      let rootErr = err
+      while (rootErr.cause) {
+        rootErr = rootErr.cause
+      }
       // @ts-ignore
-      error.stack = err.stack
+      error.stack = rootErr.stack
     }
 
     ctx.body = error
diff --git a/packages/backend-core/src/middleware/internalApi.ts b/packages/backend-core/src/middleware/internalApi.ts
index dc73cd6b66..b240738aee 100644
--- a/packages/backend-core/src/middleware/internalApi.ts
+++ b/packages/backend-core/src/middleware/internalApi.ts
@@ -1,11 +1,11 @@
 import { Header } from "../constants"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 import { isValidInternalAPIKey } from "../utils"
 
 /**
  * API Key only endpoint.
  */
-export default async (ctx: BBContext, next: any) => {
+export default async (ctx: Ctx, next: any) => {
   const apiKey = ctx.request.headers[Header.API_KEY]
   if (!apiKey) {
     ctx.throw(403, "Unauthorized")
diff --git a/packages/backend-core/src/middleware/matchers.ts b/packages/backend-core/src/middleware/matchers.ts
index 757d93a60d..8ed0b4d608 100644
--- a/packages/backend-core/src/middleware/matchers.ts
+++ b/packages/backend-core/src/middleware/matchers.ts
@@ -1,4 +1,4 @@
-import { BBContext, EndpointMatcher, RegexMatcher } from "@budibase/types"
+import { Ctx, EndpointMatcher, RegexMatcher } from "@budibase/types"
 
 const PARAM_REGEX = /\/:(.*?)(\/.*)?$/g
 
@@ -27,7 +27,7 @@ export const buildMatcherRegex = (
   })
 }
 
-export const matches = (ctx: BBContext, options: RegexMatcher[]) => {
+export const matches = (ctx: Ctx, options: RegexMatcher[]) => {
   return options.find(({ regex, method }) => {
     const urlMatch = regex.test(ctx.request.url)
     const methodMatch =
diff --git a/packages/backend-core/src/middleware/passport/local.ts b/packages/backend-core/src/middleware/passport/local.ts
index f1d72cab7a..40e6d294c1 100644
--- a/packages/backend-core/src/middleware/passport/local.ts
+++ b/packages/backend-core/src/middleware/passport/local.ts
@@ -2,7 +2,7 @@ import { UserStatus } from "../../constants"
 import { compare } from "../../utils"
 import * as users from "../../users"
 import { authError } from "./utils"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 const INVALID_ERR = "Invalid credentials"
 const EXPIRED = "This account has expired. Please reset your password"
@@ -20,7 +20,7 @@ export const options = {
  * @returns The authenticated user, or errors if they occur
  */
 export async function authenticate(
-  ctx: BBContext,
+  ctx: Ctx,
   email: string,
   password: string,
   done: Function
diff --git a/packages/backend-core/src/middleware/passport/sso/sso.ts b/packages/backend-core/src/middleware/passport/sso/sso.ts
index 8901fcc56f..1bb43d4466 100644
--- a/packages/backend-core/src/middleware/passport/sso/sso.ts
+++ b/packages/backend-core/src/middleware/passport/sso/sso.ts
@@ -20,7 +20,7 @@ export const ssoSaveUserNoOp: SaveSSOUserFunction = (user: SSOUser) =>
  */
 export async function authenticate(
   details: SSOAuthDetails,
-  requireLocalAccount: boolean = true,
+  requireLocalAccount = true,
   done: any,
   saveUserFn: SaveSSOUserFunction
 ) {
diff --git a/packages/backend-core/src/middleware/tenancy.ts b/packages/backend-core/src/middleware/tenancy.ts
index 22b7cc213d..de756c0af2 100644
--- a/packages/backend-core/src/middleware/tenancy.ts
+++ b/packages/backend-core/src/middleware/tenancy.ts
@@ -3,11 +3,12 @@ import { getTenantIDFromCtx } from "../tenancy"
 import { buildMatcherRegex, matches } from "./matchers"
 import { Header } from "../constants"
 import {
-  BBContext,
+  Ctx,
   EndpointMatcher,
   GetTenantIdOptions,
   TenantResolutionStrategy,
 } from "@budibase/types"
+import type { Next, Middleware } from "koa"
 
 export default function (
   allowQueryStringPatterns: EndpointMatcher[],
@@ -17,7 +18,7 @@ export default function (
   const allowQsOptions = buildMatcherRegex(allowQueryStringPatterns)
   const noTenancyOptions = buildMatcherRegex(noTenancyPatterns)
 
-  return async function (ctx: BBContext | any, next: any) {
+  return async function (ctx: Ctx, next: Next) {
     const allowNoTenant =
       opts.noTenancyRequired || !!matches(ctx, noTenancyOptions)
     const tenantOpts: GetTenantIdOptions = {
@@ -32,5 +33,5 @@ export default function (
     const tenantId = getTenantIDFromCtx(ctx, tenantOpts)
     ctx.set(Header.TENANT_ID, tenantId as string)
     return doInTenant(tenantId, next)
-  }
+  } as Middleware
 }
diff --git a/packages/backend-core/src/migrations/definitions.ts b/packages/backend-core/src/migrations/definitions.ts
deleted file mode 100644
index 0dd57fe639..0000000000
--- a/packages/backend-core/src/migrations/definitions.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import {
-  MigrationType,
-  MigrationName,
-  MigrationDefinition,
-} from "@budibase/types"
-
-export const DEFINITIONS: MigrationDefinition[] = [
-  {
-    type: MigrationType.GLOBAL,
-    name: MigrationName.USER_EMAIL_VIEW_CASING,
-  },
-  {
-    type: MigrationType.GLOBAL,
-    name: MigrationName.SYNC_QUOTAS,
-  },
-  {
-    type: MigrationType.APP,
-    name: MigrationName.APP_URLS,
-  },
-  {
-    type: MigrationType.APP,
-    name: MigrationName.EVENT_APP_BACKFILL,
-  },
-  {
-    type: MigrationType.APP,
-    name: MigrationName.TABLE_SETTINGS_LINKS_TO_ACTIONS,
-  },
-  {
-    type: MigrationType.GLOBAL,
-    name: MigrationName.EVENT_GLOBAL_BACKFILL,
-  },
-  {
-    type: MigrationType.INSTALLATION,
-    name: MigrationName.EVENT_INSTALLATION_BACKFILL,
-  },
-  {
-    type: MigrationType.GLOBAL,
-    name: MigrationName.GLOBAL_INFO_SYNC_USERS,
-  },
-]
diff --git a/packages/backend-core/src/migrations/index.ts b/packages/backend-core/src/migrations/index.ts
deleted file mode 100644
index bce0cfc75c..0000000000
--- a/packages/backend-core/src/migrations/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from "./migrations"
-export * from "./definitions"
diff --git a/packages/backend-core/src/migrations/migrations.ts b/packages/backend-core/src/migrations/migrations.ts
deleted file mode 100644
index fe6bc17386..0000000000
--- a/packages/backend-core/src/migrations/migrations.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { DEFAULT_TENANT_ID } from "../constants"
-import {
-  DocumentType,
-  StaticDatabases,
-  getAllApps,
-  getGlobalDBName,
-  getDB,
-} from "../db"
-import environment from "../environment"
-import * as platform from "../platform"
-import * as context from "../context"
-import { DEFINITIONS } from "."
-import {
-  Migration,
-  MigrationOptions,
-  MigrationType,
-  MigrationNoOpOptions,
-  App,
-} from "@budibase/types"
-
-export const getMigrationsDoc = async (db: any) => {
-  // get the migrations doc
-  try {
-    return await db.get(DocumentType.MIGRATIONS)
-  } catch (err: any) {
-    if (err.status && err.status === 404) {
-      return { _id: DocumentType.MIGRATIONS }
-    } else {
-      throw err
-    }
-  }
-}
-
-export const backPopulateMigrations = async (opts: MigrationNoOpOptions) => {
-  // filter migrations to the type and populate a no-op migration
-  const migrations: Migration[] = DEFINITIONS.filter(
-    def => def.type === opts.type
-  ).map(d => ({ ...d, fn: () => {} }))
-  await runMigrations(migrations, { noOp: opts })
-}
-
-export const runMigration = async (
-  migration: Migration,
-  options: MigrationOptions = {}
-) => {
-  const migrationType = migration.type
-  const migrationName = migration.name
-  const silent = migration.silent
-
-  const log = (message: string) => {
-    if (!silent) {
-      console.log(message)
-    }
-  }
-
-  // get the db to store the migration in
-  let dbNames: string[]
-  if (migrationType === MigrationType.GLOBAL) {
-    dbNames = [getGlobalDBName()]
-  } else if (migrationType === MigrationType.APP) {
-    if (options.noOp) {
-      if (!options.noOp.appId) {
-        throw new Error("appId is required for noOp app migration")
-      }
-      dbNames = [options.noOp.appId]
-    } else {
-      const apps = (await getAllApps(migration.appOpts)) as App[]
-      dbNames = apps.map(app => app.appId)
-    }
-  } else if (migrationType === MigrationType.INSTALLATION) {
-    dbNames = [StaticDatabases.PLATFORM_INFO.name]
-  } else {
-    throw new Error(`Unrecognised migration type [${migrationType}]`)
-  }
-
-  const length = dbNames.length
-  let count = 0
-
-  // run the migration against each db
-  for (const dbName of dbNames) {
-    count++
-    const lengthStatement = length > 1 ? `[${count}/${length}]` : ""
-
-    const db = getDB(dbName)
-
-    try {
-      const doc = await getMigrationsDoc(db)
-
-      // the migration has already been run
-      if (doc[migrationName]) {
-        // check for force
-        if (
-          options.force &&
-          options.force[migrationType] &&
-          options.force[migrationType].includes(migrationName)
-        ) {
-          log(`[Migration: ${migrationName}] [DB: ${dbName}] Forcing`)
-        } else {
-          // no force, exit
-          return
-        }
-      }
-
-      // check if the migration is not a no-op
-      if (!options.noOp) {
-        log(
-          `[Migration: ${migrationName}] [DB: ${dbName}] Running ${lengthStatement}`
-        )
-
-        if (migration.preventRetry) {
-          // eagerly set the completion date
-          // so that we never run this migration twice even upon failure
-          doc[migrationName] = Date.now()
-          const response = await db.put(doc)
-          doc._rev = response.rev
-        }
-
-        // run the migration
-        if (migrationType === MigrationType.APP) {
-          await context.doInAppContext(db.name, async () => {
-            await migration.fn(db)
-          })
-        } else {
-          await migration.fn(db)
-        }
-
-        log(`[Migration: ${migrationName}] [DB: ${dbName}] Complete`)
-      }
-
-      // mark as complete
-      doc[migrationName] = Date.now()
-      await db.put(doc)
-    } catch (err) {
-      console.error(
-        `[Migration: ${migrationName}] [DB: ${dbName}] Error: `,
-        err
-      )
-      throw err
-    }
-  }
-}
-
-export const runMigrations = async (
-  migrations: Migration[],
-  options: MigrationOptions = {}
-) => {
-  let tenantIds
-
-  if (environment.MULTI_TENANCY) {
-    if (options.noOp) {
-      tenantIds = [options.noOp.tenantId]
-    } else if (!options.tenantIds || !options.tenantIds.length) {
-      // run for all tenants
-      tenantIds = await platform.tenants.getTenantIds()
-    } else {
-      tenantIds = options.tenantIds
-    }
-  } else {
-    // single tenancy
-    tenantIds = [DEFAULT_TENANT_ID]
-  }
-
-  if (tenantIds.length > 1) {
-    console.log(`Checking migrations for ${tenantIds.length} tenants`)
-  } else {
-    console.log("Checking migrations")
-  }
-
-  let count = 0
-  // for all tenants
-  for (const tenantId of tenantIds) {
-    count++
-    if (tenantIds.length > 1) {
-      console.log(`Progress [${count}/${tenantIds.length}]`)
-    }
-    // for all migrations
-    for (const migration of migrations) {
-      // run the migration
-      await context.doInTenant(
-        tenantId,
-        async () => await runMigration(migration, options)
-      )
-    }
-  }
-  console.log("Migrations complete")
-}
diff --git a/packages/backend-core/src/migrations/tests/__snapshots__/migrations.spec.ts.snap b/packages/backend-core/src/migrations/tests/__snapshots__/migrations.spec.ts.snap
deleted file mode 100644
index 377900b5d5..0000000000
--- a/packages/backend-core/src/migrations/tests/__snapshots__/migrations.spec.ts.snap
+++ /dev/null
@@ -1,11 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`migrations should match snapshot 1`] = `
-{
-  "_id": "migrations",
-  "_rev": "1-2f64479842a0513aa8b97f356b0b9127",
-  "createdAt": "2020-01-01T00:00:00.000Z",
-  "test": 1577836800000,
-  "updatedAt": "2020-01-01T00:00:00.000Z",
-}
-`;
diff --git a/packages/backend-core/src/migrations/tests/migrations.spec.ts b/packages/backend-core/src/migrations/tests/migrations.spec.ts
deleted file mode 100644
index af2eb33cf5..0000000000
--- a/packages/backend-core/src/migrations/tests/migrations.spec.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { testEnv, DBTestConfiguration } from "../../../tests/extra"
-import * as migrations from "../index"
-import * as context from "../../context"
-import { MigrationType } from "@budibase/types"
-
-testEnv.multiTenant()
-
-describe("migrations", () => {
-  const config = new DBTestConfiguration()
-
-  const migrationFunction = jest.fn()
-
-  const MIGRATIONS = [
-    {
-      type: MigrationType.GLOBAL,
-      name: "test" as any,
-      fn: migrationFunction,
-    },
-  ]
-
-  beforeEach(() => {
-    config.newTenant()
-  })
-
-  afterEach(async () => {
-    jest.clearAllMocks()
-  })
-
-  const migrate = () => {
-    return migrations.runMigrations(MIGRATIONS, {
-      tenantIds: [config.tenantId],
-    })
-  }
-
-  it("should run a new migration", async () => {
-    await config.doInTenant(async () => {
-      await migrate()
-      expect(migrationFunction).toHaveBeenCalled()
-      const db = context.getGlobalDB()
-      const doc = await migrations.getMigrationsDoc(db)
-      expect(doc.test).toBeDefined()
-    })
-  })
-
-  it("should match snapshot", async () => {
-    await config.doInTenant(async () => {
-      await migrate()
-      const doc = await migrations.getMigrationsDoc(context.getGlobalDB())
-      expect(doc).toMatchSnapshot()
-    })
-  })
-
-  it("should skip a previously run migration", async () => {
-    await config.doInTenant(async () => {
-      const db = context.getGlobalDB()
-      await migrate()
-      const previousDoc = await migrations.getMigrationsDoc(db)
-      await migrate()
-      const currentDoc = await migrations.getMigrationsDoc(db)
-      expect(migrationFunction).toHaveBeenCalledTimes(1)
-      expect(currentDoc.test).toBe(previousDoc.test)
-    })
-  })
-})
diff --git a/packages/backend-core/src/objectStore/objectStore.ts b/packages/backend-core/src/objectStore/objectStore.ts
index 68b1b10ec2..79875b5e99 100644
--- a/packages/backend-core/src/objectStore/objectStore.ts
+++ b/packages/backend-core/src/objectStore/objectStore.ts
@@ -334,7 +334,7 @@ export async function listAllObjects(bucketName: string, path: string) {
 export function getPresignedUrl(
   bucketName: string,
   key: string,
-  durationSeconds: number = 3600
+  durationSeconds = 3600
 ) {
   const objectStore = ObjectStore(bucketName, { presigning: true })
   const params = {
diff --git a/packages/backend-core/src/queue/queue.ts b/packages/backend-core/src/queue/queue.ts
index f5d710f02d..4e1086823b 100644
--- a/packages/backend-core/src/queue/queue.ts
+++ b/packages/backend-core/src/queue/queue.ts
@@ -7,7 +7,7 @@ import { addListeners, StalledFn } from "./listeners"
 import { Duration } from "../utils"
 import * as timers from "../timers"
 
-export { QueueOptions, Queue, JobOptions } from "bull"
+export type { QueueOptions, Queue, JobOptions } from "bull"
 
 // the queue lock is held for 5 minutes
 const QUEUE_LOCK_MS = Duration.fromMinutes(5).toMs()
diff --git a/packages/backend-core/src/redis/redlockImpl.ts b/packages/backend-core/src/redis/redlockImpl.ts
index adeb5b12ec..a48fac0c3d 100644
--- a/packages/backend-core/src/redis/redlockImpl.ts
+++ b/packages/backend-core/src/redis/redlockImpl.ts
@@ -92,7 +92,7 @@ function getLockName(opts: LockOptions) {
   // determine lock name
   // by default use the tenantId for uniqueness, unless using a system lock
   const prefix = opts.systemLock ? "system" : context.getTenantId()
-  let name: string = `lock:${prefix}_${opts.name}`
+  let name = `lock:${prefix}_${opts.name}`
   // add additional unique name if required
   if (opts.resource) {
     name = name + `_${opts.resource}`
diff --git a/packages/backend-core/src/redis/tests/redis.spec.ts b/packages/backend-core/src/redis/tests/redis.spec.ts
index 4ea41fdb7f..1ac33e1434 100644
--- a/packages/backend-core/src/redis/tests/redis.spec.ts
+++ b/packages/backend-core/src/redis/tests/redis.spec.ts
@@ -11,7 +11,7 @@ describe("redis", () => {
   let container: StartedTestContainer
 
   beforeAll(async () => {
-    const container = await new GenericContainer("redis")
+    container = await new GenericContainer("redis")
       .withExposedPorts(6379)
       .start()
 
diff --git a/packages/backend-core/src/security/permissions.ts b/packages/backend-core/src/security/permissions.ts
index 929ae92909..263f042a9d 100644
--- a/packages/backend-core/src/security/permissions.ts
+++ b/packages/backend-core/src/security/permissions.ts
@@ -2,6 +2,8 @@ import {
   PermissionLevel,
   PermissionType,
   BuiltinPermissionID,
+  Permission,
+  BuiltinPermissions,
 } from "@budibase/types"
 import flatten from "lodash/flatten"
 import cloneDeep from "lodash/fp/cloneDeep"
@@ -12,7 +14,7 @@ export type RoleHierarchy = {
   permissionId: string
 }[]
 
-export class Permission {
+export class PermissionImpl implements Permission {
   type: PermissionType
   level: PermissionLevel
 
@@ -61,68 +63,62 @@ export function getAllowedLevels(userPermLevel: PermissionLevel): string[] {
   }
 }
 
-export const BUILTIN_PERMISSIONS: {
-  [key in keyof typeof BuiltinPermissionID]: {
-    _id: (typeof BuiltinPermissionID)[key]
-    name: string
-    permissions: Permission[]
-  }
-} = {
+export const BUILTIN_PERMISSIONS: BuiltinPermissions = {
   PUBLIC: {
     _id: BuiltinPermissionID.PUBLIC,
     name: "Public",
     permissions: [
-      new Permission(PermissionType.WEBHOOK, PermissionLevel.EXECUTE),
+      new PermissionImpl(PermissionType.WEBHOOK, PermissionLevel.EXECUTE),
     ],
   },
   READ_ONLY: {
     _id: BuiltinPermissionID.READ_ONLY,
     name: "Read only",
     permissions: [
-      new Permission(PermissionType.QUERY, PermissionLevel.READ),
-      new Permission(PermissionType.TABLE, PermissionLevel.READ),
-      new Permission(PermissionType.APP, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.QUERY, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.TABLE, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.APP, PermissionLevel.READ),
     ],
   },
   WRITE: {
     _id: BuiltinPermissionID.WRITE,
     name: "Read/Write",
     permissions: [
-      new Permission(PermissionType.QUERY, PermissionLevel.WRITE),
-      new Permission(PermissionType.TABLE, PermissionLevel.WRITE),
-      new Permission(PermissionType.AUTOMATION, PermissionLevel.EXECUTE),
-      new Permission(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
-      new Permission(PermissionType.APP, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.QUERY, PermissionLevel.WRITE),
+      new PermissionImpl(PermissionType.TABLE, PermissionLevel.WRITE),
+      new PermissionImpl(PermissionType.AUTOMATION, PermissionLevel.EXECUTE),
+      new PermissionImpl(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.APP, PermissionLevel.READ),
     ],
   },
   POWER: {
     _id: BuiltinPermissionID.POWER,
     name: "Power",
     permissions: [
-      new Permission(PermissionType.TABLE, PermissionLevel.WRITE),
-      new Permission(PermissionType.USER, PermissionLevel.READ),
-      new Permission(PermissionType.AUTOMATION, PermissionLevel.EXECUTE),
-      new Permission(PermissionType.WEBHOOK, PermissionLevel.READ),
-      new Permission(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
-      new Permission(PermissionType.APP, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.TABLE, PermissionLevel.WRITE),
+      new PermissionImpl(PermissionType.USER, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.AUTOMATION, PermissionLevel.EXECUTE),
+      new PermissionImpl(PermissionType.WEBHOOK, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.APP, PermissionLevel.READ),
     ],
   },
   ADMIN: {
     _id: BuiltinPermissionID.ADMIN,
     name: "Admin",
     permissions: [
-      new Permission(PermissionType.TABLE, PermissionLevel.ADMIN),
-      new Permission(PermissionType.USER, PermissionLevel.ADMIN),
-      new Permission(PermissionType.AUTOMATION, PermissionLevel.ADMIN),
-      new Permission(PermissionType.WEBHOOK, PermissionLevel.READ),
-      new Permission(PermissionType.QUERY, PermissionLevel.ADMIN),
-      new Permission(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
-      new Permission(PermissionType.APP, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.TABLE, PermissionLevel.ADMIN),
+      new PermissionImpl(PermissionType.USER, PermissionLevel.ADMIN),
+      new PermissionImpl(PermissionType.AUTOMATION, PermissionLevel.ADMIN),
+      new PermissionImpl(PermissionType.WEBHOOK, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.QUERY, PermissionLevel.ADMIN),
+      new PermissionImpl(PermissionType.LEGACY_VIEW, PermissionLevel.READ),
+      new PermissionImpl(PermissionType.APP, PermissionLevel.READ),
     ],
   },
 }
 
-export function getBuiltinPermissions() {
+export function getBuiltinPermissions(): BuiltinPermissions {
   return cloneDeep(BUILTIN_PERMISSIONS)
 }
 
diff --git a/packages/backend-core/src/security/roles.ts b/packages/backend-core/src/security/roles.ts
index 4076be93a0..2c424a4900 100644
--- a/packages/backend-core/src/security/roles.ts
+++ b/packages/backend-core/src/security/roles.ts
@@ -592,7 +592,10 @@ export class AccessController {
     )
   }
 
-  async checkScreensAccess(screens: Screen[], userRoleId: string) {
+  async checkScreensAccess(
+    screens: Screen[],
+    userRoleId: string
+  ): Promise<Screen[]> {
     let accessibleScreens = []
     // don't want to handle this with Promise.all as this would mean all custom roles would be
     // retrieved at same time, it is likely a custom role will be re-used and therefore want
diff --git a/packages/backend-core/src/security/tests/permissions.spec.ts b/packages/backend-core/src/security/tests/permissions.spec.ts
index f98833c7cd..d268a56a1f 100644
--- a/packages/backend-core/src/security/tests/permissions.spec.ts
+++ b/packages/backend-core/src/security/tests/permissions.spec.ts
@@ -133,7 +133,7 @@ describe("getBuiltinPermissionByID", () => {
       _id: BuiltinPermissionID.PUBLIC,
       name: "Public",
       permissions: [
-        new permissions.Permission(
+        new permissions.PermissionImpl(
           permissions.PermissionType.WEBHOOK,
           permissions.PermissionLevel.EXECUTE
         ),
diff --git a/packages/backend-core/src/sql/sql.ts b/packages/backend-core/src/sql/sql.ts
index e4b2b843af..334f1efdd4 100644
--- a/packages/backend-core/src/sql/sql.ts
+++ b/packages/backend-core/src/sql/sql.ts
@@ -18,6 +18,7 @@ import {
   BasicOperator,
   BBReferenceFieldMetadata,
   CalculationType,
+  EnrichedQueryJson,
   FieldSchema,
   FieldType,
   INTERNAL_TABLE_SOURCE_ID,
@@ -27,7 +28,6 @@ import {
   LogicalOperator,
   Operation,
   prefixed,
-  QueryJson,
   QueryOptions,
   RangeOperator,
   RelationshipsJson,
@@ -134,18 +134,18 @@ const allowEmptyRelationships: Record<SearchFilterKey, boolean> = {
 
 class InternalBuilder {
   private readonly client: SqlClient
-  private readonly query: QueryJson
+  private readonly query: EnrichedQueryJson
   private readonly splitter: dataFilters.ColumnSplitter
   private readonly knex: Knex
 
-  constructor(client: SqlClient, knex: Knex, query: QueryJson) {
+  constructor(client: SqlClient, knex: Knex, query: EnrichedQueryJson) {
     this.client = client
     this.query = query
     this.knex = knex
 
     this.splitter = new dataFilters.ColumnSplitter([this.table], {
       aliases: this.query.tableAliases,
-      columnPrefix: this.query.meta.columnPrefix,
+      columnPrefix: this.query.meta?.columnPrefix,
     })
   }
 
@@ -167,7 +167,7 @@ class InternalBuilder {
   }
 
   get table(): Table {
-    return this.query.meta.table
+    return this.query.table
   }
 
   get knexClient(): Knex.Client {
@@ -272,32 +272,18 @@ class InternalBuilder {
     return parts.join(".")
   }
 
-  private isFullSelectStatementRequired(): boolean {
-    const { meta } = this.query
-    for (let column of Object.values(meta.table.schema)) {
-      if (this.SPECIAL_SELECT_CASES.POSTGRES_MONEY(column)) {
-        return true
-      } else if (this.SPECIAL_SELECT_CASES.MSSQL_DATES(column)) {
-        return true
-      }
-    }
-    return false
-  }
-
   private generateSelectStatement(): (string | Knex.Raw)[] | "*" {
-    const { meta, endpoint, resource } = this.query
+    const { table, resource } = this.query
 
     if (!resource || !resource.fields || resource.fields.length === 0) {
       return "*"
     }
 
-    const alias = this.getTableName(endpoint.entityId)
-    const schema = meta.table.schema
-    if (!this.isFullSelectStatementRequired()) {
-      return [this.knex.raw("??", [`${alias}.*`])]
-    }
+    const alias = this.getTableName(table)
+    const schema = this.table.schema
+
     // get just the fields for this table
-    return resource.fields
+    const tableFields = resource.fields
       .map(field => {
         const parts = field.split(/\./g)
         let table: string | undefined = undefined
@@ -312,34 +298,33 @@ class InternalBuilder {
         return { table, column, field }
       })
       .filter(({ table }) => !table || table === alias)
-      .map(({ table, column, field }) => {
-        const columnSchema = schema[column]
 
-        if (this.SPECIAL_SELECT_CASES.POSTGRES_MONEY(columnSchema)) {
-          return this.knex.raw(`??::money::numeric as ??`, [
-            this.rawQuotedIdentifier([table, column].join(".")),
-            this.knex.raw(this.quote(field)),
-          ])
-        }
+    return tableFields.map(({ table, column, field }) => {
+      const columnSchema = schema[column]
 
-        if (this.SPECIAL_SELECT_CASES.MSSQL_DATES(columnSchema)) {
-          // Time gets returned as timestamp from mssql, not matching the expected
-          // HH:mm format
+      if (this.SPECIAL_SELECT_CASES.POSTGRES_MONEY(columnSchema)) {
+        return this.knex.raw(`??::money::numeric as ??`, [
+          this.rawQuotedIdentifier([table, column].join(".")),
+          this.knex.raw(this.quote(field)),
+        ])
+      }
 
-          // TODO: figure out how to express this safely without string
-          // interpolation.
-          return this.knex.raw(`CONVERT(varchar, ??, 108) as ??`, [
-            this.rawQuotedIdentifier(field),
-            this.knex.raw(this.quote(field)),
-          ])
-        }
+      if (this.SPECIAL_SELECT_CASES.MSSQL_DATES(columnSchema)) {
+        // Time gets returned as timestamp from mssql, not matching the expected
+        // HH:mm format
 
-        if (table) {
-          return this.rawQuotedIdentifier(`${table}.${column}`)
-        } else {
-          return this.rawQuotedIdentifier(field)
-        }
-      })
+        return this.knex.raw(`CONVERT(varchar, ??, 108) as ??`, [
+          this.rawQuotedIdentifier(field),
+          this.knex.raw(this.quote(field)),
+        ])
+      }
+
+      if (table) {
+        return this.rawQuotedIdentifier(`${table}.${column}`)
+      } else {
+        return this.rawQuotedIdentifier(field)
+      }
+    })
   }
 
   // OracleDB can't use character-large-objects (CLOBs) in WHERE clauses,
@@ -497,9 +482,8 @@ class InternalBuilder {
     filterKey: string,
     whereCb: (filterKey: string, query: Knex.QueryBuilder) => Knex.QueryBuilder
   ): Knex.QueryBuilder {
-    const { relationships, endpoint, tableAliases: aliases } = this.query
-    const tableName = endpoint.entityId
-    const fromAlias = aliases?.[tableName] || tableName
+    const { relationships, schema, tableAliases: aliases, table } = this.query
+    const fromAlias = aliases?.[table.name] || table.name
     const matches = (value: string) =>
       filterKey.match(new RegExp(`^${value}\\.`))
     if (!relationships) {
@@ -539,7 +523,7 @@ class InternalBuilder {
             aliases?.[manyToMany.through] || relationship.through
           let throughTable = this.tableNameWithSchema(manyToMany.through, {
             alias: throughAlias,
-            schema: endpoint.schema,
+            schema,
           })
           subQuery = subQuery
             // add a join through the junction table
@@ -818,14 +802,29 @@ class InternalBuilder {
         filters.oneOf,
         ArrayOperator.ONE_OF,
         (q, key: string, array) => {
+          const schema = this.getFieldSchema(key)
+          const values = Array.isArray(array) ? array : [array]
           if (shouldOr) {
             q = q.or
           }
           if (this.client === SqlClient.ORACLE) {
             // @ts-ignore
             key = this.convertClobs(key)
+          } else if (
+            this.client === SqlClient.SQL_LITE &&
+            schema?.type === FieldType.DATETIME &&
+            schema.dateOnly
+          ) {
+            for (const value of values) {
+              if (value != null) {
+                q = q.or.whereLike(key, `${value.toISOString().slice(0, 10)}%`)
+              } else {
+                q = q.or.whereNull(key)
+              }
+            }
+            return q
           }
-          return q.whereIn(key, Array.isArray(array) ? array : [array])
+          return q.whereIn(key, values)
         },
         (q, key: string[], array) => {
           if (shouldOr) {
@@ -884,6 +883,19 @@ class InternalBuilder {
         let high = value.high
         let low = value.low
 
+        if (
+          this.client === SqlClient.SQL_LITE &&
+          schema?.type === FieldType.DATETIME &&
+          schema.dateOnly
+        ) {
+          if (high != null) {
+            high = `${high.toISOString().slice(0, 10)}T23:59:59.999Z`
+          }
+          if (low != null) {
+            low = low.toISOString().slice(0, 10)
+          }
+        }
+
         if (this.client === SqlClient.ORACLE) {
           rawKey = this.convertClobs(key)
         } else if (
@@ -916,6 +928,7 @@ class InternalBuilder {
     }
     if (filters.equal) {
       iterate(filters.equal, BasicOperator.EQUAL, (q, key, value) => {
+        const schema = this.getFieldSchema(key)
         if (shouldOr) {
           q = q.or
         }
@@ -930,6 +943,16 @@ class InternalBuilder {
             // @ts-expect-error knex types are wrong, raw is fine here
             subq.whereNotNull(identifier).andWhere(identifier, value)
           )
+        } else if (
+          this.client === SqlClient.SQL_LITE &&
+          schema?.type === FieldType.DATETIME &&
+          schema.dateOnly
+        ) {
+          if (value != null) {
+            return q.whereLike(key, `${value.toISOString().slice(0, 10)}%`)
+          } else {
+            return q.whereNull(key)
+          }
         } else {
           return q.whereRaw(`COALESCE(?? = ?, FALSE)`, [
             this.rawQuotedIdentifier(key),
@@ -940,6 +963,7 @@ class InternalBuilder {
     }
     if (filters.notEqual) {
       iterate(filters.notEqual, BasicOperator.NOT_EQUAL, (q, key, value) => {
+        const schema = this.getFieldSchema(key)
         if (shouldOr) {
           q = q.or
         }
@@ -961,6 +985,18 @@ class InternalBuilder {
               // @ts-expect-error knex types are wrong, raw is fine here
               .or.whereNull(identifier)
           )
+        } else if (
+          this.client === SqlClient.SQL_LITE &&
+          schema?.type === FieldType.DATETIME &&
+          schema.dateOnly
+        ) {
+          if (value != null) {
+            return q.not
+              .whereLike(key, `${value.toISOString().slice(0, 10)}%`)
+              .or.whereNull(key)
+          } else {
+            return q.not.whereNull(key)
+          }
         } else {
           return q.whereRaw(`COALESCE(?? != ?, TRUE)`, [
             this.rawQuotedIdentifier(key),
@@ -1012,28 +1048,10 @@ class InternalBuilder {
     return isSqs(this.table)
   }
 
-  getTableName(tableOrName?: Table | string): string {
-    let table: Table
-    if (typeof tableOrName === "string") {
-      const name = tableOrName
-      if (this.query.table?.name === name) {
-        table = this.query.table
-      } else if (this.query.meta.table?.name === name) {
-        table = this.query.meta.table
-      } else if (!this.query.meta.tables?.[name]) {
-        // This can legitimately happen in custom queries, where the user is
-        // querying against a table that may not have been imported into
-        // Budibase.
-        return name
-      } else {
-        table = this.query.meta.tables[name]
-      }
-    } else if (tableOrName) {
-      table = tableOrName
-    } else {
+  getTableName(table?: Table): string {
+    if (!table) {
       table = this.table
     }
-
     let name = table.name
     if (isSqs(table) && table._id) {
       // SQS uses the table ID rather than the table name
@@ -1154,20 +1172,22 @@ class InternalBuilder {
           nulls = value.direction === SortOrder.ASCENDING ? "first" : "last"
         }
 
+        const composite = `${aliased}.${key}`
+        let identifier
+
         if (this.isAggregateField(key)) {
-          query = query.orderBy(key, direction, nulls)
+          identifier = this.rawQuotedIdentifier(key)
+        } else if (this.client === SqlClient.ORACLE) {
+          identifier = this.convertClobs(composite)
         } else {
-          let composite = `${aliased}.${key}`
-          if (this.client === SqlClient.ORACLE) {
-            query = query.orderByRaw(`?? ?? nulls ??`, [
-              this.convertClobs(composite),
-              this.knex.raw(direction),
-              this.knex.raw(nulls as string),
-            ])
-          } else {
-            query = query.orderBy(composite, direction, nulls)
-          }
+          identifier = this.rawQuotedIdentifier(composite)
         }
+
+        query = query.orderByRaw(`?? ?? ${nulls ? "nulls ??" : ""}`, [
+          identifier,
+          this.knex.raw(direction),
+          ...(nulls ? [this.knex.raw(nulls as string)] : []),
+        ])
       }
     }
 
@@ -1191,8 +1211,9 @@ class InternalBuilder {
     return withSchema
   }
 
-  private buildJsonField(field: string): string {
+  private buildJsonField(table: Table, field: string): [string, Knex.Raw] {
     const parts = field.split(".")
+    let baseName = parts[parts.length - 1]
     let unaliased: string
 
     let tableField: string
@@ -1205,10 +1226,19 @@ class InternalBuilder {
       tableField = unaliased
     }
 
-    const separator = this.client === SqlClient.ORACLE ? " VALUE " : ","
-    return this.knex
-      .raw(`?${separator}??`, [unaliased, this.rawQuotedIdentifier(tableField)])
-      .toString()
+    if (this.query.meta?.columnPrefix) {
+      baseName = baseName.replace(this.query.meta.columnPrefix, "")
+    }
+
+    let identifier = this.rawQuotedIdentifier(tableField)
+    // Internal tables have special _id, _rev, createdAt, and updatedAt fields
+    // that do not appear in the schema, meaning schema could actually be
+    // undefined.
+    const schema: FieldSchema | undefined = table.schema[baseName]
+    if (schema && schema.type === FieldType.BIGINT) {
+      identifier = this.castIntToString(identifier)
+    }
+    return [unaliased, identifier]
   }
 
   maxFunctionParameters() {
@@ -1234,7 +1264,7 @@ class InternalBuilder {
   ): Knex.QueryBuilder {
     const sqlClient = this.client
     const knex = this.knex
-    const { resource, tableAliases: aliases, endpoint, meta } = this.query
+    const { resource, tableAliases: aliases, schema, tables } = this.query
     const fields = resource?.fields || []
     for (let relationship of relationships) {
       const {
@@ -1249,13 +1279,17 @@ class InternalBuilder {
       if (!toTable || !fromTable) {
         continue
       }
-      const relatedTable = meta.tables?.[toTable]
+
+      const relatedTable = tables[toTable]
+      if (!relatedTable) {
+        throw new Error(`related table "${toTable}" not found in datasource`)
+      }
       const toAlias = aliases?.[toTable] || toTable,
         fromAlias = aliases?.[fromTable] || fromTable,
         throughAlias = (throughTable && aliases?.[throughTable]) || throughTable
       let toTableWithSchema = this.tableNameWithSchema(toTable, {
         alias: toAlias,
-        schema: endpoint.schema,
+        schema,
       })
       const requiredFields = [
         ...(relatedTable?.primary || []),
@@ -1271,8 +1305,18 @@ class InternalBuilder {
         0,
         Math.floor(this.maxFunctionParameters() / 2)
       )
-      const fieldList: string = relationshipFields
-        .map(field => this.buildJsonField(field))
+      const fieldList = relationshipFields.map(field =>
+        this.buildJsonField(relatedTable, field)
+      )
+      if (!fieldList.length) {
+        continue
+      }
+
+      const fieldListFormatted = fieldList
+        .map(f => {
+          const separator = this.client === SqlClient.ORACLE ? " VALUE " : ","
+          return this.knex.raw(`?${separator}??`, [f[0], f[1]]).toString()
+        })
         .join(",")
       // SQL Server uses TOP - which performs a little differently to the normal LIMIT syntax
       // it reduces the result set rather than limiting how much data it filters over
@@ -1293,7 +1337,7 @@ class InternalBuilder {
       if (isManyToMany) {
         let throughTableWithSchema = this.tableNameWithSchema(throughTable, {
           alias: throughAlias,
-          schema: endpoint.schema,
+          schema,
         })
         subQuery = subQuery.join(throughTableWithSchema, function () {
           this.on(`${toAlias}.${toPrimary}`, "=", `${throughAlias}.${toKey}`)
@@ -1302,13 +1346,17 @@ class InternalBuilder {
 
       // add the correlation to the overall query
       subQuery = subQuery.where(
-        correlatedTo,
+        this.rawQuotedIdentifier(correlatedTo),
         "=",
         this.rawQuotedIdentifier(correlatedFrom)
       )
 
       const standardWrap = (select: Knex.Raw): Knex.QueryBuilder => {
-        subQuery = subQuery.select(`${toAlias}.*`).limit(getRelationshipLimit())
+        subQuery = subQuery
+          .select(
+            relationshipFields.map(field => this.rawQuotedIdentifier(field))
+          )
+          .limit(getRelationshipLimit())
         // @ts-ignore - the from alias syntax isn't in Knex typing
         return knex.select(select).from({
           [toAlias]: subQuery,
@@ -1320,35 +1368,42 @@ class InternalBuilder {
           // need to check the junction table document is to the right column, this is just for SQS
           subQuery = this.addJoinFieldCheck(subQuery, relationship)
           wrapperQuery = standardWrap(
-            this.knex.raw(`json_group_array(json_object(${fieldList}))`)
+            this.knex.raw(
+              `json_group_array(json_object(${fieldListFormatted}))`
+            )
           )
           break
         case SqlClient.POSTGRES:
           wrapperQuery = standardWrap(
-            this.knex.raw(`json_agg(json_build_object(${fieldList}))`)
+            this.knex.raw(`json_agg(json_build_object(${fieldListFormatted}))`)
           )
           break
         case SqlClient.MARIADB:
           // can't use the standard wrap due to correlated sub-query limitations in MariaDB
           wrapperQuery = subQuery.select(
             knex.raw(
-              `json_arrayagg(json_object(${fieldList}) LIMIT ${getRelationshipLimit()})`
+              `json_arrayagg(json_object(${fieldListFormatted}) LIMIT ${getRelationshipLimit()})`
             )
           )
           break
         case SqlClient.MY_SQL:
         case SqlClient.ORACLE:
           wrapperQuery = standardWrap(
-            this.knex.raw(`json_arrayagg(json_object(${fieldList}))`)
+            this.knex.raw(`json_arrayagg(json_object(${fieldListFormatted}))`)
           )
           break
         case SqlClient.MS_SQL: {
           const comparatorQuery = knex
-            .select(`${fromAlias}.*`)
+            .select(`*`)
             // @ts-ignore - from alias syntax not TS supported
             .from({
               [fromAlias]: subQuery
-                .select(`${toAlias}.*`)
+                .select(
+                  fieldList.map(f => {
+                    // @ts-expect-error raw is fine here, knex types are wrong
+                    return knex.ref(f[1]).as(f[0])
+                  })
+                )
                 .limit(getRelationshipLimit()),
             })
 
@@ -1377,8 +1432,7 @@ class InternalBuilder {
       toPrimary?: string
     }[]
   ): Knex.QueryBuilder {
-    const { tableAliases: aliases, endpoint } = this.query
-    const schema = endpoint.schema
+    const { tableAliases: aliases, schema } = this.query
     const toTable = tables.to,
       fromTable = tables.from,
       throughTable = tables.through
@@ -1429,16 +1483,16 @@ class InternalBuilder {
   }
 
   qualifiedKnex(opts?: { alias?: string | boolean }): Knex.QueryBuilder {
-    let alias = this.query.tableAliases?.[this.query.endpoint.entityId]
+    let alias = this.query.tableAliases?.[this.query.table.name]
     if (opts?.alias === false) {
       alias = undefined
     } else if (typeof opts?.alias === "string") {
       alias = opts.alias
     }
     return this.knex(
-      this.tableNameWithSchema(this.query.endpoint.entityId, {
+      this.tableNameWithSchema(this.query.table.name, {
         alias,
-        schema: this.query.endpoint.schema,
+        schema: this.query.schema,
       })
     )
   }
@@ -1455,9 +1509,7 @@ class InternalBuilder {
     if (this.client === SqlClient.ORACLE) {
       // Oracle doesn't seem to automatically insert nulls
       // if we don't specify them, so we need to do that here
-      for (const [column, schema] of Object.entries(
-        this.query.meta.table.schema
-      )) {
+      for (const [column, schema] of Object.entries(this.query.table.schema)) {
         if (
           schema.constraints?.presence === true ||
           schema.type === FieldType.FORMULA ||
@@ -1534,13 +1586,12 @@ class InternalBuilder {
       limits?: { base: number; query: number }
     } = {}
   ): Knex.QueryBuilder {
-    let { endpoint, filters, paginate, relationships } = this.query
+    const { operation, filters, paginate, relationships, table } = this.query
     const { limits } = opts
-    const counting = endpoint.operation === Operation.COUNT
 
-    const tableName = endpoint.entityId
     // start building the query
     let query = this.qualifiedKnex()
+
     // handle pagination
     let foundOffset: number | null = null
     let foundLimit = limits?.query || limits?.base
@@ -1557,7 +1608,7 @@ class InternalBuilder {
       foundLimit = paginate.limit
     }
     // counting should not sort, limit or offset
-    if (!counting) {
+    if (operation !== Operation.COUNT) {
       // add the found limit if supplied
       if (foundLimit != null) {
         query = query.limit(foundLimit)
@@ -1569,7 +1620,7 @@ class InternalBuilder {
     }
 
     const aggregations = this.query.resource?.aggregations || []
-    if (counting) {
+    if (operation === Operation.COUNT) {
       query = this.addDistinctCount(query)
     } else if (aggregations.length > 0) {
       query = this.addAggregations(query, aggregations)
@@ -1578,7 +1629,7 @@ class InternalBuilder {
     }
 
     // have to add after as well (this breaks MS-SQL)
-    if (!counting) {
+    if (operation !== Operation.COUNT) {
       query = this.addSorting(query)
     }
 
@@ -1586,19 +1637,17 @@ class InternalBuilder {
 
     // handle relationships with a CTE for all others
     if (relationships?.length && aggregations.length === 0) {
-      const mainTable =
-        this.query.tableAliases?.[this.query.endpoint.entityId] ||
-        this.query.endpoint.entityId
+      const mainTable = this.query.tableAliases?.[table.name] || table.name
       const cte = this.addSorting(
         this.knex
-          .with("paginated", query)
+          .with("paginated", query.clone().clearSelect().select("*"))
           .select(this.generateSelectStatement())
           .from({
             [mainTable]: "paginated",
           })
       )
       // add JSON aggregations attached to the CTE
-      return this.addJsonRelationships(cte, tableName, relationships)
+      return this.addJsonRelationships(cte, table.name, relationships)
     }
 
     return query
@@ -1661,7 +1710,10 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
    * which for the sake of mySQL stops adding the returning statement to inserts, updates and deletes.
    * @return the query ready to be passed to the driver.
    */
-  _query(json: QueryJson, opts: QueryOptions = {}): SqlQuery | SqlQuery[] {
+  _query(
+    json: EnrichedQueryJson,
+    opts: QueryOptions = {}
+  ): SqlQuery | SqlQuery[] {
     const sqlClient = this.getSqlClient()
     const config: Knex.Config = {
       client: this.getBaseSqlClient(),
@@ -1711,34 +1763,30 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
     return this.convertToNative(query, opts)
   }
 
-  async getReturningRow(queryFn: QueryFunction, json: QueryJson) {
+  async getReturningRow(queryFn: QueryFunction, json: EnrichedQueryJson) {
     if (!json.extra || !json.extra.idFilter) {
       return {}
     }
     const input = this._query({
-      endpoint: {
-        ...json.endpoint,
-        operation: Operation.READ,
-      },
-      resource: {
-        fields: [],
-      },
+      operation: Operation.READ,
+      datasource: json.datasource,
+      schema: json.schema,
+      table: json.table,
+      tables: json.tables,
+      resource: { fields: [] },
       filters: json.extra?.idFilter,
-      paginate: {
-        limit: 1,
-      },
-      meta: json.meta,
+      paginate: { limit: 1 },
     })
     return queryFn(input, Operation.READ)
   }
 
   // when creating if an ID has been inserted need to make sure
   // the id filter is enriched with it before trying to retrieve the row
-  checkLookupKeys(id: any, json: QueryJson) {
-    if (!id || !json.meta.table || !json.meta.table.primary) {
+  checkLookupKeys(id: any, json: EnrichedQueryJson) {
+    if (!id || !json.table.primary) {
       return json
     }
-    const primaryKey = json.meta.table.primary?.[0]
+    const primaryKey = json.table.primary[0]
     json.extra = {
       idFilter: {
         equal: {
@@ -1751,7 +1799,7 @@ class SqlQueryBuilder extends SqlTableQueryBuilder {
 
   // this function recreates the returning functionality of postgres
   async queryWithReturning(
-    json: QueryJson,
+    json: EnrichedQueryJson,
     queryFn: QueryFunction,
     processFn: Function = (result: any) => result
   ) {
diff --git a/packages/backend-core/src/sql/sqlTable.ts b/packages/backend-core/src/sql/sqlTable.ts
index 84f4e290aa..8e15d3d4ef 100644
--- a/packages/backend-core/src/sql/sqlTable.ts
+++ b/packages/backend-core/src/sql/sqlTable.ts
@@ -3,13 +3,13 @@ import {
   FieldType,
   NumberFieldMetadata,
   Operation,
-  QueryJson,
   RelationshipType,
   RenameColumn,
   SqlQuery,
   Table,
   TableSourceType,
   SqlClient,
+  EnrichedQueryJson,
 } from "@budibase/types"
 import { breakExternalTableId, getNativeSql } from "./utils"
 import { helpers, utils } from "@budibase/shared-core"
@@ -25,7 +25,7 @@ function generateSchema(
   schema: CreateTableBuilder,
   table: Table,
   tables: Record<string, Table>,
-  oldTable: null | Table = null,
+  oldTable?: Table,
   renamed?: RenameColumn
 ) {
   let primaryKeys = table && table.primary ? table.primary : []
@@ -55,7 +55,7 @@ function generateSchema(
   )
   for (let [key, column] of Object.entries(table.schema)) {
     // skip things that are already correct
-    const oldColumn = oldTable ? oldTable.schema[key] : null
+    const oldColumn = oldTable?.schema[key]
     if (
       (oldColumn && oldColumn.type) ||
       columnTypeSet.includes(key) ||
@@ -199,8 +199,8 @@ function buildUpdateTable(
   knex: SchemaBuilder,
   table: Table,
   tables: Record<string, Table>,
-  oldTable: Table,
-  renamed: RenameColumn
+  oldTable?: Table,
+  renamed?: RenameColumn
 ): SchemaBuilder {
   return knex.alterTable(table.name, schema => {
     generateSchema(schema, table, tables, oldTable, renamed)
@@ -238,19 +238,18 @@ class SqlTableQueryBuilder {
    * @param json the input JSON structure from which an SQL query will be built.
    * @return the operation that was found in the JSON.
    */
-  _operation(json: QueryJson): Operation {
-    return json.endpoint.operation
+  _operation(json: EnrichedQueryJson): Operation {
+    return json.operation
   }
 
-  _tableQuery(json: QueryJson): SqlQuery | SqlQuery[] {
+  _tableQuery(json: EnrichedQueryJson): SqlQuery | SqlQuery[] {
     let client = knex({ client: this.sqlClient }).schema
-    let schemaName = json?.endpoint?.schema
-    if (schemaName) {
-      client = client.withSchema(schemaName)
+    if (json?.schema) {
+      client = client.withSchema(json.schema)
     }
 
     let query: Knex.SchemaBuilder
-    if (!json.table || !json.meta || !json.meta.tables) {
+    if (!json.table || !json.tables) {
       throw new Error("Cannot execute without table being specified")
     }
     if (json.table.sourceType === TableSourceType.INTERNAL) {
@@ -259,17 +258,17 @@ class SqlTableQueryBuilder {
 
     switch (this._operation(json)) {
       case Operation.CREATE_TABLE:
-        query = buildCreateTable(client, json.table, json.meta.tables)
+        query = buildCreateTable(client, json.table, json.tables)
         break
       case Operation.UPDATE_TABLE:
-        if (!json.meta || !json.meta.table) {
+        if (!json.table) {
           throw new Error("Must specify old table for update")
         }
         // renameColumn does not work for MySQL, so return a raw query
-        if (this.sqlClient === SqlClient.MY_SQL && json.meta.renamed) {
+        if (this.sqlClient === SqlClient.MY_SQL && json.meta?.renamed) {
           const updatedColumn = json.meta.renamed.updated
-          const tableName = schemaName
-            ? `\`${schemaName}\`.\`${json.table.name}\``
+          const tableName = json?.schema
+            ? `\`${json.schema}\`.\`${json.table.name}\``
             : `\`${json.table.name}\``
           return {
             sql: `alter table ${tableName} rename column \`${json.meta.renamed.old}\` to \`${updatedColumn}\`;`,
@@ -280,18 +279,18 @@ class SqlTableQueryBuilder {
         query = buildUpdateTable(
           client,
           json.table,
-          json.meta.tables,
-          json.meta.table,
-          json.meta.renamed!
+          json.tables,
+          json.meta?.oldTable,
+          json.meta?.renamed
         )
 
         // renameColumn for SQL Server returns a parameterised `sp_rename` query,
         // which is not supported by SQL Server and gives a syntax error.
-        if (this.sqlClient === SqlClient.MS_SQL && json.meta.renamed) {
+        if (this.sqlClient === SqlClient.MS_SQL && json.meta?.renamed) {
           const oldColumn = json.meta.renamed.old
           const updatedColumn = json.meta.renamed.updated
-          const tableName = schemaName
-            ? `${schemaName}.${json.table.name}`
+          const tableName = json?.schema
+            ? `${json.schema}.${json.table.name}`
             : `${json.table.name}`
           const sql = getNativeSql(query)
           if (Array.isArray(sql)) {
diff --git a/packages/backend-core/src/sql/utils.ts b/packages/backend-core/src/sql/utils.ts
index 1b80ff337d..b07854b2a0 100644
--- a/packages/backend-core/src/sql/utils.ts
+++ b/packages/backend-core/src/sql/utils.ts
@@ -14,7 +14,7 @@ import environment from "../environment"
 const DOUBLE_SEPARATOR = `${SEPARATOR}${SEPARATOR}`
 const ROW_ID_REGEX = /^\[.*]$/g
 const ENCODED_SPACE = encodeURIComponent(" ")
-const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{3}Z$/
+const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}:\d{2}.\d{3}Z)?$/
 const TIME_REGEX = /^(?:\d{2}:)?(?:\d{2}:)(?:\d{2})$/
 
 export function isExternalTableID(tableId: string) {
@@ -59,11 +59,19 @@ export function isExternalTable(table: Table) {
 }
 
 export function buildExternalTableId(datasourceId: string, tableName: string) {
-  // encode spaces
-  if (tableName.includes(" ")) {
-    tableName = encodeURIComponent(tableName)
+  return `${datasourceId}${DOUBLE_SEPARATOR}${encodeURIComponent(tableName)}`
+}
+
+export function encodeTableId(tableId: string) {
+  if (isExternalTableID(tableId)) {
+    return encodeURIComponent(tableId)
+  } else {
+    return tableId
   }
-  return `${datasourceId}${DOUBLE_SEPARATOR}${tableName}`
+}
+
+export function encodeViewId(viewId: string) {
+  return encodeURIComponent(viewId)
 }
 
 export function breakExternalTableId(tableId: string) {
@@ -141,15 +149,7 @@ export function isInvalidISODateString(str: string) {
 }
 
 export function isValidISODateString(str: string) {
-  const trimmedValue = str.trim()
-  if (!ISO_DATE_REGEX.test(trimmedValue)) {
-    return false
-  }
-  let d = new Date(trimmedValue)
-  if (isNaN(d.getTime())) {
-    return false
-  }
-  return d.toISOString() === trimmedValue
+  return ISO_DATE_REGEX.test(str.trim())
 }
 
 export function isValidFilter(value: any) {
diff --git a/packages/backend-core/src/tenancy/tenancy.ts b/packages/backend-core/src/tenancy/tenancy.ts
index 8835960ca5..6096b45800 100644
--- a/packages/backend-core/src/tenancy/tenancy.ts
+++ b/packages/backend-core/src/tenancy/tenancy.ts
@@ -6,7 +6,7 @@ import {
   getPlatformURL,
 } from "../context"
 import {
-  BBContext,
+  Ctx,
   TenantResolutionStrategy,
   GetTenantIdOptions,
 } from "@budibase/types"
@@ -37,7 +37,7 @@ export const isUserInAppTenant = (appId: string, user?: any) => {
 const ALL_STRATEGIES = Object.values(TenantResolutionStrategy)
 
 export const getTenantIDFromCtx = (
-  ctx: BBContext,
+  ctx: Ctx,
   opts: GetTenantIdOptions
 ): string | undefined => {
   // exit early if not multi-tenant
diff --git a/packages/backend-core/src/utils/tests/utils.spec.ts b/packages/backend-core/src/utils/tests/utils.spec.ts
index 4dc3855c35..b5c6283ce2 100644
--- a/packages/backend-core/src/utils/tests/utils.spec.ts
+++ b/packages/backend-core/src/utils/tests/utils.spec.ts
@@ -5,7 +5,7 @@ import * as db from "../../db"
 import { Header } from "../../constants"
 import { newid } from "../../utils"
 import env from "../../environment"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 describe("utils", () => {
   const config = new DBTestConfiguration()
@@ -109,7 +109,7 @@ describe("utils", () => {
   })
 
   describe("isServingBuilder", () => {
-    let ctx: BBContext
+    let ctx: Ctx
 
     const expectResult = (result: boolean) =>
       expect(utils.isServingBuilder(ctx)).toBe(result)
@@ -133,7 +133,7 @@ describe("utils", () => {
   })
 
   describe("isServingBuilderPreview", () => {
-    let ctx: BBContext
+    let ctx: Ctx
 
     const expectResult = (result: boolean) =>
       expect(utils.isServingBuilderPreview(ctx)).toBe(result)
@@ -157,7 +157,7 @@ describe("utils", () => {
   })
 
   describe("isPublicAPIRequest", () => {
-    let ctx: BBContext
+    let ctx: Ctx
 
     const expectResult = (result: boolean) =>
       expect(utils.isPublicApiRequest(ctx)).toBe(result)
diff --git a/packages/backend-core/tests/core/users/users.spec.js b/packages/backend-core/tests/core/users/users.spec.ts
similarity index 62%
rename from packages/backend-core/tests/core/users/users.spec.js
rename to packages/backend-core/tests/core/users/users.spec.ts
index f08c435b95..b14f553266 100644
--- a/packages/backend-core/tests/core/users/users.spec.js
+++ b/packages/backend-core/tests/core/users/users.spec.ts
@@ -1,32 +1,31 @@
-const _ = require("lodash/fp")
-const { structures } = require("../../../tests")
+import { range } from "lodash/fp"
+import { structures } from "../.."
 
 jest.mock("../../../src/context")
 jest.mock("../../../src/db")
 
-const context = require("../../../src/context")
-const db = require("../../../src/db")
+import * as context from "../../../src/context"
+import * as db from "../../../src/db"
 
-const { getCreatorCount } = require("../../../src/users/users")
+import { getCreatorCount } from "../../../src/users/users"
 
 describe("Users", () => {
-  let getGlobalDBMock
-  let getGlobalUserParamsMock
-  let paginationMock
+  let getGlobalDBMock: jest.SpyInstance
+  let paginationMock: jest.SpyInstance
 
   beforeEach(() => {
     jest.resetAllMocks()
 
     getGlobalDBMock = jest.spyOn(context, "getGlobalDB")
-    getGlobalUserParamsMock = jest.spyOn(db, "getGlobalUserParams")
     paginationMock = jest.spyOn(db, "pagination")
+
+    jest.spyOn(db, "getGlobalUserParams")
   })
 
-  it("Retrieves the number of creators", async () => {
-    const getUsers = (offset, limit, creators = false) => {
-      const range = _.range(offset, limit)
+  it("retrieves the number of creators", async () => {
+    const getUsers = (offset: number, limit: number, creators = false) => {
       const opts = creators ? { builder: { global: true } } : undefined
-      return range.map(() => structures.users.user(opts))
+      return range(offset, limit).map(() => structures.users.user(opts))
     }
     const page1Data = getUsers(0, 8)
     const page2Data = getUsers(8, 12, true)
diff --git a/packages/backend-core/tests/core/utilities/mocks/events.ts b/packages/backend-core/tests/core/utilities/mocks/events.ts
index 96f351de10..433986352e 100644
--- a/packages/backend-core/tests/core/utilities/mocks/events.ts
+++ b/packages/backend-core/tests/core/utilities/mocks/events.ts
@@ -117,6 +117,7 @@ beforeAll(async () => {
   jest.spyOn(events.view, "calculationCreated")
   jest.spyOn(events.view, "calculationUpdated")
   jest.spyOn(events.view, "calculationDeleted")
+  jest.spyOn(events.view, "viewJoinCreated")
 
   jest.spyOn(events.plugin, "init")
   jest.spyOn(events.plugin, "imported")
diff --git a/packages/backend-core/tests/core/utilities/structures/koa.ts b/packages/backend-core/tests/core/utilities/structures/koa.ts
index f9883dc1b9..c804d3b5f2 100644
--- a/packages/backend-core/tests/core/utilities/structures/koa.ts
+++ b/packages/backend-core/tests/core/utilities/structures/koa.ts
@@ -1,8 +1,8 @@
 import { createMockContext, createMockCookies } from "@shopify/jest-koa-mocks"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
-export const newContext = (): BBContext => {
-  const ctx = createMockContext() as any
+export const newContext = (): Ctx => {
+  const ctx = createMockContext() as Ctx
   return {
     ...ctx,
     path: "/",
diff --git a/packages/backend-core/tests/core/utilities/structures/licenses.ts b/packages/backend-core/tests/core/utilities/structures/licenses.ts
index b4d209a7ee..77f6d57b09 100644
--- a/packages/backend-core/tests/core/utilities/structures/licenses.ts
+++ b/packages/backend-core/tests/core/utilities/structures/licenses.ts
@@ -22,7 +22,6 @@ export function price(): PurchasedPrice {
     currency: "usd",
     duration: PriceDuration.MONTHLY,
     priceId: "price_123",
-    dayPasses: undefined,
     isPerUser: true,
   }
 }
@@ -50,11 +49,6 @@ export function quotas(): Quotas {
           value: 1,
           triggers: [],
         },
-        dayPasses: {
-          name: "Queries",
-          value: 1,
-          triggers: [],
-        },
         budibaseAICredits: {
           name: "Budibase AI Credits",
           value: 1,
diff --git a/packages/backend-core/tests/core/utilities/structures/quotas.ts b/packages/backend-core/tests/core/utilities/structures/quotas.ts
index 58817e4831..4b3c357b13 100644
--- a/packages/backend-core/tests/core/utilities/structures/quotas.ts
+++ b/packages/backend-core/tests/core/utilities/structures/quotas.ts
@@ -1,6 +1,6 @@
 import { MonthlyQuotaName, QuotaUsage } from "@budibase/types"
 
-export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
+export const usage = (users = 0, creators = 0): QuotaUsage => {
   return {
     _id: "usage_quota",
     quotaReset: new Date().toISOString(),
@@ -15,7 +15,6 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
     monthly: {
       "01-2023": {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
@@ -45,14 +44,12 @@ export const usage = (users: number = 0, creators: number = 0): QuotaUsage => {
       },
       "02-2023": {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
       },
       current: {
         automations: 0,
-        dayPasses: 0,
         queries: 0,
         budibaseAICredits: 0,
         triggers: {},
diff --git a/packages/backend-core/tests/core/utilities/testContainerUtils.ts b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
index 71d7fa32db..7a8a6262cc 100644
--- a/packages/backend-core/tests/core/utilities/testContainerUtils.ts
+++ b/packages/backend-core/tests/core/utilities/testContainerUtils.ts
@@ -25,7 +25,7 @@ function getTestcontainers(): ContainerInfo[] {
   // We use --format json to make sure the output is nice and machine-readable,
   // and we use --no-trunc so that the command returns full container IDs so we
   // can filter on them correctly.
-  return execSync("docker ps --format json --no-trunc")
+  return execSync("docker ps --all --format json --no-trunc")
     .toString()
     .split("\n")
     .filter(x => x.length > 0)
@@ -70,7 +70,36 @@ export function getExposedV4Port(container: ContainerInfo, port: number) {
   return getExposedV4Ports(container).find(x => x.container === port)?.host
 }
 
+interface DockerContext {
+  Name: string
+  Description: string
+  DockerEndpoint: string
+  ContextType: string
+  Error: string
+}
+
+function getCurrentDockerContext(): DockerContext {
+  const out = execSync("docker context ls --format json")
+  for (const line of out.toString().split("\n")) {
+    const parsed = JSON.parse(line)
+    if (parsed.Current) {
+      return parsed as DockerContext
+    }
+  }
+  throw new Error("No current Docker context")
+}
+
 export function setupEnv(...envs: any[]) {
+  process.env.TESTCONTAINERS_RYUK_DISABLED = "true"
+
+  // For whatever reason, testcontainers doesn't always use the correct current
+  // docker context. This bit of code forces the issue by finding the current
+  // context and setting it as the DOCKER_HOST environment
+  if (!process.env.DOCKER_HOST) {
+    const dockerContext = getCurrentDockerContext()
+    process.env.DOCKER_HOST = dockerContext.DockerEndpoint
+  }
+
   // We start couchdb in globalSetup.ts, in the root of the monorepo, so it
   // should be relatively safe to look for it by its image name.
   const couch = getContainerByImage("budibase/couchdb")
@@ -116,11 +145,12 @@ export async function startContainer(container: GenericContainer) {
     key = imageName.split("@")[0]
   }
   key = key.replace(/\//g, "-").replace(/:/g, "-")
+  const name = `${key}_testcontainer`
 
   container = container
     .withReuse()
     .withLabels({ "com.budibase": "true" })
-    .withName(`${key}_testcontainer`)
+    .withName(name)
 
   let startedContainer: StartedTestContainer | undefined = undefined
   let lastError = undefined
diff --git a/packages/backend-core/tsconfig.build.json b/packages/backend-core/tsconfig.build.json
index c714f4d942..45652a0354 100644
--- a/packages/backend-core/tsconfig.build.json
+++ b/packages/backend-core/tsconfig.build.json
@@ -1,24 +1,8 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "sourceMap": true,
-    "declaration": true,
-    "types": ["node", "jest"],
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/shared-core": ["../shared-core/src"]
-    }
+    "outDir": "dist"
   },
-  "include": ["**/*.js", "**/*.ts"],
   "exclude": [
     "node_modules",
     "dist",
diff --git a/packages/backend-core/tsconfig.test.json b/packages/backend-core/tsconfig.test.json
new file mode 100644
index 0000000000..0e3e7a79b2
--- /dev/null
+++ b/packages/backend-core/tsconfig.test.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "outDir": "dist",
+    "sourceMap": true
+  },
+  "include": ["tests/**/*.js", "tests/**/*.ts"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index aeb7418526..2caad20bf6 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -3,28 +3,23 @@
   "description": "A UI solution used in the different Budibase projects.",
   "version": "0.0.0",
   "license": "MPL-2.0",
-  "svelte": "src/index.js",
-  "module": "dist/bbui.es.js",
+  "svelte": "src/index.ts",
+  "module": "dist/bbui.mjs",
   "exports": {
     ".": {
-      "import": "./dist/bbui.es.js"
+      "import": "./dist/bbui.mjs"
     },
     "./package.json": "./package.json",
     "./spectrum-icons-rollup.js": "./src/spectrum-icons-rollup.js",
     "./spectrum-icons-vite.js": "./src/spectrum-icons-vite.js"
   },
   "scripts": {
-    "build": "rollup -c"
+    "build": "vite build",
+    "dev": "vite build --watch --mode=dev"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^16.0.0",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^11.2.1",
-    "postcss": "^8.2.9",
-    "rollup": "^2.45.2",
-    "rollup-plugin-postcss": "^4.0.0",
-    "rollup-plugin-svelte": "^7.1.0",
-    "rollup-plugin-terser": "^7.0.2"
+    "@sveltejs/vite-plugin-svelte": "1.4.0",
+    "vite-plugin-css-injected-by-js": "3.5.2"
   },
   "keywords": [
     "svelte"
@@ -35,8 +30,8 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "1.2.1",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
     "@spectrum-css/accordion": "3.0.24",
     "@spectrum-css/actionbutton": "1.0.1",
     "@spectrum-css/actiongroup": "1.0.1",
@@ -96,8 +91,7 @@
         "dependsOn": [
           {
             "projects": [
-              "@budibase/string-templates",
-              "@budibase/shared-core"
+              "@budibase/string-templates"
             ],
             "target": "build"
           }
diff --git a/packages/bbui/rollup.config.js b/packages/bbui/rollup.config.js
deleted file mode 100644
index da274e0ba5..0000000000
--- a/packages/bbui/rollup.config.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import svelte from "rollup-plugin-svelte"
-import resolve from "@rollup/plugin-node-resolve"
-import commonjs from "@rollup/plugin-commonjs"
-import json from "@rollup/plugin-json"
-import { terser } from "rollup-plugin-terser"
-import postcss from "rollup-plugin-postcss"
-
-export default {
-  input: "src/index.js",
-  output: {
-    sourcemap: true,
-    format: "esm",
-    file: "dist/bbui.es.js",
-  },
-  onwarn(warning, warn) {
-    // suppress eval warnings
-    if (warning.code === "EVAL") {
-      return
-    }
-    warn(warning)
-  },
-  plugins: [
-    resolve(),
-    commonjs(),
-    svelte({
-      emitCss: true,
-    }),
-    postcss(),
-    terser(),
-    json(),
-  ],
-}
diff --git a/packages/bbui/src/Button/Button.svelte b/packages/bbui/src/Button/Button.svelte
index 0a8917c3c1..77653d0c42 100644
--- a/packages/bbui/src/Button/Button.svelte
+++ b/packages/bbui/src/Button/Button.svelte
@@ -3,7 +3,7 @@
   import AbsTooltip from "../Tooltip/AbsTooltip.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let type
+  export let type = undefined
   export let disabled = false
   export let size = "M"
   export let cta = false
@@ -16,8 +16,8 @@
   export let active = false
   export let tooltip = undefined
   export let newStyles = true
-  export let id
-  export let ref
+  export let id = undefined
+  export let ref = undefined
   export let reverse = false
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Form/Core/CheckboxGroup.svelte b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
index d1a107fcc5..5aca7911e8 100644
--- a/packages/bbui/src/Form/Core/CheckboxGroup.svelte
+++ b/packages/bbui/src/Form/Core/CheckboxGroup.svelte
@@ -13,9 +13,8 @@
 
   const dispatch = createEventDispatcher()
 
-  const onChange = e => {
-    const optionValue = e.target.value
-    if (e.target.checked && !value.includes(optionValue)) {
+  const onChange = optionValue => {
+    if (!value.includes(optionValue)) {
       dispatch("change", [...value, optionValue])
     } else {
       dispatch(
@@ -39,10 +38,9 @@
           class="spectrum-Checkbox spectrum-Checkbox--sizeM spectrum-FieldGroup-item"
         >
           <input
-            on:change={onChange}
+            on:change={() => onChange(optionValue)}
             type="checkbox"
             class="spectrum-Checkbox-input"
-            value={optionValue}
             checked={value.includes(optionValue)}
             {disabled}
           />
diff --git a/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte b/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte
index 6c06ce4e79..84b55c403f 100644
--- a/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte
+++ b/packages/bbui/src/Form/Core/DatePicker/NumberInput.svelte
@@ -51,6 +51,7 @@
   }
   input.hide-arrows {
     -moz-appearance: textfield;
+    appearance: textfield;
   }
   input[type="time"]::-webkit-calendar-picker-indicator {
     display: none;
diff --git a/packages/bbui/src/Form/Core/DateRangePicker.svelte b/packages/bbui/src/Form/Core/DateRangePicker.svelte
index 9084942ba7..72180a98d6 100644
--- a/packages/bbui/src/Form/Core/DateRangePicker.svelte
+++ b/packages/bbui/src/Form/Core/DateRangePicker.svelte
@@ -2,13 +2,6 @@
   import CoreDatePicker from "./DatePicker/DatePicker.svelte"
   import Icon from "../../Icon/Icon.svelte"
 
-  export let value = null
-  export let disabled = false
-  export let readonly = false
-  export let error = null
-  export let appendTo = undefined
-  export let ignoreTimezones = false
-
   let fromDate
   let toDate
 </script>
diff --git a/packages/bbui/src/Form/Core/Signature.svelte b/packages/bbui/src/Form/Core/Signature.svelte
index 729d3ac5e2..e02560568c 100644
--- a/packages/bbui/src/Form/Core/Signature.svelte
+++ b/packages/bbui/src/Form/Core/Signature.svelte
@@ -85,7 +85,7 @@
     }
 
     const getPos = e => {
-      var rect = canvasRef.getBoundingClientRect()
+      let rect = canvasRef.getBoundingClientRect()
       const canvasX = e.offsetX || e.targetTouches?.[0].pageX - rect.left
       const canvasY = e.offsetY || e.targetTouches?.[0].pageY - rect.top
 
diff --git a/packages/bbui/src/Form/Core/Slider.svelte b/packages/bbui/src/Form/Core/Slider.svelte
index 1a601d0185..0fcadd8bad 100644
--- a/packages/bbui/src/Form/Core/Slider.svelte
+++ b/packages/bbui/src/Form/Core/Slider.svelte
@@ -39,6 +39,7 @@
     padding: 0;
     margin: 0;
     -webkit-appearance: none;
+    appearance: none;
     background: transparent;
   }
   input::-webkit-slider-thumb {
diff --git a/packages/bbui/src/Form/Search.svelte b/packages/bbui/src/Form/Search.svelte
index 2fbda275eb..a085986d3e 100644
--- a/packages/bbui/src/Form/Search.svelte
+++ b/packages/bbui/src/Form/Search.svelte
@@ -10,7 +10,7 @@
   export let disabled = false
   export let updateOnChange = true
   export let quiet = false
-  export let inputRef
+  export let inputRef = undefined
   export let helpText = null
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Form/Select.svelte b/packages/bbui/src/Form/Select.svelte
index 260090c7b7..0e67a1f532 100644
--- a/packages/bbui/src/Form/Select.svelte
+++ b/packages/bbui/src/Form/Select.svelte
@@ -17,18 +17,18 @@
   export let getOptionIcon = option => option?.icon
   export let getOptionColour = option => option?.colour
   export let useOptionIconImage = false
-  export let isOptionEnabled
+  export let isOptionEnabled = undefined
   export let quiet = false
   export let autoWidth = false
   export let sort = false
   export let tooltip = ""
   export let autocomplete = false
-  export let customPopoverHeight
-  export let align
+  export let customPopoverHeight = undefined
+  export let align = undefined
   export let footer = null
   export let tag = null
   export let helpText = null
-  export let compare
+  export let compare = undefined
   export let onOptionMouseenter = () => {}
   export let onOptionMouseleave = () => {}
 
diff --git a/packages/bbui/src/Icon/Icon.svelte b/packages/bbui/src/Icon/Icon.svelte
index 73ad8edd10..7438fab5fd 100644
--- a/packages/bbui/src/Icon/Icon.svelte
+++ b/packages/bbui/src/Icon/Icon.svelte
@@ -1,23 +1,23 @@
-<script>
+<script lang="ts">
   import {
     default as AbsTooltip,
     TooltipPosition,
     TooltipType,
   } from "../Tooltip/AbsTooltip.svelte"
 
-  export let name = "Add"
-  export let hidden = false
+  export let name: string = "Add"
+  export let hidden: boolean = false
   export let size = "M"
-  export let hoverable = false
-  export let disabled = false
-  export let color
-  export let hoverColor
-  export let tooltip
+  export let hoverable: boolean = false
+  export let disabled: boolean = false
+  export let color: string | undefined = undefined
+  export let hoverColor: string | undefined = undefined
+  export let tooltip: string | undefined = undefined
   export let tooltipPosition = TooltipPosition.Bottom
   export let tooltipType = TooltipType.Default
-  export let tooltipColor
-  export let tooltipWrap = true
-  export let newStyles = false
+  export let tooltipColor: string | undefined = undefined
+  export let tooltipWrap: boolean = true
+  export let newStyles: boolean = false
 </script>
 
 <AbsTooltip
diff --git a/packages/bbui/src/Label/Label.svelte b/packages/bbui/src/Label/Label.svelte
index 71b0967d99..41e1ccf794 100644
--- a/packages/bbui/src/Label/Label.svelte
+++ b/packages/bbui/src/Label/Label.svelte
@@ -4,7 +4,7 @@
 
   export let size = "M"
   export let tooltip = ""
-  export let muted
+  export let muted = undefined
 </script>
 
 <TooltipWrapper {tooltip} {size}>
diff --git a/packages/bbui/src/Layout/Page.svelte b/packages/bbui/src/Layout/Page.svelte
index 62dd9cc909..e469927e60 100644
--- a/packages/bbui/src/Layout/Page.svelte
+++ b/packages/bbui/src/Layout/Page.svelte
@@ -43,12 +43,11 @@
     flex-direction: row;
     justify-content: flex-start;
     align-items: stretch;
-    overflow-y: scroll !important;
     flex: 1 1 auto;
     overflow-x: hidden;
   }
   .main {
-    overflow: auto;
+    overflow-y: scroll;
   }
   .content {
     display: flex;
diff --git a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
index 37a1e07d73..112fa739c7 100644
--- a/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
+++ b/packages/bbui/src/ProgressCircle/ProgressCircle.svelte
@@ -37,7 +37,7 @@
     }
   }
 
-  export let overBackground
+  export let overBackground = false
 </script>
 
 <!-- svelte-ignore a11y-no-static-element-interactions -->
diff --git a/packages/bbui/src/Table/Table.svelte b/packages/bbui/src/Table/Table.svelte
index 3916bec738..228838e477 100644
--- a/packages/bbui/src/Table/Table.svelte
+++ b/packages/bbui/src/Table/Table.svelte
@@ -43,7 +43,7 @@
   export let showHeaderBorder = true
   export let placeholderText = "No rows found"
   export let snippets = []
-  export let defaultSortColumn
+  export let defaultSortColumn = undefined
   export let defaultSortOrder = "Ascending"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/bbui/src/Tabs/Tabs.svelte b/packages/bbui/src/Tabs/Tabs.svelte
index c94b396398..3955145ad1 100644
--- a/packages/bbui/src/Tabs/Tabs.svelte
+++ b/packages/bbui/src/Tabs/Tabs.svelte
@@ -124,8 +124,6 @@
   .spectrum-Tabs-selectionIndicator.emphasized {
     background-color: var(--spectrum-global-color-blue-400);
   }
-  .spectrum-Tabs--horizontal .spectrum-Tabs-selectionIndicator {
-  }
   .noHorizPadding {
     padding: 0;
   }
diff --git a/packages/bbui/src/Tooltip/AbsTooltip.svelte b/packages/bbui/src/Tooltip/AbsTooltip.svelte
index 4d2399aaf8..a887db4102 100644
--- a/packages/bbui/src/Tooltip/AbsTooltip.svelte
+++ b/packages/bbui/src/Tooltip/AbsTooltip.svelte
@@ -23,7 +23,7 @@
   export let type = TooltipType.Default
   export let text = ""
   export let fixed = false
-  export let color = null
+  export let color = ""
   export let noWrap = false
 
   let wrapper
@@ -134,6 +134,7 @@
   .spectrum-Tooltip-label {
     display: -webkit-box;
     -webkit-line-clamp: 3;
+    line-clamp: 3;
     -webkit-box-orient: vertical;
     overflow: hidden;
     font-size: 12px;
diff --git a/packages/bbui/src/Typography/Heading.svelte b/packages/bbui/src/Typography/Heading.svelte
index 50522fffc3..f48d5d958e 100644
--- a/packages/bbui/src/Typography/Heading.svelte
+++ b/packages/bbui/src/Typography/Heading.svelte
@@ -1,11 +1,11 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/typography/dist/index-vars.css"
 
   // Sizes
-  export let size = "M"
-  export let textAlign
-  export let noPadding = false
-  export let weight = "default" // light, heavy, default
+  export let size: "XS" | "S" | "M" | "L" = "M"
+  export let textAlign: string | undefined = undefined
+  export let noPadding: boolean = false
+  export let weight: "light" | "heavy" | "default" = "default"
 </script>
 
 <h1
diff --git a/packages/bbui/src/bbui.css b/packages/bbui/src/bbui.css
index dd0588818e..810c5ff2c0 100644
--- a/packages/bbui/src/bbui.css
+++ b/packages/bbui/src/bbui.css
@@ -45,6 +45,11 @@
   --purple: #806fde;
   --purple-dark: #130080;
 
+  --error-bg: rgba(226, 109, 105, 0.3);
+  --warning-bg: rgba(255, 210, 106, 0.3);
+  --error-content: rgba(226, 109, 105, 0.6);
+  --warning-content: rgba(255, 210, 106, 0.6);
+
   --rounded-small: 4px;
   --rounded-medium: 8px;
   --rounded-large: 16px;
diff --git a/packages/bbui/src/helpers.js b/packages/bbui/src/helpers.ts
similarity index 86%
rename from packages/bbui/src/helpers.js
rename to packages/bbui/src/helpers.ts
index 246587af44..330f381d53 100644
--- a/packages/bbui/src/helpers.js
+++ b/packages/bbui/src/helpers.ts
@@ -6,9 +6,8 @@ export const deepGet = helpers.deepGet
 /**
  * Generates a DOM safe UUID.
  * Starting with a letter is important to make it DOM safe.
- * @return {string} a random DOM safe UUID
  */
-export function uuid() {
+export function uuid(): string {
   return "cxxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx".replace(/[xy]/g, c => {
     const r = (Math.random() * 16) | 0
     const v = c === "x" ? r : (r & 0x3) | 0x8
@@ -18,22 +17,18 @@ export function uuid() {
 
 /**
  * Capitalises a string
- * @param string the string to capitalise
- * @return {string} the capitalised string
  */
-export const capitalise = string => {
+export const capitalise = (string?: string | null): string => {
   if (!string) {
-    return string
+    return ""
   }
   return string.substring(0, 1).toUpperCase() + string.substring(1)
 }
 
 /**
  * Computes a short hash of a string
- * @param string the string to compute a hash of
- * @return {string} the hash string
  */
-export const hashString = string => {
+export const hashString = (string?: string | null): string => {
   if (!string) {
     return "0"
   }
@@ -54,11 +49,12 @@ export const hashString = string => {
  * will override the value "foo" rather than "bar".
  * If a deep path is specified and the parent keys don't exist then these will
  * be created.
- * @param obj the object
- * @param key the key
- * @param value the value
  */
-export const deepSet = (obj, key, value) => {
+export const deepSet = (
+  obj: Record<string, any> | null,
+  key: string | null,
+  value: any
+): void => {
   if (!obj || !key) {
     return
   }
@@ -82,9 +78,8 @@ export const deepSet = (obj, key, value) => {
 
 /**
  * Deeply clones an object. Functions are not supported.
- * @param obj the object to clone
  */
-export const cloneDeep = obj => {
+export const cloneDeep = <T>(obj: T): T => {
   if (!obj) {
     return obj
   }
@@ -93,9 +88,8 @@ export const cloneDeep = obj => {
 
 /**
  * Copies a value to the clipboard
- * @param value the value to copy
  */
-export const copyToClipboard = value => {
+export const copyToClipboard = (value: any): Promise<void> => {
   return new Promise(res => {
     if (navigator.clipboard && window.isSecureContext) {
       // Try using the clipboard API first
@@ -117,9 +111,12 @@ export const copyToClipboard = value => {
   })
 }
 
-// Parsed a date value. This is usually an ISO string, but can be a
+// Parse a date value. This is usually an ISO string, but can be a
 // bunch of different formats and shapes depending on schema flags.
-export const parseDate = (value, { enableTime = true }) => {
+export const parseDate = (
+  value: string | dayjs.Dayjs | null,
+  { enableTime = true }
+): dayjs.Dayjs | null => {
   // If empty then invalid
   if (!value) {
     return null
@@ -128,7 +125,7 @@ export const parseDate = (value, { enableTime = true }) => {
   // Certain string values need transformed
   if (typeof value === "string") {
     // Check for time only values
-    if (!isNaN(new Date(`0-${value}`))) {
+    if (!isNaN(new Date(`0-${value}`).valueOf())) {
       value = `0-${value}`
     }
 
@@ -153,9 +150,9 @@ export const parseDate = (value, { enableTime = true }) => {
 // Stringifies a dayjs object to create an ISO string that respects the various
 // schema flags
 export const stringifyDate = (
-  value,
+  value: null | dayjs.Dayjs,
   { enableTime = true, timeOnly = false, ignoreTimezones = false } = {}
-) => {
+): string | null => {
   if (!value) {
     return null
   }
@@ -192,7 +189,7 @@ export const stringifyDate = (
 }
 
 // Determine the dayjs-compatible format of the browser's default locale
-const getPatternForPart = part => {
+const getPatternForPart = (part: Intl.DateTimeFormatPart): string => {
   switch (part.type) {
     case "day":
       return "D".repeat(part.value.length)
@@ -214,9 +211,9 @@ const localeDateFormat = new Intl.DateTimeFormat()
 
 // Formats a dayjs date according to schema flags
 export const getDateDisplayValue = (
-  value,
+  value: dayjs.Dayjs | null,
   { enableTime = true, timeOnly = false } = {}
-) => {
+): string => {
   if (!value?.isValid()) {
     return ""
   }
@@ -229,7 +226,7 @@ export const getDateDisplayValue = (
   }
 }
 
-export const hexToRGBA = (color, opacity) => {
+export const hexToRGBA = (color: string, opacity: number): string => {
   if (color.includes("#")) {
     color = color.replace("#", "")
   }
diff --git a/packages/bbui/src/index.js b/packages/bbui/src/index.ts
similarity index 100%
rename from packages/bbui/src/index.js
rename to packages/bbui/src/index.ts
diff --git a/packages/bbui/svelte.config.js b/packages/bbui/svelte.config.js
new file mode 100644
index 0000000000..7d908c15d5
--- /dev/null
+++ b/packages/bbui/svelte.config.js
@@ -0,0 +1,7 @@
+const { vitePreprocess } = require("@sveltejs/vite-plugin-svelte")
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+module.exports = config
diff --git a/packages/bbui/tsconfig.json b/packages/bbui/tsconfig.json
new file mode 100644
index 0000000000..2fe17da42e
--- /dev/null
+++ b/packages/bbui/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "allowJs": true,
+    "outDir": "./dist",
+    "lib": ["ESNext"],
+    "baseUrl": ".",
+    "paths": {
+      "@budibase/*": [
+        "../*/src/index.ts",
+        "../*/src/index.js",
+        "../*",
+        "../../node_modules/@budibase/*"
+      ]
+    }
+  },
+  "include": ["./src/**/*"],
+  "exclude": ["node_modules", "**/*.json", "**/*.spec.ts", "**/*.spec.js"]
+}
\ No newline at end of file
diff --git a/packages/bbui/vite.config.js b/packages/bbui/vite.config.js
new file mode 100644
index 0000000000..bccca20e43
--- /dev/null
+++ b/packages/bbui/vite.config.js
@@ -0,0 +1,29 @@
+import { defineConfig } from "vite"
+import { svelte } from "@sveltejs/vite-plugin-svelte"
+import path from "path"
+import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"
+
+export default defineConfig(({ mode }) => {
+  const isProduction = mode === "production"
+  return {
+    build: {
+      sourcemap: !isProduction,
+      lib: {
+        entry: "src/index.ts",
+        formats: ["es"],
+      },
+    },
+    plugins: [
+      svelte({
+        emitCss: true,
+      }),
+      cssInjectedByJsPlugin(),
+    ],
+    resolve: {
+      alias: {
+        "@budibase/shared-core": path.resolve(__dirname, "../shared-core/src"),
+        "@budibase/types": path.resolve(__dirname, "../types/src"),
+      },
+    },
+  }
+})
diff --git a/packages/builder/.gitignore b/packages/builder/.gitignore
index abc5671984..41411ea16c 100644
--- a/packages/builder/.gitignore
+++ b/packages/builder/.gitignore
@@ -6,4 +6,4 @@ release/
 dist/
 routify
 .routify/
-svelte.config.js
\ No newline at end of file
+.rollup.cache
\ No newline at end of file
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 46e454f5b9..6fcf72c5fb 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -4,13 +4,14 @@
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
-    "build": "routify -b && vite build --emptyOutDir",
+    "build": "routify -b && NODE_OPTIONS=\"--max_old_space_size=4096\" vite build --emptyOutDir",
     "start": "routify -c rollup",
     "dev": "routify -c dev:vite",
-    "dev:vite": "vite --host 0.0.0.0",
+    "dev:vite": "vite --host 0.0.0.0 --mode=dev",
     "rollup": "rollup -c -w",
     "test": "vitest run",
-    "test:watch": "vitest"
+    "test:watch": "vitest",
+    "check:types": "yarn svelte-check"
   },
   "jest": {
     "globals": {
@@ -47,11 +48,11 @@
     ]
   },
   "dependencies": {
-    "@budibase/bbui": "0.0.0",
-    "@budibase/frontend-core": "0.0.0",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/bbui": "*",
+    "@budibase/frontend-core": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
     "@codemirror/autocomplete": "^6.7.1",
     "@codemirror/commands": "^6.2.4",
     "@codemirror/lang-javascript": "^6.1.8",
@@ -73,7 +74,6 @@
     "dayjs": "^1.10.8",
     "downloadjs": "1.4.7",
     "fast-json-patch": "^3.1.1",
-    "json-format-highlight": "^1.0.4",
     "lodash": "4.17.21",
     "posthog-js": "^1.118.0",
     "remixicon": "2.5.0",
@@ -88,15 +88,19 @@
     "@babel/plugin-transform-runtime": "^7.13.10",
     "@babel/preset-env": "^7.13.12",
     "@rollup/plugin-replace": "^5.0.3",
+    "@rollup/plugin-typescript": "8.3.0",
     "@roxi/routify": "2.18.12",
     "@sveltejs/vite-plugin-svelte": "1.4.0",
     "@testing-library/jest-dom": "6.4.2",
     "@testing-library/svelte": "^4.1.0",
+    "@types/sanitize-html": "^2.13.0",
+    "@types/shortid": "^2.2.0",
     "babel-jest": "^29.6.2",
     "identity-obj-proxy": "^3.0.0",
     "jest": "29.7.0",
     "jsdom": "^21.1.1",
     "resize-observer-polyfill": "^1.5.1",
+    "svelte-check": "^4.1.0",
     "svelte-jester": "^1.3.2",
     "vite": "^4.5.0",
     "vite-plugin-static-copy": "^0.17.0",
diff --git a/packages/builder/src/App.svelte b/packages/builder/src/App.svelte
index f31f45bb84..866a28a4e6 100644
--- a/packages/builder/src/App.svelte
+++ b/packages/builder/src/App.svelte
@@ -3,7 +3,7 @@
   import { routes } from "../.routify/routes"
   import { NotificationDisplay, BannerDisplay } from "@budibase/bbui"
   import { parse, stringify } from "qs"
-  import LicensingOverlays from "components/portal/licensing/LicensingOverlays.svelte"
+  import LicensingOverlays from "@/components/portal/licensing/LicensingOverlays.svelte"
 
   const queryHandler = { parse, stringify }
 </script>
diff --git a/packages/builder/src/analytics/index.js b/packages/builder/src/analytics/index.js
index c9887aebc3..aa83f3c7ab 100644
--- a/packages/builder/src/analytics/index.js
+++ b/packages/builder/src/analytics/index.js
@@ -1,4 +1,4 @@
-import { API } from "api"
+import { API } from "@/api"
 import PosthogClient from "./PosthogClient"
 import { Events, EventSource } from "./constants"
 
diff --git a/packages/builder/src/api.js b/packages/builder/src/api.ts
similarity index 92%
rename from packages/builder/src/api.js
rename to packages/builder/src/api.ts
index 6441b4ff48..e9e8b39e28 100644
--- a/packages/builder/src/api.js
+++ b/packages/builder/src/api.ts
@@ -3,7 +3,7 @@ import {
   CookieUtils,
   Constants,
 } from "@budibase/frontend-core"
-import { appStore } from "stores/builder"
+import { appStore } from "@/stores/builder"
 import { get } from "svelte/store"
 import { auth, navigation } from "./stores/portal"
 
@@ -16,7 +16,7 @@ export const API = createAPIClient({
     }
 
     // Add csrf token if authenticated
-    const user = get(auth).user
+    const user: any = get(auth).user
     if (user?.csrfToken) {
       headers["x-csrf-token"] = user.csrfToken
     }
@@ -52,7 +52,7 @@ export const API = createAPIClient({
       return
     }
 
-    get(navigation).goto(
+    get(navigation)?.goto(
       `${updatingUrl}?returnUrl=${encodeURIComponent(window.location.pathname)}`
     )
   },
diff --git a/packages/builder/src/components/ContextMenu.svelte b/packages/builder/src/components/ContextMenu.svelte
index 37aacf06ed..3ff2a2b084 100644
--- a/packages/builder/src/components/ContextMenu.svelte
+++ b/packages/builder/src/components/ContextMenu.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
   import { Popover, Menu, MenuItem } from "@budibase/bbui"
 
   let dropdown
diff --git a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
index 9952826be3..d775094126 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/AutomationBuilder.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { selectedAutomation } from "stores/builder"
+  import { selectedAutomation } from "@/stores/builder"
   import Flowchart from "./FlowChart/FlowChart.svelte"
 </script>
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
index b096c016df..0b68d8e4b3 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/DraggableCanvas.svelte
@@ -7,19 +7,31 @@
     onDestroy,
     tick,
   } from "svelte"
-  import { Utils } from "@budibase/frontend-core"
-  import { selectedAutomation, automationStore } from "stores/builder"
+  import Logo from "assets/bb-emblem.svg?raw"
+  import { Utils, memo } from "@budibase/frontend-core"
+  import { selectedAutomation, automationStore } from "@/stores/builder"
+
+  // CSS classes that, on mouse down, will trigger the view drag behaviour
+  export let draggableClasses = []
+
+  export function toFocus() {
+    viewToFocusEle()
+  }
+
+  export async function zoomIn() {
+    const newScale = parseFloat(Math.min($view.scale + 0.1, 1.5).toFixed(2))
+    if ($view.scale === 1.5) return
 
-  export function zoomIn() {
-    const scale = Number(Math.min($view.scale + 0.1, 1.5).toFixed(2))
     view.update(state => ({
       ...state,
-      scale,
+      scale: newScale,
     }))
   }
 
   export function zoomOut() {
-    const scale = Number(Math.max($view.scale - 0.1, 0).toFixed(2))
+    const scale = parseFloat(Math.max($view.scale - 0.1, 0.1).toFixed(2))
+    if ($view.scale === 0.1) return
+
     view.update(state => ({
       ...state,
       scale,
@@ -32,12 +44,13 @@
       w: contentDims.original.w,
       h: contentDims.original.h,
     }
-    dragOffset = []
     contentPos.update(state => ({
       ...state,
       x: 0,
       y: 0,
     }))
+    offsetX = 0
+    offsetY = 0
     view.update(state => ({
       ...state,
       scale: 1,
@@ -48,18 +61,23 @@
     const { width: wViewPort, height: hViewPort } =
       viewPort.getBoundingClientRect()
 
-    const scaleTarget = Math.min(
-      wViewPort / contentDims.original.w,
-      hViewPort / contentDims.original.h
+    const scaleTarget = parseFloat(
+      Math.min(
+        wViewPort / contentDims.original.w,
+        hViewPort / contentDims.original.h
+      ).toFixed(2)
     )
 
-    // Smallest ratio determines which dimension needs squeezed
-    view.update(state => ({
-      ...state,
-      scale: scaleTarget,
-    }))
+    // Skip behaviour if the scale target scale is the current scale
+    if ($view.scale !== scaleTarget) {
+      // Smallest ratio determines which dimension needs squeezed
+      view.update(state => ({
+        ...state,
+        scale: parseFloat(scaleTarget.toFixed(2)),
+      }))
 
-    await tick()
+      await tick()
+    }
 
     const adjustedY = (hViewPort - contentDims.original.h) / 2
 
@@ -67,7 +85,10 @@
       ...state,
       x: 0,
       y: parseInt(0 + adjustedY),
+      scrollX: 0,
+      scrollY: 0,
     }))
+    offsetY = parseInt(0 + adjustedY)
   }
 
   const dispatch = createEventDispatcher()
@@ -79,7 +100,6 @@
     dragSpot: null,
     scale: 1,
     dropzones: {},
-    //focus - node to center on?
   })
 
   setContext("draggableView", view)
@@ -89,7 +109,12 @@
   setContext("viewPos", internalPos)
 
   // Content pos tracking
-  const contentPos = writable({ x: 0, y: 0, scrollX: 0, scrollY: 0 })
+  const contentPos = writable({
+    x: 0,
+    y: 0,
+    scrollX: 0,
+    scrollY: 0,
+  })
   setContext("contentPos", contentPos)
 
   // Elements
@@ -101,7 +126,7 @@
   let down = false
 
   // Monitor the size of the viewPort
-  let observer
+  let viewObserver
 
   // Size of the core display content
   let contentDims = {}
@@ -109,24 +134,51 @@
   // Size of the view port
   let viewDims = {}
 
-  // When dragging the content, maintain the drag start offset
-  let dragOffset
-
-  // Used when focusing the UI on trigger
-  let loaded = false
-
   // Edge around the draggable content
   let contentDragPadding = 200
 
+  // Auto scroll
+  let scrollInterval
+
+  // Used to track where the draggable item is scrolling into
+  let scrollZones
+
+  // Used to track the movements of the dragged content
+  // This allows things like the background to have their own starting coords
+  let offsetX = 0
+  let offsetY = 0
+
+  // Focus element details. Used to move the viewport
+  let focusElement = memo()
+
+  // Memo Focus
+  $: focusElement.set($view.focusEle)
+
+  // Background pattern
+  let bgDim = 24
+
+  // Scale prop for the icon
+  let dotDefault = 0.006
+
+  let viewDragStart = { x: 0, y: 0 }
+  let viewDragOffset = [0, 0]
+  let startPos = [0, 0]
+
+  $: bgSize = Math.max(bgDim * $view.scale, 10)
+  $: bgWidth = bgSize
+  $: bgHeight = bgSize
+  $: dotSize = Math.max(dotDefault * $view.scale, dotDefault)
+
   const onScale = async () => {
     dispatch("zoom", $view.scale)
     await getDims()
   }
 
-  const getDims = async () => {
-    if (!mainContent) return
-
-    if (!contentDims.original) {
+  const getDims = async (forceRefresh = false) => {
+    if (!mainContent || !viewPort) {
+      return
+    }
+    if (!contentDims.original || (contentDims.original && forceRefresh)) {
       contentDims.original = {
         w: parseInt(mainContent.getBoundingClientRect().width),
         h: parseInt(mainContent.getBoundingClientRect().height),
@@ -153,7 +205,11 @@
   const buildWrapStyles = (pos, scale, dims) => {
     const { x, y } = pos
     const { w, h } = dims
-    return `--posX: ${x}px; --posY: ${y}px; --scale: ${scale}; --wrapH: ${h}px; --wrapW: ${w}px`
+    return `
+      --posX: ${x}px; --posY: ${y}px; 
+      --scale: ${scale}; 
+      --wrapH: ${h}px; --wrapW: ${w}px;
+      `
   }
 
   const onViewScroll = e => {
@@ -177,18 +233,20 @@
             }
           : {}),
       }))
+
+      offsetX = offsetX - xBump
     } else if (e.ctrlKey || e.metaKey) {
       // Scale the content on scrolling
       let updatedScale
       if (e.deltaY < 0) {
         updatedScale = Math.min(1, currentScale + 0.05)
       } else if (e.deltaY > 0) {
-        updatedScale = Math.max(0, currentScale - 0.05)
+        updatedScale = Math.max(0.1, currentScale - 0.05)
       }
 
       view.update(state => ({
         ...state,
-        scale: Number(updatedScale.toFixed(2)),
+        scale: parseFloat(updatedScale.toFixed(2)),
       }))
     } else {
       yBump = scrollIncrement * (e.deltaY < 0 ? -1 : 1)
@@ -203,6 +261,7 @@
             }
           : {}),
       }))
+      offsetY = offsetY - yBump
     }
   }
 
@@ -219,18 +278,80 @@
       y,
     }))
 
-    if (down && !$view.dragging && dragOffset) {
+    if (down && !$view.dragging) {
+      // Determine how much the view has moved since
+      viewDragOffset = [x - viewDragStart.x, y - viewDragStart.y]
+
       contentPos.update(state => ({
         ...state,
-        x: x - dragOffset[0],
-        y: y - dragOffset[1],
+        x: startPos[0] + viewDragOffset[0],
+        y: startPos[1] + viewDragOffset[1],
       }))
+      offsetX = startPos[0] + viewDragOffset[0]
+      offsetY = startPos[1] + viewDragOffset[1]
+    }
+
+    const clearScrollInterval = () => {
+      if (scrollInterval) {
+        clearInterval(scrollInterval)
+        scrollInterval = undefined
+      }
+    }
+
+    if ($view.dragging) {
+      // Static, default buffer centered around the mouse
+      const dragBuffer = 100
+
+      scrollZones = {
+        top: y < dragBuffer,
+        bottom: y > viewDims.height - dragBuffer,
+        left: x < dragBuffer,
+        // An exception for the right side as the drag handle is on the extreme left
+        right: x > viewDims.width - $view.moveStep.w,
+      }
+
+      // Determine which zones are currently in play
+      const dragOutEntries = Object.entries(scrollZones).filter(e => e[1])
+      if (dragOutEntries.length) {
+        if (!scrollInterval) {
+          const autoScroll = () => {
+            const bump = 30
+
+            return () => {
+              const dragOutEntries = Object.entries(scrollZones).filter(
+                e => e[1]
+              )
+              const dragOut = Object.fromEntries(dragOutEntries)
+
+              // Depending on the zone, you want to move the content
+              // in the opposite direction
+              const xInterval = dragOut.right ? -bump : dragOut.left ? bump : 0
+              const yInterval = dragOut.bottom ? -bump : dragOut.top ? bump : 0
+
+              contentPos.update(state => ({
+                ...state,
+                x: (state.x || 0) + xInterval,
+                y: (state.y || 0) + yInterval,
+                scrollX: state.scrollX + xInterval,
+                scrollY: state.scrollY + yInterval,
+              }))
+              offsetX = offsetX + xInterval
+              offsetY = offsetY + yInterval
+            }
+          }
+
+          scrollInterval = setInterval(autoScroll(), 30)
+        }
+      } else {
+        clearScrollInterval()
+      }
+    } else {
+      clearScrollInterval()
     }
   }
 
   const onViewDragEnd = () => {
     down = false
-    dragOffset = [0, 0]
   }
 
   const handleDragDrop = () => {
@@ -247,8 +368,40 @@
     )
   }
 
+  // Reset state on mouse up
+  const globalMouseUp = () => {
+    down = false
+
+    viewDragStart = { x: 0, y: 0 }
+    viewDragOffset = [0, 0]
+
+    if ($view.dragging) {
+      view.update(state => ({
+        ...state,
+        dragging: false,
+        moveStep: null,
+        dragSpot: null,
+        dropzones: {},
+        droptarget: null,
+      }))
+
+      if (scrollInterval) {
+        clearInterval(scrollInterval)
+        scrollInterval = undefined
+        scrollZones = {}
+      }
+
+      // Clear the scroll offset for dragging
+      contentPos.update(state => ({
+        ...state,
+        scrollY: 0,
+        scrollX: 0,
+      }))
+    }
+  }
+
   const onMouseUp = () => {
-    if ($view.droptarget) {
+    if ($view.droptarget && $view.dragging) {
       handleDragDrop()
     }
 
@@ -273,8 +426,6 @@
     if (!viewPort) {
       return
     }
-    // Update viewDims to get the latest viewport dimensions
-    viewDims = viewPort.getBoundingClientRect()
 
     if ($view.moveStep && $view.dragging === false) {
       view.update(state => ({
@@ -329,18 +480,13 @@
     }
   }
 
-  const onMoveContent = e => {
-    if (down || !viewPort) {
-      return
-    }
-    const { x, y } = eleXY(e, viewPort)
-
-    dragOffset = [Math.abs(x - $contentPos.x), Math.abs(y - $contentPos.y)]
+  const isDraggable = e => {
+    const draggable = ["draggable-view", ...draggableClasses]
+    return draggable.some(cls => e.target.classList.contains(cls))
   }
 
-  const focusOnLoad = () => {
-    if ($view.focusEle && !loaded) {
-      const focusEleDims = $view.focusEle
+  const viewToFocusEle = () => {
+    if ($focusElement) {
       const viewWidth = viewDims.width
 
       // The amount to shift the content in order to center the trigger on load.
@@ -348,8 +494,8 @@
       // The sidebar offset factors into the left positioning of the content here.
       const targetX =
         contentWrap.getBoundingClientRect().x -
-        focusEleDims.x +
-        (viewWidth / 2 - focusEleDims.width / 2)
+        $focusElement.x +
+        (viewWidth / 2 - $focusElement.width / 2)
 
       // Update the content position state
       // Shift the content up slightly to accommodate the padding
@@ -358,21 +504,19 @@
         x: targetX,
         y: -(contentDragPadding / 2),
       }))
-
-      loaded = true
     }
   }
 
   // Update dims after scaling
-  $: {
-    $view.scale
+  $: viewScale = $view.scale
+  $: if (viewScale && mainContent) {
     onScale()
   }
 
   // Focus on a registered element
   $: {
-    $view.focusEle
-    focusOnLoad()
+    $focusElement
+    viewToFocusEle()
   }
 
   // Content mouse pos and scale to css variables.
@@ -380,12 +524,21 @@
   $: wrapStyles = buildWrapStyles($contentPos, $view.scale, contentDims)
 
   onMount(() => {
-    observer = new ResizeObserver(getDims)
-    observer.observe(viewPort)
+    // As the view/browser resizes, ensure the stored view is up to date
+    viewObserver = new ResizeObserver(
+      Utils.domDebounce(() => {
+        getDims()
+      })
+    )
+    viewObserver.observe(viewPort)
+
+    // Global mouse observer
+    document.addEventListener("mouseup", globalMouseUp)
   })
 
   onDestroy(() => {
-    observer.disconnect()
+    viewObserver.disconnect()
+    document.removeEventListener("mouseup", globalMouseUp)
   })
 </script>
 
@@ -399,56 +552,45 @@
   on:mousemove={Utils.domDebounce(onMouseMove)}
   style={`--dragPadding: ${contentDragPadding}px;`}
 >
+  <svg class="draggable-background" style={`--dotSize: ${dotSize};`}>
+    <!-- Small 2px offset to tuck the points under the viewport on load-->
+    <pattern
+      id="dot-pattern"
+      width={bgWidth}
+      height={bgHeight}
+      patternUnits="userSpaceOnUse"
+      patternTransform={`translate(${offsetX - 2}, ${offsetY - 2})`}
+    >
+      <!-- eslint-disable-next-line svelte/no-at-html-tags-->
+      {@html Logo}
+    </pattern>
+    <rect x="0" y="0" width="100%" height="100%" fill="url(#dot-pattern)" />
+  </svg>
+
   <div
     class="draggable-view"
+    class:dragging={down}
     bind:this={viewPort}
     on:wheel={Utils.domDebounce(onViewScroll)}
     on:mousemove={Utils.domDebounce(onViewMouseMove)}
-    on:mouseup={onViewDragEnd}
-    on:mouseleave={onViewDragEnd}
+    on:mousedown={e => {
+      if ((e.which === 1 || e.button === 0) && isDraggable(e)) {
+        const { x, y } = eleXY(e, viewPort)
+        viewDragStart = { x, y }
+        startPos = [$contentPos.x, $contentPos.y]
+        down = true
+      }
+    }}
+    on:mouseup={e => {
+      viewDragOffset = [0, 0]
+      if ((e.which === 1 || e.button === 0) && isDraggable(e)) {
+        down = false
+      }
+      onViewDragEnd()
+    }}
   >
-    <!-- <div class="debug">
-      <span>
-        View Pos [{$internalPos.x}, {$internalPos.y}]
-      </span>
-      <span>View Dims [{viewDims.width}, {viewDims.height}]</span>
-      <span>Mouse Down [{down}]</span>
-      <span>Drag [{$view.dragging}]</span>
-      <span>Dragging [{$view?.moveStep?.id || "no"}]</span>
-      <span>Scale [{$view.scale}]</span>
-      <span>Content [{JSON.stringify($contentPos)}]</span>
-    </div> -->
-    <div
-      class="content-wrap"
-      style={wrapStyles}
-      bind:this={contentWrap}
-      class:dragging={down}
-    >
-      <div
-        class="content"
-        bind:this={mainContent}
-        on:mousemove={Utils.domDebounce(onMoveContent)}
-        on:mousedown={e => {
-          if (e.which === 1 || e.button === 0) {
-            down = true
-          }
-        }}
-        on:mouseup={e => {
-          if (e.which === 1 || e.button === 0) {
-            down = false
-          }
-        }}
-        on:mouseleave={() => {
-          down = false
-          view.update(state => ({
-            ...state,
-            dragging: false,
-            moveStep: null,
-            dragSpot: null,
-            dropzones: {},
-          }))
-        }}
-      >
+    <div class="content-wrap" style={wrapStyles} bind:this={contentWrap}>
+      <div class="content" bind:this={mainContent}>
         <slot name="content" />
       </div>
     </div>
@@ -465,7 +607,19 @@
     height: 100%;
     overflow: hidden;
     position: relative;
+    cursor: grab;
   }
+  .draggable-view.dragging {
+    cursor: grabbing;
+  }
+
+  .content {
+    transform-origin: 50% 50%;
+    transform: scale(var(--scale));
+    user-select: none;
+    padding: var(--dragPadding);
+  }
+
   .content-wrap {
     min-width: 100%;
     position: absolute;
@@ -473,25 +627,25 @@
     left: 0;
     width: var(--wrapW);
     height: var(--wrapH);
-    cursor: grab;
     transform: translate(var(--posX), var(--posY));
   }
-  .content {
-    transform: scale(var(--scale));
-    user-select: none;
-    padding: var(--dragPadding);
+
+  .draggable-background {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    top: 0;
+    left: 0;
+    pointer-events: none;
+    z-index: -1;
+    background-color: var(--spectrum-global-color-gray-50);
   }
 
-  .content-wrap.dragging {
-    cursor: grabbing;
+  .draggable-background :global(svg g path) {
+    fill: #91919a;
   }
 
-  /* .debug {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-    position: fixed;
-    padding: 8px;
-    z-index: 2;
-  } */
+  .draggable-background :global(svg g) {
+    transform: scale(var(--dotSize));
+  }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
index 524e70e329..706c196fff 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/ActionModal.svelte
@@ -10,10 +10,10 @@
     Tag,
   } from "@budibase/bbui"
   import { AutomationActionStepId } from "@budibase/types"
-  import { automationStore, selectedAutomation } from "stores/builder"
-  import { admin, licensing } from "stores/portal"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
+  import { admin, licensing } from "@/stores/portal"
   import { externalActions } from "./ExternalActions"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
 
   export let block
   export let modal
@@ -49,7 +49,7 @@
   const disabled = () => {
     return {
       SEND_EMAIL_SMTP: {
-        disabled: !$admin.checklist.smtp.checked,
+        disabled: !$admin.checklist?.smtp?.checked,
         message: "Please configure SMTP",
       },
       COLLECT: {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
index 8732623dcf..0a8ce505b8 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/AutomationBlockTagline.svelte
@@ -1,7 +1,7 @@
 <script>
   import { processStringSync } from "@budibase/string-templates"
   import { get } from "lodash/fp"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
 
   export let block
 
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
index 670067ea26..779eaf415a 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/BranchNode.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
   import {
     Drawer,
     DrawerContent,
@@ -14,12 +14,12 @@
     Modal,
     ModalContent,
   } from "@budibase/bbui"
-  import PropField from "components/automation/SetupPanel/PropField.svelte"
-  import AutomationBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
+  import PropField from "@/components/automation/SetupPanel/PropField.svelte"
+  import AutomationBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
   import FlowItemActions from "./FlowItemActions.svelte"
-  import { automationStore, selectedAutomation } from "stores/builder"
-  import { QueryUtils } from "@budibase/frontend-core"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
+  import { QueryUtils, Utils } from "@budibase/frontend-core"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher, getContext } from "svelte"
   import DragZone from "./DragZone.svelte"
@@ -36,13 +36,11 @@
   const view = getContext("draggableView")
 
   let drawer
-  let condition
   let open = true
   let confirmDeleteModal
 
   $: branch = step.inputs?.branches?.[branchIdx]
-  $: editableConditionUI = cloneDeep(branch.conditionUI || {})
-  $: condition = QueryUtils.buildQuery(editableConditionUI)
+  $: editableConditionUI = branch.conditionUI || {}
 
   // Parse all the bindings into fields for the condition builder
   $: schemaFields = bindings.map(binding => {
@@ -80,9 +78,10 @@
     slot="buttons"
     on:click={() => {
       drawer.hide()
+      const updatedConditionsUI = Utils.parseFilter(editableConditionUI)
       dispatch("change", {
-        conditionUI: editableConditionUI,
-        condition,
+        conditionUI: updatedConditionsUI,
+        condition: QueryUtils.buildQuery(updatedConditionsUI),
       })
     }}
   >
@@ -223,6 +222,7 @@
   .branch-actions {
     display: flex;
     gap: var(--spacing-l);
+    cursor: default;
   }
   .footer {
     display: flex;
@@ -261,6 +261,7 @@
     background-color: var(--background);
     border: 1px solid var(--spectrum-global-color-gray-300);
     border-radius: 4px 4px 4px 4px;
+    cursor: default;
   }
 
   .blockSection {
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
index 7086d5d1cd..01f0032e58 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowChart.svelte
@@ -3,19 +3,18 @@
     automationStore,
     automationHistoryStore,
     selectedAutomation,
-  } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import TestDataModal from "./TestDataModal.svelte"
   import {
-    Icon,
     notifications,
     Modal,
     Toggle,
     Button,
     ActionButton,
   } from "@budibase/bbui"
-  import { ActionStepID } from "constants/backend/automations"
-  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { ActionStepID } from "@/constants/backend/automations"
+  import UndoRedoControl from "@/components/common/UndoRedoControl.svelte"
   import StepNode from "./StepNode.svelte"
   import { memo } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
@@ -44,19 +43,8 @@
   $: isRowAction = sdk.automations.isRowAction($memoAutomation)
 
   const refresh = () => {
-    // Build global automation bindings.
-    const environmentBindings =
-      automationStore.actions.buildEnvironmentBindings()
-
     // Get all processed block references
     blockRefs = $selectedAutomation.blockRefs
-
-    automationStore.update(state => {
-      return {
-        ...state,
-        bindings: [...environmentBindings],
-      }
-    })
   }
 
   const getBlocks = automation => {
@@ -77,8 +65,6 @@
   }
 </script>
 
-<!-- svelte-ignore a11y-click-events-have-key-events -->
-<!-- svelte-ignore a11y-no-static-element-interactions -->
 <div class="header" class:scrolling>
   <div class="header-left">
     <UndoRedoControl store={automationHistoryStore} showButtonGroup />
@@ -111,15 +97,18 @@
       Run test
     </Button>
     <div class="buttons">
-      <Icon disabled={!$automationStore.testResults} size="M" name="Multiple" />
-      <div
-        class:disabled={!$automationStore.testResults}
-        on:click={() => {
-          $automationStore.showTestPanel = true
-        }}
-      >
-        Test details
-      </div>
+      {#if !$automationStore.showTestPanel && $automationStore.testResults}
+        <Button
+          secondary
+          icon={"Multiple"}
+          disabled={!$automationStore.testResults}
+          on:click={() => {
+            $automationStore.showTestPanel = true
+          }}
+        >
+          Test details
+        </Button>
+      {/if}
     </div>
     {#if !isRowAction}
       <div class="toggle-active setting-spacing">
@@ -138,7 +127,18 @@
 </div>
 
 <div class="root" bind:this={treeEle}>
-  <DraggableCanvas bind:this={draggable}>
+  <DraggableCanvas
+    bind:this={draggable}
+    draggableClasses={[
+      "main-content",
+      "content",
+      "block",
+      "branched",
+      "branch",
+      "flow-item",
+      "branch-wrap",
+    ]}
+  >
     <span class="main-content" slot="content">
       {#if Object.keys(blockRefs).length}
         {#each blocks as block, idx (block.id)}
@@ -179,9 +179,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    max-height: 100%;
-    height: 100%;
-    width: 100%;
   }
 
   .header-left {
@@ -221,15 +218,26 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding-left: var(--spacing-l);
-    transition: background 130ms ease-out;
+    padding: var(--spacing-l);
     flex: 0 0 60px;
     padding-right: var(--spacing-xl);
+    position: absolute;
+    width: 100%;
+    box-sizing: border-box;
+    pointer-events: none;
+  }
+
+  .header > * {
+    pointer-events: auto;
   }
 
   .controls {
     display: flex;
-    gap: var(--spacing-xl);
+    gap: var(--spacing-l);
+  }
+
+  .controls .toggle-active :global(.spectrum-Switch-label) {
+    margin-right: 0px;
   }
 
   .buttons {
@@ -243,11 +251,6 @@
     cursor: pointer;
   }
 
-  .disabled {
-    pointer-events: none;
-    color: var(--spectrum-global-color-gray-500) !important;
-  }
-
   .group {
     border-radius: 4px;
     display: flex;
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
index f55feb97ed..95df59b249 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItem.svelte
@@ -4,7 +4,7 @@
     permissions,
     selectedAutomation,
     tables,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import {
     Icon,
     Divider,
@@ -16,16 +16,16 @@
   } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
   import FlowItemHeader from "./FlowItemHeader.svelte"
-  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { ActionStepID, TriggerStepID } from "constants/backend/automations"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
+  import { ActionStepID, TriggerStepID } from "@/constants/backend/automations"
   import { AutomationStepType } from "@budibase/types"
   import FlowItemActions from "./FlowItemActions.svelte"
-  import DragHandle from "components/design/settings/controls/DraggableList/drag-handle.svelte"
+  import DragHandle from "@/components/design/settings/controls/DraggableList/drag-handle.svelte"
   import { getContext } from "svelte"
   import DragZone from "./DragZone.svelte"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
   export let block
   export let blockRef
@@ -51,8 +51,13 @@
     if (!blockEle) {
       return
     }
-    const { width, height } = blockEle.getBoundingClientRect()
-    blockDims = { width: width / $view.scale, height: height / $view.scale }
+    const { width, height, top, left } = blockEle.getBoundingClientRect()
+    blockDims = {
+      width: width / $view.scale,
+      height: height / $view.scale,
+      top,
+      left,
+    }
   }
 
   const loadSteps = blockRef => {
@@ -174,12 +179,21 @@
 
     e.stopPropagation()
 
+    updateBlockDims()
+
+    const { clientX, clientY } = e
     view.update(state => ({
       ...state,
       moveStep: {
         id: block.id,
         offsetX: $pos.x,
         offsetY: $pos.y,
+        w: blockDims.width,
+        h: blockDims.height,
+        mouse: {
+          x: Math.max(Math.round(clientX - blockDims.left), 0),
+          y: Math.max(Math.round(clientY - blockDims.top), 0),
+        },
       },
     }))
   }
@@ -386,6 +400,7 @@
     width: 480px;
     font-size: 16px;
     border-radius: 4px;
+    cursor: default;
   }
   .block .wrap {
     width: 100%;
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemActions.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemActions.svelte
index 1542c65650..e3014f3e56 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemActions.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemActions.svelte
@@ -47,5 +47,6 @@
     display: flex;
     gap: var(--spacing-m);
     padding: 8px 12px;
+    cursor: default;
   }
 </style>
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
index 0aa43f8e04..e81d6d0f5c 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/FlowItemHeader.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import { Icon, Body, AbsTooltip, StatusLight } from "@budibase/bbui"
   import { externalActions } from "./ExternalActions"
   import { createEventDispatcher } from "svelte"
-  import { Features } from "constants/backend/automations"
+  import { Features } from "@/constants/backend/automations"
 
   export let block
   export let open
@@ -22,7 +22,7 @@
   const dispatch = createEventDispatcher()
 
   $: blockRefs = $selectedAutomation?.blockRefs || {}
-  $: stepNames = automation?.definition.stepNames
+  $: stepNames = automation?.definition.stepNames || {}
   $: allSteps = automation?.definition.steps || []
   $: automationName = itemName || stepNames?.[block.id] || block?.name || ""
   $: automationNameError = getAutomationNameError(automationName)
@@ -64,7 +64,7 @@
   const getAutomationNameError = name => {
     const duplicateError =
       "This name already exists, please enter a unique name"
-    if (stepNames && editing) {
+    if (editing) {
       for (const [key, value] of Object.entries(stepNames)) {
         if (name !== block.name && name === value && key !== block.id) {
           return duplicateError
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
index 4132cf3516..fbd49723be 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/StepNode.svelte
@@ -3,8 +3,8 @@
   import BranchNode from "./BranchNode.svelte"
   import { AutomationActionStepId } from "@budibase/types"
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { automationStore } from "stores/builder"
-  import { environment } from "stores/portal"
+  import { automationStore } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import { cloneDeep } from "lodash"
   import { memo } from "@budibase/frontend-core"
   import { getContext, onMount } from "svelte"
@@ -50,9 +50,12 @@
     // Register the trigger as the focus element for the automation
     // Onload, the canvas will use the dimensions to center the step
     if (stepEle && step.type === "TRIGGER" && !$view.focusEle) {
+      const { width, height, left, right, top, bottom, x, y } =
+        stepEle.getBoundingClientRect()
+
       view.update(state => ({
         ...state,
-        focusEle: stepEle.getBoundingClientRect(),
+        focusEle: { width, height, left, right, top, bottom, x, y },
       }))
     }
   })
diff --git a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
index 5ec66870a8..ab73c6babb 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@@ -6,7 +6,7 @@
     notifications,
     ActionButton,
   } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import AutomationBlockSetup from "../../SetupPanel/AutomationBlockSetup.svelte"
   import { cloneDeep } from "lodash/fp"
   import { AutomationEventType } from "@budibase/types"
@@ -46,7 +46,7 @@
       }
     } else {
       // Leave the core data as it is
-      return testData
+      return cloneDeep(testData)
     }
   }
 
@@ -63,7 +63,10 @@
     return true
   }
 
-  $: testData = testData || parseTestData($selectedAutomation.data.testData)
+  $: currentTestData = $selectedAutomation.data.testData
+
+  // Can be updated locally to avoid race condition when testing
+  $: testData = parseTestData(currentTestData)
 
   $: {
     // clone the trigger so we're not mutating the reference
@@ -85,7 +88,7 @@
       required => testData?.[required] || required !== "row"
     )
 
-  function parseTestJSON(e) {
+  async function parseTestJSON(e) {
     let jsonUpdate
 
     try {
@@ -105,7 +108,9 @@
       }
     }
 
-    automationStore.actions.addTestDataToAutomation(jsonUpdate)
+    const updatedAuto =
+      automationStore.actions.addTestDataToAutomation(jsonUpdate)
+    await automationStore.actions.save(updatedAuto)
   }
 
   const testAutomation = async () => {
@@ -150,10 +155,14 @@
   {#if selectedValues}
     <div class="tab-content-padding">
       <AutomationBlockSetup
-        bind:testData
         {schemaProperties}
         isTestModal
+        {testData}
         block={trigger}
+        on:update={e => {
+          const { testData: updatedTestData } = e.detail
+          testData = updatedTestData
+        }}
       />
     </div>
   {/if}
@@ -162,7 +171,7 @@
       <TextArea
         value={JSON.stringify($selectedAutomation.data.testData, null, 2)}
         error={failedParse}
-        on:change={e => parseTestJSON(e)}
+        on:change={async e => await parseTestJSON(e)}
       />
     </div>
   {/if}
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
index fd7961e3b0..5cf0cfad74 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestDisplay.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Icon, Divider, Tabs, Tab, Label } from "@budibase/bbui"
   import FlowItemHeader from "./FlowChart/FlowItemHeader.svelte"
-  import { ActionStepID } from "constants/backend/automations"
+  import { ActionStepID } from "@/constants/backend/automations"
   import { JsonView } from "@zerodevx/svelte-json-view"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import { AutomationActionStepId } from "@budibase/types"
 
   export let automation
diff --git a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
index d39d228717..780730729e 100644
--- a/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/TestPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Icon, Divider } from "@budibase/bbui"
   import TestDisplay from "./TestDisplay.svelte"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
 
   export let automation
 </script>
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
index fa89ab9393..c44ba8a93a 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationNavItem.svelte
@@ -4,12 +4,12 @@
     userSelectedResourceMap,
     automationStore,
     contextMenuStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { notifications, Icon } from "@budibase/bbui"
   import { sdk } from "@budibase/shared-core"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import UpdateAutomationModal from "components/automation/AutomationPanel/UpdateAutomationModal.svelte"
-  import NavItem from "components/common/NavItem.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import UpdateAutomationModal from "@/components/automation/AutomationPanel/UpdateAutomationModal.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
 
   export let automation
   export let icon
diff --git a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
index a26efdf243..f84130f5e7 100644
--- a/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/AutomationPanel.svelte
@@ -1,11 +1,11 @@
 <script>
   import CreateAutomationModal from "./CreateAutomationModal.svelte"
   import { Modal, notifications, Layout } from "@budibase/bbui"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import NavHeader from "@/components/common/NavHeader.svelte"
   import { onMount } from "svelte"
-  import { automationStore, tables } from "stores/builder"
+  import { automationStore, tables } from "@/stores/builder"
   import AutomationNavItem from "./AutomationNavItem.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   export let modal
   export let webhookModal
diff --git a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
index 35fdba970a..19cfa179f9 100644
--- a/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/CreateAutomationModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import {
     notifications,
     Input,
@@ -11,7 +11,7 @@
     Icon,
     Label,
   } from "@budibase/bbui"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   export let webhookModal
 
diff --git a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
index 6ac7f84556..56aba711b4 100644
--- a/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
+++ b/packages/builder/src/components/automation/AutomationPanel/UpdateAutomationModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import {
     notifications,
     Icon,
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
index b16533c2ca..e713d9bc85 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@@ -20,9 +20,9 @@
     Icon,
   } from "@budibase/bbui"
 
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import { automationStore, tables } from "stores/builder"
-  import { environment } from "stores/portal"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
+  import { automationStore, tables } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import WebhookDisplay from "../Shared/WebhookDisplay.svelte"
   import {
     BindingSidePanel,
@@ -30,25 +30,28 @@
     DrawerBindableInput,
     ServerBindingPanel as AutomationBindingPanel,
     ModalBindableInput,
-  } from "components/common/bindings"
+  } from "@/components/common/bindings"
   import CodeEditorModal from "./CodeEditorModal.svelte"
   import QueryParamSelector from "./QueryParamSelector.svelte"
   import AutomationSelector from "./AutomationSelector.svelte"
   import CronBuilder from "./CronBuilder.svelte"
-  import Editor from "components/integration/QueryEditor.svelte"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { BindingHelpers, BindingType } from "components/common/bindings/utils"
+  import Editor from "@/components/integration/QueryEditor.svelte"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import {
+    BindingHelpers,
+    BindingType,
+  } from "@/components/common/bindings/utils"
   import {
     bindingsToCompletions,
     hbAutocomplete,
     EditorModes,
-  } from "components/common/CodeEditor"
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  } from "@/components/common/CodeEditor"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
   import { QueryUtils, Utils, search, memo } from "@budibase/frontend-core"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
-  import { onMount } from "svelte"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
+  import { onMount, createEventDispatcher } from "svelte"
   import { writable } from "svelte/store"
   import { cloneDeep } from "lodash/fp"
   import {
@@ -67,6 +70,8 @@
   export let isTestModal = false
   export let bindings = []
 
+  const dispatch = createEventDispatcher()
+
   // Stop unnecessary rendering
   const memoBlock = memo(block)
 
@@ -114,7 +119,7 @@
   $: schemaFields = search.getFields(
     $tables.list,
     Object.values(schema || {}),
-    { allowLinks: true }
+    { allowLinks: false }
   )
   $: queryLimit = tableId?.includes("datasource") ? "∞" : "1000"
   $: isTrigger = $memoBlock?.type === AutomationStepType.TRIGGER
@@ -288,7 +293,7 @@
               type: RowSelector,
               props: {
                 row: inputData["oldRow"] || {
-                  tableId: inputData["row"].tableId,
+                  tableId: inputData["row"]?.tableId,
                 },
                 meta: {
                   fields: inputData["meta"]?.oldFields || {},
@@ -503,15 +508,7 @@
       row: { "Active": true, "Order Id" : 14, ... }
     })
    */
-  const onChange = async update => {
-    if (isTestModal) {
-      testData = update
-    }
-
-    updateAutomation(update)
-  }
-
-  const updateAutomation = Utils.sequential(async update => {
+  const onChange = Utils.sequential(async update => {
     const request = cloneDeep(update)
     // Process app trigger updates
     if (isTrigger && !isTestModal) {
@@ -540,7 +537,9 @@
     }
     try {
       if (isTestModal) {
-        let newTestData = { schema }
+        // Be sure to merge in the testData prop data, as it can contain custom
+        // default data
+        let newTestData = { schema, ...testData }
 
         // Special case for webhook, as it requires a body, but the schema already brings back the body's contents
         if (stepId === TriggerStepID.WEBHOOK) {
@@ -557,7 +556,13 @@
           ...request,
         }
 
-        await automationStore.actions.addTestDataToAutomation(newTestData)
+        const updatedAuto =
+          automationStore.actions.addTestDataToAutomation(newTestData)
+
+        // Ensure the test request has the latest info.
+        dispatch("update", updatedAuto)
+
+        await automationStore.actions.save(updatedAuto)
       } else {
         const data = { schema, ...request }
         await automationStore.actions.updateBlockInputs(block, data)
@@ -592,10 +597,11 @@
   }
 
   function saveFilters(key) {
-    const query = QueryUtils.buildQuery(tempFilters)
+    const update = Utils.parseFilter(tempFilters)
+    const query = QueryUtils.buildQuery(update)
     onChange({
       [key]: query,
-      [`${key}-def`]: tempFilters, // need to store the builder definition in the automation
+      [`${key}-def`]: update, // need to store the builder definition in the automation
     })
 
     drawer.hide()
diff --git a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
index cda8f76de3..a9cb3cc64f 100644
--- a/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationSelector.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { automationStore, selectedAutomation } from "stores/builder"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
+  import { TriggerStepID } from "@/constants/backend/automations"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
 
diff --git a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
index fd235a70f2..1490baa602 100644
--- a/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/CronBuilder.svelte
@@ -8,9 +8,9 @@
     notifications,
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { flags } from "stores/builder"
-  import { featureFlags, licensing } from "stores/portal"
-  import { API } from "api"
+  import { flags } from "@/stores/builder"
+  import { licensing } from "@/stores/portal"
+  import { API } from "@/api"
   import MagicWand from "../../../../assets/MagicWand.svelte"
 
   import { helpers, REBOOT_CRON } from "@budibase/shared-core"
@@ -27,8 +27,7 @@
   let loadingAICronExpression = false
 
   $: aiEnabled =
-    ($featureFlags.AI_CUSTOM_CONFIGS && $licensing.customAIConfigsEnabled) ||
-    ($featureFlags.BUDIBASE_AI && $licensing.budibaseAIEnabled)
+    $licensing.customAIConfigsEnabled || $licensing.budibaseAIEnabled
   $: {
     if (cronExpression) {
       try {
@@ -98,9 +97,7 @@
   async function generateAICronExpression() {
     loadingAICronExpression = true
     try {
-      const response = await API.generateCronExpression({
-        prompt: aiCronPrompt,
-      })
+      const response = await API.generateCronExpression(aiCronPrompt)
       cronExpression = response.message
       dispatch("change", response.message)
     } catch (err) {
diff --git a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
index f46bca3090..eb97f9b02f 100644
--- a/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QueryParamSelector.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { queries } from "stores/builder"
+  import { queries } from "@/stores/builder"
   import { Select, Label } from "@budibase/bbui"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
diff --git a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
index 384067e3f2..cf5cd645e4 100644
--- a/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/QuerySelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { queries } from "stores/builder"
+  import { queries } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
index 88e2f06be9..cc3315a4ab 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelector.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import {
     ActionButton,
     Popover,
@@ -13,8 +13,8 @@
   import RowSelectorTypes from "./RowSelectorTypes.svelte"
   import DrawerBindableSlot from "../../common/bindings/DrawerBindableSlot.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
-  import { FIELDS } from "constants/backend"
-  import { capitalise } from "helpers"
+  import { FIELDS } from "@/constants/backend"
+  import { capitalise } from "@/helpers"
   import { memo } from "@budibase/frontend-core"
   import PropField from "./PropField.svelte"
   import { cloneDeep, isPlainObject, mergeWith } from "lodash"
diff --git a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
index 5bdc20ab37..86666660af 100644
--- a/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/RowSelectorTypes.svelte
@@ -7,16 +7,16 @@
     Toggle,
   } from "@budibase/bbui"
   import { FieldType } from "@budibase/types"
-  import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
+  import LinkedRowSelector from "@/components/common/LinkedRowSelector.svelte"
   import DrawerBindableInput from "../../common/bindings/DrawerBindableInput.svelte"
   import ModalBindableInput from "../../common/bindings/ModalBindableInput.svelte"
   import AutomationBindingPanel from "../../common/bindings/ServerBindingPanel.svelte"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let onChange
   export let field
diff --git a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
index 74bfe27b29..5488e9651c 100644
--- a/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/TableSelector.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
index 56cc58e0c5..dfe2b0bc7d 100644
--- a/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
+++ b/packages/builder/src/components/automation/Shared/CreateWebhookModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, notifications, ModalContent } from "@budibase/bbui"
-  import { automationStore, selectedAutomation } from "stores/builder"
+  import { automationStore, selectedAutomation } from "@/stores/builder"
   import WebhookDisplay from "./WebhookDisplay.svelte"
   import { onMount, onDestroy } from "svelte"
 
diff --git a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
index 745f29d56a..ffab667142 100644
--- a/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
+++ b/packages/builder/src/components/backend/DataTable/RowFieldControl.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import {
     Input,
     Select,
@@ -13,12 +13,12 @@
     ActionButton,
     notifications,
   } from "@budibase/bbui"
-  import Dropzone from "components/common/Dropzone.svelte"
-  import { capitalise } from "helpers"
-  import LinkedRowSelector from "components/common/LinkedRowSelector.svelte"
+  import Dropzone from "@/components/common/Dropzone.svelte"
+  import { capitalise } from "@/helpers"
+  import LinkedRowSelector from "@/components/common/LinkedRowSelector.svelte"
   import Editor from "../../integration/QueryEditor.svelte"
   import { SignatureModal } from "@budibase/frontend-core/src/components"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
 
   export let meta
   export let value
diff --git a/packages/builder/src/components/backend/DataTable/Table.svelte b/packages/builder/src/components/backend/DataTable/Table.svelte
index e09dd4bd39..a32d67c881 100644
--- a/packages/builder/src/components/backend/DataTable/Table.svelte
+++ b/packages/builder/src/components/backend/DataTable/Table.svelte
@@ -2,8 +2,8 @@
   import { fade } from "svelte/transition"
   import { goto, params } from "@roxi/routify"
   import { Table, Heading, Layout } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import { TableNames, UNEDITABLE_USER_FIELDS } from "@/constants"
   import RoleCell from "./cells/RoleCell.svelte"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
index 6c718d79ae..d8d1f4d24c 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/DeleteRowsButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { Button } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let selectedRows
   export let deleteRows
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
index e2d611a523..21173965d9 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExistingRelationshipButton.svelte
@@ -2,7 +2,7 @@
   import { ActionButton, notifications } from "@budibase/bbui"
   import CreateEditRelationshipModal from "../../Datasources/CreateEditRelationshipModal.svelte"
 
-  import { datasources, tables as tablesStore } from "stores/builder"
+  import { datasources, tables as tablesStore } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let table
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
index e9352045ea..ee53faf9bc 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ExportButton.svelte
@@ -7,9 +7,9 @@
     Button,
   } from "@budibase/bbui"
   import download from "downloadjs"
-  import { API } from "api"
-  import { ROW_EXPORT_FORMATS } from "constants/backend"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { API } from "@/api"
+  import { ROW_EXPORT_FORMATS } from "@/constants/backend"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   export let view
   export let sorting
@@ -56,28 +56,19 @@
   }
 
   const exportAllData = async () => {
-    return await API.exportView({
-      viewName: view,
-      format: exportFormat,
-    })
+    return await API.exportView(view, exportFormat)
   }
 
   const exportFilteredData = async () => {
-    let payload = {
-      tableId: view,
-      format: exportFormat,
-      search: {
-        paginate: false,
-      },
-    }
+    let payload = {}
     if (selectedRows?.length) {
       payload.rows = selectedRows.map(row => row._id)
     }
     if (sorting) {
-      payload.search.sort = sorting.sortColumn
-      payload.search.sortOrder = sorting.sortOrder
+      payload.sort = sorting.sortColumn
+      payload.sortOrder = sorting.sortOrder
     }
-    return await API.exportRows(payload)
+    return await API.exportRows(view, exportFormat, payload)
   }
 
   const exportData = async () => {
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
index a2e7a2a194..ddbf4a53e9 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ImportButton.svelte
@@ -1,9 +1,9 @@
 <script>
   import { ActionButton, Button, Body, notifications } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import ExistingTableDataImport from "components/backend/TableNavigator/ExistingTableDataImport.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import ExistingTableDataImport from "@/components/backend/TableNavigator/ExistingTableDataImport.svelte"
   import { createEventDispatcher } from "svelte"
-  import { API } from "api"
+  import { API } from "@/api"
 
   export let tableId
   export let tableType
@@ -30,11 +30,7 @@
   const importData = async () => {
     try {
       loading = true
-      await API.importTableData({
-        tableId,
-        rows,
-        identifierFields,
-      })
+      await API.importTableData(tableId, rows, identifierFields)
       notifications.success("Rows successfully imported")
       popover.hide()
     } catch (error) {
diff --git a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
index 85227b9140..092c09e735 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/ManageAccessButton.svelte
@@ -8,12 +8,12 @@
     ListItem,
     notifications,
   } from "@budibase/bbui"
-  import { permissions as permissionsStore, roles } from "stores/builder"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { permissions as permissionsStore, roles } from "@/stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { PermissionSource } from "@budibase/types"
-  import { capitalise } from "helpers"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
-  import { Roles } from "constants/backend"
+  import { capitalise } from "@/helpers"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import { Roles } from "@/constants/backend"
 
   export let resourceId
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
index c6103b1697..ff687e69f2 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/TableFilterButton.svelte
@@ -1,12 +1,12 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { ActionButton, Button } from "@budibase/bbui"
-  import FilterBuilder from "components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
-  import { getUserBindings } from "dataBinding"
+  import FilterBuilder from "@/components/design/settings/controls/FilterEditor/FilterBuilder.svelte"
+  import { getUserBindings } from "@/dataBinding"
   import { makePropSafe } from "@budibase/string-templates"
-  import { search } from "@budibase/frontend-core"
-  import { tables } from "stores/builder"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import { search, Utils } from "@budibase/frontend-core"
+  import { tables } from "@/stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   export let schema
   export let filters
@@ -73,7 +73,7 @@
       cta
       slot="buttons"
       on:click={() => {
-        dispatch("change", localFilters)
+        dispatch("change", Utils.parseFilter(localFilters))
         popover.hide()
       }}
     >
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
index 2cda43dda0..1b9ed5b001 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/ColumnsSettingContent.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-  import ToggleActionButtonGroup from "components/common/ToggleActionButtonGroup.svelte"
+  import ToggleActionButtonGroup from "@/components/common/ToggleActionButtonGroup.svelte"
   import { helpers } from "@budibase/shared-core"
   import { SchemaUtils } from "@budibase/frontend-core"
   import { Icon, notifications, ActionButton, Popover } from "@budibase/bbui"
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
index b2448eeaf3..7016fcf0b0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ActionButton, List, ListItem, Button } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
-  import { automationStore, appStore } from "stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import { TriggerStepID } from "@/constants/backend/automations"
+  import { automationStore, appStore } from "@/stores/builder"
   import { createEventDispatcher, getContext } from "svelte"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
index 801abeaf9f..349e242422 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte
@@ -10,7 +10,7 @@
   import { getContext } from "svelte"
   import { ActionButton } from "@budibase/bbui"
   import ColumnsSettingContent from "./ColumnsSettingContent.svelte"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { tableColumns, datasource } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
index 5d1ec835d5..40edfa326a 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte
@@ -6,14 +6,14 @@
     tables,
     builderStore,
     viewsV2,
-  } from "stores/builder"
-  import { TriggerStepID } from "constants/backend/automations"
+  } from "@/stores/builder"
+  import { TriggerStepID } from "@/constants/backend/automations"
   import { goto } from "@roxi/routify"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import MagicWand from "./magic-wand.svg"
-  import { AutoScreenTypes } from "constants"
-  import CreateScreenModal from "pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte"
-  import { getSequentialName } from "helpers/duplicate"
+  import { AutoScreenTypes } from "@/constants"
+  import CreateScreenModal from "@/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte"
+  import { getSequentialName } from "@/helpers/duplicate"
 
   const { datasource } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
index f61e19c19d..1f02162cf0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte
@@ -10,9 +10,9 @@
     ModalContent,
     Input,
   } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { getContext } from "svelte"
-  import { appStore, rowActions } from "stores/builder"
+  import { appStore, rowActions } from "@/stores/builder"
   import { goto, url } from "@roxi/routify"
   import { derived } from "svelte/store"
 
@@ -39,9 +39,9 @@
 
   const toggleAction = async (action, enabled) => {
     if (enabled) {
-      await rowActions.enableView(tableId, viewId, action.id)
+      await rowActions.enableView(tableId, action.id, viewId)
     } else {
-      await rowActions.disableView(tableId, viewId, action.id)
+      await rowActions.disableView(tableId, action.id, viewId)
     }
   }
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
index db446b3c9e..b2edb52725 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridScreensButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton, List, ListItem, Button } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
-  import { screenStore, appStore } from "stores/builder"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
+  import { screenStore, appStore } from "@/stores/builder"
   import { getContext, createEventDispatcher } from "svelte"
 
   const { datasource } = getContext("grid")
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
index 148d8b1d5f..7ee47a5cfc 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSizeButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getContext } from "svelte"
   import { ActionButton, Label } from "@budibase/bbui"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const {
     Constants,
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
index 244a1b1560..aab29286c0 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridSortButton.svelte
@@ -2,7 +2,7 @@
   import { getContext } from "svelte"
   import { ActionButton, Select } from "@budibase/bbui"
   import { canBeSortColumn } from "@budibase/frontend-core"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { sort, columns } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
index 55eb2475cf..34b388c9ac 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionButton, Popover, Heading, Body, Button } from "@budibase/bbui"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   let anchor
   let open = false
diff --git a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
index 7b279d3948..7733a90bad 100644
--- a/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
+++ b/packages/builder/src/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte
@@ -7,9 +7,9 @@
     Button,
   } from "@budibase/bbui"
   import { CalculationType, canGroupBy, isNumeric } from "@budibase/types"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
   import { getContext } from "svelte"
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
 
   const { definition, datasource, rows } = getContext("grid")
   const calculationTypeOptions = [
diff --git a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
index 8c9b4e306b..a39badb81b 100644
--- a/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
+++ b/packages/builder/src/components/backend/DataTable/cells/RoleCell.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let value
 
diff --git a/packages/builder/src/components/backend/DataTable/formula.js b/packages/builder/src/components/backend/DataTable/formula.js
index a9491abfef..9ec75b52c0 100644
--- a/packages/builder/src/components/backend/DataTable/formula.js
+++ b/packages/builder/src/components/backend/DataTable/formula.js
@@ -1,6 +1,6 @@
 import { FieldType } from "@budibase/types"
-import { FIELDS } from "constants/backend"
-import { tables } from "stores/builder"
+import { FIELDS } from "@/constants/backend"
+import { tables } from "@/stores/builder"
 import { get as svelteGet } from "svelte/store"
 
 // currently supported level of relationship depth (server side)
diff --git a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
index 1acf5e3efd..45711bc733 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CalculateModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, notifications, ModalContent } from "@budibase/bbui"
-  import { tables, views } from "stores/builder"
-  import { FIELDS } from "constants/backend"
+  import { tables, views } from "@/stores/builder"
+  import { FIELDS } from "@/constants/backend"
 
   const CALCULATIONS = [
     {
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
index 17069aa8c6..4af1dcc0ee 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditColumn.svelte
@@ -25,32 +25,31 @@
   import { makePropSafe } from "@budibase/string-templates"
   import { createEventDispatcher, getContext, onMount } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/builder"
-  import { featureFlags } from "stores/portal"
-  import { TableNames, UNEDITABLE_USER_FIELDS } from "constants"
+  import { tables, datasources } from "@/stores/builder"
+  import { licensing } from "@/stores/portal"
+  import { TableNames, UNEDITABLE_USER_FIELDS } from "@/constants"
   import {
     FIELDS,
     RelationshipType,
     PrettyRelationshipDefinitions,
     DB_TYPE_EXTERNAL,
-  } from "constants/backend"
-  import { getAutoColumnInformation, buildAutoColumn } from "helpers/utils"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import AIFieldConfiguration from "components/common/AIFieldConfiguration.svelte"
-  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
-  import { getBindings } from "components/backend/DataTable/formula"
+  } from "@/constants/backend"
+  import { getAutoColumnInformation, buildAutoColumn } from "@/helpers/utils"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import AIFieldConfiguration from "@/components/common/AIFieldConfiguration.svelte"
+  import ModalBindableInput from "@/components/common/bindings/ModalBindableInput.svelte"
+  import { getBindings } from "@/components/backend/DataTable/formula"
   import JSONSchemaModal from "./JSONSchemaModal.svelte"
   import {
     BBReferenceFieldSubType,
     FieldType,
     SourceName,
   } from "@budibase/types"
-  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
+  import RelationshipSelector from "@/components/common/RelationshipSelector.svelte"
   import { RowUtils, canBeDisplayColumn } from "@budibase/frontend-core"
-  import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
+  import ServerBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
   import OptionsEditor from "./OptionsEditor.svelte"
-  import { isEnabled } from "helpers/featureFlags"
-  import { getUserBindings } from "dataBinding"
+  import { getUserBindings } from "@/dataBinding"
 
   export let field
 
@@ -101,7 +100,8 @@
   let optionsValid = true
 
   $: rowGoldenSample = RowUtils.generateGoldenSample($rows)
-  $: aiEnabled = $featureFlags.BUDIBASE_AI || $featureFlags.AI_CUSTOM_CONFIGS
+  $: aiEnabled =
+    $licensing.customAIConfigsEnabled || $licensing.budibaseAiEnabled
   $: if (primaryDisplay) {
     editableColumn.constraints.presence = { allowEmpty: false }
   }
@@ -168,7 +168,6 @@
   // used to select what different options can be displayed for column type
   $: canBeDisplay =
     canBeDisplayColumn(editableColumn) && !editableColumn.autocolumn
-  $: defaultValuesEnabled = isEnabled("DEFAULT_VALUES")
   $: canHaveDefault = !required && canHaveDefaultColumn(editableColumn.type)
   $: canBeRequired =
     editableColumn?.type !== FieldType.LINK &&
@@ -300,7 +299,7 @@
     }
 
     // Ensure we don't have a default value if we can't have one
-    if (!canHaveDefault || !defaultValuesEnabled) {
+    if (!canHaveDefault) {
       delete saveColumn.default
     }
 
@@ -848,51 +847,49 @@
     </div>
   {/if}
 
-  {#if defaultValuesEnabled}
-    {#if editableColumn.type === FieldType.OPTIONS}
-      <Select
-        disabled={!canHaveDefault}
-        options={editableColumn.constraints?.inclusion || []}
-        label="Default value"
-        value={editableColumn.default}
-        on:change={e => (editableColumn.default = e.detail)}
-        placeholder="None"
-      />
-    {:else if editableColumn.type === FieldType.ARRAY}
-      <Multiselect
-        disabled={!canHaveDefault}
-        options={editableColumn.constraints?.inclusion || []}
-        label="Default value"
-        value={editableColumn.default}
-        on:change={e =>
-          (editableColumn.default = e.detail?.length ? e.detail : undefined)}
-        placeholder="None"
-      />
-    {:else if editableColumn.subtype === BBReferenceFieldSubType.USER}
-      {@const defaultValue =
-        editableColumn.type === FieldType.BB_REFERENCE_SINGLE
-          ? SingleUserDefault
-          : MultiUserDefault}
-      <Toggle
-        disabled={!canHaveDefault}
-        text="Default to current user"
-        value={editableColumn.default === defaultValue}
-        on:change={e =>
-          (editableColumn.default = e.detail ? defaultValue : undefined)}
-      />
-    {:else}
-      <ModalBindableInput
-        disabled={!canHaveDefault}
-        panel={ServerBindingPanel}
-        title="Default value"
-        label="Default value"
-        placeholder="None"
-        value={editableColumn.default}
-        on:change={e => (editableColumn.default = e.detail)}
-        bindings={defaultValueBindings}
-        allowJS
-      />
-    {/if}
+  {#if editableColumn.type === FieldType.OPTIONS}
+    <Select
+      disabled={!canHaveDefault}
+      options={editableColumn.constraints?.inclusion || []}
+      label="Default value"
+      value={editableColumn.default}
+      on:change={e => (editableColumn.default = e.detail)}
+      placeholder="None"
+    />
+  {:else if editableColumn.type === FieldType.ARRAY}
+    <Multiselect
+      disabled={!canHaveDefault}
+      options={editableColumn.constraints?.inclusion || []}
+      label="Default value"
+      value={editableColumn.default}
+      on:change={e =>
+        (editableColumn.default = e.detail?.length ? e.detail : undefined)}
+      placeholder="None"
+    />
+  {:else if editableColumn.subtype === BBReferenceFieldSubType.USER}
+    {@const defaultValue =
+      editableColumn.type === FieldType.BB_REFERENCE_SINGLE
+        ? SingleUserDefault
+        : MultiUserDefault}
+    <Toggle
+      disabled={!canHaveDefault}
+      text="Default to current user"
+      value={editableColumn.default === defaultValue}
+      on:change={e =>
+        (editableColumn.default = e.detail ? defaultValue : undefined)}
+    />
+  {:else}
+    <ModalBindableInput
+      disabled={!canHaveDefault}
+      panel={ServerBindingPanel}
+      title="Default value"
+      label="Default value"
+      placeholder="None"
+      value={editableColumn.default}
+      on:change={e => (editableColumn.default = e.detail)}
+      bindings={defaultValueBindings}
+      allowJS
+    />
   {/if}
 </Layout>
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
index eb99e994d1..beaf51cf70 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditRow.svelte
@@ -1,10 +1,10 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { ModalContent, keepOpen, notifications } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
-  import { API } from "api"
-  import { FIELDS } from "constants/backend"
+  import { API } from "@/api"
+  import { FIELDS } from "@/constants/backend"
 
   const FORMULA_TYPE = FIELDS.FORMULA.type
   const AI_TYPE = FIELDS.AI.type
diff --git a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
index 5ac2beab65..a3fe16733b 100644
--- a/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/CreateEditUser.svelte
@@ -1,6 +1,6 @@
 <script>
   import { createEventDispatcher } from "svelte"
-  import { tables, roles } from "stores/builder"
+  import { tables, roles } from "@/stores/builder"
   import {
     notifications,
     keepOpen,
@@ -9,8 +9,8 @@
     Link,
   } from "@budibase/bbui"
   import RowFieldControl from "../RowFieldControl.svelte"
-  import { API } from "api"
-  import ErrorsBox from "components/common/ErrorsBox.svelte"
+  import { API } from "@/api"
+  import ErrorsBox from "@/components/common/ErrorsBox.svelte"
   import { goto } from "@roxi/routify"
 
   export let row = {}
diff --git a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
index 1c67da1ab8..025015a6c3 100644
--- a/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/FilterModal.svelte
@@ -10,7 +10,7 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { tables, views } from "stores/builder"
+  import { tables, views } from "@/stores/builder"
 
   const CONDITIONS = [
     {
diff --git a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
index d122013428..acd6040973 100644
--- a/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/GroupByModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, ModalContent, notifications } from "@budibase/bbui"
-  import { tables, views } from "stores/builder"
-  import { FIELDS } from "constants/backend"
+  import { tables, views } from "@/stores/builder"
+  import { FIELDS } from "@/constants/backend"
 
   export let view = {}
 
diff --git a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
index 0b2eb58748..908a7b1aea 100644
--- a/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/JSONSchemaModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Editor from "components/integration/QueryEditor.svelte"
+  import Editor from "@/components/integration/QueryEditor.svelte"
   import {
     ModalContent,
     Tabs,
@@ -12,8 +12,8 @@
     ActionButton,
   } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { FIELDS } from "constants/backend"
-  import { generate } from "helpers/schemaGenerator"
+  import { FIELDS } from "@/constants/backend"
+  import { generate } from "@/helpers/schemaGenerator"
 
   export let schema = {}
   export let json
diff --git a/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte b/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
index 8e35e38ae9..8546b34cd8 100644
--- a/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/OptionsEditor.svelte
@@ -4,7 +4,7 @@
   import { Icon, Popover } from "@budibase/bbui"
   import { tick } from "svelte"
   import { Constants } from "@budibase/frontend-core"
-  import { getSequentialName } from "helpers/duplicate"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { derived, writable } from "svelte/store"
 
   export let constraints
diff --git a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
index d031e752cd..58507373ac 100644
--- a/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
+++ b/packages/builder/src/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getContext } from "svelte"
-  import CreateEditColumn from "components/backend/DataTable/modals/CreateEditColumn.svelte"
+  import CreateEditColumn from "@/components/backend/DataTable/modals/CreateEditColumn.svelte"
 
   const { datasource, rows } = getContext("grid")
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
index 1ba32838ab..d538a9b1b7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DatasourceNavItem.svelte
@@ -1,12 +1,12 @@
 <script>
   import { isActive } from "@roxi/routify"
-  import { BUDIBASE_INTERNAL_DB_ID } from "constants/backend"
-  import { contextMenuStore, userSelectedResourceMap } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  import { BUDIBASE_INTERNAL_DB_ID } from "@/constants/backend"
+  import { contextMenuStore, userSelectedResourceMap } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
 
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { Icon } from "@budibase/bbui"
-  import UpdateDatasourceModal from "components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
+  import UpdateDatasourceModal from "@/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte"
   import DeleteConfirmationModal from "./DeleteConfirmationModal.svelte"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
index 3d36d1e00e..6982f87dc7 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavItem/DeleteConfirmationModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources } from "stores/builder"
+  import { datasources } from "@/stores/builder"
   import { notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let datasource
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index d7a98c564a..8d85bee556 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -8,12 +8,12 @@
     views,
     viewsV2,
     userSelectedResourceMap,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import QueryNavItem from "./QueryNavItem.svelte"
-  import NavItem from "components/common/NavItem.svelte"
-  import TableNavigator from "components/backend/TableNavigator/TableNavigator.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import TableNavigator from "@/components/backend/TableNavigator/TableNavigator.svelte"
   import DatasourceNavItem from "./DatasourceNavItem/DatasourceNavItem.svelte"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
   import { enrichDatasources } from "./datasourceUtils"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte b/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
index a0cdabc63c..1f6b0060d2 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/IntegrationIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { getIcon } from "./icons"
-  import CustomSVG from "components/common/CustomSVG.svelte"
+  import CustomSVG from "@/components/common/CustomSVG.svelte"
 
   export let integrationType
   export let schema
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte b/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
index 8d7d6dc5d3..5b611cc4df 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/QueryNavItem.svelte
@@ -3,16 +3,16 @@
     customQueryIconText,
     customQueryIconColor,
     customQueryText,
-  } from "helpers/data/utils"
+  } from "@/helpers/data/utils"
   import { goto as gotoStore, isActive } from "@roxi/routify"
   import {
     datasources,
     queries,
     userSelectedResourceMap,
     contextMenuStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { notifications, Icon } from "@budibase/bbui"
 
   export let datasource
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
index bc7fa53b49..5e38cc9bfe 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/datasourceUtils.js
@@ -1,4 +1,4 @@
-import { TableNames } from "constants"
+import { TableNames } from "@/constants"
 
 const showDatasourceOpen = ({
   selected,
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
index 88359c2782..5b48834b5b 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
+++ b/packages/builder/src/components/backend/DatasourceNavigator/icons/index.js
@@ -16,7 +16,7 @@ import Firebase from "./Firebase.svelte"
 import Redis from "./Redis.svelte"
 import Snowflake from "./Snowflake.svelte"
 import Custom from "./Custom.svelte"
-import { integrations } from "stores/builder"
+import { integrations } from "@/stores/builder"
 import { get } from "svelte/store"
 
 const ICONS = {
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
index 1de322c203..37610061ac 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/builder"
+  import { datasources, queries } from "@/stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
index e6d6026f7c..df1cf5f589 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/modals/UpdateDatasourceModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { get } from "svelte/store"
-  import { datasources, integrations } from "stores/builder"
+  import { datasources, integrations } from "@/stores/builder"
   import { notifications, Input, ModalContent, Modal } from "@budibase/bbui"
-  import { integrationForDatasource } from "stores/selectors"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   let error = ""
   let modal
@@ -33,7 +33,7 @@
       ...datasource,
       name,
     }
-    await datasources.update({
+    await datasources.save({
       datasource: updatedDatasource,
       integration: integrationForDatasource(get(integrations), datasource),
     })
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/ConfigInput.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/ConfigInput.svelte
index 70f2ffef46..569f77d5ce 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/ConfigInput.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/ConfigInput.svelte
@@ -12,6 +12,7 @@
   export let name
   export let config
   export let showModal = () => {}
+  export let placeholder
 
   const selectComponent = type => {
     if (type === "object") {
@@ -40,6 +41,7 @@
   {name}
   {config}
   {showModal}
+  {placeholder}
   on:blur
   on:change
 />
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/LongForm.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/LongForm.svelte
index efbeb007e8..6b366a882e 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/LongForm.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/LongForm.svelte
@@ -5,11 +5,12 @@
   export let name
   export let value
   export let error
+  export let placeholder
 </script>
 
 <div class="form-row">
   <Label>{name}</Label>
-  <TextArea on:blur on:change {type} {value} {error} />
+  <TextArea on:blur on:change {type} {value} {error} {placeholder} />
 </div>
 
 <style>
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
index e92655cc59..6dbfc7f6d9 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Object.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, Button } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
 
   export let name
   export let value
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Select.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Select.svelte
index 3185a6c22c..6caf3f25b6 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Select.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/Select.svelte
@@ -6,6 +6,7 @@
   export let value
   export let error
   export let config
+  export let placeholder
 </script>
 
 <div class="form-row">
@@ -17,6 +18,7 @@
     {type}
     value={value || undefined}
     {error}
+    {placeholder}
   />
 </div>
 
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
index 1940488819..4e42a3f1fc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/fields/String.svelte
@@ -1,11 +1,12 @@
 <script>
   import { Label, EnvDropdown } from "@budibase/bbui"
-  import { environment, licensing } from "stores/portal"
+  import { environment, licensing } from "@/stores/portal"
 
   export let type
   export let name
   export let value
   export let error
+  export let placeholder
   export let showModal = () => {}
 
   async function handleUpgradePanel() {
@@ -22,6 +23,7 @@
     type={type === "port" ? "string" : type}
     {value}
     {error}
+    {placeholder}
     variables={$environment.variables}
     environmentVariablesEnabled={$licensing.environmentVariablesEnabled}
     {showModal}
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
index 14191868b6..058b4348cc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/index.svelte
@@ -8,12 +8,12 @@
     ModalContent,
   } from "@budibase/bbui"
   import { processStringSync } from "@budibase/string-templates"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
   import ConfigInput from "./ConfigInput.svelte"
   import { createValidatedConfigStore } from "./stores/validatedConfig"
   import { createValidatedNameStore } from "./stores/validatedName"
   import { get } from "svelte/store"
-  import { environment } from "stores/portal"
+  import { environment } from "@/stores/portal"
 
   export let integration
   export let config
@@ -85,7 +85,7 @@
     />
   {/if}
 
-  {#each $configStore.validatedConfig as { type, key, value, error, name, hidden, config }}
+  {#each $configStore.validatedConfig as { type, key, value, error, name, hidden, config, placeholder }}
     {#if hidden === undefined || !eval(processStringSync(hidden, $configStore.config))}
       <ConfigInput
         {type}
@@ -93,6 +93,7 @@
         {error}
         {name}
         {config}
+        {placeholder}
         showModal={() =>
           showModal(newValue => configStore.updateFieldValue(key, newValue))}
         on:blur={() => configStore.markFieldActive(key)}
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
index edd39cc49f..df2bab1dd9 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedConfig.js
@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { getValidatorFields } from "./validation"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { notifications } from "@budibase/bbui"
 import { object } from "yup"
 
@@ -114,6 +114,7 @@ export const createValidatedConfigStore = (integration, config) => {
           value: getValue(),
           error: $errorsStore[key],
           name: capitalise(properties.display || key),
+          placeholder: properties.placeholder,
           type: properties.type,
           hidden: properties.hidden,
           config: properties.config,
diff --git a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
index d4179a8c45..0e7a9c81bc 100644
--- a/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
+++ b/packages/builder/src/components/backend/Datasources/ConfigEditor/stores/validatedName.js
@@ -1,5 +1,5 @@
 import { derived, get, writable } from "svelte/store"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { string } from "yup"
 
 export const createValidatedNameStore = (name, isVisible) => {
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
index 7e11c98768..97d3de6874 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationship.svelte
@@ -2,7 +2,7 @@
   import {
     RelationshipType,
     PrettyRelationshipDefinitions,
-  } from "constants/backend"
+  } from "@/constants/backend"
   import {
     keepOpen,
     Button,
@@ -13,10 +13,10 @@
     Body,
     Helpers,
   } from "@budibase/bbui"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import { RelationshipErrorChecker } from "./relationshipErrors"
   import { onMount } from "svelte"
-  import RelationshipSelector from "components/common/RelationshipSelector.svelte"
+  import RelationshipSelector from "@/components/common/RelationshipSelector.svelte"
 
   export let save
   export let datasource
diff --git a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
index d2682597d4..1bfe87617d 100644
--- a/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
+++ b/packages/builder/src/components/backend/Datasources/CreateEditRelationshipModal.svelte
@@ -2,8 +2,8 @@
   import { Modal } from "@budibase/bbui"
   import { get } from "svelte/store"
   import CreateEditRelationship from "./CreateEditRelationship.svelte"
-  import { integrations, datasources } from "stores/builder"
-  import { integrationForDatasource } from "stores/selectors"
+  import { integrations, datasources } from "@/stores/builder"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   export let datasource
   export let tables
@@ -41,7 +41,7 @@
         get(integrations),
         datasource
       )
-      await datasources.update({ datasource, integration })
+      await datasources.save({ datasource, integration })
 
       await afterSave({ datasource, action })
     } catch (err) {
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte b/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
index 3bc2457c99..66968a7ea2 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/index.svelte
@@ -6,8 +6,8 @@
     Layout,
     ModalContent,
   } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
   import { createTableSelectionStore } from "./tableSelectionStore"
 
   export let integration
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index e9bd06d69b..31a94f0a96 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
@@ -1,6 +1,6 @@
 import { derived, writable, get } from "svelte/store"
 import { keepOpen, notifications } from "@budibase/bbui"
-import { datasources, tables } from "stores/builder"
+import { datasources, tables } from "@/stores/builder"
 
 export const createTableSelectionStore = (integration, datasource) => {
   const tableNamesStore = writable([])
diff --git a/packages/builder/src/components/backend/RoleEditor/BracketEdge.svelte b/packages/builder/src/components/backend/RoleEditor/BracketEdge.svelte
index 182b56f122..058c47f00c 100644
--- a/packages/builder/src/components/backend/RoleEditor/BracketEdge.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/BracketEdge.svelte
@@ -24,9 +24,9 @@
     const j = 32 // Outer radius strength (higher is stronger)
 
     // Calculate unit vector
-    var dx = x1 - x2
-    var dy = y1 - y2
-    var len = Math.sqrt(dx * dx + dy * dy)
+    let dx = x1 - x2
+    let dy = y1 - y2
+    let len = Math.sqrt(dx * dx + dy * dy)
     dx = dx / len
     dy = dy / len
 
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte b/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
index 84badeb6b2..60afefd8c6 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleEdge.svelte
@@ -2,7 +2,7 @@
   import { getBezierPath, BaseEdge, EdgeLabelRenderer } from "@xyflow/svelte"
   import { Icon, TooltipPosition } from "@budibase/bbui"
   import { getContext, onMount } from "svelte"
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let sourceX
   export let sourceY
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
index 90c0a9fca8..a9d1aed1e4 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleFlow.svelte
@@ -23,9 +23,9 @@
   import { setContext, tick } from "svelte"
   import Controls from "./Controls.svelte"
   import { GridResolution, MaxAutoZoom, ZoomDuration } from "./constants"
-  import { roles } from "stores/builder"
-  import { Roles } from "constants/backend"
-  import { getSequentialName } from "helpers/duplicate"
+  import { roles } from "@/stores/builder"
+  import { Roles } from "@/constants/backend"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { derivedMemo } from "@budibase/frontend-core"
 
   const flow = useSvelteFlow()
diff --git a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
index 32a95f4278..c01ae43362 100644
--- a/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
+++ b/packages/builder/src/components/backend/RoleEditor/RoleNode.svelte
@@ -10,8 +10,8 @@
   } from "@budibase/bbui"
   import { NodeWidth, NodeHeight } from "./constants"
   import { getContext } from "svelte"
-  import { roles } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { roles } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let data
   export let id
diff --git a/packages/builder/src/components/backend/RoleEditor/utils.js b/packages/builder/src/components/backend/RoleEditor/utils.js
index a958fc6401..4a7f40ce31 100644
--- a/packages/builder/src/components/backend/RoleEditor/utils.js
+++ b/packages/builder/src/components/backend/RoleEditor/utils.js
@@ -9,8 +9,8 @@ import {
   EmptyStateID,
 } from "./constants"
 import { getNodesBounds, Position } from "@xyflow/svelte"
-import { Roles } from "constants/backend"
-import { roles } from "stores/builder"
+import { Roles } from "@/constants/backend"
+import { roles } from "@/stores/builder"
 import { get } from "svelte/store"
 
 // Calculates the bounds of all custom nodes
diff --git a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
index ce966d0daa..beddf447df 100644
--- a/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/ExistingTableDataImport.svelte
@@ -5,10 +5,10 @@
     SourceName,
   } from "@budibase/types"
   import { Select, Toggle, Multiselect, Label, Layout } from "@budibase/bbui"
-  import { DB_TYPE_INTERNAL } from "constants/backend"
-  import { API } from "api"
+  import { DB_TYPE_INTERNAL } from "@/constants/backend"
+  import { API } from "@/api"
   import { parseFile } from "./utils"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
 
   let error = null
   let fileName = null
@@ -128,11 +128,7 @@
     allValid = false
 
     if (rows.length > 0) {
-      const response = await API.validateExistingTableImport({
-        rows,
-        tableId,
-      })
-
+      const response = await API.validateExistingTableImport(rows, tableId)
       validation = response.schemaValidation
       invalidColumns = response.invalidColumns
       allValid = response.allValid
diff --git a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
index 1694ec8b0e..a7d2b2e6d7 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableDataImport.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, Icon, Layout, Label } from "@budibase/bbui"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import { utils } from "@budibase/shared-core"
   import { canBeDisplayColumn } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import { parseFile } from "./utils"
 
   export let rows = []
@@ -147,7 +147,7 @@
     loading = true
     try {
       if (rows.length > 0) {
-        const response = await API.validateNewTableImport({ rows, schema })
+        const response = await API.validateNewTableImport(rows, schema)
         validation = response.schemaValidation
         allValid = response.allValid
         errors = response.errors
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
index c0e030845f..183a803902 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { appStore, tables, datasources, screenStore } from "stores/builder"
+  import { appStore, tables, datasources, screenStore } from "@/stores/builder"
   import { InlineAlert, Link, Input, notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let table
 
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
index f0b49ca8cd..e3bb83f621 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/EditModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { cloneDeep } from "lodash/fp"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { Input, Modal, ModalContent, notifications } from "@budibase/bbui"
 
   export let table
diff --git a/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte b/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
index 6b64096e2e..f3deccb3c9 100644
--- a/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/TableNavItem/TableNavItem.svelte
@@ -3,14 +3,14 @@
     tables as tablesStore,
     userSelectedResourceMap,
     contextMenuStore,
-  } from "stores/builder"
-  import { TableNames } from "constants"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import { TableNames } from "@/constants"
+  import NavItem from "@/components/common/NavItem.svelte"
   import { isActive } from "@roxi/routify"
   import EditModal from "./EditModal.svelte"
   import DeleteConfirmationModal from "./DeleteConfirmationModal.svelte"
   import { Icon } from "@budibase/bbui"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let table
   export let idx
diff --git a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
index 5596ade573..cc3876208b 100644
--- a/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
+++ b/packages/builder/src/components/backend/TableNavigator/modals/CreateTableModal.svelte
@@ -1,13 +1,13 @@
 <script>
   import { goto, url } from "@roxi/routify"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { notifications, Input, ModalContent } from "@budibase/bbui"
   import TableDataImport from "../TableDataImport.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
     BUDIBASE_DATASOURCE_TYPE,
     DB_TYPE_INTERNAL,
-  } from "constants/backend"
+  } from "@/constants/backend"
 
   $: tableNames = $tables.list.map(table => table.name)
   $: selectedSource = $datasources.list.find(
diff --git a/packages/builder/src/components/backend/TableNavigator/utils.js b/packages/builder/src/components/backend/TableNavigator/utils.js
index a76a14c1a4..2889d90cc0 100644
--- a/packages/builder/src/components/backend/TableNavigator/utils.js
+++ b/packages/builder/src/components/backend/TableNavigator/utils.js
@@ -1,5 +1,5 @@
-import { API } from "api"
-import { FIELDS } from "constants/backend"
+import { API } from "@/api"
+import { FIELDS } from "@/constants/backend"
 
 const BYTES_IN_MB = 1000000
 const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
diff --git a/packages/builder/src/components/commandPalette/CommandPalette.svelte b/packages/builder/src/components/commandPalette/CommandPalette.svelte
index 51a688fc72..4598b44873 100644
--- a/packages/builder/src/components/commandPalette/CommandPalette.svelte
+++ b/packages/builder/src/components/commandPalette/CommandPalette.svelte
@@ -7,7 +7,7 @@
     Detail,
     notifications,
   } from "@budibase/bbui"
-  import { API } from "api"
+  import { API } from "@/api"
   import { goto } from "@roxi/routify"
   import {
     automationStore,
@@ -19,8 +19,8 @@
     queries,
     tables,
     views,
-  } from "stores/builder"
-  import { themeStore } from "stores/portal"
+  } from "@/stores/builder"
+  import { themeStore } from "@/stores/portal"
   import { getContext } from "svelte"
   import { ThemeOptions } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/components/common/AIFieldConfiguration.svelte b/packages/builder/src/components/common/AIFieldConfiguration.svelte
index cb7ac77b75..24908e0fe2 100644
--- a/packages/builder/src/components/common/AIFieldConfiguration.svelte
+++ b/packages/builder/src/components/common/AIFieldConfiguration.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Helpers, Multiselect, Select } from "@budibase/bbui"
-  import ServerBindingPanel from "components/common/bindings/ServerBindingPanel.svelte"
-  import ModalBindableInput from "components/common/bindings/ModalBindableInput.svelte"
+  import ServerBindingPanel from "@/components/common/bindings/ServerBindingPanel.svelte"
+  import ModalBindableInput from "@/components/common/bindings/ModalBindableInput.svelte"
   import {
     AIOperations,
     OperationFields,
diff --git a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
index c3e4835f96..bc88f0f981 100644
--- a/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
+++ b/packages/builder/src/components/common/CodeEditor/CodeEditor.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher, onDestroy } from "svelte"
   import { FIND_ANY_HBS_REGEX } from "@budibase/string-templates"
@@ -12,7 +12,6 @@
     completionStatus,
   } from "@codemirror/autocomplete"
   import {
-    EditorView,
     lineNumbers,
     keymap,
     highlightSpecialChars,
@@ -25,6 +24,7 @@
     MatchDecorator,
     ViewPlugin,
     Decoration,
+    EditorView,
   } from "@codemirror/view"
   import {
     bracketMatching,
@@ -43,13 +43,15 @@
   import { Compartment, EditorState } from "@codemirror/state"
   import { javascript } from "@codemirror/lang-javascript"
   import { EditorModes } from "./"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
+  import type { EditorMode } from "@budibase/types"
 
-  export let label
-  export let completions = []
-  export let mode = EditorModes.Handlebars
-  export let value = ""
-  export let placeholder = null
+  export let label: string | undefined = undefined
+  // TODO: work out what best type fits this
+  export let completions: any[] = []
+  export let mode: EditorMode = EditorModes.Handlebars
+  export let value: string | null = ""
+  export let placeholder: string | null = null
   export let autocompleteEnabled = true
   export let autofocus = false
   export let jsBindingWrapping = true
@@ -58,8 +60,8 @@
 
   const dispatch = createEventDispatcher()
 
-  let textarea
-  let editor
+  let textarea: HTMLDivElement
+  let editor: EditorView
   let mounted = false
   let isEditorInitialised = false
   let queuedRefresh = false
@@ -100,15 +102,22 @@
   /**
    * Will refresh the editor contents only after
    * it has been fully initialised
-   * @param value {string} the editor value
    */
-  const refresh = (value, initialised, mounted) => {
+  const refresh = (
+    value: string | null,
+    initialised?: boolean,
+    mounted?: boolean
+  ) => {
     if (!initialised || !mounted) {
       queuedRefresh = true
       return
     }
 
-    if (editor.state.doc.toString() !== value || queuedRefresh) {
+    if (
+      editor &&
+      value &&
+      (editor.state.doc.toString() !== value || queuedRefresh)
+    ) {
       editor.dispatch({
         changes: { from: 0, to: editor.state.doc.length, insert: value },
       })
@@ -120,12 +129,17 @@
   export const getCaretPosition = () => {
     const selection_range = editor.state.selection.ranges[0]
     return {
-      start: selection_range.from,
-      end: selection_range.to,
+      start: selection_range?.from,
+      end: selection_range?.to,
     }
   }
 
-  export const insertAtPos = opts => {
+  export const insertAtPos = (opts: {
+    start: number
+    end?: number
+    value: string
+    cursor: { anchor: number }
+  }) => {
     // Updating the value inside.
     // Retain focus
     editor.dispatch({
@@ -192,7 +206,7 @@
 
   const indentWithTabCustom = {
     key: "Tab",
-    run: view => {
+    run: (view: EditorView) => {
       if (completionStatus(view.state) === "active") {
         acceptCompletion(view)
         return true
@@ -200,7 +214,7 @@
       indentMore(view)
       return true
     },
-    shift: view => {
+    shift: (view: EditorView) => {
       indentLess(view)
       return true
     },
@@ -232,7 +246,8 @@
 
   // None of this is reactive, but it never has been, so we just assume most
   // config flags aren't changed at runtime
-  const buildExtensions = base => {
+  // TODO: work out type for base
+  const buildExtensions = (base: any[]) => {
     let complete = [...base]
 
     if (autocompleteEnabled) {
@@ -242,7 +257,7 @@
           closeOnBlur: true,
           icons: false,
           optionClass: completion =>
-            completion.simple
+            "simple" in completion && completion.simple
               ? "autocomplete-option-simple"
               : "autocomplete-option",
         })
@@ -347,7 +362,7 @@
 
 {#if label}
   <div>
-    <Label small>{label}</Label>
+    <Label size="S">{label}</Label>
   </div>
 {/if}
 
diff --git a/packages/builder/src/components/common/CodeEditor/index.js b/packages/builder/src/components/common/CodeEditor/index.ts
similarity index 59%
rename from packages/builder/src/components/common/CodeEditor/index.js
rename to packages/builder/src/components/common/CodeEditor/index.ts
index a04a140ad6..0c974e0bf4 100644
--- a/packages/builder/src/components/common/CodeEditor/index.js
+++ b/packages/builder/src/components/common/CodeEditor/index.ts
@@ -1,8 +1,15 @@
 import { getManifest } from "@budibase/string-templates"
 import sanitizeHtml from "sanitize-html"
 import { groupBy } from "lodash"
+import {
+  BindingCompletion,
+  EditorModesMap,
+  Helper,
+  Snippet,
+} from "@budibase/types"
+import { CompletionContext } from "@codemirror/autocomplete"
 
-export const EditorModes = {
+export const EditorModes: EditorModesMap = {
   JS: {
     name: "javascript",
     json: false,
@@ -26,7 +33,7 @@ export const SECTIONS = {
   },
 }
 
-export const buildHelperInfoNode = (completion, helper) => {
+export const buildHelperInfoNode = (completion: any, helper: Helper) => {
   const ele = document.createElement("div")
   ele.classList.add("info-bubble")
 
@@ -46,7 +53,7 @@ export const buildHelperInfoNode = (completion, helper) => {
   return ele
 }
 
-const toSpectrumIcon = name => {
+const toSpectrumIcon = (name: string) => {
   return `<svg
     class="spectrum-Icon spectrum-Icon--sizeS"
     focusable="false"
@@ -58,7 +65,12 @@ const toSpectrumIcon = name => {
   </svg>`
 }
 
-export const buildSectionHeader = (type, sectionName, icon, rank) => {
+export const buildSectionHeader = (
+  type: string,
+  sectionName: string,
+  icon: string,
+  rank: number
+) => {
   const ele = document.createElement("div")
   ele.classList.add("info-section")
   if (type) {
@@ -72,43 +84,52 @@ export const buildSectionHeader = (type, sectionName, icon, rank) => {
   }
 }
 
-export const helpersToCompletion = (helpers, mode) => {
+export const helpersToCompletion = (
+  helpers: Record<string, Helper>,
+  mode: { name: "javascript" | "handlebars" }
+) => {
   const { type, name: sectionName, icon } = SECTIONS.HB_HELPER
   const helperSection = buildSectionHeader(type, sectionName, icon, 99)
 
-  return Object.keys(helpers).reduce((acc, key) => {
-    let helper = helpers[key]
-    acc.push({
-      label: key,
-      info: completion => {
+  return Object.keys(helpers).flatMap(helperName => {
+    let helper = helpers[helperName]
+    return {
+      label: helperName,
+      info: (completion: BindingCompletion) => {
         return buildHelperInfoNode(completion, helper)
       },
       type: "helper",
       section: helperSection,
       detail: "Function",
-      apply: (view, completion, from, to) => {
-        insertBinding(view, from, to, key, mode)
+      apply: (
+        view: any,
+        completion: BindingCompletion,
+        from: number,
+        to: number
+      ) => {
+        insertBinding(view, from, to, helperName, mode)
       },
-    })
-    return acc
-  }, [])
+    }
+  })
 }
 
-export const getHelperCompletions = mode => {
-  const manifest = getManifest()
-  return Object.keys(manifest).reduce((acc, key) => {
-    acc = acc || []
-    return [...acc, ...helpersToCompletion(manifest[key], mode)]
-  }, [])
+export const getHelperCompletions = (mode: {
+  name: "javascript" | "handlebars"
+}) => {
+  // TODO: manifest needs to be properly typed
+  const manifest: any = getManifest()
+  return Object.keys(manifest).flatMap(key => {
+    return helpersToCompletion(manifest[key], mode)
+  })
 }
 
-export const snippetAutoComplete = snippets => {
-  return function myCompletions(context) {
+export const snippetAutoComplete = (snippets: Snippet[]) => {
+  return function myCompletions(context: CompletionContext) {
     if (!snippets?.length) {
       return null
     }
     const word = context.matchBefore(/\w*/)
-    if (word.from == word.to && !context.explicit) {
+    if (!word || (word.from == word.to && !context.explicit)) {
       return null
     }
     return {
@@ -117,7 +138,12 @@ export const snippetAutoComplete = snippets => {
         label: `snippets.${snippet.name}`,
         type: "text",
         simple: true,
-        apply: (view, completion, from, to) => {
+        apply: (
+          view: any,
+          completion: BindingCompletion,
+          from: number,
+          to: number
+        ) => {
           insertSnippet(view, from, to, completion.label)
         },
       })),
@@ -125,7 +151,7 @@ export const snippetAutoComplete = snippets => {
   }
 }
 
-const bindingFilter = (options, query) => {
+const bindingFilter = (options: BindingCompletion[], query: string) => {
   return options.filter(completion => {
     const section_parsed = completion.section.name.toLowerCase()
     const label_parsed = completion.label.toLowerCase()
@@ -138,8 +164,8 @@ const bindingFilter = (options, query) => {
   })
 }
 
-export const hbAutocomplete = baseCompletions => {
-  async function coreCompletion(context) {
+export const hbAutocomplete = (baseCompletions: BindingCompletion[]) => {
+  async function coreCompletion(context: CompletionContext) {
     let bindingStart = context.matchBefore(EditorModes.Handlebars.match)
 
     let options = baseCompletions || []
@@ -149,6 +175,9 @@ export const hbAutocomplete = baseCompletions => {
     }
     // Accommodate spaces
     const match = bindingStart.text.match(/{{[\s]*/)
+    if (!match) {
+      return null
+    }
     const query = bindingStart.text.replace(match[0], "")
     let filtered = bindingFilter(options, query)
 
@@ -162,14 +191,17 @@ export const hbAutocomplete = baseCompletions => {
   return coreCompletion
 }
 
-export const jsAutocomplete = baseCompletions => {
-  async function coreCompletion(context) {
+export const jsAutocomplete = (baseCompletions: BindingCompletion[]) => {
+  async function coreCompletion(context: CompletionContext) {
     let jsBinding = context.matchBefore(/\$\("[\s\w]*/)
     let options = baseCompletions || []
 
     if (jsBinding) {
       // Accommodate spaces
       const match = jsBinding.text.match(/\$\("[\s]*/)
+      if (!match) {
+        return null
+      }
       const query = jsBinding.text.replace(match[0], "")
       let filtered = bindingFilter(options, query)
       return {
@@ -185,7 +217,10 @@ export const jsAutocomplete = baseCompletions => {
   return coreCompletion
 }
 
-export const buildBindingInfoNode = (completion, binding) => {
+export const buildBindingInfoNode = (
+  completion: BindingCompletion,
+  binding: any
+) => {
   if (!binding.valueHTML || binding.value == null) {
     return null
   }
@@ -196,7 +231,12 @@ export const buildBindingInfoNode = (completion, binding) => {
 }
 
 // Readdress these methods. They shouldn't be used
-export const hbInsert = (value, from, to, text) => {
+export const hbInsert = (
+  value: string,
+  from: number,
+  to: number,
+  text: string
+) => {
   let parsedInsert = ""
 
   const left = from ? value.substring(0, from) : ""
@@ -212,11 +252,14 @@ export const hbInsert = (value, from, to, text) => {
 }
 
 export function jsInsert(
-  value,
-  from,
-  to,
-  text,
-  { helper, disableWrapping } = {}
+  value: string,
+  from: number,
+  to: number,
+  text: string,
+  {
+    helper,
+    disableWrapping,
+  }: { helper?: boolean; disableWrapping?: boolean } = {}
 ) {
   let parsedInsert = ""
 
@@ -236,7 +279,13 @@ export function jsInsert(
 }
 
 // Autocomplete apply behaviour
-export const insertBinding = (view, from, to, text, mode) => {
+export const insertBinding = (
+  view: any,
+  from: number,
+  to: number,
+  text: string,
+  mode: { name: "javascript" | "handlebars" }
+) => {
   let parsedInsert
 
   if (mode.name == "javascript") {
@@ -270,7 +319,12 @@ export const insertBinding = (view, from, to, text, mode) => {
   })
 }
 
-export const insertSnippet = (view, from, to, text) => {
+export const insertSnippet = (
+  view: any,
+  from: number,
+  to: number,
+  text: string
+) => {
   let cursorPos = from + text.length
   view.dispatch({
     changes: {
@@ -284,9 +338,13 @@ export const insertSnippet = (view, from, to, text) => {
   })
 }
 
-export const bindingsToCompletions = (bindings, mode) => {
+// TODO: typing in this function isn't great
+export const bindingsToCompletions = (
+  bindings: any,
+  mode: { name: "javascript" | "handlebars" }
+) => {
   const bindingByCategory = groupBy(bindings, "category")
-  const categoryMeta = bindings?.reduce((acc, ele) => {
+  const categoryMeta = bindings?.reduce((acc: any, ele: any) => {
     acc[ele.category] = acc[ele.category] || {}
 
     if (ele.icon) {
@@ -298,36 +356,46 @@ export const bindingsToCompletions = (bindings, mode) => {
     return acc
   }, {})
 
-  const completions = Object.keys(bindingByCategory).reduce((comps, catKey) => {
-    const { icon, rank } = categoryMeta[catKey] || {}
+  const completions = Object.keys(bindingByCategory).reduce(
+    (comps: any, catKey: string) => {
+      const { icon, rank } = categoryMeta[catKey] || {}
 
-    const bindindSectionHeader = buildSectionHeader(
-      bindingByCategory.type,
-      catKey,
-      icon || "",
-      typeof rank == "number" ? rank : 1
-    )
+      const bindingSectionHeader = buildSectionHeader(
+        // @ts-ignore something wrong with this - logically this should be dictionary
+        bindingByCategory.type,
+        catKey,
+        icon || "",
+        typeof rank == "number" ? rank : 1
+      )
 
-    return [
-      ...comps,
-      ...bindingByCategory[catKey].reduce((acc, binding) => {
-        let displayType = binding.fieldSchema?.type || binding.display?.type
-        acc.push({
-          label: binding.display?.name || binding.readableBinding || "NO NAME",
-          info: completion => {
-            return buildBindingInfoNode(completion, binding)
-          },
-          type: "binding",
-          detail: displayType,
-          section: bindindSectionHeader,
-          apply: (view, completion, from, to) => {
-            insertBinding(view, from, to, binding.readableBinding, mode)
-          },
-        })
-        return acc
-      }, []),
-    ]
-  }, [])
+      return [
+        ...comps,
+        ...bindingByCategory[catKey].reduce((acc, binding) => {
+          let displayType = binding.fieldSchema?.type || binding.display?.type
+          acc.push({
+            label:
+              binding.display?.name || binding.readableBinding || "NO NAME",
+            info: (completion: BindingCompletion) => {
+              return buildBindingInfoNode(completion, binding)
+            },
+            type: "binding",
+            detail: displayType,
+            section: bindingSectionHeader,
+            apply: (
+              view: any,
+              completion: BindingCompletion,
+              from: number,
+              to: number
+            ) => {
+              insertBinding(view, from, to, binding.readableBinding, mode)
+            },
+          })
+          return acc
+        }, []),
+      ]
+    },
+    []
+  )
 
   return completions
 }
diff --git a/packages/builder/src/components/common/CodeMirrorEditor.svelte b/packages/builder/src/components/common/CodeMirrorEditor.svelte
index 48177ff870..94cc9ccd0d 100644
--- a/packages/builder/src/components/common/CodeMirrorEditor.svelte
+++ b/packages/builder/src/components/common/CodeMirrorEditor.svelte
@@ -26,8 +26,8 @@
 
 <script>
   import { Label } from "@budibase/bbui"
-  import CodeMirror from "components/integration/codemirror"
-  import { themeStore } from "stores/portal"
+  import CodeMirror from "@/components/integration/codemirror"
+  import { themeStore } from "@/stores/portal"
   import { createEventDispatcher, onMount } from "svelte"
 
   export let mode = EditorModes.JS
diff --git a/packages/builder/src/components/common/Dropzone.spec.js b/packages/builder/src/components/common/Dropzone.spec.js
index 8bf202223b..0ffa7e51a1 100644
--- a/packages/builder/src/components/common/Dropzone.spec.js
+++ b/packages/builder/src/components/common/Dropzone.spec.js
@@ -2,7 +2,7 @@ import { it, expect, describe, vi } from "vitest"
 import Dropzone from "./Dropzone.svelte"
 import { render, fireEvent } from "@testing-library/svelte"
 import { notifications } from "@budibase/bbui"
-import { admin } from "stores/portal"
+import { admin } from "@/stores/portal"
 
 vi.spyOn(notifications, "error").mockImplementation(() => {})
 
diff --git a/packages/builder/src/components/common/Dropzone.svelte b/packages/builder/src/components/common/Dropzone.svelte
index 8cd85e2530..149462a97a 100644
--- a/packages/builder/src/components/common/Dropzone.svelte
+++ b/packages/builder/src/components/common/Dropzone.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Dropzone, notifications } from "@budibase/bbui"
-  import { admin } from "stores/portal"
-  import { API } from "api"
+  import { admin } from "@/stores/portal"
+  import { API } from "@/api"
 
   export let value = []
   export let label
diff --git a/packages/builder/src/components/common/EditableIcon.svelte b/packages/builder/src/components/common/EditableIcon.svelte
index 6c0986e601..150a23ecb7 100644
--- a/packages/builder/src/components/common/EditableIcon.svelte
+++ b/packages/builder/src/components/common/EditableIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, Modal } from "@budibase/bbui"
-  import ChooseIconModal from "components/start/ChooseIconModal.svelte"
+  import ChooseIconModal from "@/components/start/ChooseIconModal.svelte"
 
   export let name
   export let size = "M"
diff --git a/packages/builder/src/components/common/HelpMenu.svelte b/packages/builder/src/components/common/HelpMenu.svelte
index bba55e88dc..db2b496c12 100644
--- a/packages/builder/src/components/common/HelpMenu.svelte
+++ b/packages/builder/src/components/common/HelpMenu.svelte
@@ -1,9 +1,9 @@
 <script>
   import FontAwesomeIcon from "./FontAwesomeIcon.svelte"
   import { Popover, Heading, Body } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
-  import { isPremiumOrAbove } from "helpers/planTitle"
-  import { ChangelogURL } from "constants"
+  import { licensing } from "@/stores/portal"
+  import { isPremiumOrAbove } from "@/helpers/planTitle"
+  import { ChangelogURL } from "@/constants"
 
   $: premiumOrAboveLicense = isPremiumOrAbove($licensing?.license?.plan?.type)
 
diff --git a/packages/builder/src/components/common/LinkedRowSelector.svelte b/packages/builder/src/components/common/LinkedRowSelector.svelte
index 009d943456..8875b8896b 100644
--- a/packages/builder/src/components/common/LinkedRowSelector.svelte
+++ b/packages/builder/src/components/common/LinkedRowSelector.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { tables } from "stores/builder"
-  import { API } from "api"
+  import { tables } from "@/stores/builder"
+  import { API } from "@/api"
   import { Select, Label, Multiselect } from "@budibase/bbui"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { createEventDispatcher } from "svelte"
 
   export let schema
diff --git a/packages/builder/src/components/common/NavHeader.svelte b/packages/builder/src/components/common/NavHeader.svelte
index 2c67a3f9b3..d83d7f578b 100644
--- a/packages/builder/src/components/common/NavHeader.svelte
+++ b/packages/builder/src/components/common/NavHeader.svelte
@@ -1,7 +1,7 @@
 <script>
   import { tick } from "svelte"
   import { Icon, Body } from "@budibase/bbui"
-  import { keyUtils } from "helpers/keyUtils"
+  import { keyUtils } from "@/helpers/keyUtils"
 
   export let title
   export let placeholder
diff --git a/packages/builder/src/components/common/RoleIcon.svelte b/packages/builder/src/components/common/RoleIcon.svelte
index 3b48935e0c..e6c5af6ee0 100644
--- a/packages/builder/src/components/common/RoleIcon.svelte
+++ b/packages/builder/src/components/common/RoleIcon.svelte
@@ -1,6 +1,6 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let id
   export let size = "M"
diff --git a/packages/builder/src/components/common/RoleSelect.svelte b/packages/builder/src/components/common/RoleSelect.svelte
index 38b84e964d..62c33458bf 100644
--- a/packages/builder/src/components/common/RoleSelect.svelte
+++ b/packages/builder/src/components/common/RoleSelect.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Select, FancySelect } from "@budibase/bbui"
-  import { roles } from "stores/builder"
-  import { licensing } from "stores/portal"
+  import { roles } from "@/stores/builder"
+  import { licensing } from "@/stores/portal"
 
   import { Constants } from "@budibase/frontend-core"
   import { createEventDispatcher } from "svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let value
   export let error
diff --git a/packages/builder/src/components/common/TemplateDisplay.svelte b/packages/builder/src/components/common/TemplateDisplay.svelte
index 4fbd8b1fb8..a72e846011 100644
--- a/packages/builder/src/components/common/TemplateDisplay.svelte
+++ b/packages/builder/src/components/common/TemplateDisplay.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Layout, Detail, Button, Modal } from "@budibase/bbui"
-  import TemplateCard from "components/common/TemplateCard.svelte"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import { licensing } from "stores/portal"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
+  import TemplateCard from "@/components/common/TemplateCard.svelte"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  import { licensing } from "@/stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
 
   export let templates
 
diff --git a/packages/builder/src/components/common/UndoRedoControl.svelte b/packages/builder/src/components/common/UndoRedoControl.svelte
index bd197f3d38..b6407b7aa1 100644
--- a/packages/builder/src/components/common/UndoRedoControl.svelte
+++ b/packages/builder/src/components/common/UndoRedoControl.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Icon, ActionButton } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { isBuilderInputFocused } from "helpers"
+  import { isBuilderInputFocused } from "@/helpers"
 
   export let store
   export let showButtonGroup = false
diff --git a/packages/builder/src/components/common/UpdateAppForm.svelte b/packages/builder/src/components/common/UpdateAppForm.svelte
index 0e07c5c918..b399d3f063 100644
--- a/packages/builder/src/components/common/UpdateAppForm.svelte
+++ b/packages/builder/src/components/common/UpdateAppForm.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Button, Label, Icon, Input, notifications } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appStore, initialise } from "stores/builder"
-  import { appsStore } from "stores/portal"
-  import { API } from "api"
+  import { AppStatus } from "@/constants"
+  import { appStore, initialise } from "@/stores/builder"
+  import { appsStore } from "@/stores/portal"
+  import { API } from "@/api"
   import { writable } from "svelte/store"
-  import { createValidationStore } from "helpers/validation/yup"
-  import * as appValidation from "helpers/validation/yup/app"
-  import EditableIcon from "components/common/EditableIcon.svelte"
+  import { createValidationStore } from "@/helpers/validation/yup"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import EditableIcon from "@/components/common/EditableIcon.svelte"
   import { isEqual } from "lodash"
   import { createEventDispatcher } from "svelte"
 
diff --git a/packages/builder/src/components/common/VerificationPromptBanner.svelte b/packages/builder/src/components/common/VerificationPromptBanner.svelte
index e9109ae0b1..d707eb640d 100644
--- a/packages/builder/src/components/common/VerificationPromptBanner.svelte
+++ b/packages/builder/src/components/common/VerificationPromptBanner.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notifications, Button, Icon, Body } from "@budibase/bbui"
-  import { admin, auth } from "stores/portal"
+  import { admin, auth } from "@/stores/portal"
 
   $: user = $auth.user
   let loading = false
diff --git a/packages/builder/src/components/common/bindings/BindableCombobox.svelte b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
index 3754abd341..b3b7511ccd 100644
--- a/packages/builder/src/components/common/bindings/BindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/BindableCombobox.svelte
@@ -3,7 +3,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { createEventDispatcher } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte
index 4186cb54cc..ffb477012c 100644
--- a/packages/builder/src/components/common/bindings/BindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import {
     DrawerContent,
     ActionButton,
@@ -12,9 +12,9 @@
     decodeJSBinding,
     encodeJSBinding,
     processObjectSync,
-    processStringSync,
+    processStringWithLogsSync,
   } from "@budibase/string-templates"
-  import { readableToRuntimeBinding } from "dataBinding"
+  import { readableToRuntimeBinding } from "@/dataBinding"
   import CodeEditor from "../CodeEditor/CodeEditor.svelte"
   import {
     getHelperCompletions,
@@ -28,45 +28,47 @@
   import EvaluationSidePanel from "./EvaluationSidePanel.svelte"
   import SnippetSidePanel from "./SnippetSidePanel.svelte"
   import { BindingHelpers } from "./utils"
-  import formatHighlight from "json-format-highlight"
-  import { capitalise } from "helpers"
-  import { Utils } from "@budibase/frontend-core"
-  import { licensing } from "stores/portal"
+  import { capitalise } from "@/helpers"
+  import { Utils, JsonFormatter } from "@budibase/frontend-core"
+  import { licensing } from "@/stores/portal"
+  import { BindingMode, SidePanel } from "@budibase/types"
+  import type {
+    EnrichedBinding,
+    BindingCompletion,
+    Snippet,
+    Helper,
+    CaretPositionFn,
+    InsertAtPositionFn,
+    JSONValue,
+  } from "@budibase/types"
+  import type { Log } from "@budibase/string-templates"
+  import type { CompletionContext } from "@codemirror/autocomplete"
 
   const dispatch = createEventDispatcher()
 
-  export let bindings = []
-  export let value = ""
+  export let bindings: EnrichedBinding[] = []
+  export let value: string = ""
   export let allowHBS = true
   export let allowJS = false
   export let allowHelpers = true
   export let allowSnippets = true
   export let context = null
-  export let snippets = null
+  export let snippets: Snippet[] | null = null
   export let autofocusEditor = false
   export let placeholder = null
   export let showTabBar = true
 
-  const Modes = {
-    Text: "Text",
-    JavaScript: "JavaScript",
-  }
-  const SidePanels = {
-    Bindings: "FlashOn",
-    Evaluation: "Play",
-    Snippets: "Code",
-  }
-
-  let mode
-  let sidePanel
+  let mode: BindingMode | null
+  let sidePanel: SidePanel | null
   let initialValueJS = value?.startsWith?.("{{ js ")
-  let jsValue = initialValueJS ? value : null
-  let hbsValue = initialValueJS ? null : value
-  let getCaretPosition
-  let insertAtPos
-  let targetMode = null
-  let expressionResult
-  let expressionError
+  let jsValue: string | null = initialValueJS ? value : null
+  let hbsValue: string | null = initialValueJS ? null : value
+  let getCaretPosition: CaretPositionFn | undefined
+  let insertAtPos: InsertAtPositionFn | undefined
+  let targetMode: BindingMode | null = null
+  let expressionResult: string | undefined
+  let expressionLogs: Log[] | undefined
+  let expressionError: string | undefined
   let evaluating = false
 
   $: useSnippets = allowSnippets && !$licensing.isFreePlan
@@ -78,10 +80,12 @@
     mode
   )
   $: enrichedBindings = enrichBindings(bindings, context, snippets)
-  $: usingJS = mode === Modes.JavaScript
+  $: usingJS = mode === BindingMode.JavaScript
   $: editorMode =
-    mode === Modes.JavaScript ? EditorModes.JS : EditorModes.Handlebars
-  $: editorValue = editorMode === EditorModes.JS ? jsValue : hbsValue
+    mode === BindingMode.JavaScript ? EditorModes.JS : EditorModes.Handlebars
+  $: editorValue = (editorMode === EditorModes.JS ? jsValue : hbsValue) as
+    | string
+    | null
   $: runtimeExpression = readableToRuntimeBinding(enrichedBindings, value)
   $: requestEval(runtimeExpression, context, snippets)
   $: bindingCompletions = bindingsToCompletions(enrichedBindings, editorMode)
@@ -95,7 +99,7 @@
     }
   }
 
-  const getHBSCompletions = bindingCompletions => {
+  const getHBSCompletions = (bindingCompletions: BindingCompletion[]) => {
     return [
       hbAutocomplete([
         ...bindingCompletions,
@@ -104,71 +108,89 @@
     ]
   }
 
-  const getJSCompletions = (bindingCompletions, snippets, useSnippets) => {
-    const completions = [
+  const getJSCompletions = (
+    bindingCompletions: BindingCompletion[],
+    snippets: Snippet[] | null,
+    useSnippets?: boolean
+  ) => {
+    const completions: ((_: CompletionContext) => any)[] = [
       jsAutocomplete([
         ...bindingCompletions,
         ...getHelperCompletions(EditorModes.JS),
       ]),
     ]
-    if (useSnippets) {
+    if (useSnippets && snippets) {
       completions.push(snippetAutoComplete(snippets))
     }
     return completions
   }
 
-  const getModeOptions = (allowHBS, allowJS) => {
+  const getModeOptions = (allowHBS: boolean, allowJS: boolean) => {
     let options = []
     if (allowHBS) {
-      options.push(Modes.Text)
+      options.push(BindingMode.Text)
     }
     if (allowJS) {
-      options.push(Modes.JavaScript)
+      options.push(BindingMode.JavaScript)
     }
     return options
   }
 
-  const getSidePanelOptions = (bindings, context, useSnippets, mode) => {
+  const getSidePanelOptions = (
+    bindings: EnrichedBinding[],
+    context: any,
+    useSnippets: boolean,
+    mode: BindingMode | null
+  ) => {
     let options = []
     if (bindings?.length) {
-      options.push(SidePanels.Bindings)
+      options.push(SidePanel.Bindings)
     }
     if (context && Object.keys(context).length > 0) {
-      options.push(SidePanels.Evaluation)
+      options.push(SidePanel.Evaluation)
     }
-    if (useSnippets && mode === Modes.JavaScript) {
-      options.push(SidePanels.Snippets)
+    if (useSnippets && mode === BindingMode.JavaScript) {
+      options.push(SidePanel.Snippets)
     }
     return options
   }
 
-  const debouncedEval = Utils.debounce((expression, context, snippets) => {
-    try {
-      expressionError = null
-      expressionResult = processStringSync(
-        expression || "",
-        {
-          ...context,
-          snippets,
-        },
-        {
-          noThrow: false,
-        }
-      )
-    } catch (err) {
-      expressionResult = null
-      expressionError = err
-    }
-    evaluating = false
-  }, 260)
+  const debouncedEval = Utils.debounce(
+    (expression: string | null, context: any, snippets: Snippet[]) => {
+      try {
+        expressionError = undefined
+        const output = processStringWithLogsSync(
+          expression || "",
+          {
+            ...context,
+            snippets,
+          },
+          {
+            noThrow: false,
+          }
+        )
+        expressionResult = output.result
+        expressionLogs = output.logs
+      } catch (err: any) {
+        expressionResult = undefined
+        expressionError = err
+      }
+      evaluating = false
+    },
+    260
+  )
 
-  const requestEval = (expression, context, snippets) => {
+  const requestEval = (
+    expression: string | null,
+    context: any,
+    snippets: Snippet[] | null
+  ) => {
     evaluating = true
     debouncedEval(expression, context, snippets)
   }
 
-  const highlightJSON = json => {
-    return formatHighlight(json, {
+  const highlightJSON = (json: JSONValue) => {
+    return JsonFormatter.format(json, {
       keyColor: "#e06c75",
       numberColor: "#e5c07b",
       stringColor: "#98c379",
@@ -178,7 +200,11 @@
     })
   }
 
-  const enrichBindings = (bindings, context, snippets) => {
+  const enrichBindings = (
+    bindings: EnrichedBinding[],
+    context: any,
+    snippets: Snippet[] | null
+  ) => {
     // Create a single big array to enrich in one go
     const bindingStrings = bindings.map(binding => {
       if (binding.runtimeBinding.startsWith('trim "')) {
@@ -189,17 +215,18 @@
         return `{{ literal ${binding.runtimeBinding} }}`
       }
     })
-    const bindingEvauations = processObjectSync(bindingStrings, {
+    const bindingEvaluations = processObjectSync(bindingStrings, {
       ...context,
       snippets,
     })
 
     // Enrich bindings with evaluations and highlighted HTML
     return bindings.map((binding, idx) => {
-      if (!context) {
+      if (!context || typeof bindingEvaluations !== "object") {
         return binding
       }
-      const value = JSON.stringify(bindingEvauations[idx], null, 2)
+      const evalObj: Record<any, any> = bindingEvaluations
+      const value = JSON.stringify(evalObj[idx], null, 2)
       return {
         ...binding,
         value,
@@ -208,29 +235,38 @@
     })
   }
 
-  const updateValue = val => {
+  const updateValue = (val: any) => {
     const runtimeExpression = readableToRuntimeBinding(enrichedBindings, val)
     dispatch("change", val)
     requestEval(runtimeExpression, context, snippets)
   }
 
-  const onSelectHelper = (helper, js) => {
-    bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, helper, { js })
+  const onSelectHelper = (helper: Helper, js?: boolean) => {
+    bindingHelpers.onSelectHelper(js ? jsValue : hbsValue, helper, {
+      js,
+      dontDecode: undefined,
+    })
   }
 
-  const onSelectBinding = (binding, { forceJS } = {}) => {
+  const onSelectBinding = (
+    binding: EnrichedBinding,
+    { forceJS }: { forceJS?: boolean } = {}
+  ) => {
     const js = usingJS || forceJS
-    bindingHelpers.onSelectBinding(js ? jsValue : hbsValue, binding, { js })
+    bindingHelpers.onSelectBinding(js ? jsValue : hbsValue, binding, {
+      js,
+      dontDecode: undefined,
+    })
   }
 
-  const changeMode = newMode => {
+  const changeMode = (newMode: BindingMode) => {
     if (targetMode || newMode === mode) {
       return
     }
 
     // Get the raw editor value to see if we are abandoning changes
     let rawValue = editorValue
-    if (mode === Modes.JavaScript) {
+    if (mode === BindingMode.JavaScript && rawValue) {
       rawValue = decodeJSBinding(rawValue)
     }
 
@@ -249,16 +285,16 @@
     targetMode = null
   }
 
-  const changeSidePanel = newSidePanel => {
+  const changeSidePanel = (newSidePanel: SidePanel) => {
     sidePanel = newSidePanel === sidePanel ? null : newSidePanel
   }
 
-  const onChangeHBSValue = e => {
+  const onChangeHBSValue = (e: { detail: string }) => {
     hbsValue = e.detail
     updateValue(hbsValue)
   }
 
-  const onChangeJSValue = e => {
+  const onChangeJSValue = (e: { detail: string }) => {
     jsValue = encodeJSBinding(e.detail)
     if (!e.detail?.trim()) {
       // Don't bother saving empty values as JS
@@ -268,9 +304,14 @@
     }
   }
 
+  const addSnippet = (snippet: Snippet) =>
+    bindingHelpers.onSelectSnippet(snippet)
+
   onMount(() => {
     // Set the initial mode appropriately
-    const initialValueMode = initialValueJS ? Modes.JavaScript : Modes.Text
+    const initialValueMode = initialValueJS
+      ? BindingMode.JavaScript
+      : BindingMode.Text
     if (editorModeOptions.includes(initialValueMode)) {
       mode = initialValueMode
     } else {
@@ -314,7 +355,7 @@
         </div>
       {/if}
       <div class="editor">
-        {#if mode === Modes.Text}
+        {#if mode === BindingMode.Text}
           {#key hbsCompletions}
             <CodeEditor
               value={hbsValue}
@@ -328,10 +369,10 @@
               jsBindingWrapping={false}
             />
           {/key}
-        {:else if mode === Modes.JavaScript}
+        {:else if mode === BindingMode.JavaScript}
           {#key jsCompletions}
             <CodeEditor
-              value={decodeJSBinding(jsValue)}
+              value={jsValue ? decodeJSBinding(jsValue) : jsValue}
               on:change={onChangeJSValue}
               completions={jsCompletions}
               mode={EditorModes.JS}
@@ -371,7 +412,7 @@
       </div>
     </div>
     <div class="side" class:visible={!!sidePanel}>
-      {#if sidePanel === SidePanels.Bindings}
+      {#if sidePanel === SidePanel.Bindings}
         <BindingSidePanel
           bindings={enrichedBindings}
           {allowHelpers}
@@ -380,18 +421,16 @@
           addBinding={onSelectBinding}
           mode={editorMode}
         />
-      {:else if sidePanel === SidePanels.Evaluation}
+      {:else if sidePanel === SidePanel.Evaluation}
         <EvaluationSidePanel
           {expressionResult}
           {expressionError}
+          {expressionLogs}
           {evaluating}
-          expression={editorValue}
-        />
-      {:else if sidePanel === SidePanels.Snippets}
-        <SnippetSidePanel
-          addSnippet={snippet => bindingHelpers.onSelectSnippet(snippet)}
-          {snippets}
+          expression={editorValue ? editorValue : ""}
         />
+      {:else if sidePanel === SidePanel.Snippets}
+        <SnippetSidePanel {addSnippet} {snippets} />
       {/if}
     </div>
   </div>
diff --git a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
index f364b39ba9..c45d7999e5 100644
--- a/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/BindingSidePanel.svelte
@@ -2,7 +2,7 @@
   import groupBy from "lodash/fp/groupBy"
   import { convertToJS } from "@budibase/string-templates"
   import { Input, Layout, Icon, Popover } from "@budibase/bbui"
-  import { handlebarsCompletions } from "constants/completions"
+  import { handlebarsCompletions } from "@/constants/completions"
 
   export let addHelper
   export let addBinding
diff --git a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
index 4aa7ced9dc..6d329a8321 100644
--- a/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ClientBindingPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import BindingPanel from "./BindingPanel.svelte"
-  import { previewStore, snippets } from "stores/builder"
+  import { previewStore, snippets } from "@/stores/builder"
   import { onMount } from "svelte"
 
   export let bindings = []
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
index a4a1a2b356..77eb280bb7 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableCombobox.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  } from "@/dataBinding"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
index 65831b652a..aec23f6ccc 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableInput.svelte
@@ -3,11 +3,11 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  } from "@/dataBinding"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding } from "@budibase/string-templates"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   export let panel = ClientBindingPanel
   export let value = ""
diff --git a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
index e41a740229..6fda04480c 100644
--- a/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
+++ b/packages/builder/src/components/common/bindings/DrawerBindableSlot.svelte
@@ -3,10 +3,10 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { FieldType } from "@budibase/types"
 
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { createEventDispatcher, setContext } from "svelte"
   import { isJSBinding, findHBSBlocks } from "@budibase/string-templates"
 
diff --git a/packages/builder/src/components/common/bindings/EvaluationSidePanel.svelte b/packages/builder/src/components/common/bindings/EvaluationSidePanel.svelte
index ffb8f45297..c47840ea83 100644
--- a/packages/builder/src/components/common/bindings/EvaluationSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/EvaluationSidePanel.svelte
@@ -1,40 +1,50 @@
-<script>
-  import formatHighlight from "json-format-highlight"
+<script lang="ts">
+  import { JsonFormatter } from "@budibase/frontend-core"
   import { Icon, ProgressCircle, notifications } from "@budibase/bbui"
-  import { copyToClipboard } from "@budibase/bbui/helpers"
+  import { Helpers } from "@budibase/bbui"
   import { fade } from "svelte/transition"
   import { UserScriptError } from "@budibase/string-templates"
+  import type { Log } from "@budibase/string-templates"
+  import type { JSONValue } from "@budibase/types"
 
-  export let expressionResult
-  export let expressionError
+  // this can be essentially any primitive response from the JS function
+  export let expressionResult: JSONValue | undefined = undefined
+  export let expressionError: string | undefined = undefined
+  export let expressionLogs: Log[] = []
   export let evaluating = false
-  export let expression = null
+  export let expression: string | null = null
 
   $: error = expressionError != null
   $: empty = expression == null || expression?.trim() === ""
   $: success = !error && !empty
   $: highlightedResult = highlight(expressionResult)
+  $: highlightedLogs = expressionLogs.map(l => ({
+    log: highlight(l.log.join(", ")),
+    line: l.line,
+    type: l.type,
+  }))
 
-  const formatError = err => {
+  const formatError = (err: any) => {
     if (err.code === UserScriptError.code) {
       return err.userScriptError.toString()
     }
     return err.toString()
   }
 
-  const highlight = json => {
+  // json can be any primitive type
+  const highlight = (json?: JSONValue | null) => {
     if (json == null) {
       return ""
     }
 
     // Attempt to parse and then stringify, in case this is valid result
     try {
-      json = JSON.stringify(JSON.parse(json), null, 2)
+      json = JSON.stringify(JSON.parse(json as any), null, 2)
     } catch (err) {
-      // Ignore
+      // couldn't parse/stringify, just treat it as the raw input
     }
 
-    return formatHighlight(json, {
+    return JsonFormatter.format(json, {
       keyColor: "#e06c75",
       numberColor: "#e5c07b",
       stringColor: "#98c379",
@@ -45,11 +55,11 @@
   }
 
   const copy = () => {
-    let clipboardVal = expressionResult.result
+    let clipboardVal = expressionResult
     if (typeof clipboardVal === "object") {
       clipboardVal = JSON.stringify(clipboardVal, null, 2)
     }
-    copyToClipboard(clipboardVal)
+    Helpers.copyToClipboard(clipboardVal)
     notifications.success("Value copied to clipboard")
   }
 </script>
@@ -58,7 +68,7 @@
   <div class="header" class:success class:error>
     <div class="header-content">
       {#if error}
-        <Icon name="Alert" color="var(--spectrum-global-color-red-600)" />
+        <Icon name="Alert" color="var(--error-content)" />
         <div>Error</div>
         {#if evaluating}
           <div transition:fade|local={{ duration: 130 }}>
@@ -87,8 +97,36 @@
     {:else if error}
       {formatError(expressionError)}
     {:else}
-      <!-- eslint-disable-next-line svelte/no-at-html-tags-->
-      {@html highlightedResult}
+      <div class="output-lines">
+        {#each highlightedLogs as logLine}
+          <div
+            class="line"
+            class:error-log={logLine.type === "error"}
+            class:warn-log={logLine.type === "warn"}
+          >
+            <div class="icon-log">
+              {#if logLine.type === "error"}
+                <Icon
+                  size="XS"
+                  name="CloseCircle"
+                  color="var(--error-content)"
+                />
+              {:else if logLine.type === "warn"}
+                <Icon size="XS" name="Alert" color="var(--warning-content)" />
+              {/if}
+              <!-- eslint-disable-next-line svelte/no-at-html-tags-->
+              <span>{@html logLine.log}</span>
+            </div>
+            {#if logLine.line}
+              <span style="color: var(--blue)">:{logLine.line}</span>
+            {/if}
+          </div>
+        {/each}
+        <div class="line">
+          <!-- eslint-disable-next-line svelte/no-at-html-tags-->
+          {@html highlightedResult}
+        </div>
+      </div>
     {/if}
   </div>
 </div>
@@ -127,20 +165,37 @@
     height: 100%;
     z-index: 1;
     position: absolute;
-    opacity: 10%;
   }
   .header.error::before {
-    background: var(--spectrum-global-color-red-400);
+    background: var(--error-bg);
   }
   .body {
     flex: 1 1 auto;
     padding: var(--spacing-m) var(--spacing-l);
     font-family: var(--font-mono);
     font-size: 12px;
-    overflow-y: scroll;
+    overflow-y: auto;
     overflow-x: hidden;
-    white-space: pre-wrap;
+    white-space: pre-line;
     word-wrap: break-word;
     height: 0;
   }
+  .output-lines {
+    display: flex;
+    flex-direction: column;
+    gap: var(--spacing-xs);
+  }
+  .line {
+    border-bottom: var(--border-light);
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: end;
+    padding: var(--spacing-s);
+  }
+  .icon-log {
+    display: flex;
+    gap: var(--spacing-s);
+    align-items: start;
+  }
 </style>
diff --git a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
index 3261dc6b74..dcd62f4eed 100644
--- a/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
+++ b/packages/builder/src/components/common/bindings/ModalBindableInput.svelte
@@ -1,5 +1,5 @@
 <script>
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 </script>
 
 <DrawerBindableInput
diff --git a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
index df0da768e0..19a466db6b 100644
--- a/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
+++ b/packages/builder/src/components/common/bindings/ServerBindingPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import BindingPanel from "./BindingPanel.svelte"
-  import { snippets } from "stores/builder"
+  import { snippets } from "@/stores/builder"
 
   export let bindings = []
   export let value = ""
diff --git a/packages/builder/src/components/common/bindings/SnippetDrawer.svelte b/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
index d6b6f92b17..f10c44f81f 100644
--- a/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
+++ b/packages/builder/src/components/common/bindings/SnippetDrawer.svelte
@@ -8,11 +8,11 @@
     TooltipType,
     notifications,
   } from "@budibase/bbui"
-  import BindingPanel from "components/common/bindings/BindingPanel.svelte"
+  import BindingPanel from "@/components/common/bindings/BindingPanel.svelte"
   import { decodeJSBinding, encodeJSBinding } from "@budibase/string-templates"
-  import { snippets } from "stores/builder"
-  import { getSequentialName } from "helpers/duplicate"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { snippets } from "@/stores/builder"
+  import { getSequentialName } from "@/helpers/duplicate"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { ValidSnippetNameRegex } from "@budibase/shared-core"
 
   export let snippet
@@ -28,7 +28,9 @@
   let loading = false
   let deleteConfirmationDialog
 
-  $: defaultName = getSequentialName($snippets, "MySnippet", x => x.name)
+  $: defaultName = getSequentialName($snippets, "MySnippet", {
+    getName: x => x.name,
+  })
   $: key = snippet?.name
   $: name = snippet?.name || defaultName
   $: code = snippet?.code ? encodeJSBinding(snippet.code) : ""
@@ -63,7 +65,7 @@
     if (!name?.length) {
       return "Name is required"
     }
-    if (snippets.some(snippet => snippet.name === name)) {
+    if (!snippet?.name && snippets.some(snippet => snippet.name === name)) {
       return "That name is already in use"
     }
     if (firstCharNumberRegex.test(name)) {
@@ -106,11 +108,7 @@
         Delete
       </Button>
     {/if}
-    <Button
-      cta
-      on:click={saveSnippet}
-      disabled={!snippet && (loading || nameError)}
-    >
+    <Button cta on:click={saveSnippet} disabled={!code || loading || nameError}>
       Save
     </Button>
   </svelte:fragment>
diff --git a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte b/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
index c68699fc0f..95f40005c0 100644
--- a/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
+++ b/packages/builder/src/components/common/bindings/SnippetSidePanel.svelte
@@ -9,11 +9,11 @@
     Body,
     Button,
   } from "@budibase/bbui"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import { EditorModes } from "components/common/CodeEditor"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import { EditorModes } from "@/components/common/CodeEditor"
   import SnippetDrawer from "./SnippetDrawer.svelte"
-  import { licensing } from "stores/portal"
-  import UpgradeButton from "pages/builder/portal/_components/UpgradeButton.svelte"
+  import { licensing } from "@/stores/portal"
+  import UpgradeButton from "@/pages/builder/portal/_components/UpgradeButton.svelte"
 
   export let addSnippet
   export let snippets
@@ -186,7 +186,7 @@
   <div class="snippet-popover">
     {#key hoveredSnippet}
       <CodeEditor
-        value={hoveredSnippet.code.trim()}
+        value={hoveredSnippet.code?.trim()}
         mode={EditorModes.JS}
         readonly
       />
diff --git a/packages/builder/src/components/common/bindings/utils.js b/packages/builder/src/components/common/bindings/utils.js
index 77e4a1dfb1..9fc147a420 100644
--- a/packages/builder/src/components/common/bindings/utils.js
+++ b/packages/builder/src/components/common/bindings/utils.js
@@ -1,5 +1,5 @@
 import { decodeJSBinding } from "@budibase/string-templates"
-import { hbInsert, jsInsert } from "components/common/CodeEditor"
+import { hbInsert, jsInsert } from "@/components/common/CodeEditor"
 
 export const BindingType = {
   READABLE: "readableBinding",
diff --git a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
index b5155fc044..bc019a3c71 100644
--- a/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
+++ b/packages/builder/src/components/common/renderers/CapitaliseRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
index bd7f5b50c7..46597a57c8 100644
--- a/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
+++ b/packages/builder/src/components/common/users/PasswordRepeatInput.svelte
@@ -1,7 +1,10 @@
 <script>
   import { FancyForm, FancyInput } from "@budibase/bbui"
-  import { createValidationStore, requiredValidator } from "helpers/validation"
-  import { admin } from "stores/portal"
+  import {
+    createValidationStore,
+    requiredValidator,
+  } from "@/helpers/validation"
+  import { admin } from "@/stores/portal"
 
   export let password
   export let passwordForm
diff --git a/packages/builder/src/components/common/users/UpgradeModal.svelte b/packages/builder/src/components/common/users/UpgradeModal.svelte
index 52d5e1f9e9..fd2cc4f680 100644
--- a/packages/builder/src/components/common/users/UpgradeModal.svelte
+++ b/packages/builder/src/components/common/users/UpgradeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let isOwner
 </script>
diff --git a/packages/builder/src/components/deploy/AppActions.svelte b/packages/builder/src/components/deploy/AppActions.svelte
index 9ba46832f4..f57563b2ab 100644
--- a/packages/builder/src/components/deploy/AppActions.svelte
+++ b/packages/builder/src/components/deploy/AppActions.svelte
@@ -11,13 +11,13 @@
     StatusLight,
     AbsTooltip,
   } from "@budibase/bbui"
-  import RevertModal from "components/deploy/RevertModal.svelte"
-  import VersionModal from "components/deploy/VersionModal.svelte"
+  import RevertModal from "@/components/deploy/RevertModal.svelte"
+  import VersionModal from "@/components/deploy/VersionModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import analytics, { Events, EventSource } from "analytics"
-  import { API } from "api"
-  import { appsStore } from "stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import analytics, { Events, EventSource } from "@/analytics"
+  import { API } from "@/api"
+  import { appsStore } from "@/stores/portal"
   import {
     previewStore,
     builderStore,
@@ -26,9 +26,9 @@
     deploymentStore,
     sortedScreens,
     appPublished,
-  } from "stores/builder"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
+  } from "@/stores/builder"
+  import TourWrap from "@/components/portal/onboarding/TourWrap.svelte"
+  import { TOUR_STEP_KEYS } from "@/components/portal/onboarding/tours.js"
   import { goto } from "@roxi/routify"
 
   export let application
diff --git a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
index 899d1659e8..927d69f43c 100644
--- a/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
+++ b/packages/builder/src/components/deploy/CreateWebhookDeploymentModal.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import { ModalContent } from "@budibase/bbui"
   import { onMount } from "svelte"
   import WebhookDisplay from "../automation/Shared/WebhookDisplay.svelte"
-  import { TriggerStepID } from "constants/backend/automations"
+  import { TriggerStepID } from "@/constants/backend/automations"
 
   let webhookUrls = []
 
diff --git a/packages/builder/src/components/deploy/DeleteModal.svelte b/packages/builder/src/components/deploy/DeleteModal.svelte
index 02ac583839..ebdcb6e5e8 100644
--- a/packages/builder/src/components/deploy/DeleteModal.svelte
+++ b/packages/builder/src/components/deploy/DeleteModal.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Input, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { appsStore } from "stores/portal"
-  import { API } from "api"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { appsStore } from "@/stores/portal"
+  import { API } from "@/api"
 
   export let appId
   export let appName
diff --git a/packages/builder/src/components/deploy/RevertModal.svelte b/packages/builder/src/components/deploy/RevertModal.svelte
index dc97c81c22..a8c7b04d9f 100644
--- a/packages/builder/src/components/deploy/RevertModal.svelte
+++ b/packages/builder/src/components/deploy/RevertModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Input, Modal, notifications, ModalContent } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/builder"
-  import { API } from "api"
+  import { appStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
 
   export let onComplete = () => {}
 
diff --git a/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte b/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
index ed40a101d0..b9092e8baa 100644
--- a/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
+++ b/packages/builder/src/components/deploy/RevertModalVersionSelect.svelte
@@ -1,7 +1,7 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import clientVersions from "./clientVersions.json"
-  import { appStore } from "stores/builder"
+  import { appStore } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let revertableVersion
diff --git a/packages/builder/src/components/deploy/VersionModal.svelte b/packages/builder/src/components/deploy/VersionModal.svelte
index 653aa09fa6..f8fe2fff5d 100644
--- a/packages/builder/src/components/deploy/VersionModal.svelte
+++ b/packages/builder/src/components/deploy/VersionModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import {
     Modal,
     notifications,
@@ -9,10 +9,10 @@
     StatusLight,
     Link,
   } from "@budibase/bbui"
-  import { appStore, initialise } from "stores/builder"
-  import { API } from "api"
+  import { appStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
   import RevertModalVersionSelect from "./RevertModalVersionSelect.svelte"
-  import { ChangelogURL } from "constants"
+  import { ChangelogURL } from "@/constants"
 
   export function show() {
     updateModal.show()
diff --git a/packages/builder/src/components/design/ScreenDetailsModal.svelte b/packages/builder/src/components/design/ScreenDetailsModal.svelte
index 34872daf8c..3f8e08d031 100644
--- a/packages/builder/src/components/design/ScreenDetailsModal.svelte
+++ b/packages/builder/src/components/design/ScreenDetailsModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ModalContent, Input } from "@budibase/bbui"
-  import sanitizeUrl from "helpers/sanitizeUrl"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
   import { get } from "svelte/store"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let onConfirm
   export let onCancel
diff --git a/packages/builder/src/components/design/settings/componentSettings.js b/packages/builder/src/components/design/settings/componentSettings.js
index ede48b84ba..724a544823 100644
--- a/packages/builder/src/components/design/settings/componentSettings.js
+++ b/packages/builder/src/components/design/settings/componentSettings.js
@@ -1,5 +1,5 @@
 import { Checkbox, Select, RadioGroup, Stepper, Input } from "@budibase/bbui"
-import { licensing } from "stores/portal"
+import { licensing } from "@/stores/portal"
 import { get } from "svelte/store"
 import DataSourceSelect from "./controls/DataSourceSelect/DataSourceSelect.svelte"
 import S3DataSourceSelect from "./controls/S3DataSourceSelect.svelte"
@@ -19,7 +19,7 @@ import URLSelect from "./controls/URLSelect.svelte"
 import OptionsEditor from "./controls/OptionsEditor/OptionsEditor.svelte"
 import FormFieldSelect from "./controls/FormFieldSelect.svelte"
 import ValidationEditor from "./controls/ValidationEditor/ValidationEditor.svelte"
-import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 import ColumnEditor from "./controls/ColumnEditor/ColumnEditor.svelte"
 import BasicColumnEditor from "./controls/ColumnEditor/BasicColumnEditor.svelte"
 import GridColumnEditor from "./controls/GridColumnConfiguration/GridColumnConfiguration.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
index 471207dcff..5266c9ce07 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/ButtonActionDrawer.svelte
@@ -16,7 +16,7 @@
     getActionBindings,
     makeStateBinding,
     updateReferencesInObject,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { cloneDeep } from "lodash/fp"
 
   const flipDurationMs = 150
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
index 6e7c5874fc..19ec3df010 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ChangeFormStep.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
index 0b0fe0cfb7..af31519081 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearForm.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
index ad44ae0f2a..cd289e3f61 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ClearRowSelection.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, Select, Body } from "@budibase/bbui"
-  import { findAllMatchingComponents } from "helpers/components"
-  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
+  import { selectedScreen } from "@/stores/builder"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
index 12d4bad05a..c72fbf3c0f 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/CloseScreenModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
index 91b70e0c45..2bd9d1ea7d 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ContinueIf.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
index 410e4bb56e..da5a1168d5 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DeleteRow.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox, Body } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2 } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
index babaf2815b..7487bff37c 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DownloadFile.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { FieldType } from "@budibase/types"
-  import { tables, viewsV2 } from "stores/builder"
+  import { tables, viewsV2 } from "@/stores/builder"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
index e92991ad70..cc3ad058b6 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/DuplicateRow.svelte
@@ -5,11 +5,11 @@
     componentStore,
     tables,
     viewsV2,
-  } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
+  } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
   import SaveFields from "./SaveFields.svelte"
-  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
+  import { getDatasourceLikeProviders } from "@/components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
index 498d9b4a66..a92ef11639 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExecuteQuery.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Select, Layout, Checkbox } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { datasources, integrations, queries } from "stores/builder"
-  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { datasources, integrations, queries } from "@/stores/builder"
+  import BindingBuilder from "@/components/integration/QueryBindingBuilder.svelte"
+  import IntegrationQueryEditor from "@/components/integration/index.svelte"
   import {
     BUDIBASE_INTERNAL_DB_ID,
     BUDIBASE_DATASOURCE_TYPE,
-  } from "constants/backend"
+  } from "@/constants/backend"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
index a857bc7ede..a2de49935b 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ExportData.svelte
@@ -2,8 +2,8 @@
   import { Label, Select, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
   import ColumnEditor from "../../ColumnEditor/ColumnEditor.svelte"
-  import { findAllMatchingComponents } from "helpers/components"
-  import { selectedScreen } from "stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
+  import { selectedScreen } from "@/stores/builder"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
index 61b7494ab2..db86cee171 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/FetchRow.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { tables, viewsV2 } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2 } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
index f0606d86b3..7a1019fb5e 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/LogOut.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Label, Body, Layout } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
index 86f454d6bc..54943c19c4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/NavigateTo.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
   import { onMount } from "svelte"
   import { Label, Checkbox, Select } from "@budibase/bbui"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
index 8e61b8763f..4bc2f2017a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
index 1eb1c1116b..50a4ef9453 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/OpenSidePanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
index 77fb579aa4..e883a92ec2 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/PromptUser.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, Label } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
index 3a56689f82..9cbe4baf7f 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RefreshDataProvider.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
index 8158d2dea5..2b45bdbdc4 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/RowAction.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox } from "@budibase/bbui"
-  import { tables, viewsV2, rowActions } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { tables, viewsV2, rowActions } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
index 11bd58a860..e3390b9b1a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/S3Upload.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let parameters
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
index e03af75207..c6c912b1a7 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveFields.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Label, ActionButton, Button, Select, Input } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
index 819ed10880..a3d09693d2 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/SaveRow.svelte
@@ -5,11 +5,11 @@
     componentStore,
     tables,
     viewsV2,
-  } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getSchemaForDatasourcePlus } from "dataBinding"
+  } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getSchemaForDatasourcePlus } from "@/dataBinding"
   import SaveFields from "./SaveFields.svelte"
-  import { getDatasourceLikeProviders } from "components/design/settings/controls/ButtonActionEditor/actions/utils"
+  import { getDatasourceLikeProviders } from "@/components/design/settings/controls/ButtonActionEditor/actions/utils"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
index af16c4d197..074189627a 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ScrollTo.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { selectedScreen, componentStore } from "stores/builder"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import { Label, Combobox, Select } from "@budibase/bbui"
-  import { getActionProviders, buildFormSchema } from "dataBinding"
-  import { findComponent } from "helpers/components"
+  import { getActionProviders, buildFormSchema } from "@/dataBinding"
+  import { findComponent } from "@/helpers/components"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
index ef6232b382..e515590297 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ShowNotification.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label, Checkbox } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
index 5cd5658063..e6e89d13aa 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/TriggerAutomation.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select, Label, Input, Checkbox, Icon, Body } from "@budibase/bbui"
-  import { automationStore } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { TriggerStepID, ActionStepID } from "constants/backend/automations"
+  import { automationStore } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { TriggerStepID, ActionStepID } from "@/constants/backend/automations"
 
   export let parameters = {}
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
index 9c843e35d6..a8e3eceeba 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateFieldValue.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Select, Label, Combobox } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders, buildFormSchema } from "dataBinding"
-  import { findComponent } from "helpers/components"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders, buildFormSchema } from "@/dataBinding"
+  import { findComponent } from "@/helpers/components"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
index fda05ef45a..025170e780 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/UpdateState.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select, Label, Combobox, Checkbox, Body } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import { getAllStateVariables } from "dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import { getAllStateVariables } from "@/dataBinding"
 
   export let parameters
   export let bindings = []
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
index f44b68d4c6..8eec588794 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/ValidateForm.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Select, Label } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { getActionProviders } from "dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { getActionProviders } from "@/dataBinding"
 
   export let parameters
   export let nested
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
index ba7955f1a5..30ec0039d9 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/actions/utils.js
@@ -1,5 +1,5 @@
-import { getAllComponentContexts } from "dataBinding"
-import { capitalise } from "helpers"
+import { getAllComponentContexts } from "@/dataBinding"
+import { capitalise } from "@/helpers"
 
 // Generates bindings for all components that provider "datasource like"
 // contexts. This includes "form" contexts and "schema" contexts. This is used
diff --git a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
index e8da0f74df..8602cbf064 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
+++ b/packages/builder/src/components/design/settings/controls/ButtonActionEditor/index.js
@@ -1,6 +1,6 @@
 import * as ActionComponents from "./actions"
 import { get } from "svelte/store"
-import { appStore } from "stores/builder"
+import { appStore } from "@/stores/builder"
 // @ts-ignore
 import ActionDefinitions from "./manifest.json"
 
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
index 6f3a13a745..6bb9c54e18 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonConfiguration.svelte
@@ -3,10 +3,10 @@
   import ButtonSetting from "./ButtonSetting.svelte"
   import { createEventDispatcher } from "svelte"
   import { Helpers, Menu, MenuItem, Popover } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
-  import { getEventContextBindings } from "dataBinding"
+  import { componentStore } from "@/stores/builder"
+  import { getEventContextBindings } from "@/dataBinding"
   import { cloneDeep, isEqual } from "lodash/fp"
-  import { getRowActionButtonTemplates } from "templates/rowActions"
+  import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
   export let componentInstance
   export let componentBindings
diff --git a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
index 2387fda683..726f3cdbea 100644
--- a/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/ButtonConfiguration/ButtonSetting.svelte
@@ -1,7 +1,7 @@
 <script>
   import EditComponentPopover from "../EditComponentPopover.svelte"
   import { Icon } from "@budibase/bbui"
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
 
   export let item
diff --git a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
index e4e27a2fe5..7f013e3717 100644
--- a/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColorPicker.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ColorPicker } from "@budibase/bbui"
-  import { themeStore } from "stores/builder"
+  import { themeStore } from "@/stores/builder"
 
   export let value
 </script>
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
index d2e0ddc1b0..13db369893 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/CellDrawer.svelte
@@ -7,8 +7,8 @@
     Layout,
     Label,
   } from "@budibase/bbui"
-  import { themeStore, previewStore } from "stores/builder"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { themeStore, previewStore } from "@/stores/builder"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   export let column
 
diff --git a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
index 4a11211662..5e27b591f8 100644
--- a/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/ColumnEditor/ColumnEditor.svelte
@@ -4,8 +4,11 @@
   import { createEventDispatcher } from "svelte"
   import ColumnDrawer from "./ColumnDrawer.svelte"
   import { cloneDeep } from "lodash/fp"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, tables } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, tables } from "@/stores/builder"
 
   export let componentInstance
   export let value = []
diff --git a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
index 2e74cac0f4..310a22e73e 100644
--- a/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataProviderSelect.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Select } from "@budibase/bbui"
   import { makePropSafe } from "@budibase/string-templates"
-  import { selectedScreen } from "stores/builder"
-  import { findAllMatchingComponents } from "helpers/components"
+  import { selectedScreen } from "@/stores/builder"
+  import { findAllMatchingComponents } from "@/helpers/components"
 
   export let value
 
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
index f6d7cfc2c3..4ea8c63087 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { datasources } from "@/stores/builder"
   import { Divider, Heading } from "@budibase/bbui"
 
   export let dividerState
@@ -6,6 +7,21 @@
   export let dataSet
   export let value
   export let onSelect
+  export let identifiers = ["resourceId"]
+
+  $: displayDatasourceName = $datasources.list.length > 1
+
+  function isSelected(entry) {
+    if (!identifiers.length) {
+      return false
+    }
+    for (const identifier of identifiers) {
+      if (entry[identifier] !== value?.[identifier]) {
+        return false
+      }
+    }
+    return true
+  }
 </script>
 
 {#if dividerState}
@@ -21,15 +37,16 @@
   {#each dataSet as data}
     <li
       class="spectrum-Menu-item"
-      class:is-selected={value?.label === data.label &&
-        value?.type === data.type}
+      class:is-selected={isSelected(data) && value?.type === data.type}
       role="option"
       aria-selected="true"
       tabindex="0"
       on:click={() => onSelect(data)}
     >
       <span class="spectrum-Menu-itemLabel">
-        {data.datasourceName ? `${data.datasourceName} - ` : ""}{data.label}
+        {data.datasourceName && displayDatasourceName
+          ? `${data.datasourceName} - `
+          : ""}{data.label}
       </span>
       <svg
         class="spectrum-Icon spectrum-UIIcon-Checkmark100 spectrum-Menu-checkmark spectrum-Menu-itemIcon"
diff --git a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
index 410af53648..f5028b1eea 100644
--- a/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/DataSourceSelect/DataSourceSelect.svelte
@@ -2,7 +2,7 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import {
     Button,
     Popover,
@@ -26,15 +26,20 @@
     componentStore,
     datasources,
     integrations,
-  } from "stores/builder"
-  import BindingBuilder from "components/integration/QueryBindingBuilder.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  } from "@/stores/builder"
+  import BindingBuilder from "@/components/integration/QueryBindingBuilder.svelte"
+  import IntegrationQueryEditor from "@/components/integration/index.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
-  import { findAllComponents } from "helpers/components"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
-  import DataSourceCategory from "components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
-  import { API } from "api"
-  import { datasourceSelect as format } from "helpers/data/format"
+  import { findAllComponents } from "@/helpers/components"
+  import {
+    extractFields,
+    extractJSONArrayFields,
+    extractRelationships,
+  } from "@/helpers/bindings"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
+  import DataSourceCategory from "@/components/design/settings/controls/DataSourceSelect/DataSourceCategory.svelte"
+  import { API } from "@/api"
+  import { sortAndFormat } from "@/helpers/data/format"
 
   export let value = {}
   export let otherSources
@@ -43,7 +48,6 @@
   export let showDataProviders = true
 
   const dispatch = createEventDispatcher()
-  const arrayTypes = ["attachment", "array"]
 
   let anchorRight, dropdownRight
   let drawer
@@ -52,15 +56,13 @@
   let modal
 
   $: text = value?.label ?? "Choose an option"
-  $: tables = $tablesStore.list.map(table =>
-    format.table(table, $datasources.list)
-  )
+  $: tables = sortAndFormat.tables($tablesStore.list, $datasources.list)
   $: viewsV1 = $viewsStore.list.map(view => ({
     ...view,
     label: view.name,
     type: "view",
   }))
-  $: viewsV2 = $viewsV2Store.list.map(format.viewV2)
+  $: viewsV2 = sortAndFormat.viewsV2($viewsV2Store.list, $datasources.list)
   $: views = [...(viewsV1 || []), ...(viewsV2 || [])]
   $: queries = $queriesStore.list
     .filter(q => showAllQueries || q.queryVerb === "read" || q.readable)
@@ -84,64 +86,9 @@
       value: `{{ literal ${safe(provider._id)} }}`,
       type: "provider",
     }))
-  $: links = bindings
-    // Get only link bindings
-    .filter(x => x.fieldSchema?.type === "link")
-    // Filter out bindings provided by forms
-    .filter(x => !x.component?.endsWith("/form"))
-    .map(binding => {
-      const { providerId, readableBinding, fieldSchema } = binding || {}
-      const { name, tableId } = fieldSchema || {}
-      const safeProviderId = safe(providerId)
-      return {
-        providerId,
-        label: readableBinding,
-        fieldName: name,
-        tableId,
-        type: "link",
-        // These properties will be enriched by the client library and provide
-        // details of the parent row of the relationship field, from context
-        rowId: `{{ ${safeProviderId}.${safe("_id")} }}`,
-        rowTableId: `{{ ${safeProviderId}.${safe("tableId")} }}`,
-      }
-    })
-  $: fields = bindings
-    .filter(x => arrayTypes.includes(x.fieldSchema?.type))
-    .filter(x => x.fieldSchema?.tableId != null)
-    .map(binding => {
-      const { providerId, readableBinding, runtimeBinding } = binding
-      const { name, type, tableId } = binding.fieldSchema
-      return {
-        providerId,
-        label: readableBinding,
-        fieldName: name,
-        fieldType: type,
-        tableId,
-        type: "field",
-        value: `{{ literal ${runtimeBinding} }}`,
-      }
-    })
-  $: jsonArrays = bindings
-    .filter(
-      x =>
-        x.fieldSchema?.type === "jsonarray" ||
-        (x.fieldSchema?.type === "json" && x.fieldSchema?.subtype === "array")
-    )
-    .map(binding => {
-      const { providerId, readableBinding, runtimeBinding, tableId } = binding
-      const { name, type, prefixKeys, subtype } = binding.fieldSchema
-      return {
-        providerId,
-        label: readableBinding,
-        fieldName: name,
-        fieldType: type,
-        tableId,
-        prefixKeys,
-        type: type === "jsonarray" ? "jsonarray" : "queryarray",
-        subtype,
-        value: `{{ literal ${runtimeBinding} }}`,
-      }
-    })
+  $: links = extractRelationships(bindings)
+  $: fields = extractFields(bindings)
+  $: jsonArrays = extractJSONArrayFields(bindings)
   $: custom = {
     type: "custom",
     label: "JSON / CSV",
@@ -291,6 +238,7 @@
         dataSet={views}
         {value}
         onSelect={handleSelected}
+        identifiers={["tableId", "name"]}
       />
     {/if}
     {#if queries?.length}
@@ -300,6 +248,7 @@
         dataSet={queries}
         {value}
         onSelect={handleSelected}
+        identifiers={["_id"]}
       />
     {/if}
     {#if links?.length}
@@ -309,6 +258,7 @@
         dataSet={links}
         {value}
         onSelect={handleSelected}
+        identifiers={["tableId", "fieldName"]}
       />
     {/if}
     {#if fields?.length}
@@ -318,6 +268,7 @@
         dataSet={fields}
         {value}
         onSelect={handleSelected}
+        identifiers={["providerId", "tableId", "fieldName"]}
       />
     {/if}
     {#if jsonArrays?.length}
@@ -327,6 +278,7 @@
         dataSet={jsonArrays}
         {value}
         onSelect={handleSelected}
+        identifiers={["providerId", "tableId", "fieldName"]}
       />
     {/if}
     {#if showDataProviders && dataProviders?.length}
@@ -336,6 +288,7 @@
         dataSet={dataProviders}
         {value}
         onSelect={handleSelected}
+        identifiers={["providerId"]}
       />
     {/if}
     <DataSourceCategory
diff --git a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
index a491561f93..211f73cb3f 100644
--- a/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
+++ b/packages/builder/src/components/design/settings/controls/EditComponentPopover.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Icon, Popover, Layout } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { createEventDispatcher, getContext } from "svelte"
-  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import ComponentSettingsSection from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
 
   export let anchor
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
index 7fbac09827..085ac5702c 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/Column.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import {
     BindingValue,
     Block,
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
index 811283ba51..f01b176704 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/DetailsModal/subjects/components/BindingValue.svelte
@@ -1,13 +1,13 @@
 <script>
   import { decodeJSBinding } from "@budibase/string-templates"
-  import CodeEditor from "components/common/CodeEditor/CodeEditor.svelte"
-  import { EditorModes } from "components/common/CodeEditor"
+  import CodeEditor from "@/components/common/CodeEditor/CodeEditor.svelte"
+  import { EditorModes } from "@/components/common/CodeEditor"
   import {
     runtimeToReadableBinding,
     getDatasourceForProvider,
-  } from "dataBinding"
-  import { tables, selectedScreen, selectedComponent } from "stores/builder"
-  import { getBindings } from "components/backend/DataTable/formula"
+  } from "@/dataBinding"
+  import { tables, selectedScreen, selectedComponent } from "@/stores/builder"
+  import { getBindings } from "@/components/backend/DataTable/formula"
 
   export let value
   $: datasource = getDatasourceForProvider($selectedScreen, $selectedComponent)
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte b/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
index 42ae9ed783..177f2edcd3 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/Explanation.svelte
@@ -16,7 +16,7 @@
     DateAsNumber,
   } from "./lines"
   import subjects from "./subjects"
-  import { appStore } from "stores/builder"
+  import { appStore } from "@/stores/builder"
 
   export let tableHref = () => {}
   export let schema
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte b/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
index ef2616f562..b7e0693d76 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/lines/Column.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Line, InfoWord, DocumentationLink, Text } from "../typography"
   import { FieldType } from "@budibase/types"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import subjects from "../subjects"
 
   export let schema
diff --git a/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte b/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
index ccb33798d7..0541856737 100644
--- a/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
+++ b/packages/builder/src/components/design/settings/controls/Explanation/lines/Support.svelte
@@ -2,7 +2,7 @@
   import { Line, InfoWord, DocumentationLink, Text } from "../typography"
   import subjects from "../subjects"
   import * as explanation from "../explanation"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let setExplanationSubject
   export let support
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
index 4d1a4a2f69..e1a718c210 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldConfiguration.svelte
@@ -6,8 +6,8 @@
     getSchemaForDatasource,
     getBindableProperties,
     getComponentBindableProperties,
-  } from "dataBinding"
-  import { selectedScreen, componentStore } from "stores/builder"
+  } from "@/dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
diff --git a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
index 27590a9858..d39af94ce1 100644
--- a/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldConfiguration/FieldSetting.svelte
@@ -3,9 +3,9 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import { isJSBinding } from "@budibase/string-templates"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let item
   export let componentBindings
diff --git a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
index aab7eb60a5..f6d0190562 100644
--- a/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Select, ContextTooltip } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { Explanation } from "./Explanation"
   import { debounce } from "lodash"
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
index 7e3cf5d3ec..010216cb4d 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterBuilder.svelte
@@ -1,11 +1,11 @@
 <script>
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import { CoreFilterBuilder } from "@budibase/frontend-core"
-  import { tables } from "stores/builder"
+  import { tables } from "@/stores/builder"
   import {
     runtimeToReadableBinding,
     readableToRuntimeBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let schemaFields
   export let filters
diff --git a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
index c48cc3b8ce..2776411050 100644
--- a/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/FilterEditor/FilterEditor.svelte
@@ -7,10 +7,13 @@
     DrawerContent,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
   import FilterBuilder from "./FilterBuilder.svelte"
-  import { tables, selectedScreen } from "stores/builder"
-  import { search } from "@budibase/frontend-core"
+  import { tables, selectedScreen } from "@/stores/builder"
+  import { search, Utils } from "@budibase/frontend-core"
   import { utils } from "@budibase/shared-core"
 
   const dispatch = createEventDispatcher()
@@ -33,7 +36,8 @@
   $: text = getText(value)
 
   async function saveFilter() {
-    dispatch("change", localFilters)
+    const update = Utils.parseFilter(localFilters)
+    dispatch("change", update)
     notifications.success("Filters saved")
     drawer.hide()
   }
diff --git a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
index b418cb3111..0ddca2b0e9 100644
--- a/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormFieldSelect.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Combobox } from "@budibase/bbui"
-  import { selectedScreen } from "stores/builder"
-  import { getComponentFieldOptions } from "helpers/formFields"
+  import { selectedScreen } from "@/stores/builder"
+  import { getComponentFieldOptions } from "@/helpers/formFields"
 
   export let componentInstance
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
index 6e7297a245..380ff73848 100644
--- a/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/FormStepConfiguration.svelte
@@ -1,8 +1,12 @@
 <script>
   import { createEventDispatcher, setContext } from "svelte"
-  import ComponentSettingsSection from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
-  import { getDatasourceForProvider } from "dataBinding"
-  import { selectedScreen, componentStore, previewStore } from "stores/builder"
+  import ComponentSettingsSection from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte"
+  import { getDatasourceForProvider } from "@/dataBinding"
+  import {
+    selectedScreen,
+    componentStore,
+    previewStore,
+  } from "@/stores/builder"
   import { Helpers } from "@budibase/bbui"
   import { derived, writable } from "svelte/store"
   import { Utils } from "@budibase/frontend-core"
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
index 149ec7265a..fef6a99a4d 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/FieldSetting.svelte
@@ -3,7 +3,7 @@
   import { Toggle, Icon } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash/fp"
-  import { FIELDS } from "constants/backend"
+  import { FIELDS } from "@/constants/backend"
   import { Constants } from "@budibase/frontend-core"
   import { FieldType } from "@budibase/types"
 
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
index 39f9e37658..46aea2a6c4 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/GridColumnConfiguration.svelte
@@ -1,13 +1,16 @@
 <script>
   import { enrichSchemaWithRelColumns } from "@budibase/frontend-core"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, componentStore } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, componentStore } from "@/stores/builder"
   import DraggableList from "../DraggableList/DraggableList.svelte"
   import { createEventDispatcher } from "svelte"
   import FieldSetting from "./FieldSetting.svelte"
   import PrimaryColumnFieldSetting from "./PrimaryColumnFieldSetting.svelte"
   import getColumns from "./getColumns.js"
-  import InfoDisplay from "pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
+  import InfoDisplay from "@/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
   export let value
   export let componentInstance
@@ -23,12 +26,14 @@
   const getSchema = (asset, datasource) => {
     const schema = getSchemaForDatasource(asset, datasource).schema
 
-    // Don't show ID and rev in tables
-    if (schema) {
-      delete schema._id
-      delete schema._rev
+    if (!schema) {
+      return
     }
 
+    // Don't show ID and rev in tables
+    delete schema._id
+    delete schema._rev
+
     const result = enrichSchemaWithRelColumns(schema)
     return result
   }
diff --git a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
index 57423e8667..c4c2b3eafb 100644
--- a/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/GridColumnConfiguration/PrimaryColumnFieldSetting.svelte
@@ -4,7 +4,7 @@
   import { setContext } from "svelte"
   import { writable } from "svelte/store"
   import { FieldTypeToComponentMap } from "../FieldConfiguration/utils"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let item
   export let anchor
diff --git a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
index a7966eb671..3065a90406 100644
--- a/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/LayoutSelect.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { layoutStore } from "stores/builder"
+  import { layoutStore } from "@/stores/builder"
   import { Select } from "@budibase/bbui"
 
   export let value
diff --git a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
index 7fa784ed77..2a936dd3a3 100644
--- a/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/MultiFieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Multiselect, ContextTooltip } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { Explanation } from "./Explanation"
   import { params } from "@roxi/routify"
diff --git a/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte b/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
index c28bc49e3d..e41c533adc 100644
--- a/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
+++ b/packages/builder/src/components/design/settings/controls/PaywalledSetting.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Tag, Tags } from "@budibase/bbui"
-  import { getFormattedPlanName } from "helpers/planTitle"
+  import { getFormattedPlanName } from "@/helpers/planTitle"
 
   export let license
 
diff --git a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
index 4db9a03d80..65b3ed9395 100644
--- a/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/settings/controls/PropertyControl.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import { builderStore } from "stores/builder"
+  } from "@/dataBinding"
+  import { builderStore } from "@/stores/builder"
   import { onDestroy } from "svelte"
 
   export let label = ""
diff --git a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
index 43f158bef3..da27512942 100644
--- a/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/RelationshipFilterEditor.svelte
@@ -2,9 +2,12 @@
   import {
     findClosestMatchingComponent,
     findComponent,
-  } from "helpers/components"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { tables, selectedScreen, componentStore } from "stores/builder"
+  } from "@/helpers/components"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { tables, selectedScreen, componentStore } from "@/stores/builder"
   import FilterEditor from "./FilterEditor/FilterEditor.svelte"
 
   export let componentInstance
diff --git a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
index b716c04619..ae88b78ec5 100644
--- a/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
+++ b/packages/builder/src/components/design/settings/controls/ResetFieldsButton.svelte
@@ -1,9 +1,9 @@
 <script>
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import { findClosestMatchingComponent } from "helpers/components"
-  import { makeDatasourceFormComponents } from "templates/commonComponents"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import { findClosestMatchingComponent } from "@/helpers/components"
+  import { makeDatasourceFormComponents } from "@/templates/commonComponents"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let componentInstance
 
diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index b99e58f205..b0b968c403 100644
--- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { roles } from "stores/builder"
+  import { roles } from "@/stores/builder"
 
   export let value
   export let error
diff --git a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
index c52532508c..0c0045fe74 100644
--- a/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/S3DataSourceSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { datasources } from "stores/builder"
+  import { datasources } from "@/stores/builder"
 
   export let value = null
 
diff --git a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
index 064e53cf0d..919d58fb70 100644
--- a/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SearchFieldSelect.svelte
@@ -1,8 +1,11 @@
 <script>
   import { Multiselect } from "@budibase/bbui"
   import { search } from "@budibase/frontend-core"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen, tables } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen, tables } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
 
   export let componentInstance = {}
diff --git a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
index 0f9290ec8d..3d984de0f8 100644
--- a/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/SortableFieldSelect.svelte
@@ -1,7 +1,10 @@
 <script>
   import { Select } from "@budibase/bbui"
-  import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
-  import { selectedScreen } from "stores/builder"
+  import {
+    getDatasourceForProvider,
+    getSchemaForDatasource,
+  } from "@/dataBinding"
+  import { selectedScreen } from "@/stores/builder"
   import { createEventDispatcher } from "svelte"
   import { canBeSortColumn } from "@budibase/frontend-core"
 
diff --git a/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte b/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
index 05770a3c5c..0575ba8dbf 100644
--- a/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableConditionEditor.svelte
@@ -14,7 +14,7 @@
   import { createEventDispatcher } from "svelte"
   import { cloneDeep } from "lodash"
   import ColorPicker from "./ColorPicker.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { QueryUtils, Constants, FilterUsers } from "@budibase/frontend-core"
   import { generate } from "shortid"
   import { FieldType, FormulaType } from "@budibase/types"
diff --git a/packages/builder/src/components/design/settings/controls/TableSelect.svelte b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
index 545110a8cc..85209a92a0 100644
--- a/packages/builder/src/components/design/settings/controls/TableSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/TableSelect.svelte
@@ -1,22 +1,32 @@
 <script>
-  import { Select } from "@budibase/bbui"
+  import { Popover, Select } from "@budibase/bbui"
   import { createEventDispatcher, onMount } from "svelte"
-  import { tables as tablesStore, viewsV2 } from "stores/builder"
-  import { tableSelect as format } from "helpers/data/format"
+  import {
+    tables as tableStore,
+    datasources as datasourceStore,
+    viewsV2 as viewsV2Store,
+  } from "@/stores/builder"
+  import DataSourceCategory from "./DataSourceSelect/DataSourceCategory.svelte"
+  import { sortAndFormat } from "@/helpers/data/format"
 
   export let value
 
+  let anchorRight, dropdownRight
+
   const dispatch = createEventDispatcher()
 
-  $: tables = $tablesStore.list.map(format.table)
-  $: views = $viewsV2.list.map(format.viewV2)
+  $: tables = sortAndFormat.tables($tableStore.list, $datasourceStore.list)
+  $: views = sortAndFormat.viewsV2($viewsV2Store.list, $datasourceStore.list)
   $: options = [...(tables || []), ...(views || [])]
 
+  $: text = value?.label ?? "Choose an option"
+
   const onChange = e => {
     dispatch(
       "change",
-      options.find(x => x.resourceId === e.detail)
+      options.find(x => x.resourceId === e.resourceId)
     )
+    dropdownRight.hide()
   }
 
   onMount(() => {
@@ -29,10 +39,47 @@
   })
 </script>
 
-<Select
-  on:change={onChange}
-  value={value?.resourceId}
-  {options}
-  getOptionValue={x => x.resourceId}
-  getOptionLabel={x => x.label}
-/>
+<div class="container" bind:this={anchorRight}>
+  <Select
+    readonly
+    value={text}
+    options={[text]}
+    on:click={dropdownRight.show}
+  />
+</div>
+<Popover bind:this={dropdownRight} anchor={anchorRight}>
+  <div class="dropdown">
+    <DataSourceCategory
+      heading="Tables"
+      dataSet={tables}
+      {value}
+      onSelect={onChange}
+    />
+    {#if views?.length}
+      <DataSourceCategory
+        dividerState={true}
+        heading="Views"
+        dataSet={views}
+        {value}
+        onSelect={onChange}
+      />
+    {/if}
+  </div>
+</Popover>
+
+<style>
+  .container {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-start;
+    align-items: center;
+  }
+  .container :global(:first-child) {
+    flex: 1 1 auto;
+  }
+
+  .dropdown {
+    padding: var(--spacing-m) 0;
+    z-index: 99999999;
+  }
+</style>
diff --git a/packages/builder/src/components/design/settings/controls/URLSelect.svelte b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
index d087af95b0..3166b17e5a 100644
--- a/packages/builder/src/components/design/settings/controls/URLSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/URLSelect.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { screenStore } from "stores/builder"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import { screenStore } from "@/stores/builder"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value
   export let bindings
diff --git a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
index f70c0910e0..c49822504d 100644
--- a/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
+++ b/packages/builder/src/components/design/settings/controls/ValidationEditor/ValidationDrawer.svelte
@@ -10,10 +10,13 @@
     Input,
     DatePicker,
   } from "@budibase/bbui"
-  import { selectedScreen, selectedComponent } from "stores/builder"
-  import { findClosestMatchingComponent } from "helpers/components"
-  import { getSchemaForDatasource, getDatasourceForProvider } from "dataBinding"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { selectedScreen, selectedComponent } from "@/stores/builder"
+  import { findClosestMatchingComponent } from "@/helpers/components"
+  import {
+    getSchemaForDatasource,
+    getDatasourceForProvider,
+  } from "@/dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { generate } from "shortid"
 
   export let fieldName = null
diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 02ea50e780..fc84369c11 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Label, notifications } from "@budibase/bbui"
-  import { permissions } from "stores/builder"
+  import { permissions } from "@/stores/builder"
   import { Constants } from "@budibase/frontend-core"
-  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
 
   export let query
   export let label
diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 6f69e71ccb..e42703f9c6 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -10,8 +10,8 @@
     MenuItem,
   } from "@budibase/bbui"
   import { createEventDispatcher } from "svelte"
-  import { lowercase } from "helpers"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import { lowercase } from "@/helpers"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
 
   let dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/components/integration/QueryBindingBuilder.svelte b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
index 88d46de0a0..f79c967cda 100644
--- a/packages/builder/src/components/integration/QueryBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryBindingBuilder.svelte
@@ -3,8 +3,8 @@
   import {
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  } from "@/dataBinding"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { createEventDispatcher } from "svelte"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/integration/QueryEditor.svelte b/packages/builder/src/components/integration/QueryEditor.svelte
index 995451b7e3..b518bab2d6 100644
--- a/packages/builder/src/components/integration/QueryEditor.svelte
+++ b/packages/builder/src/components/integration/QueryEditor.svelte
@@ -2,7 +2,7 @@
   import CodeMirror from "./codemirror"
   import { Label } from "@budibase/bbui"
   import { onMount, createEventDispatcher } from "svelte"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
   import { Theme } from "@budibase/types"
 
   const dispatch = createEventDispatcher()
diff --git a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
index 340dc7839c..898a834651 100644
--- a/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryFieldsBuilder.svelte
@@ -2,7 +2,7 @@
   import { Label, Layout, Input } from "@budibase/bbui"
   import Editor from "./QueryEditor.svelte"
   import KeyValueBuilder from "./KeyValueBuilder.svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   export let fields = {}
   export let schema
diff --git a/packages/builder/src/components/integration/QueryViewer.svelte b/packages/builder/src/components/integration/QueryViewer.svelte
index 99635323ca..0f2ed24177 100644
--- a/packages/builder/src/components/integration/QueryViewer.svelte
+++ b/packages/builder/src/components/integration/QueryViewer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "@roxi/routify"
-  import { datasources, integrations, queries } from "stores/builder"
+  import { datasources, integrations, queries } from "@/stores/builder"
   import {
     Icon,
     Select,
@@ -12,13 +12,13 @@
     Divider,
     Button,
   } from "@budibase/bbui"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import AccessLevelSelect from "./AccessLevelSelect.svelte"
-  import IntegrationQueryEditor from "components/integration/index.svelte"
+  import IntegrationQueryEditor from "@/components/integration/index.svelte"
   import QueryViewerSidePanel from "./QueryViewerSidePanel/index.svelte"
   import { cloneDeep } from "lodash/fp"
-  import BindingBuilder from "components/integration/QueryViewerBindingBuilder.svelte"
-  import CodeMirrorEditor from "components/common/CodeMirrorEditor.svelte"
+  import BindingBuilder from "@/components/integration/QueryViewerBindingBuilder.svelte"
+  import CodeMirrorEditor from "@/components/common/CodeMirrorEditor.svelte"
   import { ValidQueryNameRegex } from "@budibase/shared-core"
   import ExtraQueryConfig from "./ExtraQueryConfig.svelte"
   import QueryViewerSavePromptModal from "./QueryViewerSavePromptModal.svelte"
diff --git a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
index 7e79209d8b..8e8977b2c4 100644
--- a/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
+++ b/packages/builder/src/components/integration/QueryViewerBindingBuilder.svelte
@@ -1,6 +1,6 @@
 <script>
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { getUserBindings } from "dataBinding"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import { getUserBindings } from "@/dataBinding"
 
   export let queryBindings = []
 
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
index 29f15bca40..2009f49f1c 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/PreviewPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Table from "components/backend/DataTable/Table.svelte"
+  import Table from "@/components/backend/DataTable/Table.svelte"
   import { cloneDeep } from "lodash/fp"
 
   export let schema = {}
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
index 05579275ef..eea724a3f7 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/SchemaPanel.svelte
@@ -1,6 +1,6 @@
 <script>
   import KeyValueBuilder from "../KeyValueBuilder.svelte"
-  import { SchemaTypeOptionsExpanded } from "constants/backend"
+  import { SchemaTypeOptionsExpanded } from "@/constants/backend"
 
   export let schema
   export let onSchemaChange = () => {}
diff --git a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
index c08dc5801c..6191503c31 100644
--- a/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
+++ b/packages/builder/src/components/integration/QueryViewerSidePanel/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { ActionButton } from "@budibase/bbui"
   import JSONPanel from "./JSONPanel.svelte"
   import SchemaPanel from "./SchemaPanel.svelte"
diff --git a/packages/builder/src/components/integration/RestBodyInput.svelte b/packages/builder/src/components/integration/RestBodyInput.svelte
index 4e3b645373..3bea4ffa0c 100644
--- a/packages/builder/src/components/integration/RestBodyInput.svelte
+++ b/packages/builder/src/components/integration/RestBodyInput.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import { RawRestBodyTypes } from "constants/backend"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import { RawRestBodyTypes } from "@/constants/backend"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import CodeMirrorEditor, {
     EditorModes,
-  } from "components/common/CodeMirrorEditor.svelte"
+  } from "@/components/common/CodeMirrorEditor.svelte"
 
   const objectTypes = [RawRestBodyTypes.FORM, RawRestBodyTypes.ENCODED]
   const textTypes = [
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 3b1356efe2..8468bf7017 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto, params } from "@roxi/routify"
-  import { datasources, flags, integrations, queries } from "stores/builder"
-  import { environment } from "stores/portal"
+  import { datasources, flags, integrations, queries } from "@/stores/builder"
+  import { environment } from "@/stores/portal"
   import {
     Banner,
     Body,
@@ -19,24 +19,24 @@
     Tabs,
     TextArea,
   } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import EditableLabel from "components/common/inputs/EditableLabel.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import EditableLabel from "@/components/common/inputs/EditableLabel.svelte"
   import CodeMirrorEditor, {
     EditorModes,
-  } from "components/common/CodeMirrorEditor.svelte"
+  } from "@/components/common/CodeMirrorEditor.svelte"
   import RestBodyInput from "./RestBodyInput.svelte"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { onMount } from "svelte"
-  import restUtils from "helpers/data/utils"
+  import restUtils from "@/helpers/data/utils"
   import {
     PaginationLocations,
     PaginationTypes,
     RawRestBodyTypes,
     RestBodyTypes as bodyTypes,
     SchemaTypeOptionsExpanded,
-  } from "constants/backend"
-  import JSONPreview from "components/integration/JSONPreview.svelte"
-  import AccessLevelSelect from "components/integration/AccessLevelSelect.svelte"
+  } from "@/constants/backend"
+  import JSONPreview from "@/components/integration/JSONPreview.svelte"
+  import AccessLevelSelect from "@/components/integration/AccessLevelSelect.svelte"
   import DynamicVariableModal from "./DynamicVariableModal.svelte"
   import Placeholder from "assets/bb-spaceship.svg"
   import { cloneDeep } from "lodash/fp"
@@ -48,7 +48,7 @@
     runtimeToReadableBinding,
     runtimeToReadableMap,
     toBindingsArray,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let queryId
 
@@ -176,7 +176,7 @@
       notifications.success(`Request saved successfully`)
       if (dynamicVariables) {
         datasource.config.dynamicVariables = rebuildVariables(saveId)
-        datasource = await datasources.update({
+        datasource = await datasources.save({
           integration: integrationInfo,
           datasource,
         })
diff --git a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
index 5c69b151a6..dc5bb6c8f8 100644
--- a/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
+++ b/packages/builder/src/components/portal/environment/CreateEditVariableModal.svelte
@@ -8,8 +8,8 @@
     notifications,
     Context,
   } from "@budibase/bbui"
-  import { environment } from "stores/portal"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { environment } from "@/stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { getContext } from "svelte"
 
   const modalContext = getContext(Context.Modal)
diff --git a/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte b/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
index 2278b4f6df..51b5c4c427 100644
--- a/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
+++ b/packages/builder/src/components/portal/licensing/AccountDowngradedModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let onDismiss = () => {}
   export let onShow = () => {}
diff --git a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
index bdecbcab3d..64529f8d69 100644
--- a/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
+++ b/packages/builder/src/components/portal/licensing/AppLimitModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let onDismiss = () => {}
 
diff --git a/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte b/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte
deleted file mode 100644
index 341e427bf0..0000000000
--- a/packages/builder/src/components/portal/licensing/DayPassWarningModal.svelte
+++ /dev/null
@@ -1,81 +0,0 @@
-<script>
-  import { Modal, ModalContent, Body, TooltipWrapper } from "@budibase/bbui"
-  import { licensing, auth, admin } from "stores/portal"
-
-  export let onDismiss = () => {}
-  export let onShow = () => {}
-
-  let dayPassModal
-
-  $: accountUrl = $admin.accountPortalUrl
-  $: upgradeUrl = `${accountUrl}/portal/upgrade`
-
-  $: daysRemaining = $licensing.quotaResetDaysRemaining
-  $: quotaResetDate = $licensing.quotaResetDate
-  $: dayPassesUsed =
-    $licensing.usageMetrics?.dayPasses > 100
-      ? 100
-      : $licensing.usageMetrics?.dayPasses
-  $: dayPassesTitle =
-    dayPassesUsed >= 100
-      ? "You have run out of Day Passes"
-      : "You are almost out of Day Passes"
-  $: dayPassesBody =
-    dayPassesUsed >= 100
-      ? "Upgrade your account to bring your apps back online."
-      : "Upgrade your account to prevent your apps from going offline."
-
-  export function show() {
-    dayPassModal.show()
-  }
-
-  export function hide() {
-    dayPassModal.hide()
-  }
-</script>
-
-<Modal bind:this={dayPassModal} on:show={onShow} on:hide={onDismiss}>
-  {#if $auth.user.accountPortalAccess}
-    <ModalContent
-      title={dayPassesTitle}
-      size="M"
-      confirmText="Upgrade"
-      onConfirm={() => {
-        window.location.href = upgradeUrl
-      }}
-    >
-      <Body>
-        You have used <span class="daypass_percent">{dayPassesUsed}%</span> of
-        your plans Day Passes with {daysRemaining} day{daysRemaining == 1
-          ? ""
-          : "s"} remaining.
-        <span class="tooltip">
-          <TooltipWrapper tooltip={quotaResetDate} size="S" />
-        </span>
-      </Body>
-      <Body>{dayPassesBody}</Body>
-    </ModalContent>
-  {:else}
-    <ModalContent title={dayPassesTitle} size="M" showCancelButton={false}>
-      <Body>
-        You have used <span class="daypass_percent">{dayPassesUsed}%</span> of
-        your plans Day Passes with {daysRemaining} day{daysRemaining == 1
-          ? ""
-          : "s"} remaining.
-        <span class="tooltip">
-          <TooltipWrapper tooltip={quotaResetDate} size="S" />
-        </span>
-      </Body>
-      <Body>Please contact your account holder to upgrade.</Body>
-    </ModalContent>
-  {/if}
-</Modal>
-
-<style>
-  .tooltip {
-    display: inline-block;
-  }
-  .tooltip :global(.icon-container) {
-    margin: 0px;
-  }
-</style>
diff --git a/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte b/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
index 350ebb0f11..ad218b1126 100644
--- a/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
+++ b/packages/builder/src/components/portal/licensing/EnterpriseBasicTrialBanner.svelte
@@ -3,7 +3,7 @@
   import Portal from "svelte-portal"
   import { fly } from "svelte/transition"
   import { Banner, BANNER_TYPES } from "@budibase/bbui"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let show = true
 
diff --git a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
index ab80418b6e..8280251839 100644
--- a/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
+++ b/packages/builder/src/components/portal/licensing/LicensingOverlays.svelte
@@ -1,7 +1,6 @@
 <script>
-  import { licensing, auth, temporalStore } from "stores/portal"
+  import { licensing, auth, temporalStore } from "@/stores/portal"
   import { onMount } from "svelte"
-  import DayPassWarningModal from "./DayPassWarningModal.svelte"
   import PaymentFailedModal from "./PaymentFailedModal.svelte"
   import AccountDowngradedModal from "./AccountDowngradedModal.svelte"
   import { ExpiringKeys } from "./constants"
@@ -12,7 +11,6 @@
 
   let queuedBanners = []
   let queuedModals = []
-  let dayPassModal
   let paymentFailedModal
   let accountDowngradeModal
   let userLoaded = false
@@ -22,22 +20,10 @@
 
   const processModals = () => {
     const defaultCacheFn = key => {
-      temporalStore.actions.setExpiring(key, {}, oneDayInSeconds)
+      temporalStore.setExpiring(key, {}, oneDayInSeconds)
     }
 
     const dismissableModals = [
-      {
-        key: ExpiringKeys.LICENSING_DAYPASS_WARNING_MODAL,
-        criteria: () => {
-          return $licensing?.usageMetrics?.dayPasses >= 90
-        },
-        action: () => {
-          dayPassModal.show()
-        },
-        cache: () => {
-          defaultCacheFn(ExpiringKeys.LICENSING_DAYPASS_WARNING_MODAL)
-        },
-      },
       {
         key: ExpiringKeys.LICENSING_PAYMENT_FAILED,
         criteria: () => {
@@ -64,7 +50,7 @@
       },
     ]
     return dismissableModals.filter(modal => {
-      return !temporalStore.actions.getExpiring(modal.key) && modal.criteria()
+      return !temporalStore.getExpiring(modal.key) && modal.criteria()
     })
   }
 
@@ -102,7 +88,6 @@
   })
 </script>
 
-<DayPassWarningModal bind:this={dayPassModal} onDismiss={showNextModal} />
 <PaymentFailedModal bind:this={paymentFailedModal} onDismiss={showNextModal} />
 <AccountDowngradedModal
   bind:this={accountDowngradeModal}
diff --git a/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte b/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
index 502d43d644..239c611ccb 100644
--- a/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
+++ b/packages/builder/src/components/portal/licensing/PaymentFailedModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Modal, ModalContent, Body, TooltipWrapper } from "@budibase/bbui"
-  import { auth, admin, licensing } from "stores/portal"
+  import { auth, admin, licensing } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let onDismiss = () => {}
diff --git a/packages/builder/src/components/portal/licensing/constants.js b/packages/builder/src/components/portal/licensing/constants.js
index de240adbbe..6e4463adb9 100644
--- a/packages/builder/src/components/portal/licensing/constants.js
+++ b/packages/builder/src/components/portal/licensing/constants.js
@@ -1,6 +1,4 @@
 export const ExpiringKeys = {
-  LICENSING_DAYPASS_WARNING_MODAL: "licensing_daypass_warning_90_modal",
-  LICENSING_DAYPASS_WARNING_BANNER: "licensing_daypass_warning_90_banner",
   LICENSING_PAYMENT_FAILED: "licensing_payment_failed",
   LICENSING_ACCOUNT_DOWNGRADED_MODAL: "licensing_account_downgraded_modal",
   LICENSING_APP_LIMIT_MODAL: "licensing_app_limit_modal",
diff --git a/packages/builder/src/components/portal/licensing/licensingBanners.js b/packages/builder/src/components/portal/licensing/licensingBanners.js
index 34b22c934b..62ca6caa1b 100644
--- a/packages/builder/src/components/portal/licensing/licensingBanners.js
+++ b/packages/builder/src/components/portal/licensing/licensingBanners.js
@@ -1,12 +1,12 @@
 import { ExpiringKeys } from "./constants"
-import { admin, auth, licensing, temporalStore } from "stores/portal"
+import { admin, auth, licensing, temporalStore } from "@/stores/portal"
 import { get } from "svelte/store"
 import { BANNER_TYPES } from "@budibase/bbui"
 
 const oneDayInSeconds = 86400
 
 const defaultCacheFn = key => {
-  temporalStore.actions.setExpiring(key, {}, oneDayInSeconds)
+  temporalStore.setExpiring(key, {}, oneDayInSeconds)
 }
 
 const upgradeAction = key => {
@@ -84,45 +84,6 @@ const buildUsageInfoBanner = (
       }
 }
 
-const buildDayPassBanner = () => {
-  const appAuth = get(auth)
-  const appLicensing = get(licensing)
-  if (get(licensing)?.usageMetrics["dayPasses"] >= 100) {
-    return {
-      key: "max_dayPasses",
-      type: BANNER_TYPES.NEGATIVE,
-      criteria: () => {
-        return true
-      },
-      message: `Your apps are currently offline. You have exceeded your plans limit for Day Passes. ${
-        appAuth.user.accountPortalAccess
-          ? ""
-          : "Please contact your account holder to upgrade."
-      }`,
-      ...upgradeAction(),
-      showCloseButton: false,
-    }
-  }
-
-  return buildUsageInfoBanner(
-    "dayPasses",
-    "Day Passes",
-    ExpiringKeys.LICENSING_DAYPASS_WARNING_BANNER,
-    90,
-    `You have used ${
-      appLicensing?.usageMetrics["dayPasses"]
-    }% of your monthly usage of Day Passes with ${
-      appLicensing?.quotaResetDaysRemaining
-    } day${
-      get(licensing).quotaResetDaysRemaining == 1 ? "" : "s"
-    } remaining. All apps will be taken offline if this limit is reached. ${
-      appAuth.user.accountPortalAccess
-        ? ""
-        : "Please contact your account holder to upgrade."
-    }`
-  )
-}
-
 const buildPaymentFailedBanner = () => {
   return {
     key: "payment_Failed",
@@ -166,7 +127,6 @@ const buildUsersAboveLimitBanner = EXPIRY_KEY => {
 export const getBanners = () => {
   return [
     buildPaymentFailedBanner(),
-    buildDayPassBanner(ExpiringKeys.LICENSING_DAYPASS_WARNING_BANNER),
     buildUsageInfoBanner(
       "rows",
       "Rows",
@@ -188,7 +148,7 @@ export const getBanners = () => {
     buildUsersAboveLimitBanner(ExpiringKeys.LICENSING_USERS_ABOVE_LIMIT_BANNER),
   ].filter(licensingBanner => {
     return (
-      !temporalStore.actions.getExpiring(licensingBanner.key) &&
+      !temporalStore.getExpiring(licensingBanner.key) &&
       licensingBanner.criteria()
     )
   })
diff --git a/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
index e195b52106..f9dab7c06b 100644
--- a/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
+++ b/packages/builder/src/components/portal/onboarding/EnterpriseBasicTrialModal.svelte
@@ -2,8 +2,8 @@
   import { Modal, ModalContent } from "@budibase/bbui"
   import FreeTrial from "../../../../assets/FreeTrial.svelte"
   import { get } from "svelte/store"
-  import { auth, licensing, admin } from "stores/portal"
-  import { API } from "api"
+  import { auth, licensing, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { PlanType } from "@budibase/types"
 
   let freeTrialModal
diff --git a/packages/builder/src/components/portal/onboarding/TourPopover.svelte b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
index 732ee40e11..dabbde098b 100644
--- a/packages/builder/src/components/portal/onboarding/TourPopover.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourPopover.svelte
@@ -2,7 +2,7 @@
   import { Popover, Layout, Heading, Body, Button, Link } from "@budibase/bbui"
   import { TOURS, getCurrentStepIdx } from "./tours.js"
   import { goto, layout, isActive } from "@roxi/routify"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   let popoverAnchor
   let popover
diff --git a/packages/builder/src/components/portal/onboarding/TourWrap.svelte b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
index 05b3935f23..db0841a05b 100644
--- a/packages/builder/src/components/portal/onboarding/TourWrap.svelte
+++ b/packages/builder/src/components/portal/onboarding/TourWrap.svelte
@@ -2,7 +2,7 @@
   import { tourHandler } from "./tourHandler"
   import { TOURSBYSTEP, TOURS, getCurrentStepIdx } from "./tours"
   import { onMount, onDestroy } from "svelte"
-  import { builderStore } from "stores/builder"
+  import { builderStore } from "@/stores/builder"
 
   export let stepKeys = []
 
diff --git a/packages/builder/src/components/portal/onboarding/tourHandler.js b/packages/builder/src/components/portal/onboarding/tourHandler.js
index 6268e980db..c89475438d 100644
--- a/packages/builder/src/components/portal/onboarding/tourHandler.js
+++ b/packages/builder/src/components/portal/onboarding/tourHandler.js
@@ -1,4 +1,4 @@
-import { builderStore } from "stores/builder"
+import { builderStore } from "@/stores/builder"
 import { get } from "svelte/store"
 
 const registerNode = async (node, tourStepKey) => {
diff --git a/packages/builder/src/components/portal/onboarding/tours.js b/packages/builder/src/components/portal/onboarding/tours.js
index 6a3fe1daf0..ad62bdde4d 100644
--- a/packages/builder/src/components/portal/onboarding/tours.js
+++ b/packages/builder/src/components/portal/onboarding/tours.js
@@ -1,7 +1,7 @@
 import { get } from "svelte/store"
-import { builderStore } from "stores/builder"
-import { auth } from "stores/portal"
-import analytics from "analytics"
+import { builderStore } from "@/stores/builder"
+import { auth } from "@/stores/portal"
+import analytics from "@/analytics"
 import {
   OnboardingData,
   OnboardingDesign,
@@ -9,7 +9,7 @@ import {
   NewViewUpdateFormRowId,
   NewFormSteps,
 } from "./steps"
-import { API } from "api"
+import { API } from "@/api"
 
 const ONBOARDING_EVENT_PREFIX = "onboarding"
 
diff --git a/packages/builder/src/components/settings/APIKeyModal.svelte b/packages/builder/src/components/settings/APIKeyModal.svelte
index 06b1d095fc..f5bff9281d 100644
--- a/packages/builder/src/components/settings/APIKeyModal.svelte
+++ b/packages/builder/src/components/settings/APIKeyModal.svelte
@@ -6,7 +6,7 @@
     notifications,
     CopyInput,
   } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   let apiKey = null
diff --git a/packages/builder/src/components/settings/ChangePasswordModal.svelte b/packages/builder/src/components/settings/ChangePasswordModal.svelte
index 32b8b53fa9..353e260d57 100644
--- a/packages/builder/src/components/settings/ChangePasswordModal.svelte
+++ b/packages/builder/src/components/settings/ChangePasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ModalContent, Body, notifications } from "@budibase/bbui"
-  import PasswordRepeatInput from "components/common/users/PasswordRepeatInput.svelte"
-  import { auth } from "stores/portal"
+  import PasswordRepeatInput from "@/components/common/users/PasswordRepeatInput.svelte"
+  import { auth } from "@/stores/portal"
 
   let password
   let error
diff --git a/packages/builder/src/components/settings/ProfileModal.svelte b/packages/builder/src/components/settings/ProfileModal.svelte
index caaf5154b3..55deb6387a 100644
--- a/packages/builder/src/components/settings/ProfileModal.svelte
+++ b/packages/builder/src/components/settings/ProfileModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
   import { writable } from "svelte/store"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   const values = writable({
     firstName: $auth.user.firstName,
diff --git a/packages/builder/src/components/settings/ThemeModal.svelte b/packages/builder/src/components/settings/ThemeModal.svelte
index 7bc3c1efa3..d8f5446e49 100644
--- a/packages/builder/src/components/settings/ThemeModal.svelte
+++ b/packages/builder/src/components/settings/ThemeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Select } from "@budibase/bbui"
-  import { themeStore } from "stores/portal"
+  import { themeStore } from "@/stores/portal"
   import { ThemeOptions } from "@budibase/shared-core"
 </script>
 
diff --git a/packages/builder/src/components/start/AppContextMenuModals.svelte b/packages/builder/src/components/start/AppContextMenuModals.svelte
index f4921c4312..186e0d8601 100644
--- a/packages/builder/src/components/start/AppContextMenuModals.svelte
+++ b/packages/builder/src/components/start/AppContextMenuModals.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Modal } from "@budibase/bbui"
-  import DeleteModal from "components/deploy/DeleteModal.svelte"
+  import DeleteModal from "@/components/deploy/DeleteModal.svelte"
   import ExportAppModal from "./ExportAppModal.svelte"
   import DuplicateAppModal from "./DuplicateAppModal.svelte"
-  import { licensing } from "stores/portal"
+  import { licensing } from "@/stores/portal"
 
   export let app
 
diff --git a/packages/builder/src/components/start/AppRow.svelte b/packages/builder/src/components/start/AppRow.svelte
index 2f0b30ded9..bf1e899a84 100644
--- a/packages/builder/src/components/start/AppRow.svelte
+++ b/packages/builder/src/components/start/AppRow.svelte
@@ -1,14 +1,14 @@
 <script>
   import { Heading, Body, Button, Icon } from "@budibase/bbui"
   import { processStringSync } from "@budibase/string-templates"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { goto } from "@roxi/routify"
   import { UserAvatars } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
   import AppContextMenuModals from "./AppContextMenuModals.svelte"
   import getAppContextMenuItems from "./getAppContextMenuItems.js"
-  import FavouriteAppButton from "pages/builder/portal/apps/FavouriteAppButton.svelte"
-  import { contextMenuStore } from "stores/builder"
+  import FavouriteAppButton from "@/pages/builder/portal/apps/FavouriteAppButton.svelte"
+  import { contextMenuStore } from "@/stores/builder"
 
   export let app
   export let lockedAction
diff --git a/packages/builder/src/components/start/ChooseIconModal.svelte b/packages/builder/src/components/start/ChooseIconModal.svelte
index 463567b12a..3128b70807 100644
--- a/packages/builder/src/components/start/ChooseIconModal.svelte
+++ b/packages/builder/src/components/start/ChooseIconModal.svelte
@@ -6,7 +6,7 @@
     Label,
     notifications,
   } from "@budibase/bbui"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
   import { createEventDispatcher } from "svelte"
 
   export let app
diff --git a/packages/builder/src/components/start/CreateAppModal.svelte b/packages/builder/src/components/start/CreateAppModal.svelte
index 83ed089006..af122ee02e 100644
--- a/packages/builder/src/components/start/CreateAppModal.svelte
+++ b/packages/builder/src/components/start/CreateAppModal.svelte
@@ -7,15 +7,15 @@
     ModalContent,
     Dropzone,
   } from "@budibase/bbui"
-  import { initialise } from "stores/builder"
-  import { API } from "api"
-  import { appsStore, admin, auth } from "stores/portal"
+  import { initialise } from "@/stores/builder"
+  import { API } from "@/api"
+  import { appsStore, admin, auth } from "@/stores/portal"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
-  import { createValidationStore } from "helpers/validation/yup"
-  import * as appValidation from "helpers/validation/yup/app"
-  import TemplateCard from "components/common/TemplateCard.svelte"
-  import { lowercase } from "helpers"
+  import { createValidationStore } from "@/helpers/validation/yup"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import TemplateCard from "@/components/common/TemplateCard.svelte"
+  import { lowercase } from "@/helpers"
   import { sdk } from "@budibase/shared-core"
 
   export let template
@@ -26,6 +26,7 @@
   const values = writable({ name: "", url: null })
   const validation = createValidationStore()
   const encryptionValidation = createValidationStore()
+  const isEncryptedRegex = /^.*\.enc.*\.tar\.gz$/gm
 
   $: {
     const { url } = $values
@@ -37,7 +38,9 @@
     encryptionValidation.check({ ...$values })
   }
 
-  $: encryptedFile = $values.file?.name?.endsWith(".enc.tar.gz")
+  // filename should be separated to avoid updates everytime any other form element changes
+  $: filename = $values.file?.name
+  $: encryptedFile = isEncryptedRegex.test(filename)
 
   onMount(async () => {
     const lastChar = $auth.user?.firstName
@@ -171,7 +174,7 @@
           try {
             await createNewApp()
           } catch (error) {
-            notifications.error("Error creating app")
+            notifications.error(`Error creating app - ${error.message}`)
           }
         }
       },
diff --git a/packages/builder/src/components/start/DuplicateAppModal.svelte b/packages/builder/src/components/start/DuplicateAppModal.svelte
index 0db92ff76d..2db6a99762 100644
--- a/packages/builder/src/components/start/DuplicateAppModal.svelte
+++ b/packages/builder/src/components/start/DuplicateAppModal.svelte
@@ -6,12 +6,12 @@
     Layout,
     keepOpen,
   } from "@budibase/bbui"
-  import { createValidationStore } from "helpers/validation/yup"
+  import { createValidationStore } from "@/helpers/validation/yup"
   import { writable, get } from "svelte/store"
-  import * as appValidation from "helpers/validation/yup/app"
-  import { appsStore, auth } from "stores/portal"
+  import * as appValidation from "@/helpers/validation/yup/app"
+  import { appsStore, auth } from "@/stores/portal"
   import { onMount } from "svelte"
-  import { API } from "api"
+  import { API } from "@/api"
   import { sdk } from "@budibase/shared-core"
 
   export let appId
@@ -68,7 +68,7 @@
     }
 
     try {
-      const app = await API.duplicateApp(data, appId)
+      const app = await API.duplicateApp(appId, data)
       appsStore.load()
       if (!sdk.users.isBuilder($auth.user, app?.duplicateAppId)) {
         // Refresh for access to created applications
diff --git a/packages/builder/src/components/start/ExportAppModal.svelte b/packages/builder/src/components/start/ExportAppModal.svelte
index 3fba522b09..88615af44d 100644
--- a/packages/builder/src/components/start/ExportAppModal.svelte
+++ b/packages/builder/src/components/start/ExportAppModal.svelte
@@ -9,7 +9,7 @@
     notifications,
   } from "@budibase/bbui"
   import { downloadFile } from "@budibase/frontend-core"
-  import { createValidationStore } from "helpers/validation/yup"
+  import { createValidationStore } from "@/helpers/validation/yup"
 
   export let app
   export let published
diff --git a/packages/builder/src/components/start/ImportAppModal.svelte b/packages/builder/src/components/start/ImportAppModal.svelte
index 4c88593514..209e8bedc7 100644
--- a/packages/builder/src/components/start/ImportAppModal.svelte
+++ b/packages/builder/src/components/start/ImportAppModal.svelte
@@ -8,8 +8,8 @@
     notifications,
     Body,
   } from "@budibase/bbui"
-  import { API } from "api"
-  import { initialise } from "stores/builder"
+  import { API } from "@/api"
+  import { initialise } from "@/stores/builder"
 
   export let app
 
diff --git a/packages/builder/src/components/usage/Usage.svelte b/packages/builder/src/components/usage/Usage.svelte
index da1bb4489a..ee2f5ddb4b 100644
--- a/packages/builder/src/components/usage/Usage.svelte
+++ b/packages/builder/src/components/usage/Usage.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, ProgressBar, Heading, Icon, Link } from "@budibase/bbui"
-  import { admin, auth } from "stores/portal"
+  import { admin, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let usage
diff --git a/packages/builder/src/constants/backend/automations.js b/packages/builder/src/constants/backend/automations.ts
similarity index 100%
rename from packages/builder/src/constants/backend/automations.js
rename to packages/builder/src/constants/backend/automations.ts
diff --git a/packages/builder/src/constants/backend/backups.js b/packages/builder/src/constants/backend/backups.ts
similarity index 100%
rename from packages/builder/src/constants/backend/backups.js
rename to packages/builder/src/constants/backend/backups.ts
diff --git a/packages/builder/src/constants/backend/index.js b/packages/builder/src/constants/backend/index.ts
similarity index 97%
rename from packages/builder/src/constants/backend/index.js
rename to packages/builder/src/constants/backend/index.ts
index 6ddf4c2138..b7d3f584be 100644
--- a/packages/builder/src/constants/backend/index.js
+++ b/packages/builder/src/constants/backend/index.ts
@@ -16,7 +16,10 @@ export {
 
 export const AUTO_COLUMN_SUB_TYPES = AutoFieldSubType
 
-export const AUTO_COLUMN_DISPLAY_NAMES = {
+export const AUTO_COLUMN_DISPLAY_NAMES: Record<
+  keyof typeof AUTO_COLUMN_SUB_TYPES,
+  string
+> = {
   AUTO_ID: "Auto ID",
   CREATED_BY: "Created By",
   CREATED_AT: "Created At",
@@ -209,13 +212,6 @@ export const Roles = {
   BUILDER: "BUILDER",
 }
 
-export function isAutoColumnUserRelationship(subtype) {
-  return (
-    subtype === AUTO_COLUMN_SUB_TYPES.CREATED_BY ||
-    subtype === AUTO_COLUMN_SUB_TYPES.UPDATED_BY
-  )
-}
-
 export const PrettyRelationshipDefinitions = {
   MANY: "Many rows",
   ONE: "One row",
diff --git a/packages/builder/src/constants/index.js b/packages/builder/src/constants/index.ts
similarity index 98%
rename from packages/builder/src/constants/index.js
rename to packages/builder/src/constants/index.ts
index 0d51f57c3e..3498183c8e 100644
--- a/packages/builder/src/constants/index.js
+++ b/packages/builder/src/constants/index.ts
@@ -68,7 +68,6 @@ export const OnboardingType = {
 
 export const PlanModel = {
   PER_USER: "perUser",
-  DAY_PASS: "dayPass",
 }
 
 export const ChangelogURL = "https://docs.budibase.com/changelog"
diff --git a/packages/builder/src/dataBinding.js b/packages/builder/src/dataBinding.js
index 8adc27ee59..1272c9eb6d 100644
--- a/packages/builder/src/dataBinding.js
+++ b/packages/builder/src/dataBinding.js
@@ -7,7 +7,7 @@ import {
   findComponent,
   findComponentPath,
   getComponentContexts,
-} from "helpers/components"
+} from "@/helpers/components"
 import {
   componentStore,
   screenStore,
@@ -17,7 +17,7 @@ import {
   tables as tablesStore,
   roles as rolesStore,
   selectedScreen,
-} from "stores/builder"
+} from "@/stores/builder"
 import {
   makePropSafe,
   isJSBinding,
@@ -27,10 +27,10 @@ import {
 } from "@budibase/string-templates"
 import { TableNames } from "./constants"
 import { JSONUtils, Constants } from "@budibase/frontend-core"
-import ActionDefinitions from "components/design/settings/controls/ButtonActionEditor/manifest.json"
-import { environment, licensing } from "stores/portal"
-import { convertOldFieldFormat } from "components/design/settings/controls/FieldConfiguration/utils"
-import { FIELDS, DB_TYPE_INTERNAL } from "constants/backend"
+import ActionDefinitions from "@/components/design/settings/controls/ButtonActionEditor/manifest.json"
+import { environment, licensing } from "@/stores/portal"
+import { convertOldFieldFormat } from "@/components/design/settings/controls/FieldConfiguration/utils"
+import { FIELDS, DB_TYPE_INTERNAL } from "@/constants/backend"
 import { FieldType } from "@budibase/types"
 
 const { ContextScopes } = Constants
@@ -900,7 +900,7 @@ export const getSchemaForDatasourcePlus = (resourceId, options) => {
  *   optional and only needed for "provider" datasource types.
  * @param datasource the datasource definition
  * @param options options for generating the schema
- * @return {{schema: Object, table: Object}}
+ * @return {{schema: Object, table: Table}}
  */
 export const getSchemaForDatasource = (asset, datasource, options) => {
   options = options || {}
@@ -1141,10 +1141,11 @@ export const buildFormSchema = (component, asset) => {
   const fieldSetting = settings.find(
     setting => setting.key === "field" && setting.type.startsWith("field/")
   )
-  if (fieldSetting && component.field) {
+  if (fieldSetting) {
     const type = fieldSetting.type.split("field/")[1]
-    if (type) {
-      schema[component.field] = { type }
+    const key = component.field || component._instanceName
+    if (type && key) {
+      schema[key] = { type }
     }
   }
   component._children?.forEach(child => {
@@ -1506,7 +1507,12 @@ export const updateReferencesInObject = ({
 
 // Migrate references
 // Switch all bindings to reference their ids
-export const migrateReferencesInObject = ({ obj, label = "steps", steps }) => {
+export const migrateReferencesInObject = ({
+  obj,
+  label = "steps",
+  steps,
+  originalIndex,
+}) => {
   const stepIndexRegex = new RegExp(`{{\\s*${label}\\.(\\d+)\\.`, "g")
   const updateActionStep = (str, index, replaceWith) =>
     str.replace(`{{ ${label}.${index}.`, `{{ ${label}.${replaceWith}.`)
@@ -1527,6 +1533,7 @@ export const migrateReferencesInObject = ({ obj, label = "steps", steps }) => {
       migrateReferencesInObject({
         obj: obj[key],
         steps,
+        originalIndex,
       })
     }
   }
diff --git a/packages/builder/src/dataBinding.test.js b/packages/builder/src/dataBinding.test.js
index 6cea9b166b..5e3b484e22 100644
--- a/packages/builder/src/dataBinding.test.js
+++ b/packages/builder/src/dataBinding.test.js
@@ -3,7 +3,7 @@ import {
   runtimeToReadableBinding,
   readableToRuntimeBinding,
   updateReferencesInObject,
-} from "dataBinding"
+} from "@/dataBinding"
 
 describe("Builder dataBinding", () => {
   beforeEach(() => {
diff --git a/packages/builder/src/global.css b/packages/builder/src/global.css
index adf4a47070..a13d491416 100644
--- a/packages/builder/src/global.css
+++ b/packages/builder/src/global.css
@@ -61,7 +61,7 @@ a {
   height: 8px;
 }
 ::-webkit-scrollbar-track {
-  background: var(--spectrum-alias-background-color-default);
+  background: transparent;
 }
 ::-webkit-scrollbar-thumb {
   background-color: var(--spectrum-global-color-gray-400);
@@ -71,6 +71,5 @@ a {
   background: var(--spectrum-alias-background-color-default);
 }
 html * {
-  scrollbar-color: var(--spectrum-global-color-gray-400)
-    var(--spectrum-alias-background-color-default);
+  scrollbar-color: var(--spectrum-global-color-gray-400) transparent;
 }
diff --git a/packages/builder/src/helpers/bindings.ts b/packages/builder/src/helpers/bindings.ts
new file mode 100644
index 0000000000..66a13d9ba3
--- /dev/null
+++ b/packages/builder/src/helpers/bindings.ts
@@ -0,0 +1,74 @@
+import { makePropSafe } from "@budibase/string-templates"
+import { UIBinding } from "@budibase/types"
+
+export function extractRelationships(bindings: UIBinding[]) {
+  return (
+    bindings
+      // Get only link bindings
+      .filter(x => x.fieldSchema?.type === "link")
+      // Filter out bindings provided by forms
+      .filter(x => !x.component?.endsWith("/form"))
+      .map(binding => {
+        const { providerId, readableBinding, fieldSchema } = binding || {}
+        const { name, tableId } = fieldSchema || {}
+        const safeProviderId = makePropSafe(providerId)
+        return {
+          providerId,
+          label: readableBinding,
+          fieldName: name,
+          tableId,
+          type: "link",
+          // These properties will be enriched by the client library and provide
+          // details of the parent row of the relationship field, from context
+          rowId: `{{ ${safeProviderId}.${makePropSafe("_id")} }}`,
+          rowTableId: `{{ ${safeProviderId}.${makePropSafe("tableId")} }}`,
+        }
+      })
+  )
+}
+
+export function extractFields(bindings: UIBinding[]) {
+  return bindings
+    .filter(
+      x =>
+        x.fieldSchema?.type === "attachment" ||
+        (x.fieldSchema?.type === "array" && x.tableId)
+    )
+    .map(binding => {
+      const { providerId, readableBinding, runtimeBinding } = binding
+      const { name, type, tableId } = binding.fieldSchema!
+      return {
+        providerId,
+        label: readableBinding,
+        fieldName: name,
+        fieldType: type,
+        tableId,
+        type: "field",
+        value: `{{ literal ${runtimeBinding} }}`,
+      }
+    })
+}
+
+export function extractJSONArrayFields(bindings: UIBinding[]) {
+  return bindings
+    .filter(
+      x =>
+        x.fieldSchema?.type === "jsonarray" ||
+        (x.fieldSchema?.type === "json" && x.fieldSchema?.subtype === "array")
+    )
+    .map(binding => {
+      const { providerId, readableBinding, runtimeBinding, tableId } = binding
+      const { name, type, prefixKeys, subtype } = binding.fieldSchema!
+      return {
+        providerId,
+        label: readableBinding,
+        fieldName: name,
+        fieldType: type,
+        tableId,
+        prefixKeys,
+        type: type === "jsonarray" ? "jsonarray" : "queryarray",
+        subtype,
+        value: `{{ literal ${runtimeBinding} }}`,
+      }
+    })
+}
diff --git a/packages/builder/src/helpers/components.js b/packages/builder/src/helpers/components.js
index ca1be3c736..b1116d7750 100644
--- a/packages/builder/src/helpers/components.js
+++ b/packages/builder/src/helpers/components.js
@@ -1,4 +1,4 @@
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { get } from "svelte/store"
 import { Helpers } from "@budibase/bbui"
 import {
@@ -6,7 +6,7 @@ import {
   encodeJSBinding,
   findHBSBlocks,
 } from "@budibase/string-templates"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { Constants } from "@budibase/frontend-core"
 
 const { ContextScopes } = Constants
diff --git a/packages/builder/src/helpers/data/format.js b/packages/builder/src/helpers/data/format.js
index 5b9714008b..ba274d5464 100644
--- a/packages/builder/src/helpers/data/format.js
+++ b/packages/builder/src/helpers/data/format.js
@@ -9,11 +9,18 @@ export const datasourceSelect = {
       datasourceName: datasource?.name,
     }
   },
-  viewV2: view => ({
-    ...view,
-    label: view.name,
-    type: "viewV2",
-  }),
+  viewV2: (view, datasources) => {
+    const datasource = datasources
+      ?.filter(f => f.entities)
+      .flatMap(d => d.entities)
+      .find(ds => ds._id === view.tableId)
+    return {
+      ...view,
+      label: view.name,
+      type: "viewV2",
+      datasourceName: datasource?.name,
+    }
+  },
 }
 
 export const tableSelect = {
@@ -31,3 +38,36 @@ export const tableSelect = {
     resourceId: view.id,
   }),
 }
+
+export const sortAndFormat = {
+  tables: (tables, datasources) => {
+    return tables
+      .map(table => {
+        const formatted = datasourceSelect.table(table, datasources)
+        return {
+          ...formatted,
+          resourceId: table._id,
+        }
+      })
+      .sort((a, b) => {
+        // sort tables alphabetically, grouped by datasource
+        const dsA = a.datasourceName ?? ""
+        const dsB = b.datasourceName ?? ""
+
+        const dsComparison = dsA.localeCompare(dsB)
+        if (dsComparison !== 0) {
+          return dsComparison
+        }
+        return a.label.localeCompare(b.label)
+      })
+  },
+  viewsV2: (views, datasources) => {
+    return views.map(view => {
+      const formatted = datasourceSelect.viewV2(view, datasources)
+      return {
+        ...formatted,
+        resourceId: view.id,
+      }
+    })
+  },
+}
diff --git a/packages/builder/src/helpers/data/utils.js b/packages/builder/src/helpers/data/utils.js
index a592b57a26..7194dc13ee 100644
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@@ -1,4 +1,4 @@
-import { IntegrationTypes } from "constants/backend"
+import { IntegrationTypes } from "@/constants/backend"
 import { findHBSBlocks } from "@budibase/string-templates"
 
 export function breakQueryString(qs) {
diff --git a/packages/builder/src/helpers/duplicate.js b/packages/builder/src/helpers/duplicate.ts
similarity index 86%
rename from packages/builder/src/helpers/duplicate.js
rename to packages/builder/src/helpers/duplicate.ts
index 361e1faa25..b4740b3e52 100644
--- a/packages/builder/src/helpers/duplicate.js
+++ b/packages/builder/src/helpers/duplicate.ts
@@ -10,13 +10,13 @@
  *
  * Repl
  */
-export const duplicateName = (name, allNames) => {
+export const duplicateName = (name: string, allNames: string[]) => {
   const duplicatePattern = new RegExp(`\\s(\\d+)$`)
   const baseName = name.split(duplicatePattern)[0]
   const isDuplicate = new RegExp(`${baseName}\\s(\\d+)$`)
 
   // get the sequence from matched names
-  const sequence = []
+  const sequence: number[] = []
   allNames.filter(n => {
     if (n === baseName) {
       return true
@@ -70,12 +70,18 @@ export const duplicateName = (name, allNames) => {
  * @param getName optional function to extract the name for an item, if not a
  *  flat array of strings
  */
-export const getSequentialName = (
-  items,
-  prefix,
-  { getName = x => x, numberFirstItem = false } = {}
+export const getSequentialName = <T extends any>(
+  items: T[] | null,
+  prefix: string | null,
+  {
+    getName,
+    numberFirstItem,
+  }: {
+    getName?: (item: T) => string
+    numberFirstItem?: boolean
+  } = {}
 ) => {
-  if (!prefix?.length || !getName) {
+  if (!prefix?.length) {
     return null
   }
   const trimmedPrefix = prefix.trim()
@@ -85,7 +91,7 @@ export const getSequentialName = (
   }
   let max = 0
   items.forEach(item => {
-    const name = getName(item)
+    const name = getName?.(item) ?? item
     if (typeof name !== "string" || !name.startsWith(trimmedPrefix)) {
       return
     }
diff --git a/packages/builder/src/helpers/featureFlags.js b/packages/builder/src/helpers/featureFlags.ts
similarity index 54%
rename from packages/builder/src/helpers/featureFlags.js
rename to packages/builder/src/helpers/featureFlags.ts
index e9054e8a9c..faa57892e8 100644
--- a/packages/builder/src/helpers/featureFlags.js
+++ b/packages/builder/src/helpers/featureFlags.ts
@@ -1,7 +1,8 @@
+import { FeatureFlag } from "@budibase/types"
 import { auth } from "../stores/portal"
 import { get } from "svelte/store"
 
-export const isEnabled = featureFlag => {
+export const isEnabled = (featureFlag: FeatureFlag | `${FeatureFlag}`) => {
   const user = get(auth).user
   return !!user?.flags?.[featureFlag]
 }
diff --git a/packages/builder/src/helpers/fetchData.js b/packages/builder/src/helpers/fetchData.ts
similarity index 52%
rename from packages/builder/src/helpers/fetchData.js
rename to packages/builder/src/helpers/fetchData.ts
index 9208419c4e..cffb8f4d7d 100644
--- a/packages/builder/src/helpers/fetchData.js
+++ b/packages/builder/src/helpers/fetchData.ts
@@ -1,13 +1,21 @@
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
-export default function (url) {
-  const store = writable({ status: "LOADING", data: {}, error: {} })
+export default function (url: string) {
+  const store = writable<{
+    status: "LOADING" | "SUCCESS" | "ERROR"
+    data: object
+    error?: unknown
+  }>({
+    status: "LOADING",
+    data: {},
+    error: {},
+  })
 
   async function get() {
     store.update(u => ({ ...u, status: "LOADING" }))
     try {
-      const data = await API.get({ url })
+      const data = await API.get<object>({ url })
       store.set({ data, status: "SUCCESS" })
     } catch (e) {
       store.set({ data: {}, error: e, status: "ERROR" })
diff --git a/packages/builder/src/helpers/formFields.js b/packages/builder/src/helpers/formFields.js
index 693fd35d4d..ec5d625917 100644
--- a/packages/builder/src/helpers/formFields.js
+++ b/packages/builder/src/helpers/formFields.js
@@ -1,5 +1,5 @@
-import { findClosestMatchingComponent } from "helpers/components"
-import { getDatasourceForProvider, getSchemaForDatasource } from "dataBinding"
+import { findClosestMatchingComponent } from "@/helpers/components"
+import { getDatasourceForProvider, getSchemaForDatasource } from "@/dataBinding"
 
 export const getComponentFieldOptions = (asset, id, type, loose = true) => {
   const form = findClosestMatchingComponent(
diff --git a/packages/builder/src/helpers/helpers.js b/packages/builder/src/helpers/helpers.js
deleted file mode 100644
index 99483d40e2..0000000000
--- a/packages/builder/src/helpers/helpers.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import { last, flow } from "lodash/fp"
-
-export const buildStyle = styles => {
-  let str = ""
-  for (let s in styles) {
-    if (styles[s]) {
-      let key = convertCamel(s)
-      str += `${key}: ${styles[s]}; `
-    }
-  }
-  return str
-}
-
-export const convertCamel = str => {
-  return str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)
-}
-
-export const pipe = (arg, funcs) => flow(funcs)(arg)
-
-export const capitalise = s => {
-  if (!s) {
-    return s
-  }
-  return s.substring(0, 1).toUpperCase() + s.substring(1)
-}
-
-export const lowercase = s => s.substring(0, 1).toLowerCase() + s.substring(1)
-
-export const lowercaseExceptFirst = s =>
-  s.charAt(0) + s.substring(1).toLowerCase()
-
-export const get_name = s => (!s ? "" : last(s.split("/")))
-
-export const get_capitalised_name = name => pipe(name, [get_name, capitalise])
-
-export const isBuilderInputFocused = e => {
-  const activeTag = document.activeElement?.tagName.toLowerCase()
-  const inCodeEditor = document.activeElement?.classList?.contains("cm-content")
-  if (
-    (inCodeEditor || ["input", "textarea"].indexOf(activeTag) !== -1) &&
-    e.key !== "Escape"
-  ) {
-    return true
-  }
-  return false
-}
diff --git a/packages/builder/src/helpers/helpers.ts b/packages/builder/src/helpers/helpers.ts
new file mode 100644
index 0000000000..f767e6f59f
--- /dev/null
+++ b/packages/builder/src/helpers/helpers.ts
@@ -0,0 +1,50 @@
+import type { Many } from "lodash"
+import { last, flow } from "lodash/fp"
+
+export const buildStyle = (styles: Record<string, any>) => {
+  let str = ""
+  for (let s in styles) {
+    if (styles[s]) {
+      let key = convertCamel(s)
+      str += `${key}: ${styles[s]}; `
+    }
+  }
+  return str
+}
+
+export const convertCamel = (str: string) => {
+  return str.replace(/[A-Z]/g, match => `-${match.toLowerCase()}`)
+}
+
+export const pipe = (arg: string, funcs: Many<(...args: any[]) => any>) =>
+  flow(funcs)(arg)
+
+export const capitalise = (s: string) => {
+  if (!s) {
+    return s
+  }
+  return s.substring(0, 1).toUpperCase() + s.substring(1)
+}
+
+export const lowercase = (s: string) =>
+  s.substring(0, 1).toLowerCase() + s.substring(1)
+
+export const lowercaseExceptFirst = (s: string) =>
+  s.charAt(0) + s.substring(1).toLowerCase()
+
+export const get_name = (s: string) => (!s ? "" : last(s.split("/")))
+
+export const get_capitalised_name = (name: string) =>
+  pipe(name, [get_name, capitalise])
+
+export const isBuilderInputFocused = (e: KeyboardEvent) => {
+  const activeTag = document.activeElement?.tagName.toLowerCase()
+  const inCodeEditor = document.activeElement?.classList?.contains("cm-content")
+  if (
+    (inCodeEditor || ["input", "textarea"].indexOf(activeTag!) !== -1) &&
+    e.key !== "Escape"
+  ) {
+    return true
+  }
+  return false
+}
diff --git a/packages/builder/src/helpers/index.js b/packages/builder/src/helpers/index.ts
similarity index 70%
rename from packages/builder/src/helpers/index.js
rename to packages/builder/src/helpers/index.ts
index 687723e361..0e61eeb9c6 100644
--- a/packages/builder/src/helpers/index.js
+++ b/packages/builder/src/helpers/index.ts
@@ -9,3 +9,5 @@ export {
   lowercase,
   isBuilderInputFocused,
 } from "./helpers"
+export * as featureFlag from "./featureFlags"
+export * as bindings from "./bindings"
diff --git a/packages/builder/src/helpers/keyUtils.js b/packages/builder/src/helpers/keyUtils.js
deleted file mode 100644
index 8d6dfb06dc..0000000000
--- a/packages/builder/src/helpers/keyUtils.js
+++ /dev/null
@@ -1,7 +0,0 @@
-function handleEnter(fnc) {
-  return e => e.key === "Enter" && fnc()
-}
-
-export const keyUtils = {
-  handleEnter,
-}
diff --git a/packages/builder/src/helpers/keyUtils.ts b/packages/builder/src/helpers/keyUtils.ts
new file mode 100644
index 0000000000..f78b05ec2b
--- /dev/null
+++ b/packages/builder/src/helpers/keyUtils.ts
@@ -0,0 +1,7 @@
+function handleEnter(fnc: () => void) {
+  return (e: KeyboardEvent) => e.key === "Enter" && fnc()
+}
+
+export const keyUtils = {
+  handleEnter,
+}
diff --git a/packages/builder/src/helpers/pagination.js b/packages/builder/src/helpers/pagination.ts
similarity index 76%
rename from packages/builder/src/helpers/pagination.js
rename to packages/builder/src/helpers/pagination.ts
index 122973f1a1..0280cd1052 100644
--- a/packages/builder/src/helpers/pagination.js
+++ b/packages/builder/src/helpers/pagination.ts
@@ -1,6 +1,16 @@
 import { writable } from "svelte/store"
 
-function defaultValue() {
+interface PaginationStore {
+  nextPage: string | null | undefined
+  page: string | null | undefined
+  hasPrevPage: boolean
+  hasNextPage: boolean
+  loading: boolean
+  pageNumber: number
+  pages: string[]
+}
+
+function defaultValue(): PaginationStore {
   return {
     nextPage: null,
     page: undefined,
@@ -29,13 +39,13 @@ export function createPaginationStore() {
     update(state => {
       state.pageNumber++
       state.page = state.nextPage
-      state.pages.push(state.page)
+      state.pages.push(state.page!)
       state.hasPrevPage = state.pageNumber > 1
       return state
     })
   }
 
-  function fetched(hasNextPage, nextPage) {
+  function fetched(hasNextPage: boolean, nextPage: string) {
     update(state => {
       state.hasNextPage = hasNextPage
       state.nextPage = nextPage
diff --git a/packages/builder/src/helpers/planTitle.js b/packages/builder/src/helpers/planTitle.ts
similarity index 86%
rename from packages/builder/src/helpers/planTitle.js
rename to packages/builder/src/helpers/planTitle.ts
index c08b8bf3fe..ab342b4d93 100644
--- a/packages/builder/src/helpers/planTitle.js
+++ b/packages/builder/src/helpers/planTitle.ts
@@ -1,6 +1,6 @@
 import { PlanType } from "@budibase/types"
 
-export function getFormattedPlanName(userPlanType) {
+export function getFormattedPlanName(userPlanType: PlanType) {
   let planName
   switch (userPlanType) {
     case PlanType.PRO:
@@ -29,6 +29,6 @@ export function getFormattedPlanName(userPlanType) {
   return `${planName} Plan`
 }
 
-export function isPremiumOrAbove(userPlanType) {
+export function isPremiumOrAbove(userPlanType: PlanType) {
   return ![PlanType.PRO, PlanType.TEAM, PlanType.FREE].includes(userPlanType)
 }
diff --git a/packages/builder/src/helpers/sanitizeUrl.js b/packages/builder/src/helpers/sanitizeUrl.ts
similarity index 88%
rename from packages/builder/src/helpers/sanitizeUrl.js
rename to packages/builder/src/helpers/sanitizeUrl.ts
index 4d00c503fb..5b76930037 100644
--- a/packages/builder/src/helpers/sanitizeUrl.js
+++ b/packages/builder/src/helpers/sanitizeUrl.ts
@@ -1,4 +1,4 @@
-export default function (url) {
+export default function (url: string) {
   return url
     .split("/")
     .map(part => {
diff --git a/packages/builder/src/helpers/screen.ts b/packages/builder/src/helpers/screen.ts
new file mode 100644
index 0000000000..296a597adb
--- /dev/null
+++ b/packages/builder/src/helpers/screen.ts
@@ -0,0 +1,46 @@
+import { Component, Screen, ScreenProps } from "@budibase/types"
+import clientManifest from "@budibase/client/manifest.json"
+
+export function findComponentsBySettingsType(
+  screen: Screen,
+  type: string | string[]
+) {
+  const typesArray = Array.isArray(type) ? type : [type]
+
+  const result: {
+    component: Component
+    setting: {
+      type: string
+      key: string
+    }
+  }[] = []
+  function recurseFieldComponentsInChildren(component: ScreenProps) {
+    if (!component) {
+      return
+    }
+
+    const definition = getManifestDefinition(component)
+    const setting =
+      "settings" in definition &&
+      definition.settings.find((s: any) => typesArray.includes(s.type))
+    if (setting && "type" in setting) {
+      result.push({
+        component,
+        setting: { type: setting.type!, key: setting.key! },
+      })
+    }
+    component._children?.forEach(child => {
+      recurseFieldComponentsInChildren(child)
+    })
+  }
+
+  recurseFieldComponentsInChildren(screen?.props)
+  return result
+}
+
+function getManifestDefinition(component: Component) {
+  const componentType = component._component.split("/").slice(-1)[0]
+  const definition =
+    clientManifest[componentType as keyof typeof clientManifest]
+  return definition
+}
diff --git a/packages/builder/src/helpers/tests/duplicate.test.js b/packages/builder/src/helpers/tests/duplicate.test.ts
similarity index 100%
rename from packages/builder/src/helpers/tests/duplicate.test.js
rename to packages/builder/src/helpers/tests/duplicate.test.ts
diff --git a/packages/builder/src/helpers/tests/nameHelpers.spec.js b/packages/builder/src/helpers/tests/nameHelpers.spec.ts
similarity index 100%
rename from packages/builder/src/helpers/tests/nameHelpers.spec.js
rename to packages/builder/src/helpers/tests/nameHelpers.spec.ts
diff --git a/packages/builder/src/helpers/utils.js b/packages/builder/src/helpers/utils.js
deleted file mode 100644
index f3d48331e7..0000000000
--- a/packages/builder/src/helpers/utils.js
+++ /dev/null
@@ -1,75 +0,0 @@
-import { FieldType } from "@budibase/types"
-import { ActionStepID } from "constants/backend/automations"
-import { TableNames } from "constants"
-import {
-  AUTO_COLUMN_DISPLAY_NAMES,
-  AUTO_COLUMN_SUB_TYPES,
-  FIELDS,
-  isAutoColumnUserRelationship,
-} from "constants/backend"
-import { isEnabled } from "helpers/featureFlags"
-
-export function getAutoColumnInformation(enabled = true) {
-  let info = {}
-  for (const [key, subtype] of Object.entries(AUTO_COLUMN_SUB_TYPES)) {
-    // Because it's possible to replicate the functionality of CREATED_AT and
-    // CREATED_BY columns, we disable their creation when the DEFAULT_VALUES
-    // feature flag is enabled.
-    if (isEnabled("DEFAULT_VALUES")) {
-      if (
-        subtype === AUTO_COLUMN_SUB_TYPES.CREATED_AT ||
-        subtype === AUTO_COLUMN_SUB_TYPES.CREATED_BY
-      ) {
-        continue
-      }
-    }
-    info[subtype] = { enabled, name: AUTO_COLUMN_DISPLAY_NAMES[key] }
-  }
-  return info
-}
-
-export function buildAutoColumn(tableName, name, subtype) {
-  let type, constraints
-  switch (subtype) {
-    case AUTO_COLUMN_SUB_TYPES.UPDATED_BY:
-    case AUTO_COLUMN_SUB_TYPES.CREATED_BY:
-      type = FieldType.LINK
-      constraints = FIELDS.LINK.constraints
-      break
-    case AUTO_COLUMN_SUB_TYPES.AUTO_ID:
-      type = FieldType.NUMBER
-      constraints = FIELDS.NUMBER.constraints
-      break
-    case AUTO_COLUMN_SUB_TYPES.UPDATED_AT:
-    case AUTO_COLUMN_SUB_TYPES.CREATED_AT:
-      type = FieldType.DATETIME
-      constraints = FIELDS.DATETIME.constraints
-      break
-    default:
-      type = FieldType.STRING
-      constraints = FIELDS.STRING.constraints
-      break
-  }
-  if (Object.values(AUTO_COLUMN_SUB_TYPES).indexOf(subtype) === -1) {
-    throw "Cannot build auto column with supplied subtype"
-  }
-  const base = {
-    name,
-    type,
-    subtype,
-    icon: "ri-magic-line",
-    autocolumn: true,
-    constraints,
-  }
-  if (isAutoColumnUserRelationship(subtype)) {
-    base.tableId = TableNames.USERS
-    base.fieldName = `${tableName}-${name}`
-  }
-  return base
-}
-
-export function checkForCollectStep(automation) {
-  return automation.definition.steps.some(
-    step => step.stepId === ActionStepID.COLLECT
-  )
-}
diff --git a/packages/builder/src/helpers/utils.ts b/packages/builder/src/helpers/utils.ts
new file mode 100644
index 0000000000..140daaef3b
--- /dev/null
+++ b/packages/builder/src/helpers/utils.ts
@@ -0,0 +1,96 @@
+import {
+  AutoFieldSubType,
+  Automation,
+  DateFieldMetadata,
+  FieldType,
+  NumberFieldMetadata,
+  RelationshipFieldMetadata,
+  RelationshipType,
+} from "@budibase/types"
+import { ActionStepID } from "@/constants/backend/automations"
+import { TableNames } from "@/constants"
+import {
+  AUTO_COLUMN_DISPLAY_NAMES,
+  AUTO_COLUMN_SUB_TYPES,
+  FIELDS,
+} from "@/constants/backend"
+import { utils } from "@budibase/shared-core"
+
+type AutoColumnInformation = Partial<
+  Record<AutoFieldSubType, { enabled: boolean; name: string }>
+>
+
+export function getAutoColumnInformation(
+  enabled = true
+): AutoColumnInformation {
+  const info: AutoColumnInformation = {}
+  for (const [key, subtype] of Object.entries(AUTO_COLUMN_SUB_TYPES)) {
+    // Because it's possible to replicate the functionality of CREATED_AT and
+    // CREATED_BY columns with user column default values, we disable their creation
+    if (
+      subtype === AUTO_COLUMN_SUB_TYPES.CREATED_AT ||
+      subtype === AUTO_COLUMN_SUB_TYPES.CREATED_BY
+    ) {
+      continue
+    }
+    const typedKey = key as keyof typeof AUTO_COLUMN_SUB_TYPES
+    info[subtype] = {
+      enabled,
+      name: AUTO_COLUMN_DISPLAY_NAMES[typedKey],
+    }
+  }
+  return info
+}
+
+export function buildAutoColumn(
+  tableName: string,
+  name: string,
+  subtype: AutoFieldSubType
+): RelationshipFieldMetadata | NumberFieldMetadata | DateFieldMetadata {
+  const base = {
+    name,
+    icon: "ri-magic-line",
+    autocolumn: true,
+  }
+
+  switch (subtype) {
+    case AUTO_COLUMN_SUB_TYPES.UPDATED_BY:
+    case AUTO_COLUMN_SUB_TYPES.CREATED_BY:
+      return {
+        ...base,
+        type: FieldType.LINK,
+        subtype,
+        constraints: FIELDS.LINK.constraints,
+        tableId: TableNames.USERS,
+        fieldName: `${tableName}-${name}`,
+        relationshipType: RelationshipType.MANY_TO_ONE,
+      }
+
+    case AUTO_COLUMN_SUB_TYPES.AUTO_ID:
+      return {
+        ...base,
+        type: FieldType.NUMBER,
+        subtype,
+        constraints: FIELDS.NUMBER.constraints,
+      }
+    case AUTO_COLUMN_SUB_TYPES.UPDATED_AT:
+    case AUTO_COLUMN_SUB_TYPES.CREATED_AT:
+      return {
+        ...base,
+        type: FieldType.DATETIME,
+        subtype,
+        constraints: FIELDS.DATETIME.constraints,
+      }
+
+    default:
+      throw utils.unreachable(subtype, {
+        message: "Cannot build auto column with supplied subtype",
+      })
+  }
+}
+
+export function checkForCollectStep(automation: Automation) {
+  return automation.definition.steps.some(
+    step => step.stepId === ActionStepID.COLLECT
+  )
+}
diff --git a/packages/builder/src/helpers/validation/yup/app.js b/packages/builder/src/helpers/validation/yup/app.js
index 3a00b7a49f..ff2be34d09 100644
--- a/packages/builder/src/helpers/validation/yup/app.js
+++ b/packages/builder/src/helpers/validation/yup/app.js
@@ -1,5 +1,5 @@
 import { string, mixed } from "yup"
-import { APP_NAME_REGEX, APP_URL_REGEX } from "constants"
+import { APP_NAME_REGEX, APP_URL_REGEX } from "@/constants"
 
 export const name = (validation, { apps, currentApp } = { apps: [] }) => {
   validation.addValidator(
diff --git a/packages/builder/src/helpers/validation/yup/index.js b/packages/builder/src/helpers/validation/yup/index.js
index b10ed2369e..7323f5b723 100644
--- a/packages/builder/src/helpers/validation/yup/index.js
+++ b/packages/builder/src/helpers/validation/yup/index.js
@@ -1,4 +1,4 @@
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { object, string, number } from "yup"
 import { writable, get } from "svelte/store"
 import { notifications } from "@budibase/bbui"
diff --git a/packages/builder/src/helpers/warnings.js b/packages/builder/src/helpers/warnings.ts
similarity index 85%
rename from packages/builder/src/helpers/warnings.js
rename to packages/builder/src/helpers/warnings.ts
index ad943a8578..ae6c65666c 100644
--- a/packages/builder/src/helpers/warnings.js
+++ b/packages/builder/src/helpers/warnings.ts
@@ -1,4 +1,4 @@
-export const suppressWarnings = warnings => {
+export const suppressWarnings = (warnings: string[]) => {
   if (!warnings?.length) {
     return
   }
diff --git a/packages/builder/src/pages/builder/Branding.svelte b/packages/builder/src/pages/builder/Branding.svelte
index e51ca1c70d..8e47879950 100644
--- a/packages/builder/src/pages/builder/Branding.svelte
+++ b/packages/builder/src/pages/builder/Branding.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { organisation, auth } from "stores/portal"
+  import { organisation, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   let loaded = false
diff --git a/packages/builder/src/pages/builder/_layout.svelte b/packages/builder/src/pages/builder/_layout.svelte
index 13067c5836..7e765d7366 100644
--- a/packages/builder/src/pages/builder/_layout.svelte
+++ b/packages/builder/src/pages/builder/_layout.svelte
@@ -1,11 +1,11 @@
 <script>
   import { isActive, redirect, params } from "@roxi/routify"
-  import { admin, auth, licensing, navigation } from "stores/portal"
+  import { admin, auth, licensing, navigation } from "@/stores/portal"
   import { onMount } from "svelte"
   import { CookieUtils, Constants } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import Branding from "./Branding.svelte"
-  import ContextMenu from "components/ContextMenu.svelte"
+  import ContextMenu from "@/components/ContextMenu.svelte"
 
   let loaded = false
 
@@ -18,7 +18,7 @@
 
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
-  navigation.actions.init($redirect)
+  navigation.init($redirect)
 
   const validateTenantId = async () => {
     const host = window.location.host
diff --git a/packages/builder/src/pages/builder/admin/_layout.svelte b/packages/builder/src/pages/builder/admin/_layout.svelte
index f03a7b8285..afc065b4bb 100644
--- a/packages/builder/src/pages/builder/admin/_layout.svelte
+++ b/packages/builder/src/pages/builder/admin/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
 
@@ -9,7 +9,7 @@
   $: useAccountPortal = cloud && !$admin.disableAccountPortal
 
   onMount(() => {
-    if ($admin?.checklist?.adminUser.checked || useAccountPortal) {
+    if ($admin?.checklist?.adminUser?.checked || useAccountPortal) {
       $redirect("../")
     } else {
       loaded = true
diff --git a/packages/builder/src/pages/builder/admin/index.svelte b/packages/builder/src/pages/builder/admin/index.svelte
index 2921f065d3..8a9aaf273b 100644
--- a/packages/builder/src/pages/builder/admin/index.svelte
+++ b/packages/builder/src/pages/builder/admin/index.svelte
@@ -9,8 +9,8 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { API } from "api"
-  import { admin, auth } from "stores/portal"
+  import { API } from "@/api"
+  import { admin, auth } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { passwordsMatch, handleError } from "../auth/_components/utils"
@@ -36,10 +36,7 @@
       await API.createAdminUser(adminUser)
       notifications.success("Admin user created")
       await admin.init()
-      await auth.login({
-        username: formData?.email.trim(),
-        password: formData?.password,
-      })
+      await auth.login(formData?.email.trim(), formData?.password)
       $goto("../portal")
     } catch (error) {
       submitted = false
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
index 687678c08a..2260892913 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/BuilderSidePanel.svelte
@@ -14,7 +14,7 @@
     Button,
     FancySelect,
   } from "@budibase/bbui"
-  import { builderStore, appStore, roles, appPublished } from "stores/builder"
+  import { builderStore, appStore, roles, appPublished } from "@/stores/builder"
   import {
     groups,
     licensing,
@@ -22,7 +22,7 @@
     users,
     auth,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import {
     fetchData,
     Constants,
@@ -30,11 +30,11 @@
     RoleUtils,
   } from "@budibase/frontend-core"
   import { sdk } from "@budibase/shared-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import GroupIcon from "../../../portal/users/groups/_components/GroupIcon.svelte"
-  import RoleSelect from "components/common/RoleSelect.svelte"
-  import UpgradeModal from "components/common/users/UpgradeModal.svelte"
-  import { emailValidator } from "helpers/validation"
+  import RoleSelect from "@/components/common/RoleSelect.svelte"
+  import UpgradeModal from "@/components/common/users/UpgradeModal.svelte"
+  import { emailValidator } from "@/helpers/validation"
   import { fly } from "svelte/transition"
   import InfoDisplay from "../design/[screenId]/[componentId]/_components/Component/InfoDisplay.svelte"
 
@@ -236,13 +236,13 @@
     }
 
     if (!role) {
-      await groups.actions.removeApp(target._id, prodAppId)
+      await groups.removeApp(target._id, prodAppId)
     } else {
-      await groups.actions.addApp(target._id, prodAppId, role)
+      await groups.addApp(target._id, prodAppId, role)
     }
 
     await usersFetch.refresh()
-    await groups.actions.init()
+    await groups.init()
   }
 
   const onUpdateGroup = async (group, role) => {
@@ -268,7 +268,7 @@
       if (!group.roles) {
         return false
       }
-      return groups.actions.getGroupAppIds(group).includes(appId)
+      return groups.getGroupAppIds(group).includes(appId)
     })
   }
 
@@ -299,7 +299,7 @@
       role: group?.builder?.apps.includes(prodAppId)
         ? Constants.Roles.CREATOR
         : group.roles?.[
-            groups.actions.getGroupAppIds(group).find(x => x === prodAppId)
+            groups.getGroupAppIds(group).find(x => x === prodAppId)
           ],
     }
   }
@@ -368,20 +368,22 @@
     const payload = [
       {
         email: newUserEmail,
-        builder: {
-          global: creationRoleType === Constants.BudibaseRoles.Admin,
-          creator: creationRoleType === Constants.BudibaseRoles.Creator,
+        userInfo: {
+          builder: {
+            global: creationRoleType === Constants.BudibaseRoles.Admin,
+            creator: creationRoleType === Constants.BudibaseRoles.Creator,
+          },
+          admin: { global: creationRoleType === Constants.BudibaseRoles.Admin },
         },
-        admin: { global: creationRoleType === Constants.BudibaseRoles.Admin },
       },
     ]
 
     const notCreatingAdmin = creationRoleType !== Constants.BudibaseRoles.Admin
     const isCreator = creationAccessType === Constants.Roles.CREATOR
     if (notCreatingAdmin && isCreator) {
-      payload[0].builder.apps = [prodAppId]
+      payload[0].userInfo.builder.apps = [prodAppId]
     } else if (notCreatingAdmin && !isCreator) {
-      payload[0].apps = { [prodAppId]: creationAccessType }
+      payload[0].userInfo.apps = { [prodAppId]: creationAccessType }
     }
 
     let userInviteResponse
@@ -440,13 +442,11 @@
 
   const onUpdateUserInvite = async (invite, role) => {
     let updateBody = {
-      code: invite.code,
       apps: {
         ...invite.apps,
         [prodAppId]: role,
       },
     }
-
     if (role === Constants.Roles.CREATOR) {
       updateBody.builder = updateBody.builder || {}
       updateBody.builder.apps = [...(updateBody.builder.apps ?? []), prodAppId]
@@ -454,7 +454,7 @@
     } else if (role !== Constants.Roles.CREATOR && invite?.builder?.apps) {
       invite.builder.apps = []
     }
-    await users.updateInvite(updateBody)
+    await users.updateInvite(invite.code, updateBody)
     await filterInvites(query)
   }
 
@@ -468,8 +468,7 @@
     let updated = { ...invite }
     delete updated.info.apps[prodAppId]
 
-    return await users.updateInvite({
-      code: updated.code,
+    return await users.updateInvite(updated.code, {
       apps: updated.apps,
     })
   }
@@ -483,12 +482,12 @@
   }
 
   const removeGroupAppBuilder = async groupId => {
-    await groups.actions.removeGroupAppBuilder(groupId, prodAppId)
+    await groups.removeGroupAppBuilder(groupId, prodAppId)
   }
 
   const initSidePanel = async sidePaneOpen => {
     if (sidePaneOpen === true) {
-      await groups.actions.init()
+      await groups.init()
     }
     loaded = true
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
index d77744a809..e57ede854b 100644
--- a/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_components/PreviewOverlay.svelte
@@ -6,7 +6,7 @@
     themeStore,
     selectedScreen,
     appStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { ProgressCircle } from "@budibase/bbui"
 
   $: route = $selectedScreen?.routing.route || "/"
diff --git a/packages/builder/src/pages/builder/app/[application]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
index 8e109d3145..27b27e7685 100644
--- a/packages/builder/src/pages/builder/app/[application]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/_layout.svelte
@@ -7,8 +7,8 @@
     previewStore,
     userStore,
     deploymentStore,
-  } from "stores/builder"
-  import { auth, appsStore } from "stores/portal"
+  } from "@/stores/builder"
+  import { auth, appsStore } from "@/stores/portal"
   import {
     Icon,
     Tabs,
@@ -18,21 +18,21 @@
     notifications,
     TooltipPosition,
   } from "@budibase/bbui"
-  import AppActions from "components/deploy/AppActions.svelte"
-  import { API } from "api"
+  import AppActions from "@/components/deploy/AppActions.svelte"
+  import { API } from "@/api"
   import { isActive, url, goto, layout, redirect } from "@roxi/routify"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
   import { onMount, onDestroy } from "svelte"
-  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
-  import CommandPalette from "components/commandPalette/CommandPalette.svelte"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import TourPopover from "components/portal/onboarding/TourPopover.svelte"
+  import VerificationPromptBanner from "@/components/common/VerificationPromptBanner.svelte"
+  import CommandPalette from "@/components/commandPalette/CommandPalette.svelte"
+  import TourWrap from "@/components/portal/onboarding/TourWrap.svelte"
+  import TourPopover from "@/components/portal/onboarding/TourPopover.svelte"
   import BuilderSidePanel from "./_components/BuilderSidePanel.svelte"
   import { UserAvatars } from "@budibase/frontend-core"
-  import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+  import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
   import PreviewOverlay from "./_components/PreviewOverlay.svelte"
-  import EnterpriseBasicTrialModal from "components/portal/onboarding/EnterpriseBasicTrialModal.svelte"
-  import UpdateAppTopNav from "components/common/UpdateAppTopNav.svelte"
+  import EnterpriseBasicTrialModal from "@/components/portal/onboarding/EnterpriseBasicTrialModal.svelte"
+  import UpdateAppTopNav from "@/components/common/UpdateAppTopNav.svelte"
 
   export let application
 
@@ -105,9 +105,6 @@
     if (!hasSynced && application) {
       try {
         await API.syncApp(application)
-        // check if user has beta access
-        // const betaResponse = await API.checkBetaAccess($auth?.user?.email)
-        // betaAccess = betaResponse.access
       } catch (error) {
         notifications.error("Failed to sync with production database")
       }
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
index 9d5f716e0e..f6899c0fa4 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
   import { params } from "@roxi/routify"
 
   if ($params.automation) {
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
index 1a15ed48c6..d2c2cbc94c 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/[automationId]/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import AutomationBuilder from "components/automation/AutomationBuilder/AutomationBuilder.svelte"
+  import AutomationBuilder from "@/components/automation/AutomationBuilder/AutomationBuilder.svelte"
 </script>
 
 <AutomationBuilder />
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
index acc1b8e2d9..f0f7f9be20 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/_layout.svelte
@@ -1,22 +1,21 @@
 <script>
   import { Heading, Body, Layout, Button, Modal } from "@budibase/bbui"
-  import AutomationPanel from "components/automation/AutomationPanel/AutomationPanel.svelte"
-  import CreateAutomationModal from "components/automation/AutomationPanel/CreateAutomationModal.svelte"
-  import CreateWebhookModal from "components/automation/Shared/CreateWebhookModal.svelte"
-  import TestPanel from "components/automation/AutomationBuilder/TestPanel.svelte"
+  import AutomationPanel from "@/components/automation/AutomationPanel/AutomationPanel.svelte"
+  import CreateAutomationModal from "@/components/automation/AutomationPanel/CreateAutomationModal.svelte"
+  import CreateWebhookModal from "@/components/automation/Shared/CreateWebhookModal.svelte"
+  import TestPanel from "@/components/automation/AutomationBuilder/TestPanel.svelte"
   import { onDestroy, onMount } from "svelte"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import {
     builderStore,
     automationStore,
     selectedAutomation,
-  } from "stores/builder"
+  } from "@/stores/builder"
 
   $: automationId = $selectedAutomation?.data?._id
   $: builderStore.selectResource(automationId)
 
-  // Keep URL and state in sync for selected screen ID
   const stopSyncing = syncURLToState({
     urlParam: "automationId",
     stateKey: "selectedAutomationId",
@@ -108,11 +107,9 @@
     justify-content: center;
     align-items: center;
   }
-
   .main {
     width: 300px;
   }
-
   .setup {
     padding-top: 9px;
     border-left: var(--border-light);
diff --git a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
index ffd9b5d34c..3899947631 100644
--- a/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/automation/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
 
   $: {
     if ($automationStore.automations?.length) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
index 3d36b018c7..a5f484caff 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleAuthPrompt.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Layout, Link } from "@budibase/bbui"
-  import { organisation } from "stores/portal"
+  import { organisation } from "@/stores/portal"
   import GoogleButton from "./GoogleButton.svelte"
 
   $: isGoogleConfigured = !!$organisation.googleDatasourceConfigured
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
index 3024fe1395..924d1ee060 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/GoogleButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import GoogleLogo from "assets/google-logo.png"
-  import { auth } from "stores/portal"
-  import { appStore } from "stores/builder"
+  import { auth } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
 
   export let disabled
   export let samePage
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
index e24b95a0fe..ecefe5356b 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/index.svelte
@@ -1,16 +1,16 @@
 <script>
   import { Modal, keepOpen, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { IntegrationTypes } from "constants/backend"
+  import { IntegrationTypes } from "@/constants/backend"
   import GoogleAuthPrompt from "./GoogleAuthPrompt.svelte"
 
   import { get } from "svelte/store"
-  import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
-  import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
-  import { datasources } from "stores/builder"
+  import TableImportSelection from "@/components/backend/Datasources/TableImportSelection/index.svelte"
+  import DatasourceConfigEditor from "@/components/backend/Datasources/ConfigEditor/index.svelte"
+  import { datasources } from "@/stores/builder"
   import { createOnGoogleAuthStore } from "./stores/onGoogleAuth.js"
   import { createDatasourceCreationStore } from "./stores/datasourceCreation.js"
-  import { configFromIntegration } from "stores/selectors"
+  import { configFromIntegration } from "@/stores/selectors"
 
   export let loading = false
   const store = createDatasourceCreationStore()
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
index 9b39f1f658..01c89cfabb 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.js
@@ -1,5 +1,5 @@
 import { get, writable } from "svelte/store"
-import { shouldIntegrationFetchTableNames } from "stores/selectors"
+import { shouldIntegrationFetchTableNames } from "@/stores/selectors"
 
 export const defaultStore = {
   finished: false,
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
index 75a3afc2ff..9552dcbf20 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/datasourceCreation.test.js
@@ -5,14 +5,13 @@ import {
 } from "./datasourceCreation"
 import { get } from "svelte/store"
 
-vi.mock("stores/selectors", () => ({
+vi.mock("@/stores/selectors", () => ({
   shouldIntegrationFetchTableNames: vi.fn(),
 }))
 
 describe("datasource creation store", () => {
   beforeEach(ctx => {
     vi.clearAllMocks()
-    // eslint-disable-next-line no-import-assign
     ctx.store = createDatasourceCreationStore()
 
     ctx.integration = { data: "integration" }
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
index 57dd5ee419..c93425b987 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.js
@@ -1,7 +1,7 @@
 import { derived } from "svelte/store"
 import { params } from "@roxi/routify"
-import { integrations } from "stores/builder"
-import { IntegrationTypes } from "constants/backend"
+import { integrations } from "@/stores/builder"
+import { IntegrationTypes } from "@/constants/backend"
 
 export const createOnGoogleAuthStore = () => {
   return derived([params, integrations], ([$params, $integrations]) => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
index edf133ea0d..3bd0f47bb1 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateExternalDatasourceModal/stores/onGoogleAuth.test.js
@@ -4,14 +4,14 @@ import { writable, get } from "svelte/store"
 // eslint-disable-next-line
 import { params } from "@roxi/routify"
 // eslint-disable-next-line
-import { integrations } from "stores/builder"
-import { IntegrationTypes } from "constants/backend"
+import { integrations } from "@/stores/builder"
+import { IntegrationTypes } from "@/constants/backend"
 
 vi.mock("@roxi/routify", () => ({
   params: vi.fn(),
 }))
 
-vi.mock("stores/builder", () => ({
+vi.mock("@/stores/builder", () => ({
   integrations: vi.fn(),
 }))
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
index a23b960f21..6fee783363 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_components/CreateInternalTableModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Modal, notifications } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
 
   let modal
   let promptUpload = false
diff --git a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
index 869110c2f4..0dc60505c7 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/_layout.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import DatasourceNavigator from "components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
-  import Panel from "components/design/Panel.svelte"
+  import DatasourceNavigator from "@/components/backend/DatasourceNavigator/DatasourceNavigator.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { isActive, redirect, goto, params } from "@roxi/routify"
-  import { datasources } from "stores/builder"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import { datasources } from "@/stores/builder"
+  import NavHeader from "@/components/common/NavHeader.svelte"
 
   let searchValue
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
index c4f0861f45..2bc8a1ba18 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfig.svelte
@@ -1,8 +1,8 @@
 <script>
   import { keepOpen, Modal, notifications } from "@budibase/bbui"
-  import { integrationForDatasource } from "stores/selectors"
-  import { datasources, integrations } from "stores/builder"
-  import DatasourceConfigEditor from "components/backend/Datasources/ConfigEditor/index.svelte"
+  import { integrationForDatasource } from "@/stores/selectors"
+  import { datasources, integrations } from "@/stores/builder"
+  import DatasourceConfigEditor from "@/components/backend/Datasources/ConfigEditor/index.svelte"
   import EditDatasourceConfigButton from "./EditDatasourceConfigButton.svelte"
 
   export let datasource
@@ -13,7 +13,7 @@
 
   async function saveDatasource({ config, name }) {
     try {
-      await datasources.update({
+      await datasources.save({
         integration,
         datasource: { ...datasource, config, name },
       })
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
index 298677ef52..5048cbef6a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/EditDatasourceConfigButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
 
   export let datasource
   const getSubtitle = datasource => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
index 9e7f04fd78..165f732b55 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/PromptQueryModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto as gotoStore, params as paramsStore } from "@roxi/routify"
   import { Modal, ModalContent, Body, Heading } from "@budibase/bbui"
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
 
   const handleOpen = (modal, params) => {
     if (params["?promptQuery"] && modal?.show) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
index a4ba056cc5..9b562182b7 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Authentication/RestAuthenticationModal.svelte
@@ -11,10 +11,10 @@
     notifications,
   } from "@budibase/bbui"
   import { AUTH_TYPE_LABELS, AUTH_TYPES } from "./authTypes"
-  import { BindableCombobox } from "components/common/bindings"
-  import { getAuthBindings, getEnvironmentBindings } from "dataBinding"
-  import { environment, licensing, auth } from "stores/portal"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import { BindableCombobox } from "@/components/common/bindings"
+  import { getAuthBindings, getEnvironmentBindings } from "@/dataBinding"
+  import { environment, licensing, auth } from "@/stores/portal"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
 
   export let configs
   export let currentConfig
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
index 6e7ed89d84..4dd6a90a44 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Headers.svelte
@@ -1,11 +1,11 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import {
     getRestBindings,
     readableToRuntimeBinding,
     runtimeToReadableMap,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "./SaveDatasourceButton.svelte"
   import Panel from "./Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
index 87f90551a4..dd90acf367 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportQueriesModal.svelte
@@ -12,7 +12,7 @@
     TextArea,
     Dropzone,
   } from "@budibase/bbui"
-  import { datasources, queries } from "stores/builder"
+  import { datasources, queries } from "@/stores/builder"
   import { writable } from "svelte/store"
 
   export let navigateDatasource = false
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
index 93f1e87672..b70b55e8d4 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/index.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Button, Table } from "@budibase/bbui"
-  import { queries } from "stores/builder"
-  import CapitaliseRenderer from "components/common/renderers/CapitaliseRenderer.svelte"
+  import { queries } from "@/stores/builder"
+  import CapitaliseRenderer from "@/components/common/renderers/CapitaliseRenderer.svelte"
   import RestImportButton from "./RestImportButton.svelte"
   import Panel from "../Panel.svelte"
   import Tooltip from "../Tooltip.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
index dd35abf001..4ccb353847 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Relationships.svelte
@@ -1,13 +1,13 @@
 <script>
   import { Button, Table, notifications } from "@budibase/bbui"
-  import CreateEditRelationshipModal from "components/backend/Datasources/CreateEditRelationshipModal.svelte"
+  import CreateEditRelationshipModal from "@/components/backend/Datasources/CreateEditRelationshipModal.svelte"
   import {
     tables as tablesStore,
     integrations as integrationsStore,
     datasources as datasourcesStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { DatasourceFeature } from "@budibase/types"
-  import { API } from "api"
+  import { API } from "@/api"
   import Panel from "./Panel.svelte"
   import Tooltip from "./Tooltip.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
index 83a8e13c9e..4bbeba728a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/SaveDatasourceButton.svelte
@@ -1,8 +1,8 @@
 <script>
   import { get } from "svelte/store"
   import { isEqual } from "lodash"
-  import { integrationForDatasource } from "stores/selectors"
-  import { integrations, datasources } from "stores/builder"
+  import { integrationForDatasource } from "@/stores/selectors"
+  import { integrations, datasources } from "@/stores/builder"
   import { notifications, Button } from "@budibase/bbui"
 
   export let datasource
@@ -16,7 +16,7 @@
         get(integrations),
         updatedDatasource
       )
-      await datasources.update({ datasource: updatedDatasource, integration })
+      await datasources.save({ datasource: updatedDatasource, integration })
       notifications.success(
         `Datasource ${updatedDatasource.name} updated successfully`
       )
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
index 894b705a30..1cc25f3799 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Settings.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, Button, Layout, notifications } from "@budibase/bbui"
   import Panel from "./Panel.svelte"
-  import { API } from "api"
+  import { API } from "@/api"
   import { downloadText } from "@budibase/frontend-core"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
index 612ea5fc35..eaf517a30a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/Controls.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Button, Modal } from "@budibase/bbui"
-  import { integrations, tables } from "stores/builder"
+  import { integrations, tables } from "@/stores/builder"
   import CreateExternalTableModal from "./CreateExternalTableModal.svelte"
-  import TableImportSelection from "components/backend/Datasources/TableImportSelection/index.svelte"
-  import { integrationForDatasource } from "stores/selectors"
+  import TableImportSelection from "@/components/backend/Datasources/TableImportSelection/index.svelte"
+  import { integrationForDatasource } from "@/stores/selectors"
 
   export let datasource
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
index b5a8dfc8ac..74295e1d42 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/CreateExternalTableModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { tables, datasources } from "stores/builder"
+  import { tables, datasources } from "@/stores/builder"
   import { goto } from "@roxi/routify"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   export let datasource
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
index 831936fb28..6346c3cba1 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Tables/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "@roxi/routify"
   import { Table } from "@budibase/bbui"
-  import ArrayRenderer from "components/common/renderers/ArrayRenderer.svelte"
+  import ArrayRenderer from "@/components/common/renderers/ArrayRenderer.svelte"
   import Controls from "./Controls.svelte"
   import Panel from "../Panel.svelte"
   import Tooltip from "../Tooltip.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
index 2d37c71999..a19beb9083 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/ViewDynamicVariables.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, Table, BoldRenderer, CodeRenderer } from "@budibase/bbui"
-  import { queries } from "stores/builder"
+  import { queries } from "@/stores/builder"
   import { goto } from "@roxi/routify"
 
   export let datasource
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
index b50d5e7611..0e0dba066a 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Variables/index.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Heading, Layout } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
   import ViewDynamicVariables from "./ViewDynamicVariables.svelte"
-  import { getEnvironmentBindings } from "dataBinding"
-  import { licensing } from "stores/portal"
-  import { queries } from "stores/builder"
+  import { getEnvironmentBindings } from "@/dataBinding"
+  import { licensing } from "@/stores/portal"
+  import { queries } from "@/stores/builder"
   import { cloneDeep } from "lodash/fp"
   import SaveDatasourceButton from "../SaveDatasourceButton.svelte"
   import Panel from "../Panel.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
index 417f750ab5..7f66c7ce53 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_layout.svelte
@@ -1,7 +1,7 @@
 <script>
   import { params } from "@roxi/routify"
-  import { datasources, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { datasources, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
index b723788695..9aa0c5b7e8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Tabs, Tab, Heading, Body, Layout } from "@budibase/bbui"
-  import { datasources, integrations } from "stores/builder"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
+  import { datasources, integrations } from "@/stores/builder"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
   import EditDatasourceConfig from "./_components/EditDatasourceConfig.svelte"
   import TablesPanel from "./_components/panels/Tables/index.svelte"
   import RelationshipsPanel from "./_components/panels/Relationships.svelte"
@@ -12,8 +12,8 @@
   import PromptQueryModal from "./_components/PromptQueryModal.svelte"
   import SettingsPanel from "./_components/panels/Settings.svelte"
   import { helpers } from "@budibase/shared-core"
-  import { admin } from "stores/portal"
-  import { IntegrationTypes } from "constants/backend"
+  import { admin } from "@/stores/portal"
+  import { IntegrationTypes } from "@/constants/backend"
 
   let selectedPanel = null
   let panelOptions = []
@@ -117,7 +117,4 @@
     align-items: center;
     margin-bottom: 12px;
   }
-
-  .tabs {
-  }
 </style>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
index 57b851bb25..c37ca6d606 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/bb_internal/index.svelte
@@ -1,12 +1,15 @@
 <script>
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
-  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources, builderStore } from "stores/builder"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  import { tables, datasources, builderStore } from "@/stores/builder"
   import { goto } from "@roxi/routify"
   import { onMount } from "svelte"
-  import { BUDIBASE_INTERNAL_DB_ID, DB_TYPE_EXTERNAL } from "constants/backend"
-  import { TableNames } from "constants"
+  import {
+    BUDIBASE_INTERNAL_DB_ID,
+    DB_TYPE_EXTERNAL,
+  } from "@/constants/backend"
+  import { TableNames } from "@/constants"
 
   let modal
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
index 789d6c5443..96a0201238 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/datasource_internal_bb_default/index.svelte
@@ -1,10 +1,13 @@
 <script>
   import { Button, Heading, Body, Layout, Modal, Divider } from "@budibase/bbui"
-  import CreateTableModal from "components/backend/TableNavigator/modals/CreateTableModal.svelte"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { tables, datasources, builderStore } from "stores/builder"
+  import CreateTableModal from "@/components/backend/TableNavigator/modals/CreateTableModal.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  import { tables, datasources, builderStore } from "@/stores/builder"
   import { goto } from "@roxi/routify"
-  import { DEFAULT_BB_DATASOURCE_ID, DB_TYPE_EXTERNAL } from "constants/backend"
+  import {
+    DEFAULT_BB_DATASOURCE_ID,
+    DB_TYPE_EXTERNAL,
+  } from "@/constants/backend"
   import { onMount } from "svelte"
 
   let modal
diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
index c77ff0dce9..5daf3c3e6e 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { datasources } from "stores/builder"
+  import { datasources } from "@/stores/builder"
   import { redirect } from "@roxi/routify"
   import { onMount } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
index ff9a27a14b..2f40adc162 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { TableNames } from "constants"
-  import { datasources } from "stores/builder"
+  import { TableNames } from "@/constants"
+  import { datasources } from "@/stores/builder"
 
   $: {
     if ($datasources.hasData) {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/new.svelte b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
index 20efd3667b..2ba23686ab 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/new.svelte
@@ -1,20 +1,20 @@
 <script>
-  import { API } from "api"
+  import { API } from "@/api"
   import {
     tables,
     datasources,
     sortedIntegrations as integrations,
-  } from "stores/builder"
+  } from "@/stores/builder"
 
-  import { hasData } from "stores/selectors"
+  import { hasData } from "@/stores/selectors"
   import { notifications, Body, Icon, AbsTooltip } from "@budibase/bbui"
   import { params, goto } from "@roxi/routify"
   import CreateExternalDatasourceModal from "./_components/CreateExternalDatasourceModal/index.svelte"
   import CreateInternalTableModal from "./_components/CreateInternalTableModal.svelte"
   import DatasourceOption from "./_components/DatasourceOption.svelte"
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
-  import CreationPage from "components/common/CreationPage.svelte"
-  import ICONS from "components/backend/DatasourceNavigator/icons/index.js"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  import CreationPage from "@/components/common/CreationPage.svelte"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons/index.js"
 
   let internalTableModal
   let externalDatasourceModal
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
index 580c0d557a..8f7218dfe9 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { queries, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { queries, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
index 754bf9c83d..7d67c8cb73 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/[queryId]/index.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { queries, datasources } from "stores/builder"
-  import QueryViewer from "components/integration/QueryViewer.svelte"
-  import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
-  import { IntegrationTypes } from "constants/backend"
+  import { queries, datasources } from "@/stores/builder"
+  import QueryViewer from "@/components/integration/QueryViewer.svelte"
+  import RestQueryViewer from "@/components/integration/RestQueryViewer.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
   import { cloneDeep } from "lodash/fp"
 
   $: query = $queries.selected
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
index 277970defa..cd961e15e5 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from "svelte"
-  import { queries } from "stores/builder"
+  import { queries } from "@/stores/builder"
   import { redirect } from "@roxi/routify"
 
   onMount(async () => {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
index 7d27b05d67..e3690f21ae 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/query/new/[datasourceId]/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import QueryViewer from "components/integration/QueryViewer.svelte"
-  import RestQueryViewer from "components/integration/RestQueryViewer.svelte"
-  import { IntegrationTypes } from "constants/backend"
-  import { datasources } from "stores/builder"
+  import QueryViewer from "@/components/integration/QueryViewer.svelte"
+  import RestQueryViewer from "@/components/integration/RestQueryViewer.svelte"
+  import { IntegrationTypes } from "@/constants/backend"
+  import { datasources } from "@/stores/builder"
 
   $: datasource = $datasources.list.find(ds => ds._id === $params.datasourceId)
   $: {
diff --git a/packages/builder/src/pages/builder/app/[application]/data/roles.svelte b/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
index 0177577730..1edbdfb75c 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/roles.svelte
@@ -1,6 +1,6 @@
 <script>
-  import RoleEditor from "components/backend/RoleEditor/RoleEditor.svelte"
-  import { builderStore } from "stores/builder"
+  import RoleEditor from "@/components/backend/RoleEditor/RoleEditor.svelte"
+  import { builderStore } from "@/stores/builder"
 
   builderStore.selectResource("roles")
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
index 9c1baa723e..4a12047c37 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { viewsV2, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { viewsV2, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
index 39b1dc4768..4d42c0d5d6 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/[viewId]/index.svelte
@@ -1,19 +1,19 @@
 <script>
-  import { viewsV2, rowActions } from "stores/builder"
-  import { admin, themeStore, featureFlags } from "stores/portal"
+  import { viewsV2, rowActions } from "@/stores/builder"
+  import { admin, themeStore, licensing } from "@/stores/portal"
   import { Grid } from "@budibase/frontend-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import { notifications } from "@budibase/bbui"
-  import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
-  import GridFilterButton from "components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
-  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
-  import GridSortButton from "components/backend/DataTable/buttons/grid/GridSortButton.svelte"
-  import GridColumnsSettingButton from "components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte"
-  import GridSizeButton from "components/backend/DataTable/buttons/grid/GridSizeButton.svelte"
-  import GridGenerateButton from "components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
-  import GridScreensButton from "components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
-  import GridRowActionsButton from "components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
-  import GridViewCalculationButton from "components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte"
+  import GridCreateEditRowModal from "@/components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
+  import GridFilterButton from "@/components/backend/DataTable/buttons/grid/GridFilterButton.svelte"
+  import GridManageAccessButton from "@/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import GridSortButton from "@/components/backend/DataTable/buttons/grid/GridSortButton.svelte"
+  import GridColumnsSettingButton from "@/components/backend/DataTable/buttons/grid/GridColumnsSettingButton.svelte"
+  import GridSizeButton from "@/components/backend/DataTable/buttons/grid/GridSizeButton.svelte"
+  import GridGenerateButton from "@/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
+  import GridScreensButton from "@/components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
+  import GridRowActionsButton from "@/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
+  import GridViewCalculationButton from "@/components/backend/DataTable/buttons/grid/GridViewCalculationButton.svelte"
   import { ViewV2Type } from "@budibase/types"
 
   let generateButton
@@ -53,7 +53,7 @@
   {buttons}
   allowAddRows
   allowDeleteRows
-  aiEnabled={$featureFlags.BUDIBASE_AI || $featureFlags.AI_CUSTOM_CONFIGS}
+  aiEnabled={$licensing.customAIConfigsEnabled || $licensing.budibaseAiEnabled}
   showAvatars={false}
   on:updatedatasource={handleGridViewUpdate}
   isCloud={$admin.cloud}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
index ecc85e7622..06d6359f11 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/CreateViewButton.svelte
@@ -1,8 +1,8 @@
 <script>
-  import DetailPopover from "components/common/DetailPopover.svelte"
+  import DetailPopover from "@/components/common/DetailPopover.svelte"
   import { Input, notifications, Button, Icon, ListItem } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { viewsV2 } from "stores/builder"
+  import { viewsV2 } from "@/stores/builder"
   import { ViewV2Type } from "@budibase/types"
 
   export let table
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
index 0b5f18b70b..5a23c976f8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/DeleteViewModal.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { views, viewsV2 } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import { views, viewsV2 } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { notifications } from "@budibase/bbui"
 
   export let view
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
index 0f39fa063d..165dd2fdca 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/EditViewModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { views, viewsV2 } from "stores/builder"
+  import { views, viewsV2 } from "@/stores/builder"
   import { cloneDeep } from "lodash/fp"
   import { notifications, Input, Modal, ModalContent } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
index bf3d073f60..e9c5745cc6 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_components/ViewNavBar.svelte
@@ -5,18 +5,18 @@
     userSelectedResourceMap,
     contextMenuStore,
     appStore,
-  } from "stores/builder"
-  import IntegrationIcon from "components/backend/DatasourceNavigator/IntegrationIcon.svelte"
+  } from "@/stores/builder"
+  import IntegrationIcon from "@/components/backend/DatasourceNavigator/IntegrationIcon.svelte"
   import { Icon, ActionButton, ActionMenu, MenuItem } from "@budibase/bbui"
   import { params, url } from "@roxi/routify"
   import EditViewModal from "./EditViewModal.svelte"
   import DeleteViewModal from "./DeleteViewModal.svelte"
-  import EditTableModal from "components/backend/TableNavigator/TableNavItem/EditModal.svelte"
-  import DeleteTableModal from "components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte"
+  import EditTableModal from "@/components/backend/TableNavigator/TableNavItem/EditModal.svelte"
+  import DeleteTableModal from "@/components/backend/TableNavigator/TableNavItem/DeleteConfirmationModal.svelte"
   import { UserAvatars } from "@budibase/frontend-core"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
-  import { TableNames } from "constants"
-  import { alphabetical } from "components/backend/TableNavigator/utils"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
+  import { TableNames } from "@/constants"
+  import { alphabetical } from "@/components/backend/TableNavigator/utils"
   import { tick, onDestroy } from "svelte"
   import { derived } from "svelte/store"
   import CreateViewButton from "./CreateViewButton.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
index da05196c04..58fcf7c9c3 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { syncURLToState } from "helpers/urlStateSync"
-  import { tables, builderStore } from "stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
+  import { tables, builderStore } from "@/stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
   import ViewNavBar from "./_components/ViewNavBar.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
index 5684e77e31..59359817d8 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/index.svelte
@@ -7,25 +7,25 @@
     appStore,
     rowActions,
     roles,
-  } from "stores/builder"
-  import { themeStore, admin, featureFlags } from "stores/portal"
-  import { TableNames } from "constants"
+  } from "@/stores/builder"
+  import { themeStore, admin, licensing } from "@/stores/portal"
+  import { TableNames } from "@/constants"
   import { Grid } from "@budibase/frontend-core"
-  import { API } from "api"
-  import GridAddColumnModal from "components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
-  import GridCreateEditRowModal from "components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
-  import GridEditUserModal from "components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
-  import GridImportButton from "components/backend/DataTable/buttons/grid/GridImportButton.svelte"
-  import GridExportButton from "components/backend/DataTable/buttons/grid/GridExportButton.svelte"
-  import GridManageAccessButton from "components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
-  import GridRelationshipButton from "components/backend/DataTable/buttons/grid/GridRelationshipButton.svelte"
-  import GridEditColumnModal from "components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
-  import GridUsersTableButton from "components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte"
-  import GridGenerateButton from "components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
-  import GridScreensButton from "components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
-  import GridAutomationsButton from "components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte"
-  import GridRowActionsButton from "components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
-  import { DB_TYPE_EXTERNAL } from "constants/backend"
+  import { API } from "@/api"
+  import GridAddColumnModal from "@/components/backend/DataTable/modals/grid/GridCreateColumnModal.svelte"
+  import GridCreateEditRowModal from "@/components/backend/DataTable/modals/grid/GridCreateEditRowModal.svelte"
+  import GridEditUserModal from "@/components/backend/DataTable/modals/grid/GridEditUserModal.svelte"
+  import GridImportButton from "@/components/backend/DataTable/buttons/grid/GridImportButton.svelte"
+  import GridExportButton from "@/components/backend/DataTable/buttons/grid/GridExportButton.svelte"
+  import GridManageAccessButton from "@/components/backend/DataTable/buttons/grid/GridManageAccessButton.svelte"
+  import GridRelationshipButton from "@/components/backend/DataTable/buttons/grid/GridRelationshipButton.svelte"
+  import GridEditColumnModal from "@/components/backend/DataTable/modals/grid/GridEditColumnModal.svelte"
+  import GridUsersTableButton from "@/components/backend/DataTable/buttons/grid/GridUsersTableButton.svelte"
+  import GridGenerateButton from "@/components/backend/DataTable/buttons/grid/GridGenerateButton.svelte"
+  import GridScreensButton from "@/components/backend/DataTable/buttons/grid/GridScreensButton.svelte"
+  import GridAutomationsButton from "@/components/backend/DataTable/buttons/grid/GridAutomationsButton.svelte"
+  import GridRowActionsButton from "@/components/backend/DataTable/buttons/grid/GridRowActionsButton.svelte"
+  import { DB_TYPE_EXTERNAL } from "@/constants/backend"
 
   let generateButton
 
@@ -130,7 +130,8 @@
     schemaOverrides={isUsersTable ? userSchemaOverrides : null}
     showAvatars={false}
     isCloud={$admin.cloud}
-    aiEnabled={$featureFlags.BUDIBASE_AI || $featureFlags.AI_CUSTOM_CONFIGS}
+    aiEnabled={$licensing.customAIConfigsEnabled ||
+      $licensing.budibaseAIEnabled}
     {buttons}
     buttonsCollapsed
     on:updatedatasource={handleGridTableUpdate}
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
index df3a18c2bb..001b2b1736 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
-  import { views, builderStore } from "stores/builder"
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { views, builderStore } from "@/stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
index 2c822569b7..f56b48af17 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/[tableId]/v1/[viewName]/index.svelte
@@ -1,15 +1,15 @@
 <script>
-  import { views, tables } from "stores/builder"
-  import { API } from "api"
-  import Table from "components/backend/DataTable/Table.svelte"
-  import CalculateButton from "components/backend/DataTable/buttons/CalculateButton.svelte"
-  import GroupByButton from "components/backend/DataTable/buttons/GroupByButton.svelte"
-  import ViewFilterButton from "components/backend/DataTable/buttons/ViewFilterButton.svelte"
-  import ExportButton from "components/backend/DataTable/buttons/ExportButton.svelte"
-  import ManageAccessButton from "components/backend/DataTable/buttons/ManageAccessButton.svelte"
-  import HideAutocolumnButton from "components/backend/DataTable/buttons/HideAutocolumnButton.svelte"
+  import { views, tables } from "@/stores/builder"
+  import { API } from "@/api"
+  import Table from "@/components/backend/DataTable/Table.svelte"
+  import CalculateButton from "@/components/backend/DataTable/buttons/CalculateButton.svelte"
+  import GroupByButton from "@/components/backend/DataTable/buttons/GroupByButton.svelte"
+  import ViewFilterButton from "@/components/backend/DataTable/buttons/ViewFilterButton.svelte"
+  import ExportButton from "@/components/backend/DataTable/buttons/ExportButton.svelte"
+  import ManageAccessButton from "@/components/backend/DataTable/buttons/ManageAccessButton.svelte"
+  import HideAutocolumnButton from "@/components/backend/DataTable/buttons/HideAutocolumnButton.svelte"
   import { notifications } from "@budibase/bbui"
-  import { ROW_EXPORT_FORMATS } from "constants/backend"
+  import { ROW_EXPORT_FORMATS } from "@/constants/backend"
 
   let hideAutocolumns = true
   let data = []
@@ -43,8 +43,7 @@
       return
     }
     try {
-      data = await API.fetchViewData({
-        name,
+      data = await API.fetchViewData(name, {
         calculation,
         field,
         groupBy,
diff --git a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
index 3f21e48672..22b786bd00 100644
--- a/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/table/index.svelte
@@ -1,8 +1,8 @@
 <script>
   import { onMount } from "svelte"
-  import { datasources, tables } from "stores/builder"
+  import { datasources, tables } from "@/stores/builder"
   import { redirect } from "@roxi/routify"
-  import { TableNames } from "constants"
+  import { TableNames } from "@/constants"
 
   onMount(() => {
     if ($tables.selected) {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
index ee72c0fbf5..30f11e6cab 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsPanel.svelte
@@ -1,23 +1,23 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import {
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
   import DesignSection from "./DesignSection.svelte"
   import CustomStylesSection from "./CustomStylesSection.svelte"
   import ConditionalUISection from "./ConditionalUISection.svelte"
-  import { getComponentName } from "helpers/components"
+  import { getComponentName } from "@/helpers/components"
   import {
     getBindableProperties,
     getComponentBindableProperties,
-  } from "dataBinding"
+  } from "@/dataBinding"
   import { ActionButton, notifications } from "@budibase/bbui"
-  import { capitalise } from "helpers"
-  import TourWrap from "components/portal/onboarding/TourWrap.svelte"
-  import { TOUR_STEP_KEYS } from "components/portal/onboarding/tours.js"
+  import { capitalise } from "@/helpers"
+  import TourWrap from "@/components/portal/onboarding/TourWrap.svelte"
+  import { TOUR_STEP_KEYS } from "@/components/portal/onboarding/tours.js"
 
   const {
     BUILDER_FORM_CREATE_STEPS,
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
index d40f28e65a..0b147e867c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ComponentSettingsSection.svelte
@@ -1,12 +1,12 @@
 <script>
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore, builderStore } from "stores/builder"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import ResetFieldsButton from "components/design/settings/controls/ResetFieldsButton.svelte"
-  import EjectBlockButton from "components/design/settings/controls/EjectBlockButton.svelte"
-  import { getComponentForSetting } from "components/design/settings/componentSettings"
+  import { componentStore, builderStore } from "@/stores/builder"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import ResetFieldsButton from "@/components/design/settings/controls/ResetFieldsButton.svelte"
+  import EjectBlockButton from "@/components/design/settings/controls/EjectBlockButton.svelte"
+  import { getComponentForSetting } from "@/components/design/settings/componentSettings"
   import InfoDisplay from "./InfoDisplay.svelte"
-  import analytics, { Events } from "analytics"
+  import analytics, { Events } from "@/analytics"
   import { shouldDisplaySetting } from "@budibase/frontend-core"
   import { getContext, setContext } from "svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
index c7139a81e2..2309737cb8 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUIDrawer.svelte
@@ -11,11 +11,11 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
   import { QueryUtils, Constants } from "@budibase/frontend-core"
-  import { selectedComponent, componentStore } from "stores/builder"
-  import { getComponentForSetting } from "components/design/settings/componentSettings"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import { selectedComponent, componentStore } from "@/stores/builder"
+  import { getComponentForSetting } from "@/components/design/settings/componentSettings"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
 
   export let conditions = []
   export let bindings = []
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
index fc862a19c8..b40a6af3c6 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/ConditionalUISection.svelte
@@ -6,7 +6,7 @@
     Button,
     notifications,
   } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
   import ConditionalUIDrawer from "./ConditionalUIDrawer.svelte"
   import ComponentSettingsSection from "./ComponentSettingsSection.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
index fea5da244f..30e448774b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/CustomStylesSection.svelte
@@ -9,13 +9,13 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { selectedScreen, componentStore } from "stores/builder"
-  import ClientBindingPanel from "components/common/bindings/ClientBindingPanel.svelte"
+  import { selectedScreen, componentStore } from "@/stores/builder"
+  import ClientBindingPanel from "@/components/common/bindings/ClientBindingPanel.svelte"
   import {
     getBindableProperties,
     readableToRuntimeBinding,
     runtimeToReadableBinding,
-  } from "dataBinding"
+  } from "@/dataBinding"
 
   export let componentInstance
   export let componentDefinition
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
index a0a0686412..54940ce29c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/StyleSection.svelte
@@ -1,7 +1,7 @@
 <script>
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
   import { DetailSummary, notifications } from "@budibase/bbui"
-  import { componentStore } from "stores/builder"
+  import { componentStore } from "@/stores/builder"
 
   export let name
   export let properties
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
index 7c65b6e6ec..7f0d4caaa9 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Component/componentStyles.js
@@ -1,5 +1,5 @@
 import { Input, Select } from "@budibase/bbui"
-import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
+import ColorPicker from "@/components/design/settings/controls/ColorPicker.svelte"
 
 export const margin = {
   label: "Margin",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
index 1355561076..2437645c40 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/EditNavItemPopover.svelte
@@ -1,12 +1,12 @@
 <script>
   import { Icon, Popover, RadioGroup } from "@budibase/bbui"
   import { createEventDispatcher, getContext } from "svelte"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
-  import RoleSelect from "components/common/RoleSelect.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
+  import RoleSelect from "@/components/common/RoleSelect.svelte"
   import SubLinksDrawer from "./SubLinksDrawer.svelte"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let anchor
   export let navItem
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
index 3cea3f7367..e14b1e7d12 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItem.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { runtimeToReadableBinding } from "dataBinding"
+  import { runtimeToReadableBinding } from "@/dataBinding"
   import EditNavItemPopover from "./EditNavItemPopover.svelte"
   import { Icon } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
index db55f501f0..95881b1bed 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/NavItemConfiguration.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { navigationStore } from "stores/builder"
-  import DraggableList from "components/design/settings/controls/DraggableList/DraggableList.svelte"
+  import { navigationStore } from "@/stores/builder"
+  import DraggableList from "@/components/design/settings/controls/DraggableList/DraggableList.svelte"
   import NavItem from "./NavItem.svelte"
   import { generate } from "shortid"
-  import { getSequentialName } from "helpers/duplicate"
+  import { getSequentialName } from "@/helpers/duplicate"
   import { Constants } from "@budibase/frontend-core"
 
   export let bindings
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
index b1958e4d3d..56bbbd1dab 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/SubLinksDrawer.svelte
@@ -11,8 +11,8 @@
   import { flip } from "svelte/animate"
   import { dndzone } from "svelte-dnd-action"
   import { generate } from "shortid"
-  import { screenStore } from "stores/builder"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
+  import { screenStore } from "@/stores/builder"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
 
   export let value = []
   export let onChange
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
index 7c8b03caca..cdc0c4056d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Navigation/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import NavItemConfiguration from "./NavItemConfiguration.svelte"
   import { get } from "svelte/store"
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import {
     Toggle,
     DetailSummary,
@@ -15,14 +15,14 @@
     screenStore,
     componentStore,
     navigationStore as nav,
-  } from "stores/builder"
-  import { DefaultAppTheme } from "constants"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import BarButtonList from "components/design/settings/controls/BarButtonList.svelte"
-  import ColorPicker from "components/design/settings/controls/ColorPicker.svelte"
-  import DrawerBindableInput from "components/common/bindings/DrawerBindableInput.svelte"
-  import DrawerBindableCombobox from "components/common/bindings/DrawerBindableCombobox.svelte"
-  import { getBindableProperties } from "dataBinding"
+  } from "@/stores/builder"
+  import { DefaultAppTheme } from "@/constants"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import BarButtonList from "@/components/design/settings/controls/BarButtonList.svelte"
+  import ColorPicker from "@/components/design/settings/controls/ColorPicker.svelte"
+  import DrawerBindableInput from "@/components/common/bindings/DrawerBindableInput.svelte"
+  import DrawerBindableCombobox from "@/components/common/bindings/DrawerBindableCombobox.svelte"
+  import { getBindableProperties } from "@/dataBinding"
 
   const positionOptions = [
     { value: "Top", barIcon: "PaddingTop" },
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
index eb7a839b22..3bd683bec4 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/AppThemeSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { notifications } from "@budibase/bbui"
-  import { themeStore, appStore } from "stores/builder"
+  import { themeStore, appStore } from "@/stores/builder"
   import { ThemeOptions, getThemeClassNames } from "@budibase/shared-core"
 
   const onChangeTheme = async theme => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
index 62fe593602..3a6e7a702c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/GeneralPanel.svelte
@@ -8,13 +8,13 @@
     Select,
     notifications,
   } from "@budibase/bbui"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
-  import RoleSelect from "components/design/settings/controls/RoleSelect.svelte"
-  import { selectedScreen, screenStore } from "stores/builder"
-  import sanitizeUrl from "helpers/sanitizeUrl"
-  import ButtonActionEditor from "components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
-  import { getBindableProperties } from "dataBinding"
-  import BarButtonList from "components/design/settings/controls/BarButtonList.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
+  import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
+  import { selectedScreen, screenStore } from "@/stores/builder"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
+  import ButtonActionEditor from "@/components/design/settings/controls/ButtonActionEditor/ButtonActionEditor.svelte"
+  import { getBindableProperties } from "@/dataBinding"
+  import BarButtonList from "@/components/design/settings/controls/BarButtonList.svelte"
 
   $: bindings = getBindableProperties($selectedScreen, null)
   $: screenSettings = getScreenSettings($selectedScreen)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
index 8b3128f852..af693a872f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/ThemePanel.svelte
@@ -7,11 +7,11 @@
     Icon,
     Body,
   } from "@budibase/bbui"
-  import { themeStore, appStore } from "stores/builder"
-  import { DefaultAppTheme } from "constants"
+  import { themeStore, appStore } from "@/stores/builder"
+  import { DefaultAppTheme } from "@/constants"
   import AppThemeSelect from "./AppThemeSelect.svelte"
   import ButtonRoundnessSelect from "./ButtonRoundnessSelect.svelte"
-  import PropertyControl from "components/design/settings/controls/PropertyControl.svelte"
+  import PropertyControl from "@/components/design/settings/controls/PropertyControl.svelte"
 
   $: customTheme = $themeStore.customTheme || {}
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
index 405b8b0c21..d2fed41655 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_components/Screen/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import GeneralPanel from "./GeneralPanel.svelte"
   import ThemePanel from "./ThemePanel.svelte"
-  import { selectedScreen } from "stores/builder"
-  import Panel from "components/design/Panel.svelte"
-  import { capitalise } from "helpers"
+  import { selectedScreen } from "@/stores/builder"
+  import Panel from "@/components/design/Panel.svelte"
+  import { capitalise } from "@/helpers"
   import { ActionButton, Layout } from "@budibase/bbui"
 
   let activeTab = "general"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
index 15a9c773ef..16fe7d9c2f 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/_layout.svelte
@@ -1,14 +1,14 @@
 <script>
-  import { syncURLToState } from "helpers/urlStateSync"
+  import { syncURLToState } from "@/helpers/urlStateSync"
   import {
     builderStore,
     screenStore,
     selectedScreen,
     componentStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import * as routify from "@roxi/routify"
   import { onDestroy } from "svelte"
-  import { findComponent } from "helpers/components"
+  import { findComponent } from "@/helpers/components"
   import ComponentSettingsPanel from "./_components/Component/ComponentSettingsPanel.svelte"
   import NavigationPanel from "./_components/Navigation/index.svelte"
   import ScreenSettingsPanel from "./_components/Screen/index.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
index 361e07a026..aa0b26f6b7 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/[componentId]/new/_components/NewComponentPanel.svelte
@@ -1,5 +1,5 @@
 <script>
-  import Panel from "components/design/Panel.svelte"
+  import Panel from "@/components/design/Panel.svelte"
   import { goto } from "@roxi/routify"
   import { Layout, Search, Icon, Body, notifications } from "@budibase/bbui"
   import structure from "./componentStructure.json"
@@ -8,10 +8,10 @@
     selectedScreen,
     componentStore,
     selectedComponent,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import { onMount } from "svelte"
   import { fly } from "svelte/transition"
-  import { findComponentPath } from "helpers/components"
+  import { findComponentPath } from "@/helpers/components"
 
   let searchString
   let searchRef
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
index 4617814485..29e2ce03ff 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPanel.svelte
@@ -1,8 +1,8 @@
 <script>
   import DevicePreviewSelect from "./DevicePreviewSelect.svelte"
   import AppPreview from "./AppPreview.svelte"
-  import { screenStore, appStore } from "stores/builder"
-  import UndoRedoControl from "components/common/UndoRedoControl.svelte"
+  import { screenStore, appStore } from "@/stores/builder"
+  import UndoRedoControl from "@/components/common/UndoRedoControl.svelte"
 </script>
 
 <div class="app-panel">
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index 1e8868f03c..3951c0e902 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -11,12 +11,13 @@
     selectedScreen,
     hoverStore,
     componentTreeNodesStore,
+    screenComponentErrors,
     snippets,
-  } from "stores/builder"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  } from "@/stores/builder"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import { Layout, Heading, Body, Icon, notifications } from "@budibase/bbui"
   import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
-  import { findComponent, findComponentPath } from "helpers/components"
+  import { findComponent, findComponentPath } from "@/helpers/components"
   import { isActive, goto } from "@roxi/routify"
   import { ClientAppSkeleton } from "@budibase/frontend-core"
   import { getThemeClassNames, ThemeClassPrefix } from "@budibase/shared-core"
@@ -68,6 +69,7 @@
       port: window.location.port,
     },
     snippets: $snippets,
+    componentErrors: $screenComponentErrors,
   }
 
   // Refresh the preview when required
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
index 6b27d79c15..ca8a08368a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentKeyHandler.svelte
@@ -5,11 +5,11 @@
     componentStore,
     selectedComponent,
     componentTreeNodesStore,
-  } from "stores/builder"
-  import { findComponent, getChildIdsForComponent } from "helpers/components"
+  } from "@/stores/builder"
+  import { findComponent, getChildIdsForComponent } from "@/helpers/components"
   import { goto, isActive } from "@roxi/routify"
   import { notifications } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   let confirmDeleteDialog
   let confirmEjectDialog
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
index 997fac6f10..a6f404d61b 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/ComponentTree.svelte
@@ -1,5 +1,5 @@
 <script>
-  import NavItem from "components/common/NavItem.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
   import { Icon, notifications } from "@budibase/bbui"
   import {
     selectedScreen,
@@ -9,12 +9,12 @@
     hoverStore,
     componentTreeNodesStore,
     contextMenuStore,
-  } from "stores/builder"
+  } from "@/stores/builder"
   import {
     findComponentPath,
     getComponentText,
     getComponentName,
-  } from "helpers/components"
+  } from "@/helpers/components"
   import { get } from "svelte/store"
   import { dndStore } from "./dndStore"
   import getComponentContextMenuItems from "./getComponentContextMenuItems"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
index 4612440a2c..45185d8e2d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/DNDPositionIndicator.svelte
@@ -50,8 +50,6 @@
     border-radius: 4px;
     pointer-events: none;
   }
-  .indicator.above {
-  }
   .indicator.below {
     margin-top: 32px;
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
index 0ab78b387f..2361abce89 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/dndStore.js
@@ -1,6 +1,6 @@
 import { writable, get } from "svelte/store"
-import { findComponentParent, findComponentPath } from "helpers/components"
-import { selectedScreen, componentStore } from "stores/builder"
+import { findComponentParent, findComponentPath } from "@/helpers/components"
+import { selectedScreen, componentStore } from "@/stores/builder"
 
 export const DropPosition = {
   ABOVE: "above",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
index f2dfb73a68..76f42b518e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getComponentContextMenuItems.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 
 const getContextMenuItems = (component, componentCollapsed) => {
   const definition = componentStore.getDefinition(component?._component)
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
index 25f2e908e6..3a514db260 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/getScreenContextMenuItems.js
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { notifications } from "@budibase/bbui"
 
 const getContextMenuItems = (component, showCopy) => {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
index fce8c12800..eb5a57ec9c 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ComponentList/index.svelte
@@ -8,8 +8,8 @@
     userSelectedResourceMap,
     hoverStore,
     contextMenuStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
   import ComponentTree from "./ComponentTree.svelte"
   import { dndStore, DropPosition } from "./dndStore.js"
   import DNDPositionIndicator from "./DNDPositionIndicator.svelte"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
index 9c0df03f12..436571dd2e 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/DevicePreviewSelect.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ActionGroup, ActionButton } from "@budibase/bbui"
-  import { previewStore } from "stores/builder"
+  import { previewStore } from "@/stores/builder"
 </script>
 
 <ActionGroup compact quiet>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
index ab078a3a5b..fa3ad5f6be 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/LeftPanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import ScreenList from "./ScreenList/index.svelte"
   import ComponentList from "./ComponentList/index.svelte"
-  import { getHorizontalResizeActions } from "components/common/resizable"
+  import { getHorizontalResizeActions } from "@/components/common/resizable"
 
   const [resizable, resizableHandle] = getHorizontalResizeActions()
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
index 09e29d806a..807c0208a2 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/RoleIndicator.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Tooltip, StatusLight } from "@budibase/bbui"
-  import { roles } from "stores/builder"
-  import { Roles } from "constants/backend"
+  import { roles } from "@/stores/builder"
+  import { Roles } from "@/constants/backend"
 
   export let roleId
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
index e533145fa1..6377e1ca33 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/ScreenNavItem.svelte
@@ -6,14 +6,14 @@
     userSelectedResourceMap,
     contextMenuStore,
     componentStore,
-  } from "stores/builder"
-  import NavItem from "components/common/NavItem.svelte"
+  } from "@/stores/builder"
+  import NavItem from "@/components/common/NavItem.svelte"
   import RoleIndicator from "./RoleIndicator.svelte"
-  import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
-  import sanitizeUrl from "helpers/sanitizeUrl"
-  import { makeComponentUnique } from "helpers/components"
-  import { capitalise } from "helpers"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ScreenDetailsModal from "@/components/design/ScreenDetailsModal.svelte"
+  import sanitizeUrl from "@/helpers/sanitizeUrl"
+  import { makeComponentUnique } from "@/helpers/components"
+  import { capitalise } from "@/helpers"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
 
   export let screen
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
index 5c9da100e4..a5f00f2c7a 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/ScreenList/index.svelte
@@ -1,10 +1,10 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { sortedScreens } from "stores/builder"
+  import { sortedScreens } from "@/stores/builder"
   import ScreenNavItem from "./ScreenNavItem.svelte"
   import { goto } from "@roxi/routify"
-  import { getVerticalResizeActions } from "components/common/resizable"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import { getVerticalResizeActions } from "@/components/common/resizable"
+  import NavHeader from "@/components/common/NavHeader.svelte"
 
   const [resizable, resizableHandle] = getVerticalResizeActions()
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
index ac87b53db2..c990971c3d 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_layout.svelte
@@ -1,8 +1,8 @@
 <script>
   import AppPanel from "./_components/AppPanel.svelte"
   import * as routify from "@roxi/routify"
-  import { syncURLToState } from "helpers/urlStateSync"
-  import { screenStore, selectedScreen } from "stores/builder"
+  import { syncURLToState } from "@/helpers/urlStateSync"
+  import { screenStore, selectedScreen } from "@/stores/builder"
   import { onDestroy } from "svelte"
   import LeftPanel from "./_components/LeftPanel.svelte"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
index e71dba1280..ed553bd452 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   $redirect(`./${$screenStore.selectedScreenId}-screen`)
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
index 47d7c765d6..edc502bbb4 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/CreateScreenModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import ScreenDetailsModal from "components/design/ScreenDetailsModal.svelte"
+  import ScreenDetailsModal from "@/components/design/ScreenDetailsModal.svelte"
   import DatasourceModal from "./DatasourceModal.svelte"
   import TypeModal from "./TypeModal.svelte"
   import tableTypes from "./tableTypes"
@@ -12,13 +12,13 @@
     builderStore,
     datasources,
     appStore,
-  } from "stores/builder"
-  import { auth } from "stores/portal"
+  } from "@/stores/builder"
+  import { auth } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
-  import * as screenTemplating from "templates/screenTemplating"
-  import { Roles } from "constants/backend"
-  import { AutoScreenTypes } from "constants"
+  import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
+  import * as screenTemplating from "@/templates/screenTemplating"
+  import { Roles } from "@/constants/backend"
+  import { AutoScreenTypes } from "@/constants"
   import { makeTableOption, makeViewOption } from "./utils"
 
   let mode
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
index d32e8e3fc7..4c37d626bd 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/DatasourceModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Body, ModalContent, Layout } from "@budibase/bbui"
-  import { datasources as datasourcesStore } from "stores/builder"
-  import ICONS from "components/backend/DatasourceNavigator/icons"
-  import { IntegrationNames } from "constants"
+  import { datasources as datasourcesStore } from "@/stores/builder"
+  import ICONS from "@/components/backend/DatasourceNavigator/icons"
+  import { IntegrationNames } from "@/constants"
   import { createEventDispatcher } from "svelte"
   import TableOrViewOption from "./TableOrViewOption.svelte"
   import { makeTableOption, makeViewOption } from "./utils"
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
index 3101ce41ea..bbd6fda256 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/index.svelte
@@ -1,11 +1,11 @@
 <script>
   import { Body } from "@budibase/bbui"
-  import CreationPage from "components/common/CreationPage.svelte"
+  import CreationPage from "@/components/common/CreationPage.svelte"
   import blank from "./images/blank.svg"
   import table from "./images/tableInline.svg"
   import form from "./images/formUpdate.svg"
   import CreateScreenModal from "./CreateScreenModal.svelte"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   export let onClose = null
 
diff --git a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
index 1f2461d2cb..212a475462 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
+++ b/packages/builder/src/pages/builder/app/[application]/design/_components/NewScreen/utils.js
@@ -1,4 +1,4 @@
-import * as format from "helpers/data/format"
+import * as format from "@/helpers/data/format"
 
 export const makeViewOption = view => ({
   icon: "Remove",
diff --git a/packages/builder/src/pages/builder/app/[application]/design/index.svelte b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
index b9fca41695..93761fe596 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
 
   $: {
     if ($screenStore.screens.length > 0) {
diff --git a/packages/builder/src/pages/builder/app/[application]/design/new.svelte b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
index a9af09a3a1..5b1772c5bf 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/new.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/new.svelte
@@ -1,6 +1,6 @@
 <script>
   import NewScreen from "./_components/NewScreen/index.svelte"
-  import { screenStore } from "stores/builder"
+  import { screenStore } from "@/stores/builder"
   import { goto } from "@roxi/routify"
 
   $: onClose = getOnClose($screenStore)
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
index 67befddcb9..5691c2556b 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
   import { Page, Layout, AbsTooltip, TooltipPosition } from "@budibase/bbui"
   import { url, isActive } from "@roxi/routify"
-  import DeleteModal from "components/deploy/DeleteModal.svelte"
-  import { isOnlyUser, appStore } from "stores/builder"
+  import DeleteModal from "@/components/deploy/DeleteModal.svelte"
+  import { isOnlyUser, appStore } from "@/stores/builder"
 
   let deleteModal
 </script>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
index 6dc95b0a13..cfe912699f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/_components/HistoryDetailsPanel.svelte
@@ -8,10 +8,10 @@
     Icon,
   } from "@budibase/bbui"
   import StatusRenderer from "./StatusRenderer.svelte"
-  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
-  import TestDisplay from "components/automation/AutomationBuilder/TestDisplay.svelte"
+  import DateTimeRenderer from "@/components/common/renderers/DateTimeRenderer.svelte"
+  import TestDisplay from "@/components/automation/AutomationBuilder/TestDisplay.svelte"
   import { goto } from "@roxi/routify"
-  import { automationStore } from "stores/builder"
+  import { automationStore } from "@/stores/builder"
 
   export let history
   export let appId
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
index dd332c92a9..71faa5762f 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/automations/index.svelte
@@ -11,14 +11,14 @@
     Toggle,
     notifications,
   } from "@budibase/bbui"
-  import DateTimeRenderer from "components/common/renderers/DateTimeRenderer.svelte"
+  import DateTimeRenderer from "@/components/common/renderers/DateTimeRenderer.svelte"
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import HistoryDetailsPanel from "./_components/HistoryDetailsPanel.svelte"
-  import { automationStore, appStore } from "stores/builder"
-  import { createPaginationStore } from "helpers/pagination"
+  import { automationStore, appStore } from "@/stores/builder"
+  import { createPaginationStore } from "@/helpers/pagination"
   import { getContext, onDestroy, onMount } from "svelte"
   import dayjs from "dayjs"
-  import { auth, licensing, admin, appsStore } from "stores/portal"
+  import { auth, licensing, admin, appsStore } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
   import Portal from "svelte-portal"
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
index 3e88fb5541..93d6f0ae81 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/ActionsRenderer.svelte
@@ -9,11 +9,11 @@
     AbsTooltip,
     TooltipPosition,
   } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
   import CreateRestoreModal from "./CreateRestoreModal.svelte"
   import { createEventDispatcher } from "svelte"
-  import { isOnlyUser } from "stores/builder"
-  import { BackupType } from "constants/backend/backups"
+  import { isOnlyUser } from "@/stores/builder"
+  import { BackupType } from "@/constants/backend/backups"
 
   export let row
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
index 62ef3e239d..09528be113 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/CreateRestoreModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Input, Body } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   export let confirm
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
index 9fd15c22df..23a1f6411e 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/_components/TypeRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { BackupTrigger } from "constants/backend/backups"
+  import { BackupTrigger } from "@/constants/backend/backups"
 
   export let row
 
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
index e8a67b2ae1..0e01cdcbff 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/backups/index.svelte
@@ -12,9 +12,9 @@
     Tag,
     Table,
   } from "@budibase/bbui"
-  import { backups, licensing, auth, admin } from "stores/portal"
-  import { appStore } from "stores/builder"
-  import { createPaginationStore } from "helpers/pagination"
+  import { backups, licensing, auth, admin } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
+  import { createPaginationStore } from "@/helpers/pagination"
   import TimeAgoRenderer from "./_components/TimeAgoRenderer.svelte"
   import AppSizeRenderer from "./_components/AppSizeRenderer.svelte"
   import ActionsRenderer from "./_components/ActionsRenderer.svelte"
@@ -22,9 +22,9 @@
   import StatusRenderer from "./_components/StatusRenderer.svelte"
   import TypeRenderer from "./_components/TypeRenderer.svelte"
   import BackupsDefault from "assets/backups-default.png"
-  import { BackupTrigger, BackupType } from "constants/backend/backups"
+  import { BackupTrigger, BackupType } from "@/constants/backend/backups"
   import { onMount } from "svelte"
-  import DateRangePicker from "components/common/DateRangePicker.svelte"
+  import DateRangePicker from "@/components/common/DateRangePicker.svelte"
 
   let loading = true
   let backupData = null
@@ -99,21 +99,18 @@
   }
 
   async function fetchBackups(filters, page, dateRange = []) {
-    const body = {
-      appId: $appStore.appId,
+    const opts = {
       ...filters,
       page,
     }
-
     const [startDate, endDate] = dateRange
     if (startDate) {
-      body.startDate = startDate
+      opts.startDate = startDate
     }
     if (endDate) {
-      body.endDate = endDate
+      opts.endDate = endDate
     }
-
-    const response = await backups.searchBackups(body)
+    const response = await backups.searchBackups($appStore.appId, opts)
     pageInfo.fetched(response.hasNextPage, response.nextPage)
 
     // flatten so we have an easier structure to use for the table schema
@@ -123,9 +120,7 @@
   async function createManualBackup() {
     try {
       loading = true
-      let response = await backups.createManualBackup({
-        appId: $appStore.appId,
-      })
+      let response = await backups.createManualBackup($appStore.appId)
       await fetchBackups(filterOpt, page)
       notifications.success(response.message)
     } catch (err) {
@@ -149,24 +144,14 @@
 
   async function handleButtonClick({ detail }) {
     if (detail.type === "backupDelete") {
-      await backups.deleteBackup({
-        appId: $appStore.appId,
-        backupId: detail.backupId,
-      })
+      await backups.deleteBackup($appStore.appId, detail.backupId)
       await fetchBackups(filterOpt, page)
     } else if (detail.type === "backupRestore") {
-      await backups.restoreBackup({
-        appId: $appStore.appId,
-        backupId: detail.backupId,
-        name: detail.restoreBackupName,
-      })
-      await fetchBackups(filterOpt, page)
-    } else if (detail.type === "backupUpdate") {
-      await backups.updateBackup({
-        appId: $appStore.appId,
-        backupId: detail.backupId,
-        name: detail.name,
-      })
+      await backups.restoreBackup(
+        $appStore.appId,
+        detail.backupId,
+        detail.restoreBackupName
+      )
       await fetchBackups(filterOpt, page)
     }
   }
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
index 5f82447e36..5b820f8ada 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/embed.svelte
@@ -9,9 +9,9 @@
     Icon,
     notifications,
   } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appsStore } from "stores/portal"
-  import { appStore } from "stores/builder"
+  import { AppStatus } from "@/constants"
+  import { appsStore } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
 
   $: filteredApps = $appsStore.apps.filter(app => app.devId == $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
index 417b5e4872..9b27a7dc03 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/exportImport.svelte
@@ -7,11 +7,11 @@
     ActionButton,
     Modal,
   } from "@budibase/bbui"
-  import { AppStatus } from "constants"
-  import { appsStore } from "stores/portal"
-  import { appStore } from "stores/builder"
-  import ExportAppModal from "components/start/ExportAppModal.svelte"
-  import ImportAppModal from "components/start/ImportAppModal.svelte"
+  import { AppStatus } from "@/constants"
+  import { appsStore } from "@/stores/portal"
+  import { appStore } from "@/stores/builder"
+  import ExportAppModal from "@/components/start/ExportAppModal.svelte"
+  import ImportAppModal from "@/components/start/ImportAppModal.svelte"
 
   $: filteredApps = $appsStore.apps.filter(app => app.devId === $appStore.appId)
   $: app = filteredApps.length ? filteredApps[0] : {}
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
index e91b8ac3a8..846dacc002 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/name-and-url.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Layout, Divider, Heading, Body } from "@budibase/bbui"
-  import UpdateAppForm from "components/common/UpdateAppForm.svelte"
+  import UpdateAppForm from "@/components/common/UpdateAppForm.svelte"
 </script>
 
 <Layout noPadding>
diff --git a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
index bd592fa308..6a780555a9 100644
--- a/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/settings/version.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Layout, Heading, Body, Divider, Button } from "@budibase/bbui"
-  import { isOnlyUser, appStore } from "stores/builder"
-  import VersionModal from "components/deploy/VersionModal.svelte"
+  import { isOnlyUser, appStore } from "@/stores/builder"
+  import VersionModal from "@/components/deploy/VersionModal.svelte"
 
   let versionModal
 
diff --git a/packages/builder/src/pages/builder/app/_layout.svelte b/packages/builder/src/pages/builder/app/_layout.svelte
index 17f70bf815..0b81999dfa 100644
--- a/packages/builder/src/pages/builder/app/_layout.svelte
+++ b/packages/builder/src/pages/builder/app/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 </script>
 
 {#if $auth.user}
diff --git a/packages/builder/src/pages/builder/app/updating/[application].svelte b/packages/builder/src/pages/builder/app/updating/[application].svelte
index 1f92861edf..34468e3c71 100644
--- a/packages/builder/src/pages/builder/app/updating/[application].svelte
+++ b/packages/builder/src/pages/builder/app/updating/[application].svelte
@@ -2,7 +2,7 @@
   import { Updating } from "@budibase/frontend-core"
   import { redirect, params } from "@roxi/routify"
 
-  import { API } from "api"
+  import { API } from "@/api"
 
   async function isMigrationDone() {
     const response = await API.getMigrationStatus()
diff --git a/packages/builder/src/pages/builder/apps/_layout.svelte b/packages/builder/src/pages/builder/apps/_layout.svelte
index 17f70bf815..0b81999dfa 100644
--- a/packages/builder/src/pages/builder/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/apps/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 </script>
 
 {#if $auth.user}
diff --git a/packages/builder/src/pages/builder/apps/index.svelte b/packages/builder/src/pages/builder/apps/index.svelte
index 095bf2023b..eaf0f108d8 100644
--- a/packages/builder/src/pages/builder/apps/index.svelte
+++ b/packages/builder/src/pages/builder/apps/index.svelte
@@ -15,16 +15,17 @@
   import {
     appsStore,
     organisation,
+    admin,
     auth,
     groups,
     licensing,
     enrichedApps,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import { AppStatus } from "constants"
-  import { gradient } from "actions"
-  import ProfileModal from "components/settings/ProfileModal.svelte"
-  import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
+  import { AppStatus } from "@/constants"
+  import { gradient } from "@/actions"
+  import ProfileModal from "@/components/settings/ProfileModal.svelte"
+  import ChangePasswordModal from "@/components/settings/ChangePasswordModal.svelte"
   import { processStringSync } from "@budibase/string-templates"
   import Spaceman from "assets/bb-space-man.svg"
   import Logo from "assets/bb-emblem.svg"
@@ -42,6 +43,7 @@
     app => app.status === AppStatus.DEPLOYED
   )
   $: userApps = getUserApps(publishedApps, userGroups, $auth.user)
+  $: isOwner = $auth.accountPortalAccess && $admin.cloud
 
   function getUserApps(publishedApps, userGroups, user) {
     if (sdk.users.isAdmin(user)) {
@@ -53,7 +55,7 @@
       }
       if (!Object.keys(user?.roles).length && user?.userGroups) {
         return userGroups.find(group => {
-          return groups.actions
+          return groups
             .getGroupAppIds(group)
             .map(role => appsStore.extractAppId(role))
             .includes(app.appId)
@@ -86,7 +88,7 @@
     try {
       await organisation.init()
       await appsStore.load()
-      await groups.actions.init()
+      await groups.init()
     } catch (error) {
       notifications.error("Error loading apps")
     }
@@ -111,7 +113,13 @@
               </MenuItem>
               <MenuItem
                 icon="LockClosed"
-                on:click={() => changePasswordModal.show()}
+                on:click={() => {
+                  if (isOwner) {
+                    window.location.href = `${$admin.accountPortalUrl}/portal/account`
+                  } else {
+                    changePasswordModal.show()
+                  }
+                }}
               >
                 Update password
               </MenuItem>
@@ -136,7 +144,7 @@
             </Body>
           </Layout>
           <Divider />
-          {#if $licensing.usageMetrics?.dayPasses >= 100 || $licensing.errUserLimit}
+          {#if $licensing.errUserLimit}
             <div>
               <Layout gap="S" justifyItems="center">
                 <img class="spaceman" alt="spaceman" src={Spaceman} />
diff --git a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
index 812f744087..c27f08a8c3 100644
--- a/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/GoogleButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { FancyButton } from "@budibase/bbui"
   import GoogleLogo from "assets/google-logo.png"
-  import { auth, organisation } from "stores/portal"
+  import { auth, organisation } from "@/stores/portal"
 
   export let samePage
   let show
diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
index f5dcbe7466..52ab905651 100644
--- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
@@ -6,7 +6,7 @@
   import OktaLogo from "assets/okta-logo.png"
   import OneLoginLogo from "assets/onelogin-logo.png"
 
-  import { oidc, organisation, auth } from "stores/portal"
+  import { oidc, organisation, auth } from "@/stores/portal"
   import { onMount } from "svelte"
 
   export let samePage
diff --git a/packages/builder/src/pages/builder/auth/_layout.svelte b/packages/builder/src/pages/builder/auth/_layout.svelte
index 1a40847aa0..1978d0c985 100644
--- a/packages/builder/src/pages/builder/auth/_layout.svelte
+++ b/packages/builder/src/pages/builder/auth/_layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { CookieUtils } from "@budibase/frontend-core"
 
diff --git a/packages/builder/src/pages/builder/auth/forgot.svelte b/packages/builder/src/pages/builder/auth/forgot.svelte
index 3ec0416c73..c775bf33fb 100644
--- a/packages/builder/src/pages/builder/auth/forgot.svelte
+++ b/packages/builder/src/pages/builder/auth/forgot.svelte
@@ -9,7 +9,7 @@
     FancyForm,
     FancyInput,
   } from "@budibase/bbui"
-  import { organisation, auth } from "stores/portal"
+  import { organisation, auth } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
diff --git a/packages/builder/src/pages/builder/auth/index.svelte b/packages/builder/src/pages/builder/auth/index.svelte
index 72b3a8c7cf..330ac7462e 100644
--- a/packages/builder/src/pages/builder/auth/index.svelte
+++ b/packages/builder/src/pages/builder/auth/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import { notifications } from "@budibase/bbui"
 
diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte
index 7bb2a3ad49..41e56fa9c2 100644
--- a/packages/builder/src/pages/builder/auth/login.svelte
+++ b/packages/builder/src/pages/builder/auth/login.svelte
@@ -12,7 +12,7 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, organisation, oidc, admin } from "stores/portal"
+  import { auth, organisation, oidc, admin } from "@/stores/portal"
   import GoogleButton from "./_components/GoogleButton.svelte"
   import OIDCButton from "./_components/OIDCButton.svelte"
   import { handleError } from "./_components/utils"
@@ -35,10 +35,7 @@
       return
     }
     try {
-      await auth.login({
-        username: formData?.username.trim(),
-        password: formData?.password,
-      })
+      await auth.login(formData?.username.trim(), formData?.password)
       if ($auth?.user?.forceResetPassword) {
         $goto("./reset")
       } else {
diff --git a/packages/builder/src/pages/builder/auth/org.svelte b/packages/builder/src/pages/builder/auth/org.svelte
index 8fd94463d9..ee5a5e606c 100644
--- a/packages/builder/src/pages/builder/auth/org.svelte
+++ b/packages/builder/src/pages/builder/auth/org.svelte
@@ -9,7 +9,7 @@
     notifications,
   } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { get } from "svelte/store"
   import { onMount } from "svelte"
diff --git a/packages/builder/src/pages/builder/auth/reset.svelte b/packages/builder/src/pages/builder/auth/reset.svelte
index e1464aba77..64438c22d5 100644
--- a/packages/builder/src/pages/builder/auth/reset.svelte
+++ b/packages/builder/src/pages/builder/auth/reset.svelte
@@ -8,7 +8,7 @@
     notifications,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { auth, organisation } from "stores/portal"
+  import { auth, organisation } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { onMount } from "svelte"
@@ -30,10 +30,16 @@
     try {
       loading = true
       if (forceResetPassword) {
+        const email = $auth.user.email
+        const tenantId = $auth.user.tenantId
         await auth.updateSelf({
           password,
           forceResetPassword: false,
         })
+        if (!$auth.user) {
+          // Update self will clear the platform user, so need to login
+          await auth.login(email, password, tenantId)
+        }
         $goto("../portal/")
       } else {
         await auth.resetPassword(password, resetCode)
diff --git a/packages/builder/src/pages/builder/index.svelte b/packages/builder/src/pages/builder/index.svelte
index c6d9d3c1c3..da8e49ad9a 100644
--- a/packages/builder/src/pages/builder/index.svelte
+++ b/packages/builder/src/pages/builder/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   auth.checkQueryString()
diff --git a/packages/builder/src/pages/builder/invite/index.svelte b/packages/builder/src/pages/builder/invite/index.svelte
index 597deed7c9..cf0c293254 100644
--- a/packages/builder/src/pages/builder/invite/index.svelte
+++ b/packages/builder/src/pages/builder/invite/index.svelte
@@ -9,7 +9,7 @@
     FancyInput,
   } from "@budibase/bbui"
   import { goto, params } from "@roxi/routify"
-  import { users, organisation, auth, admin } from "stores/portal"
+  import { users, organisation, auth, admin } from "@/stores/portal"
   import Logo from "assets/bb-emblem.svg"
   import { TestimonialPage } from "@budibase/frontend-core/src/components"
   import { onMount } from "svelte"
@@ -66,10 +66,7 @@
 
   async function login() {
     try {
-      await auth.login({
-        username: formData.email.trim(),
-        password: formData.password.trim(),
-      })
+      await auth.login(formData.email.trim(), formData.password.trim())
       notifications.success("Logged in successfully")
       $goto("../portal")
     } catch (err) {
diff --git a/packages/builder/src/pages/builder/maintenance/index.svelte b/packages/builder/src/pages/builder/maintenance/index.svelte
index f7eb16ab81..017b4356ba 100644
--- a/packages/builder/src/pages/builder/maintenance/index.svelte
+++ b/packages/builder/src/pages/builder/maintenance/index.svelte
@@ -1,7 +1,7 @@
 <script>
   import { MaintenanceType } from "@budibase/types"
   import { Heading, Body, Button, Layout } from "@budibase/bbui"
-  import { admin } from "stores/portal"
+  import { admin } from "@/stores/portal"
   import BudibaseLogo from "../portal/_components/BudibaseLogo.svelte"
 
   $: {
diff --git a/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
index 1df724099b..75c0ce7aec 100644
--- a/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/LockedFeature.svelte
@@ -10,7 +10,7 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
 
   export let title
   export let planType
diff --git a/packages/builder/src/pages/builder/portal/_components/Logo.svelte b/packages/builder/src/pages/builder/portal/_components/Logo.svelte
index 0d928d68ca..817d93adfa 100644
--- a/packages/builder/src/pages/builder/portal/_components/Logo.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/Logo.svelte
@@ -1,7 +1,7 @@
 <script>
   import Logo from "assets/bb-emblem.svg"
   import { goto } from "@roxi/routify"
-  import { organisation } from "stores/portal"
+  import { organisation } from "@/stores/portal"
 </script>
 
 <!-- svelte-ignore a11y-no-noninteractive-element-interactions-->
diff --git a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
index 9b4938e0d5..256199f3d7 100644
--- a/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/MobileMenu.svelte
@@ -1,12 +1,12 @@
 <script>
   import { Layout } from "@budibase/bbui"
-  import { SideNav, SideNavItem } from "components/portal/page"
+  import { SideNav, SideNavItem } from "@/components/portal/page"
   import { createEventDispatcher } from "svelte"
   import { isActive } from "@roxi/routify"
   import UpgradeButton from "./UpgradeButton.svelte"
   import { fade } from "svelte/transition"
   import Logo from "./Logo.svelte"
-  import { menu } from "stores/portal"
+  import { menu } from "@/stores/portal"
 
   export let visible = false
 
diff --git a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
index 7131285b55..3c2e65ebf5 100644
--- a/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UpgradeButton.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import { auth, admin, licensing } from "stores/portal"
+  import { auth, admin, licensing } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 </script>
 
diff --git a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
index 9faae70aa9..6e4f69688f 100644
--- a/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
+++ b/packages/builder/src/pages/builder/portal/_components/UserDropdown.svelte
@@ -1,11 +1,11 @@
 <script>
-  import { auth } from "stores/portal"
+  import { admin, auth } from "@/stores/portal"
   import { ActionMenu, MenuItem, Icon, Modal } from "@budibase/bbui"
   import { goto } from "@roxi/routify"
-  import ProfileModal from "components/settings/ProfileModal.svelte"
-  import ChangePasswordModal from "components/settings/ChangePasswordModal.svelte"
-  import ThemeModal from "components/settings/ThemeModal.svelte"
-  import APIKeyModal from "components/settings/APIKeyModal.svelte"
+  import ProfileModal from "@/components/settings/ProfileModal.svelte"
+  import ChangePasswordModal from "@/components/settings/ChangePasswordModal.svelte"
+  import ThemeModal from "@/components/settings/ThemeModal.svelte"
+  import APIKeyModal from "@/components/settings/APIKeyModal.svelte"
   import { UserAvatar } from "@budibase/frontend-core"
 
   let themeModal
@@ -13,6 +13,8 @@
   let updatePasswordModal
   let apiKeyModal
 
+  $: isOwner = $auth.accountPortalAccess && $admin.cloud
+
   const logout = async () => {
     try {
       await auth.logout()
@@ -32,7 +34,16 @@
   </MenuItem>
   <MenuItem icon="Moon" on:click={() => themeModal.show()}>Theme</MenuItem>
   {#if !$auth.isSSO}
-    <MenuItem icon="LockClosed" on:click={() => updatePasswordModal.show()}>
+    <MenuItem
+      icon="LockClosed"
+      on:click={() => {
+        if (isOwner) {
+          window.location.href = `${$admin.accountPortalUrl}/portal/account`
+        } else {
+          updatePasswordModal.show()
+        }
+      }}
+    >
       Update password
     </MenuItem>
   {/if}
diff --git a/packages/builder/src/pages/builder/portal/_layout.svelte b/packages/builder/src/pages/builder/portal/_layout.svelte
index 73152a1cd5..323b231037 100644
--- a/packages/builder/src/pages/builder/portal/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/_layout.svelte
@@ -8,16 +8,16 @@
     appsStore,
     licensing,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
   import UpgradeButton from "./_components/UpgradeButton.svelte"
   import MobileMenu from "./_components/MobileMenu.svelte"
   import Logo from "./_components/Logo.svelte"
   import UserDropdown from "./_components/UserDropdown.svelte"
-  import HelpMenu from "components/common/HelpMenu.svelte"
-  import VerificationPromptBanner from "components/common/VerificationPromptBanner.svelte"
+  import HelpMenu from "@/components/common/HelpMenu.svelte"
+  import VerificationPromptBanner from "@/components/common/VerificationPromptBanner.svelte"
   import { sdk } from "@budibase/shared-core"
-  import EnterpriseBasicTrialBanner from "components/portal/licensing/EnterpriseBasicTrialBanner.svelte"
+  import EnterpriseBasicTrialBanner from "@/components/portal/licensing/EnterpriseBasicTrialBanner.svelte"
   import { Constants } from "@budibase/frontend-core"
 
   let loaded = false
diff --git a/packages/builder/src/pages/builder/portal/account/_layout.svelte b/packages/builder/src/pages/builder/portal/account/_layout.svelte
index 892e853aad..27cc3cbd85 100644
--- a/packages/builder/src/pages/builder/portal/account/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/account/_layout.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto, isActive } from "@roxi/routify"
   import { Page } from "@budibase/bbui"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
-  import { menu } from "stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
+  import { menu } from "@/stores/portal"
 
   $: wide = $isActive("./auditLogs")
   $: pages = $menu.find(x => x.title === "Account")?.subPages || []
diff --git a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
index 41254af970..bc30dab77f 100644
--- a/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/auditLogs/index.svelte
@@ -17,16 +17,16 @@
     Divider,
     ActionButton,
   } from "@budibase/bbui"
-  import { licensing, users, appsStore, auditLogs } from "stores/portal"
+  import { licensing, users, appsStore, auditLogs } from "@/stores/portal"
   import LockedFeature from "../../_components/LockedFeature.svelte"
-  import { createPaginationStore } from "helpers/pagination"
+  import { createPaginationStore } from "@/helpers/pagination"
   import { onMount, setContext } from "svelte"
   import ViewDetailsRenderer from "./_components/ViewDetailsRenderer.svelte"
   import UserRenderer from "./_components/UserRenderer.svelte"
   import TimeRenderer from "./_components/TimeRenderer.svelte"
   import AppColumnRenderer from "./_components/AppColumnRenderer.svelte"
   import { cloneDeep } from "lodash"
-  import DateRangePicker from "components/common/DateRangePicker.svelte"
+  import DateRangePicker from "@/components/common/DateRangePicker.svelte"
   import dayjs from "dayjs"
 
   const schema = {
@@ -152,16 +152,16 @@
       logsPageInfo.loading()
       await auditLogs.search({
         bookmark: logsPage,
-        startDate: dateRange[0],
-        endDate: dateRange[1],
+        startDate: dateRange[0] || undefined,
+        endDate: dateRange[1] || undefined,
         fullSearch: logSearchTerm,
         userIds: selectedUsers,
         appIds: selectedApps,
         events: selectedEvents,
       })
       logsPageInfo.fetched(
-        $auditLogs.logs.hasNextPage,
-        $auditLogs.logs.bookmark
+        $auditLogs.logs?.hasNextPage,
+        $auditLogs.logs?.bookmark
       )
     } catch (error) {
       notifications.error(`Error getting audit logs - ${error}`)
@@ -200,6 +200,8 @@
       return Object.entries(obj).map(([id, label]) => {
         return { id, label }
       })
+    } else {
+      return []
     }
   }
 
@@ -316,7 +318,7 @@
     <Table
       on:click={({ detail }) => viewDetails(detail)}
       {customRenderers}
-      data={$auditLogs.logs.data}
+      data={$auditLogs.logs?.data}
       allowEditColumns={false}
       allowEditRows={false}
       allowSelectRows={false}
diff --git a/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte b/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
index f9634d0b9a..aaf2e783a0 100644
--- a/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
+++ b/packages/builder/src/pages/builder/portal/account/systemLogs/index.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Layout, Heading, Body, Button } from "@budibase/bbui"
   import { downloadStream } from "@budibase/frontend-core"
-  import Spinner from "components/common/Spinner.svelte"
+  import Spinner from "@/components/common/Spinner.svelte"
 
-  import { API } from "api"
+  import { API } from "@/api"
 
   let loading = false
 
diff --git a/packages/builder/src/pages/builder/portal/account/upgrade.svelte b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
index dbdedb6805..3440cd71ea 100644
--- a/packages/builder/src/pages/builder/portal/account/upgrade.svelte
+++ b/packages/builder/src/pages/builder/portal/account/upgrade.svelte
@@ -13,11 +13,11 @@
     CopyInput,
     File,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { processStringSync } from "@budibase/string-templates"
-  import DeleteLicenseKeyModal from "components/portal/licensing/DeleteLicenseKeyModal.svelte"
-  import { API } from "api"
+  import DeleteLicenseKeyModal from "@/components/portal/licensing/DeleteLicenseKeyModal.svelte"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { sdk } from "@budibase/shared-core"
 
@@ -64,7 +64,7 @@
 
   const activateLicenseKey = async () => {
     try {
-      await API.activateLicenseKey({ licenseKey })
+      await API.activateLicenseKey(licenseKey)
       await auth.getSelf()
       await getLicenseKey()
       notifications.success("Successfully activated")
@@ -119,7 +119,7 @@
 
   async function activateOfflineLicense(offlineLicenseToken) {
     try {
-      await API.activateOfflineLicense({ offlineLicenseToken })
+      await API.activateOfflineLicense(offlineLicenseToken)
       await auth.getSelf()
       await getOfflineLicense()
       notifications.success("Successfully activated")
diff --git a/packages/builder/src/pages/builder/portal/account/usage.svelte b/packages/builder/src/pages/builder/portal/account/usage.svelte
index 7a1b1f8e14..d318f04e09 100644
--- a/packages/builder/src/pages/builder/portal/account/usage.svelte
+++ b/packages/builder/src/pages/builder/portal/account/usage.svelte
@@ -10,12 +10,12 @@
     TooltipWrapper,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { admin, auth, licensing } from "stores/portal"
+  import { admin, auth, licensing } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
-  import { DashCard, Usage } from "components/usage"
-  import { PlanModel } from "constants"
+  import { DashCard, Usage } from "@/components/usage"
+  import { PlanModel } from "@/constants"
   import { sdk } from "@budibase/shared-core"
-  import { getFormattedPlanName } from "helpers/planTitle"
+  import { getFormattedPlanName } from "@/helpers/planTitle"
 
   let staticUsage = []
   let monthlyUsage = []
@@ -28,7 +28,7 @@
   const upgradeUrl = `${$admin.accountPortalUrl}/portal/upgrade`
   const manageUrl = `${$admin.accountPortalUrl}/portal/billing`
 
-  const WARN_USAGE = ["Queries", "Automations", "Rows", "Day Passes", "Users"]
+  const WARN_USAGE = ["Queries", "Automations", "Rows", "Users"]
   const oneDayInSeconds = 86400
 
   const EXCLUDE_QUOTAS = {
@@ -36,9 +36,6 @@
     Users: license => {
       return license.plan.model !== PlanModel.PER_USER
     },
-    "Day Passes": license => {
-      return license.plan.model !== PlanModel.DAY_PASS
-    },
   }
 
   function excludeQuota(name) {
diff --git a/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte b/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
index 7d6b4d81a9..04cad5d763 100644
--- a/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/FavouriteAppButton.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon, TooltipPosition, TooltipType } from "@budibase/bbui"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
 
   export let app
   export let size = "S"
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
index 871326eb91..fd8964d5df 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/_layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { params, redirect } from "@roxi/routify"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
 
   $: app = $appsStore.apps.find(app => app.appId === $params.appId)
   $: {
diff --git a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
index cc03ec01dc..feba4dceaf 100644
--- a/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/[appId]/index.svelte
@@ -6,9 +6,9 @@
     auth,
     sideBarCollapsed,
     enrichedApps,
-  } from "stores/portal"
-  import AppContextMenuModals from "components/start/AppContextMenuModals.svelte"
-  import getAppContextMenuItems from "components/start/getAppContextMenuItems.js"
+  } from "@/stores/portal"
+  import AppContextMenuModals from "@/components/start/AppContextMenuModals.svelte"
+  import getAppContextMenuItems from "@/components/start/getAppContextMenuItems.js"
   import FavouriteAppButton from "../FavouriteAppButton.svelte"
   import {
     Link,
@@ -19,10 +19,10 @@
     TooltipType,
   } from "@budibase/bbui"
   import { sdk, getThemeClassNames } from "@budibase/shared-core"
-  import { API } from "api"
+  import { API } from "@/api"
   import ErrorSVG from "./ErrorSVG.svelte"
   import { ClientAppSkeleton } from "@budibase/frontend-core"
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
 
   $: app = $enrichedApps.find(app => app.appId === $params.appId)
   $: iframeUrl = getIframeURL(app)
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte b/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
index 92d04897fe..eb18a8db83 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/AppNavItem.svelte
@@ -1,13 +1,13 @@
 <script>
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { params, goto } from "@roxi/routify"
-  import NavItem from "components/common/NavItem.svelte"
-  import AppContextMenuModals from "components/start/AppContextMenuModals.svelte"
-  import getAppContextMenuItems from "components/start/getAppContextMenuItems.js"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import AppContextMenuModals from "@/components/start/AppContextMenuModals.svelte"
+  import getAppContextMenuItems from "@/components/start/getAppContextMenuItems.js"
   import FavouriteAppButton from "../FavouriteAppButton.svelte"
   import { sdk } from "@budibase/shared-core"
   import { Icon } from "@budibase/bbui"
-  import { contextMenuStore } from "stores/builder"
+  import { contextMenuStore } from "@/stores/builder"
 
   export let app
 
diff --git a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
index 0f72accf9f..a11bb2b45a 100644
--- a/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_components/PortalSideBar.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { sideBarCollapsed, enrichedApps } from "stores/portal"
+  import { sideBarCollapsed, enrichedApps } from "@/stores/portal"
   import { params, goto } from "@roxi/routify"
-  import NavItem from "components/common/NavItem.svelte"
-  import NavHeader from "components/common/NavHeader.svelte"
+  import NavItem from "@/components/common/NavItem.svelte"
+  import NavHeader from "@/components/common/NavHeader.svelte"
   import AppNavItem from "./AppNavItem.svelte"
 
   let searchString
diff --git a/packages/builder/src/pages/builder/portal/apps/_layout.svelte b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
index 00719dc6d5..0a3b02f30f 100644
--- a/packages/builder/src/pages/builder/portal/apps/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/_layout.svelte
@@ -7,7 +7,7 @@
     licensing,
     groups,
     auth,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
@@ -24,7 +24,7 @@
         promises.push(templates.load())
       }
 
-      promises.push(groups.actions.init())
+      promises.push(groups.init())
 
       // Always load latest
       await Promise.all(promises)
diff --git a/packages/builder/src/pages/builder/portal/apps/create.svelte b/packages/builder/src/pages/builder/portal/apps/create.svelte
index 1248c41cf8..1f3a0cb052 100644
--- a/packages/builder/src/pages/builder/portal/apps/create.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/create.svelte
@@ -2,11 +2,11 @@
   import { url } from "@roxi/routify"
   import FirstAppOnboarding from "./onboarding/index.svelte"
   import { Layout, Page, Button, Modal } from "@budibase/bbui"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import TemplateDisplay from "components/common/TemplateDisplay.svelte"
-  import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
-  import { appsStore, templates, licensing } from "stores/portal"
-  import { Breadcrumbs, Breadcrumb, Header } from "components/portal/page"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  import TemplateDisplay from "@/components/common/TemplateDisplay.svelte"
+  import AppLimitModal from "@/components/portal/licensing/AppLimitModal.svelte"
+  import { appsStore, templates, licensing } from "@/stores/portal"
+  import { Breadcrumbs, Breadcrumb, Header } from "@/components/portal/page"
 
   let template
   let creationModal = false
diff --git a/packages/builder/src/pages/builder/portal/apps/index.svelte b/packages/builder/src/pages/builder/portal/apps/index.svelte
index c3fcfd65ff..bcd59cd948 100644
--- a/packages/builder/src/pages/builder/portal/apps/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/index.svelte
@@ -11,13 +11,13 @@
     Body,
     Search,
   } from "@budibase/bbui"
-  import Spinner from "components/common/Spinner.svelte"
-  import CreateAppModal from "components/start/CreateAppModal.svelte"
-  import AppLimitModal from "components/portal/licensing/AppLimitModal.svelte"
-  import AccountLockedModal from "components/portal/licensing/AccountLockedModal.svelte"
+  import Spinner from "@/components/common/Spinner.svelte"
+  import CreateAppModal from "@/components/start/CreateAppModal.svelte"
+  import AppLimitModal from "@/components/portal/licensing/AppLimitModal.svelte"
+  import AccountLockedModal from "@/components/portal/licensing/AccountLockedModal.svelte"
   import { sdk } from "@budibase/shared-core"
-  import { automationStore, initialise } from "stores/builder"
-  import { API } from "api"
+  import { automationStore, initialise } from "@/stores/builder"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import {
     appsStore,
@@ -27,9 +27,9 @@
     environment,
     enrichedApps,
     sortBy,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { goto } from "@roxi/routify"
-  import AppRow from "components/start/AppRow.svelte"
+  import AppRow from "@/components/start/AppRow.svelte"
   import Logo from "assets/bb-space-man.svg"
 
   let template
@@ -139,7 +139,7 @@
       await auth.setInitInfo({})
       $goto(`/builder/app/${createdApp.instance._id}`)
     } catch (error) {
-      notifications.error("Error creating app")
+      notifications.error(`Error creating app - ${error.message}`)
     }
   }
 
@@ -191,8 +191,14 @@
           ? "View errors"
           : "View error"}
         on:dismiss={async () => {
-          await automationStore.actions.clearLogErrors({ appId })
-          await appsStore.load()
+          const automationId = Object.keys(automationErrors[appId] || {})[0]
+          if (automationId) {
+            await automationStore.actions.clearLogErrors({
+              appId,
+              automationId,
+            })
+            await appsStore.load()
+          }
         }}
         message={automationErrorMessage(appId)}
       />
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
index d27d75a90d..cc414b7434 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/NamePanel.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Button, FancyForm, FancyInput } from "@budibase/bbui"
   import PanelHeader from "./PanelHeader.svelte"
-  import { APP_URL_REGEX } from "constants"
+  import { APP_URL_REGEX } from "@/constants"
 
   export let disabled
   export let name = ""
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
index 49b8032726..356f6c412e 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/_components/PanelHeader.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FontAwesomeIcon from "components/common/FontAwesomeIcon.svelte"
+  import FontAwesomeIcon from "@/components/common/FontAwesomeIcon.svelte"
   import { Heading, Body } from "@budibase/bbui"
 
   export let onBack = null
diff --git a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
index 7426dd902e..062a37315f 100644
--- a/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/onboarding/index.svelte
@@ -4,8 +4,8 @@
   import ExampleApp from "./_components/ExampleApp.svelte"
   import { notifications } from "@budibase/bbui"
   import { SplitPage } from "@budibase/frontend-core"
-  import { API } from "api"
-  import { auth, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { auth, admin } from "@/stores/portal"
 
   let name = "My first app"
   let url = "my-first-app"
diff --git a/packages/builder/src/pages/builder/portal/apps/templates.svelte b/packages/builder/src/pages/builder/portal/apps/templates.svelte
index f9d44a34c7..87139da9a9 100644
--- a/packages/builder/src/pages/builder/portal/apps/templates.svelte
+++ b/packages/builder/src/pages/builder/portal/apps/templates.svelte
@@ -1,9 +1,9 @@
 <script>
   import { url } from "@roxi/routify"
   import { Layout, Page } from "@budibase/bbui"
-  import TemplateDisplay from "components/common/TemplateDisplay.svelte"
-  import { templates } from "stores/portal"
-  import { Breadcrumbs, Breadcrumb, Header } from "components/portal/page"
+  import TemplateDisplay from "@/components/common/TemplateDisplay.svelte"
+  import { templates } from "@/stores/portal"
+  import { Breadcrumbs, Breadcrumb, Header } from "@/components/portal/page"
 </script>
 
 <Page>
diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
index fe3b9056e9..ead80f1ded 100644
--- a/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/_components/AddPluginModal.svelte
@@ -8,9 +8,9 @@
     Body,
     notifications,
   } from "@budibase/bbui"
-  import KeyValueBuilder from "components/integration/KeyValueBuilder.svelte"
-  import { plugins } from "stores/portal"
-  import { PluginSource } from "constants"
+  import KeyValueBuilder from "@/components/integration/KeyValueBuilder.svelte"
+  import { plugins } from "@/stores/portal"
+  import { PluginSource } from "@/constants"
 
   function opt(name, optional) {
     if (optional) {
diff --git a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
index 1782b44f2b..b41776dcfe 100644
--- a/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/_components/DeletePluginModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Body, ModalContent, notifications } from "@budibase/bbui"
-  import { plugins } from "stores/portal"
+  import { plugins } from "@/stores/portal"
   import { createEventDispatcher } from "svelte"
 
   export let plugin
diff --git a/packages/builder/src/pages/builder/portal/plugins/index.svelte b/packages/builder/src/pages/builder/portal/plugins/index.svelte
index d8dd4eae11..9da048030f 100644
--- a/packages/builder/src/pages/builder/portal/plugins/index.svelte
+++ b/packages/builder/src/pages/builder/portal/plugins/index.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import {
     Layout,
     Heading,
@@ -12,7 +12,7 @@
     Table,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { plugins, admin } from "stores/portal"
+  import { plugins, admin } from "@/stores/portal"
   import AddPluginModal from "./_components/AddPluginModal.svelte"
   import PluginNameRenderer from "./_components/PluginNameRenderer.svelte"
   import EditPluginRenderer from "./_components/EditPluginRenderer.svelte"
@@ -42,23 +42,25 @@
     { column: "edit", component: EditPluginRenderer },
   ]
 
-  let modal
-  let searchTerm = ""
-  let filter = "all"
+  let modal: any
+  let searchTerm: any = ""
+  let filter: any = "all"
   let filterOptions = [
     { label: "All plugins", value: "all" },
     { label: "Components", value: "component" },
   ]
 
+  const searchPlaceholder: any = "Search"
+
   if (!$admin.cloud) {
     filterOptions.push({ label: "Datasources", value: "datasource" })
   }
 
   $: filteredPlugins = $plugins
-    .filter(plugin => {
+    .filter((plugin: any) => {
       return filter === "all" || plugin.schema.type === filter
     })
-    .filter(plugin => {
+    .filter((plugin: any) => {
       return (
         !searchTerm ||
         plugin?.name?.toLowerCase().includes(searchTerm.toLowerCase())
@@ -85,8 +87,8 @@
           <Button
             on:click={() =>
               window
-                .open("https://github.com/Budibase/plugins", "_blank")
-                .focus()}
+                ?.open("https://github.com/Budibase/plugins", "_blank")
+                ?.focus()}
             secondary
           >
             GitHub repo
@@ -98,12 +100,12 @@
           <div class="select">
             <Select
               bind:value={filter}
-              placeholder={null}
+              placeholder={undefined}
               options={filterOptions}
               autoWidth
             />
           </div>
-          <Search bind:value={searchTerm} placeholder="Search" />
+          <Search bind:value={searchTerm} placeholder={searchPlaceholder} />
         </div>
       {/if}
     </div>
diff --git a/packages/builder/src/pages/builder/portal/settings/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
index ac22eda5f4..81a0047153 100644
--- a/packages/builder/src/pages/builder/portal/settings/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/_layout.svelte
@@ -1,8 +1,8 @@
 <script>
   import { goto, isActive } from "@roxi/routify"
   import { Page } from "@budibase/bbui"
-  import { Content, SideNav, SideNavItem } from "components/portal/page"
-  import { menu } from "stores/portal"
+  import { Content, SideNav, SideNavItem } from "@/components/portal/page"
+  import { menu } from "@/stores/portal"
 
   $: wide = $isActive("./email/:template")
   $: pages = $menu.find(x => x.title === "Settings")?.subPages || []
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
index e797a1c5bd..bfd4311aa0 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
+++ b/packages/builder/src/pages/builder/portal/settings/ai/AISettings.spec.js
@@ -1,7 +1,7 @@
 import { it, expect, describe, vi } from "vitest"
 import AISettings from "./index.svelte"
 import { render, fireEvent } from "@testing-library/svelte"
-import { admin, licensing, featureFlags } from "stores/portal"
+import { admin, licensing, featureFlags } from "@/stores/portal"
 import { notifications } from "@budibase/bbui"
 
 vi.spyOn(notifications, "error").mockImplementation(vi.fn)
diff --git a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
index ec0ff31e58..ae36fd5b98 100644
--- a/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/ai/index.svelte
@@ -12,8 +12,8 @@
     Tags,
     Tag,
   } from "@budibase/bbui"
-  import { admin, licensing, featureFlags } from "stores/portal"
-  import { API } from "api"
+  import { admin, licensing } from "@/stores/portal"
+  import { API } from "@/api"
   import AIConfigModal from "./ConfigModal.svelte"
   import AIConfigTile from "./AIConfigTile.svelte"
 
@@ -27,8 +27,7 @@
   let editingUuid
 
   $: isCloud = $admin.cloud
-  $: customAIConfigsEnabled =
-    $featureFlags.AI_CUSTOM_CONFIGS && $licensing.customAIConfigsEnabled
+  $: customAIConfigsEnabled = $licensing.customAIConfigsEnabled
 
   async function fetchAIConfig() {
     try {
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
index 795f384fde..7693b56f29 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/google.svelte
@@ -16,8 +16,8 @@
     Link,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, admin } from "@/stores/portal"
 
   const ConfigTypes = {
     Google: "google",
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
index 3ef3737249..a1151ad991 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/index.svelte
@@ -24,8 +24,8 @@
     Link,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, admin, licensing } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, admin, licensing } from "@/stores/portal"
   import Scim from "./scim.svelte"
   import Google from "./google.svelte"
 
@@ -140,10 +140,7 @@
     if (image) {
       let data = new FormData()
       data.append("file", image)
-      await API.uploadOIDCLogo({
-        name: image.name,
-        data,
-      })
+      await API.uploadOIDCLogo(image.name, data)
     }
   }
 
diff --git a/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte b/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
index 11c5929efb..68a6ff02ae 100644
--- a/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/auth/scim.svelte
@@ -12,8 +12,8 @@
     Helpers,
   } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { API } from "api"
-  import { organisation, auth } from "stores/portal"
+  import { API } from "@/api"
+  import { organisation, auth } from "@/stores/portal"
 
   const configType = "scim"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/branding.svelte b/packages/builder/src/pages/builder/portal/settings/branding.svelte
index 17da5b87d7..51b6307a04 100644
--- a/packages/builder/src/pages/builder/portal/settings/branding.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/branding.svelte
@@ -14,8 +14,8 @@
     Label,
     TextArea,
   } from "@budibase/bbui"
-  import { auth, organisation, licensing, admin } from "stores/portal"
-  import { API } from "api"
+  import { auth, organisation, licensing, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { goto } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte b/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
index 98cee021ef..08bc7a844e 100644
--- a/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/diagnostics.svelte
@@ -9,9 +9,9 @@
     Icon,
     TextArea,
   } from "@budibase/bbui"
-  import { auth, admin } from "stores/portal"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
-  import { API } from "api"
+  import { API } from "@/api"
   import { onMount } from "svelte"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/email/[template].svelte b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
index b31800adf0..7fbf6d3361 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/[template].svelte
@@ -10,10 +10,10 @@
     Tab,
   } from "@budibase/bbui"
   import { url } from "@roxi/routify"
-  import { email } from "stores/portal"
-  import Editor from "components/integration/QueryEditor.svelte"
+  import { email } from "@/stores/portal"
+  import Editor from "@/components/integration/QueryEditor.svelte"
   import TemplateBindings from "./_components/TemplateBindings.svelte"
-  import { Breadcrumbs, Breadcrumb } from "components/portal/page"
+  import { Breadcrumbs, Breadcrumb } from "@/components/portal/page"
 
   // this is the email purpose
   export let template
@@ -34,7 +34,7 @@
   async function saveTemplate() {
     try {
       // Save your template config
-      await email.templates.save(selectedTemplate)
+      await email.saveTemplate(selectedTemplate)
       notifications.success("Template saved")
     } catch (error) {
       notifications.error("Failed to update template settings")
diff --git a/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
index e371c2daae..14e7d2c3ca 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/_layout.svelte
@@ -1,11 +1,11 @@
 <script>
   import { onMount } from "svelte"
-  import { email } from "stores/portal"
+  import { email } from "@/stores/portal"
   import { notifications } from "@budibase/bbui"
 
   onMount(async () => {
     try {
-      await email.templates.fetch()
+      await email.fetchTemplates()
     } catch (error) {
       notifications.error("Error fetching email templates")
     }
diff --git a/packages/builder/src/pages/builder/portal/settings/email/index.svelte b/packages/builder/src/pages/builder/portal/settings/email/index.svelte
index 71687bcc70..3b055cc7d8 100644
--- a/packages/builder/src/pages/builder/portal/settings/email/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/email/index.svelte
@@ -13,8 +13,8 @@
     Table,
     Checkbox,
   } from "@budibase/bbui"
-  import { email, admin } from "stores/portal"
-  import { API } from "api"
+  import { email, admin } from "@/stores/portal"
+  import { API } from "@/api"
   import { cloneDeep } from "lodash/fp"
 
   const ConfigTypes = {
@@ -69,10 +69,7 @@
   async function deleteSmtp() {
     // Delete the SMTP config
     try {
-      await API.deleteConfig({
-        id: smtpConfig._id,
-        rev: smtpConfig._rev,
-      })
+      await API.deleteConfig(smtpConfig._id, smtpConfig._rev)
       smtpConfig = {
         type: ConfigTypes.SMTP,
         config: {
@@ -180,7 +177,7 @@
       <Button
         secondary
         on:click={deleteSmtp}
-        disabled={!$admin.checklist.smtp.checked}
+        disabled={!$admin.checklist?.smtp?.checked}
       >
         Reset
       </Button>
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
index fd754fa006..00ff1804d9 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/_components/EditVariableColumn.svelte
@@ -1,8 +1,8 @@
 <script>
   import { ActionButton, Modal } from "@budibase/bbui"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { environment } from "stores/portal"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { environment } from "@/stores/portal"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
 
   export let row
 
@@ -10,7 +10,8 @@
   let deleteDialog
 
   const save = async data => {
-    await environment.updateVariable(data)
+    const { name, ...rest } = data
+    await environment.updateVariable(name, rest)
     editVariableModal.hide()
   }
 </script>
diff --git a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
index 0d4c7e1479..13892c61d3 100644
--- a/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/environment/index.svelte
@@ -7,9 +7,9 @@
     InlineAlert,
     notifications,
   } from "@budibase/bbui"
-  import { environment, licensing } from "stores/portal"
+  import { environment, licensing } from "@/stores/portal"
   import { onMount } from "svelte"
-  import CreateEditVariableModal from "components/portal/environment/CreateEditVariableModal.svelte"
+  import CreateEditVariableModal from "@/components/portal/environment/CreateEditVariableModal.svelte"
   import EditVariableColumn from "./_components/EditVariableColumn.svelte"
   import LockedFeature from "../../_components/LockedFeature.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/settings/index.svelte b/packages/builder/src/pages/builder/portal/settings/index.svelte
index 26688e3861..27a1611bf0 100644
--- a/packages/builder/src/pages/builder/portal/settings/index.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/index.svelte
@@ -1,10 +1,5 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { featureFlags } from "stores/portal"
 
-  if ($featureFlags.AI_CUSTOM_CONFIGS) {
-    $redirect("./ai")
-  } else {
-    $redirect("./auth")
-  }
+  $redirect("./ai")
 </script>
diff --git a/packages/builder/src/pages/builder/portal/settings/organisation.svelte b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
index c107a7339e..7e473bf8f2 100644
--- a/packages/builder/src/pages/builder/portal/settings/organisation.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/organisation.svelte
@@ -10,7 +10,7 @@
     notifications,
     Toggle,
   } from "@budibase/bbui"
-  import { auth, organisation, admin } from "stores/portal"
+  import { auth, organisation, admin } from "@/stores/portal"
   import { writable } from "svelte/store"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
diff --git a/packages/builder/src/pages/builder/portal/settings/version.svelte b/packages/builder/src/pages/builder/portal/settings/version.svelte
index 032c077557..62e405d0d3 100644
--- a/packages/builder/src/pages/builder/portal/settings/version.svelte
+++ b/packages/builder/src/pages/builder/portal/settings/version.svelte
@@ -9,8 +9,8 @@
     Label,
     Link,
   } from "@budibase/bbui"
-  import { API } from "api"
-  import { auth, admin } from "stores/portal"
+  import { API } from "@/api"
+  import { auth, admin } from "@/stores/portal"
   import { redirect } from "@roxi/routify"
   import { sdk } from "@budibase/shared-core"
 
diff --git a/packages/builder/src/pages/builder/portal/users/_layout.svelte b/packages/builder/src/pages/builder/portal/users/_layout.svelte
index d53da89613..c13fa2a8b5 100644
--- a/packages/builder/src/pages/builder/portal/users/_layout.svelte
+++ b/packages/builder/src/pages/builder/portal/users/_layout.svelte
@@ -1,9 +1,9 @@
 <script>
   import { Page, notifications } from "@budibase/bbui"
   import { onMount } from "svelte"
-  import { SideNav, SideNavItem, Content } from "components/portal/page"
+  import { SideNav, SideNavItem, Content } from "@/components/portal/page"
   import { isActive, goto } from "@roxi/routify"
-  import { menu, features } from "stores/portal"
+  import { menu, features } from "@/stores/portal"
 
   $: wide = $isActive("./users/index") || $isActive("./groups/index")
   $: pages = $menu.find(x => x.title === "Users")?.subPages || []
diff --git a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
index 36ec43b6b3..58fd1d93cb 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/[groupId].svelte
@@ -10,10 +10,10 @@
     notifications,
   } from "@budibase/bbui"
   import { goto, url } from "@roxi/routify"
-  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { Breadcrumb, Breadcrumbs } from "components/portal/page"
-  import { roles } from "stores/builder"
-  import { appsStore, auth, groups } from "stores/portal"
+  import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
+  import { Breadcrumb, Breadcrumbs } from "@/components/portal/page"
+  import { roles } from "@/stores/builder"
+  import { appsStore, auth, groups } from "@/stores/portal"
   import { onMount, setContext } from "svelte"
   import AppNameTableRenderer from "../users/_components/AppNameTableRenderer.svelte"
   import AppRoleTableRenderer from "../users/_components/AppRoleTableRenderer.svelte"
@@ -53,9 +53,7 @@
   $: readonly = !isAdmin || isScimGroup
   $: groupApps = $appsStore.apps
     .filter(app =>
-      groups.actions
-        .getGroupAppIds(group)
-        .includes(appsStore.getProdAppID(app.devId))
+      groups.getGroupAppIds(group).includes(appsStore.getProdAppID(app.devId))
     )
     .map(app => ({
       ...app,
@@ -72,7 +70,7 @@
 
   async function deleteGroup() {
     try {
-      await groups.actions.delete(group)
+      await groups.delete(group)
       notifications.success("User group deleted successfully")
       $goto("./")
     } catch (error) {
@@ -82,7 +80,7 @@
 
   async function saveGroup(group) {
     try {
-      await groups.actions.save(group)
+      await groups.save(group)
     } catch (error) {
       if (error.message) {
         notifications.error(error.message)
@@ -93,7 +91,7 @@
   }
 
   const removeApp = async app => {
-    await groups.actions.removeApp(groupId, appsStore.getProdAppID(app.devId))
+    await groups.removeApp(groupId, appsStore.getProdAppID(app.devId))
   }
   setContext("roles", {
     updateRole: () => {},
@@ -102,7 +100,7 @@
 
   onMount(async () => {
     try {
-      await Promise.all([groups.actions.init(), roles.fetch()])
+      await Promise.all([groups.init(), roles.fetch()])
       loaded = true
     } catch (error) {
       notifications.error("Error fetching user group data")
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
index 5071d40add..88b8b4657b 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/AppAddModal.svelte
@@ -1,8 +1,8 @@
 <script>
   import { keepOpen, Body, ModalContent, Select } from "@budibase/bbui"
-  import { appsStore, groups } from "stores/portal"
-  import { roles } from "stores/builder"
-  import RoleSelect from "components/common/RoleSelect.svelte"
+  import { appsStore, groups } from "@/stores/portal"
+  import { roles } from "@/stores/builder"
+  import RoleSelect from "@/components/common/RoleSelect.svelte"
 
   export let group
 
@@ -23,7 +23,7 @@
 
       return keepOpen
     } else {
-      await groups.actions.addApp(group._id, prodAppId, selectedRoleId)
+      await groups.addApp(group._id, prodAppId, selectedRoleId)
     }
   }
 </script>
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
index 8cec28a0ef..d360de3850 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/EditUserPicker.svelte
@@ -1,8 +1,8 @@
 <script>
   import { Button, Popover, notifications } from "@budibase/bbui"
-  import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
-  import { createPaginationStore } from "helpers/pagination"
-  import { groups, users } from "stores/portal"
+  import UserGroupPicker from "@/components/settings/UserGroupPicker.svelte"
+  import { createPaginationStore } from "@/helpers/pagination"
+  import { groups, users } from "@/stores/portal"
 
   export let groupId
   export let onUsersUpdated
@@ -50,11 +50,11 @@
     selected={group.users?.map(user => user._id)}
     list={$users.data}
     on:select={async e => {
-      await groups.actions.addUser(groupId, e.detail)
+      await groups.addUser(groupId, e.detail)
       onUsersUpdated()
     }}
     on:deselect={async e => {
-      await groups.actions.removeUser(groupId, e.detail)
+      await groups.removeUser(groupId, e.detail)
       onUsersUpdated()
     }}
   />
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
index 9f6703964a..71fd4c0be3 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/GroupUsers.svelte
@@ -4,8 +4,8 @@
   import { Heading, Pagination, Table, Search } from "@budibase/bbui"
   import { fetchData } from "@budibase/frontend-core"
   import { goto } from "@roxi/routify"
-  import { API } from "api"
-  import { groups } from "stores/portal"
+  import { API } from "@/api"
+  import { groups } from "@/stores/portal"
   import { setContext } from "svelte"
 
   import RemoveUserTableRenderer from "../_components/RemoveUserTableRenderer.svelte"
@@ -52,7 +52,7 @@
   ]
 
   const removeUser = async id => {
-    await groups.actions.removeUser(groupId, id)
+    await groups.removeUser(groupId, id)
     fetchGroupUsers.refresh()
   }
 
diff --git a/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
index 4d71c71ae6..406a499f51 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/_components/RemoveUserTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
   import { getContext } from "svelte"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/groups/index.svelte b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
index 5636d555ae..9982f85352 100644
--- a/packages/builder/src/pages/builder/portal/users/groups/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/groups/index.svelte
@@ -13,7 +13,7 @@
     Search,
     notifications,
   } from "@budibase/bbui"
-  import { groups, auth, licensing, admin } from "stores/portal"
+  import { groups, auth, licensing, admin } from "@/stores/portal"
   import { onMount } from "svelte"
   import CreateEditGroupModal from "./_components/CreateEditGroupModal.svelte"
   import { cloneDeep } from "lodash/fp"
@@ -60,7 +60,7 @@
 
   async function saveGroup(group) {
     try {
-      group = await groups.actions.save(group)
+      group = await groups.save(group)
       $goto(`./${group._id}`)
       notifications.success(`User group created successfully`)
     } catch (error) {
@@ -83,7 +83,7 @@
     try {
       // always load latest
       await licensing.init()
-      await groups.actions.init()
+      await groups.init()
     } catch (error) {
       notifications.error("Error getting user groups")
     }
diff --git a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
index 3547a4876e..6c480d9ef8 100644
--- a/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/[userId].svelte
@@ -18,14 +18,14 @@
     Table,
   } from "@budibase/bbui"
   import { onMount, setContext } from "svelte"
-  import { users, auth, groups, appsStore, licensing } from "stores/portal"
-  import { roles } from "stores/builder"
+  import { users, auth, groups, appsStore, licensing } from "@/stores/portal"
+  import { roles } from "@/stores/builder"
   import ForceResetPasswordModal from "./_components/ForceResetPasswordModal.svelte"
-  import UserGroupPicker from "components/settings/UserGroupPicker.svelte"
+  import UserGroupPicker from "@/components/settings/UserGroupPicker.svelte"
   import DeleteUserModal from "./_components/DeleteUserModal.svelte"
   import GroupIcon from "../groups/_components/GroupIcon.svelte"
   import { Constants, UserAvatar } from "@budibase/frontend-core"
-  import { Breadcrumbs, Breadcrumb } from "components/portal/page"
+  import { Breadcrumbs, Breadcrumb } from "@/components/portal/page"
   import RemoveGroupTableRenderer from "./_components/RemoveGroupTableRenderer.svelte"
   import GroupNameTableRenderer from "../groups/_components/GroupNameTableRenderer.svelte"
   import AppNameTableRenderer from "./_components/AppNameTableRenderer.svelte"
@@ -87,6 +87,7 @@
   let popover
   let user, tenantOwner
   let loaded = false
+  let userFieldsToUpdate = {}
 
   $: internalGroups = $groups?.filter(g => !g?.scimInfo?.isSync)
 
@@ -164,40 +165,45 @@
     return label
   }
 
-  async function updateUserFirstName(evt) {
+  async function saveUser() {
     try {
-      await users.save({ ...user, firstName: evt.target.value })
+      await users.save({ ...user, ...userFieldsToUpdate })
+      userFieldsToUpdate = {}
       await fetchUser()
     } catch (error) {
       notifications.error("Error updating user")
     }
   }
 
+  async function updateUserFirstName(evt) {
+    userFieldsToUpdate.firstName = evt.target.value
+  }
+
   async function updateUserLastName(evt) {
-    try {
-      await users.save({ ...user, lastName: evt.target.value })
-      await fetchUser()
-    } catch (error) {
-      notifications.error("Error updating user")
-    }
+    userFieldsToUpdate.lastName = evt.target.value
   }
 
   async function updateUserRole({ detail }) {
+    let flags = {}
     if (detail === Constants.BudibaseRoles.Developer) {
-      toggleFlags({ admin: { global: false }, builder: { global: true } })
+      flags = { admin: { global: false }, builder: { global: true } }
     } else if (detail === Constants.BudibaseRoles.Admin) {
-      toggleFlags({ admin: { global: true }, builder: { global: true } })
+      flags = { admin: { global: true }, builder: { global: true } }
     } else if (detail === Constants.BudibaseRoles.AppUser) {
-      toggleFlags({ admin: { global: false }, builder: { global: false } })
+      flags = { admin: { global: false }, builder: { global: false } }
     } else if (detail === Constants.BudibaseRoles.Creator) {
-      toggleFlags({
+      flags = {
         admin: { global: false },
         builder: {
           global: false,
           creator: true,
           apps: user?.builder?.apps || [],
         },
-      })
+      }
+    }
+    userFieldsToUpdate = {
+      ...userFieldsToUpdate,
+      ...flags,
     }
   }
 
@@ -209,22 +215,13 @@
     tenantOwner = await users.getAccountHolder()
   }
 
-  async function toggleFlags(detail) {
-    try {
-      await users.save({ ...user, ...detail })
-      await fetchUser()
-    } catch (error) {
-      notifications.error("Error updating user")
-    }
-  }
-
   const addGroup = async groupId => {
-    await groups.actions.addUser(groupId, userId)
+    await groups.addUser(groupId, userId)
     await fetchUser()
   }
 
   const removeGroup = async groupId => {
-    await groups.actions.removeUser(groupId, userId)
+    await groups.removeUser(groupId, userId)
     await fetchUser()
   }
 
@@ -234,7 +231,7 @@
 
   onMount(async () => {
     try {
-      await Promise.all([fetchUser(), groups.actions.init(), roles.fetch()])
+      await Promise.all([fetchUser(), groups.init(), roles.fetch()])
       loaded = true
     } catch (error) {
       notifications.error("Error getting user groups")
@@ -296,7 +293,7 @@
           <Input
             disabled={readonly}
             value={user?.firstName}
-            on:blur={updateUserFirstName}
+            on:input={updateUserFirstName}
           />
         </div>
         <div class="field">
@@ -304,7 +301,7 @@
           <Input
             disabled={readonly}
             value={user?.lastName}
-            on:blur={updateUserLastName}
+            on:input={updateUserLastName}
           />
         </div>
         <!-- don't let a user remove the privileges that let them be here -->
@@ -325,6 +322,13 @@
         {/if}
       </div>
     </Layout>
+    <div>
+      <Button
+        cta
+        disabled={Object.keys(userFieldsToUpdate).length === 0}
+        on:click={saveUser}>Save</Button
+      >
+    </div>
 
     {#if $licensing.groupsEnabled}
       <!-- User groups -->
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
index 36709ae9c0..9122ff09ab 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AddUserModal.svelte
@@ -9,10 +9,10 @@
     Layout,
     Icon,
   } from "@budibase/bbui"
-  import { groups, licensing } from "stores/portal"
+  import { groups, licensing } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
-  import { emailValidator } from "helpers/validation"
-  import { capitalise } from "helpers"
+  import { emailValidator } from "@/helpers/validation"
+  import { capitalise } from "@/helpers"
 
   export let showOnboardingTypeModal
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
index 03a3e626a4..9429cfbc23 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppRoleTableRenderer.svelte
@@ -1,8 +1,8 @@
 <script>
   import { StatusLight } from "@budibase/bbui"
   import { Constants } from "@budibase/frontend-core"
-  import { roles } from "stores/builder"
-  import { capitalise } from "helpers"
+  import { roles } from "@/stores/builder"
+  import { capitalise } from "@/helpers"
 
   export let value
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
index 28057f609c..54d220b67a 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/AppsTableRenderer.svelte
@@ -1,6 +1,6 @@
 <script>
   import { Icon } from "@budibase/bbui"
-  import { appsStore } from "stores/portal"
+  import { appsStore } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
index 946fa430d2..ea1070090f 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/DeleteUserModal.svelte
@@ -2,7 +2,7 @@
   import { goto } from "@roxi/routify"
   import { Body, ModalContent, notifications } from "@budibase/bbui"
 
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
 
   export let user
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
index 36fdcccbce..7f8ad3d492 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ForceResetPasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { createEventDispatcher } from "svelte"
   import { ModalContent, Body, Input, notifications } from "@budibase/bbui"
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
 
   const dispatch = createEventDispatcher()
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
index 432fb7abb7..b8aca87459 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/ImportUsersModal.svelte
@@ -7,10 +7,10 @@
     notifications,
     Icon,
   } from "@budibase/bbui"
-  import { groups, licensing, admin } from "stores/portal"
-  import { emailValidator } from "helpers/validation"
+  import { groups, licensing, admin } from "@/stores/portal"
+  import { emailValidator } from "@/helpers/validation"
   import { Constants } from "@budibase/frontend-core"
-  import { capitalise } from "helpers"
+  import { capitalise } from "@/helpers"
 
   const BYTES_IN_MB = 1000000
   const FILE_SIZE_LIMIT = BYTES_IN_MB * 5
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
index afac8ae74b..19ff7e6f46 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/OnboardingTypeModal.svelte
@@ -1,6 +1,6 @@
 <script>
   import { ModalContent, Body, Layout, Icon } from "@budibase/bbui"
-  import { OnboardingType } from "constants"
+  import { OnboardingType } from "@/constants"
 
   export let chooseCreationType
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
index ce9c41d4ac..e5d7b32b94 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/PasswordModal.svelte
@@ -1,7 +1,7 @@
 <script>
   import { Body, ModalContent, Table, Icon } from "@budibase/bbui"
   import PasswordCopyTableRenderer from "./PasswordCopyTableRenderer.svelte"
-  import { parseToCsv } from "helpers/data/utils"
+  import { parseToCsv } from "@/helpers/data/utils"
   import { onMount } from "svelte"
   import InviteResponseRenderer from "./InviteResponseRenderer.svelte"
 
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
index 5eacdec944..96c13acc8c 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RemoveGroupTableRenderer.svelte
@@ -1,7 +1,7 @@
 <script>
   import { ActionButton } from "@budibase/bbui"
   import { getContext } from "svelte"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { sdk } from "@budibase/shared-core"
 
   export let value
diff --git a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
index 0006cc4be0..eae8e5e910 100644
--- a/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/_components/RoleTableRenderer.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { users } from "stores/portal"
+  import { users } from "@/stores/portal"
   import { Constants } from "@budibase/frontend-core"
 
   export let row
diff --git a/packages/builder/src/pages/builder/portal/users/users/index.svelte b/packages/builder/src/pages/builder/portal/users/users/index.svelte
index 9c4e8f70c7..c77e40c964 100644
--- a/packages/builder/src/pages/builder/portal/users/users/index.svelte
+++ b/packages/builder/src/pages/builder/portal/users/users/index.svelte
@@ -20,10 +20,10 @@
     licensing,
     organisation,
     admin,
-  } from "stores/portal"
+  } from "@/stores/portal"
   import { onMount } from "svelte"
-  import DeleteRowsButton from "components/backend/DataTable/buttons/DeleteRowsButton.svelte"
-  import UpgradeModal from "components/common/users/UpgradeModal.svelte"
+  import DeleteRowsButton from "@/components/backend/DataTable/buttons/DeleteRowsButton.svelte"
+  import UpgradeModal from "@/components/common/users/UpgradeModal.svelte"
   import GroupsTableRenderer from "./_components/GroupsTableRenderer.svelte"
   import AppsTableRenderer from "./_components/AppsTableRenderer.svelte"
   import RoleTableRenderer from "./_components/RoleTableRenderer.svelte"
@@ -35,8 +35,8 @@
   import ImportUsersModal from "./_components/ImportUsersModal.svelte"
   import { get } from "svelte/store"
   import { Constants, Utils, fetchData } from "@budibase/frontend-core"
-  import { API } from "api"
-  import { OnboardingType } from "constants"
+  import { API } from "@/api"
+  import { OnboardingType } from "@/constants"
   import { sdk } from "@budibase/shared-core"
 
   const fetch = fetchData({
@@ -247,10 +247,11 @@
     try {
       bulkSaveResponse = await users.create(await removingDuplicities(userData))
       notifications.success("Successfully created user")
-      await groups.actions.init()
+      await groups.init()
       passwordModal.show()
       await fetch.refresh()
     } catch (error) {
+      console.error(error)
       notifications.error("Error creating user")
     }
   }
@@ -317,7 +318,7 @@
 
   onMount(async () => {
     try {
-      await groups.actions.init()
+      await groups.init()
       groupsLoaded = true
     } catch (error) {
       notifications.error("Error fetching user group data")
diff --git a/packages/builder/src/pages/index.svelte b/packages/builder/src/pages/index.svelte
index 5bd8d4c3f4..2f13074c9f 100644
--- a/packages/builder/src/pages/index.svelte
+++ b/packages/builder/src/pages/index.svelte
@@ -1,6 +1,6 @@
 <script>
   import { redirect } from "@roxi/routify"
-  import { auth } from "stores/portal"
+  import { auth } from "@/stores/portal"
   import { onMount } from "svelte"
   import { notifications } from "@budibase/bbui"
 
diff --git a/packages/builder/src/stores/BudiStore.js b/packages/builder/src/stores/BudiStore.js
deleted file mode 100644
index e854aa6588..0000000000
--- a/packages/builder/src/stores/BudiStore.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { writable } from "svelte/store"
-
-export default class BudiStore {
-  constructor(init, opts) {
-    const store = writable({ ...init })
-
-    /**
-     * Internal Svelte store
-     */
-    this.store = store
-
-    /**
-     * Exposes the svelte subscribe fn to allow $ notation access
-     * @example
-     * $navigation.selectedScreenId
-     */
-    this.subscribe = this.store.subscribe
-
-    /**
-     * Exposes the svelte update fn.
-     * *Store modification should be kept to a minimum
-     */
-    this.update = this.store.update
-    this.set = this.store.set
-
-    /**
-     * Optional debug mode to output the store updates to console
-     */
-    if (opts?.debug) {
-      this.subscribe(state => {
-        console.warn(`${this.constructor.name}`, state)
-      })
-    }
-  }
-}
diff --git a/packages/builder/src/stores/BudiStore.ts b/packages/builder/src/stores/BudiStore.ts
new file mode 100644
index 0000000000..c638bbf5bc
--- /dev/null
+++ b/packages/builder/src/stores/BudiStore.ts
@@ -0,0 +1,76 @@
+import { writable, Writable, Readable } from "svelte/store"
+import {
+  createLocalStorageStore,
+  createSessionStorageStore,
+} from "@budibase/frontend-core"
+
+export enum PersistenceType {
+  NONE = "none",
+  LOCAL = "local",
+  SESSION = "session",
+}
+
+interface BudiStoreOpts {
+  debug?: boolean
+  persistence?: {
+    type: PersistenceType
+    key: string
+  }
+}
+
+export class BudiStore<T> {
+  store: Writable<T>
+  subscribe: Writable<T>["subscribe"]
+  update: Writable<T>["update"]
+  set: Writable<T>["set"]
+
+  constructor(init: T, opts?: BudiStoreOpts) {
+    if (opts?.persistence) {
+      switch (opts.persistence.type) {
+        case PersistenceType.LOCAL:
+          this.store = createLocalStorageStore(opts.persistence.key, init)
+          break
+        case PersistenceType.SESSION:
+          this.store = createSessionStorageStore(opts.persistence.key, init)
+          break
+        default:
+          this.store = writable<T>(init)
+      }
+    } else {
+      this.store = writable<T>(init)
+    }
+
+    this.subscribe = this.store.subscribe
+    this.update = this.store.update
+    this.set = this.store.set
+
+    // Optional debug mode to output the store updates to console
+    if (opts?.debug) {
+      this.subscribe(state => {
+        console.warn(`${this.constructor.name}`, state)
+      })
+    }
+  }
+}
+
+// This deliberately does not extend a BudiStore as doing so imposes a requirement that
+// DerivedT must extend T, which is not desirable, due to the type of the subscribe property.
+export class DerivedBudiStore<T, DerivedT> {
+  store: BudiStore<T>
+  derivedStore: Readable<DerivedT>
+  subscribe: Readable<DerivedT>["subscribe"]
+  update: Writable<T>["update"]
+  set: Writable<T>["set"]
+
+  constructor(
+    init: T,
+    makeDerivedStore: (store: Writable<T>) => Readable<DerivedT>,
+    opts?: BudiStoreOpts
+  ) {
+    this.store = new BudiStore(init, opts)
+    this.derivedStore = makeDerivedStore(this.store)
+    this.subscribe = this.derivedStore.subscribe
+    this.update = this.store.update
+    this.set = this.store.set
+  }
+}
diff --git a/packages/builder/src/stores/builder/app.js b/packages/builder/src/stores/builder/app.ts
similarity index 55%
rename from packages/builder/src/stores/builder/app.js
rename to packages/builder/src/stores/builder/app.ts
index e57a079185..3c8ed4afc1 100644
--- a/packages/builder/src/stores/builder/app.js
+++ b/packages/builder/src/stores/builder/app.ts
@@ -1,7 +1,54 @@
-import { API } from "api"
-import BudiStore from "../BudiStore"
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import {
+  App,
+  AppFeatures,
+  AppIcon,
+  AutomationSettings,
+  Plugin,
+} from "@budibase/types"
 
-export const INITIAL_APP_META_STATE = {
+interface ClientFeatures {
+  spectrumThemes: boolean
+  intelligentLoading: boolean
+  deviceAwareness: boolean
+  state: boolean
+  rowSelection: boolean
+  customThemes: boolean
+  devicePreview: boolean
+  messagePassing: boolean
+  continueIfAction: boolean
+  showNotificationAction: boolean
+  sidePanel: boolean
+}
+
+interface TypeSupportPresets {
+  [key: string]: any
+}
+
+interface AppMetaState {
+  appId: string
+  name: string
+  url: string
+  libraries: string[]
+  clientFeatures: ClientFeatures
+  typeSupportPresets: TypeSupportPresets
+  features: AppFeatures
+  clientLibPath: string
+  hasLock: boolean
+  appInstance: { _id: string } | null
+  initialised: boolean
+  hasAppPackage: boolean
+  usedPlugins: Plugin[] | null
+  automations: AutomationSettings
+  routes: { [key: string]: any }
+  version?: string
+  revertableVersion?: string
+  upgradableVersion?: string
+  icon?: AppIcon
+}
+
+export const INITIAL_APP_META_STATE: AppMetaState = {
   appId: "",
   name: "",
   url: "",
@@ -34,7 +81,7 @@ export const INITIAL_APP_META_STATE = {
   routes: {},
 }
 
-export class AppMetaStore extends BudiStore {
+export class AppMetaStore extends BudiStore<AppMetaState> {
   constructor() {
     super(INITIAL_APP_META_STATE)
   }
@@ -43,14 +90,18 @@ export class AppMetaStore extends BudiStore {
     this.store.set({ ...INITIAL_APP_META_STATE })
   }
 
-  syncAppPackage(pkg) {
+  syncAppPackage(pkg: {
+    application: App
+    clientLibPath: string
+    hasLock: boolean
+  }) {
     const { application: app, clientLibPath, hasLock } = pkg
 
     this.update(state => ({
       ...state,
       name: app.name,
       appId: app.appId,
-      url: app.url,
+      url: app.url || "",
       hasLock,
       clientLibPath,
       libraries: app.componentLibraries,
@@ -58,8 +109,8 @@ export class AppMetaStore extends BudiStore {
       appInstance: app.instance,
       revertableVersion: app.revertableVersion,
       upgradableVersion: app.upgradableVersion,
-      usedPlugins: app.usedPlugins,
-      icon: app.icon || {},
+      usedPlugins: app.usedPlugins || null,
+      icon: app.icon,
       features: {
         ...INITIAL_APP_META_STATE.features,
         ...app.features,
@@ -70,7 +121,7 @@ export class AppMetaStore extends BudiStore {
     }))
   }
 
-  syncClientFeatures(features) {
+  syncClientFeatures(features: Partial<ClientFeatures>) {
     this.update(state => ({
       ...state,
       clientFeatures: {
@@ -80,7 +131,7 @@ export class AppMetaStore extends BudiStore {
     }))
   }
 
-  syncClientTypeSupportPresets(typeSupportPresets) {
+  syncClientTypeSupportPresets(typeSupportPresets: TypeSupportPresets) {
     this.update(state => ({
       ...state,
       typeSupportPresets,
@@ -96,7 +147,7 @@ export class AppMetaStore extends BudiStore {
   }
 
   // Returned from socket
-  syncMetadata(metadata) {
+  syncMetadata(metadata: { name: string; url: string; icon?: AppIcon }) {
     const { name, url, icon } = metadata
     this.update(state => ({
       ...state,
diff --git a/packages/builder/src/stores/builder/automations.js b/packages/builder/src/stores/builder/automations.ts
similarity index 64%
rename from packages/builder/src/stores/builder/automations.js
rename to packages/builder/src/stores/builder/automations.ts
index 8f54f85ef5..9b20b4cd03 100644
--- a/packages/builder/src/stores/builder/automations.js
+++ b/packages/builder/src/stores/builder/automations.ts
@@ -1,30 +1,58 @@
-import { writable, get, derived } from "svelte/store"
-import { API } from "api"
+import { derived, get } from "svelte/store"
+import { API } from "@/api"
 import { cloneDeep } from "lodash/fp"
 import { generate } from "shortid"
-import { createHistoryStore } from "stores/builder/history"
-import { licensing } from "stores/portal"
-import { tables } from "stores/builder"
+import { createHistoryStore } from "@/stores/builder/history"
+import { licensing } from "@/stores/portal"
+import { tables, appStore } from "@/stores/builder"
 import { notifications } from "@budibase/bbui"
 import {
   getEnvironmentBindings,
   migrateReferencesInObject,
   getUserBindings,
   getSettingBindings,
-} from "dataBinding"
+} from "@/dataBinding"
 import {
   AutomationTriggerStepId,
   AutomationEventType,
   AutomationStepType,
+  AutomationActionStepId,
+  Automation,
+  AutomationStep,
+  Table,
+  Branch,
+  AutomationTrigger,
+  AutomationStatus,
+  UILogicalOperator,
+  EmptyFilterOption,
+  AutomationIOType,
+  AutomationStepSchema,
+  AutomationTriggerSchema,
+  BranchPath,
+  BlockDefinitions,
 } from "@budibase/types"
-import { ActionStepID } from "constants/backend/automations"
-import { FIELDS } from "constants/backend"
+import { ActionStepID } from "@/constants/backend/automations"
+import { FIELDS } from "@/constants/backend"
 import { sdk } from "@budibase/shared-core"
 import { rowActions } from "./rowActions"
-import { getNewStepName } from "helpers/automations/nameHelpers"
+import { getNewStepName } from "@/helpers/automations/nameHelpers"
 import { QueryUtils } from "@budibase/frontend-core"
+import { BudiStore, DerivedBudiStore } from "@/stores/BudiStore"
 
-const initialAutomationState = {
+interface AutomationState {
+  automations: Automation[]
+  testResults: any | null
+  showTestPanel: boolean
+  blockDefinitions: BlockDefinitions
+  selectedAutomationId: string | null
+}
+
+interface DerivedAutomationState extends AutomationState {
+  data: Automation | null
+  blockRefs: Record<string, any>
+}
+
+const initialAutomationState: AutomationState = {
   automations: [],
   testResults: null,
   showTestPanel: false,
@@ -36,25 +64,11 @@ const initialAutomationState = {
   selectedAutomationId: null,
 }
 
-// If this functions, remove the actions elements
-export const createAutomationStore = () => {
-  const store = writable(initialAutomationState)
-
-  store.actions = automationActions(store)
-
-  // Setup history for automations
-  const history = createHistoryStore({
-    getDoc: store.actions.getDefinition,
-    selectDoc: store.actions.select,
-  })
-
-  store.actions.save = history.wrapSaveDoc(store.actions.save)
-  store.actions.delete = history.wrapDeleteDoc(store.actions.delete)
-  return { store, history }
-}
-
-const getFinalDefinitions = (triggers, actions) => {
-  const creatable = {}
+const getFinalDefinitions = (
+  triggers: Record<string, any>,
+  actions: Record<string, any>
+): BlockDefinitions => {
+  const creatable: Record<string, any> = {}
   Object.entries(triggers).forEach(entry => {
     if (entry[0] === AutomationTriggerStepId.ROW_ACTION) {
       return
@@ -68,7 +82,7 @@ const getFinalDefinitions = (triggers, actions) => {
   }
 }
 
-const automationActions = store => ({
+const automationActions = (store: AutomationStore) => ({
   /**
    * Move a given block from one location on the tree to another.
    *
@@ -76,7 +90,32 @@ const automationActions = store => ({
    * @param {Object} destPath the destinationPart
    * @param {Object} automation the automaton to be mutated
    */
-  moveBlock: async (sourcePath, destPath, automation) => {
+  moveBlock: async (
+    sourcePath: BranchPath[],
+    destPath: BranchPath[],
+    automation: Automation
+  ) => {
+    // The last part of the source node address, containing the id.
+    const pathSource = sourcePath.at(-1)
+
+    // The last part of the destination node address, containing the id.
+    const pathEnd = destPath.at(-1)
+
+    // Check if dragging a step into its own drag zone
+    const isOwnDragzone = pathSource?.id === pathEnd?.id
+
+    // Check if dragging the first branch step into the branch node drag zone
+    const isFirstBranchStep =
+      pathEnd?.branchStepId &&
+      pathEnd.branchIdx === pathSource?.branchIdx &&
+      pathSource?.stepIdx === 0
+
+    // If dragging into an area that will not affect the tree structure
+    // Ignore the drag and drop.
+    if (isOwnDragzone || isFirstBranchStep) {
+      return
+    }
+
     // Use core delete to remove and return the deleted block
     // from the automation
     const { deleted, newAutomation } = store.actions.deleteBlock(
@@ -86,22 +125,21 @@ const automationActions = store => ({
 
     // Traverse again as deleting the node from its original location
     // will redefine all proceding node locations
-    const newRefs = {}
+    const newRefs: Record<string, any> = {}
     store.actions.traverse(newRefs, newAutomation)
 
-    // The last part of the destination node address, containing the id.
-    const pathEnd = destPath.at(-1)
-
     let finalPath
     // If dropping in a branch-step dropzone you need to find
     // the updated parent step route then add the branch details again
-    if (pathEnd.branchStepId) {
+    if (pathEnd?.branchStepId) {
       const branchStepRef = newRefs[pathEnd.branchStepId]
       finalPath = branchStepRef.pathTo
       finalPath.push(pathEnd)
     } else {
       // Place the target 1 after the drop
-      finalPath = newRefs[pathEnd.id].pathTo
+      if (pathEnd?.id) {
+        finalPath = newRefs[pathEnd.id].pathTo
+      }
       finalPath.at(-1).stepIdx += 1
     }
 
@@ -121,7 +159,6 @@ const automationActions = store => ({
       console.error("Error moving automation block ", e)
     }
   },
-
   /**
    * Core delete function that will delete the node at the provided
    * location. Loops require 2 deletes so the function returns an array.
@@ -131,7 +168,7 @@ const automationActions = store => ({
    * @param {*} automation the automation to alter.
    * @returns {Object} contains the deleted nodes and new updated automation
    */
-  deleteBlock: (pathTo, automation) => {
+  deleteBlock: (pathTo: Array<BranchPath>, automation: Automation) => {
     let newAutomation = cloneDeep(automation)
 
     const steps = [
@@ -139,20 +176,20 @@ const automationActions = store => ({
       ...newAutomation.definition.steps,
     ]
 
-    let cache
+    let cache: any
     pathTo.forEach((path, pathIdx, array) => {
       const final = pathIdx === array.length - 1
       const { stepIdx, branchIdx } = path
 
-      const deleteCore = (steps, idx) => {
+      const deleteCore = (steps: AutomationStep[], idx: number) => {
         const targetBlock = steps[idx]
         // By default, include the id of the target block
         const idsToDelete = [targetBlock.id]
-        const blocksDeleted = []
+        const blocksDeleted: AutomationStep[] = []
 
         // If deleting a looped block, ensure all related block references are
         // collated beforehand. Delete can then be handled atomically
-        const loopSteps = {}
+        const loopSteps: Record<string, string> = {}
         steps.forEach(child => {
           const { blockToLoop, id: loopBlockId } = child
           if (blockToLoop) {
@@ -209,7 +246,6 @@ const automationActions = store => ({
     // should be 1-2 blocks in an array
     return cache
   },
-
   /**
    * Build metadata for the automation tree. Store the path and
    * note any loop information used when rendering
@@ -217,8 +253,12 @@ const automationActions = store => ({
    * @param {Object} block
    * @param {Array<Object>} pathTo
    */
-  registerBlock: (blocks, block, pathTo, terminating) => {
-    // Directly mutate the `blocks` object without reassigning
+  registerBlock: (
+    blocks: Record<string, any>,
+    block: AutomationStep | AutomationTrigger,
+    pathTo: Array<BranchPath>,
+    terminating: boolean
+  ) => {
     blocks[block.id] = {
       ...(blocks[block.id] || {}),
       pathTo,
@@ -234,35 +274,37 @@ const automationActions = store => ({
       }
     }
   },
+
   /**
    * Build a sequential list of all steps on the step path provided
    *
    * @param {Array<Object>} pathWay e.g. [{stepIdx:2},{branchIdx:0, stepIdx:2},...]
    * @returns {Array<Object>} all steps encountered on the provided path
    */
-  getPathSteps: (pathWay, automation) => {
+  getPathSteps: (pathWay: Array<BranchPath>, automation: Automation) => {
     // Base Steps, including trigger
     const steps = [
       automation.definition.trigger,
       ...automation.definition.steps,
     ]
 
-    let result
+    let result: (AutomationStep | AutomationTrigger)[] = []
     pathWay.forEach(path => {
       const { stepIdx, branchIdx } = path
-      let last = result ? result[result.length - 1] : []
-      if (!result) {
+      let last = result.length ? result[result.length - 1] : []
+      if (!result.length) {
         // Preceeding steps.
         result = steps.slice(0, stepIdx + 1)
         return
       }
-
-      if (Number.isInteger(branchIdx)) {
-        const branchId = last.inputs.branches[branchIdx].id
-        const children = last.inputs.children[branchId]
-        const stepChildren = children.slice(0, stepIdx + 1)
-        // Preceeding steps.
-        result = result.concat(stepChildren)
+      if (last && "inputs" in last) {
+        if (Number.isInteger(branchIdx)) {
+          const branchId = last.inputs.branches[branchIdx].id
+          const children = last.inputs.children[branchId]
+          const stepChildren = children.slice(0, stepIdx + 1)
+          // Preceeding steps.
+          result = result.concat(stepChildren)
+        }
       }
     })
     return result
@@ -279,18 +321,27 @@ const automationActions = store => ({
    * @param {Boolean} insert defaults to false
    * @returns
    */
-  updateStep: (pathWay, automation, update, insert = false) => {
+  updateStep: (
+    pathWay: Array<BranchPath>,
+    automation: Automation,
+    update: AutomationStep | AutomationTrigger,
+    insert = false
+  ) => {
     let newAutomation = cloneDeep(automation)
 
-    const finalise = (dest, idx, update) => {
+    const finalise = (
+      dest: AutomationStep[],
+      idx: number,
+      update: AutomationStep | AutomationTrigger
+    ) => {
       dest.splice(
         idx,
-        insert ? 0 : update.length || 1,
+        insert ? 0 : Array.isArray(update) ? update.length : 1,
         ...(Array.isArray(update) ? update : [update])
       )
     }
 
-    let cache = null
+    let cache: any = null
     pathWay.forEach((path, idx, array) => {
       const { stepIdx, branchIdx } = path
       let final = idx === array.length - 1
@@ -346,7 +397,7 @@ const automationActions = store => ({
    * @returns {Array<Object>} all available user bindings
    */
   buildUserBindings: () => {
-    return getUserBindings().map(binding => {
+    return getUserBindings().map((binding: any) => {
       return {
         ...binding,
         category: "User",
@@ -374,7 +425,6 @@ const automationActions = store => ({
       }
     })
   },
-
   /**
    * Take the supplied step id and aggregate all bindings for every
    * step preceding it.
@@ -382,15 +432,14 @@ const automationActions = store => ({
    * @param {string} id the step id of the target
    * @returns {Array<Object>} all bindings on the path to this step
    */
-  getPathBindings: id => {
-    const block = get(selectedAutomation).blockRefs[id]
-    const bindings = store.actions.getAvailableBindings(
+  getPathBindings: (id: string) => {
+    const block = get(selectedAutomation)?.blockRefs[id]
+    return store.actions.getAvailableBindings(
       block,
-      get(selectedAutomation).data
+      get(selectedAutomation)?.data
     )
-
-    return bindings
   },
+
   /**
    * Takes the provided automation and traverses all possible paths.
    * References to all nodes/steps encountered on the way are stored
@@ -399,8 +448,8 @@ const automationActions = store => ({
    *
    * @param {Object} automation
    */
-  traverse: (blockRefs, automation) => {
-    let blocks = []
+  traverse: (blockRefs: Record<string, any>, automation: Automation) => {
+    let blocks: (AutomationStep | AutomationTrigger)[] = []
     if (!automation || !blockRefs) {
       return
     }
@@ -409,7 +458,13 @@ const automationActions = store => ({
     }
     blocks = blocks.concat(automation.definition.steps || [])
 
-    const treeTraverse = (block, pathTo, stepIdx, branchIdx, terminating) => {
+    const treeTraverse = (
+      block: AutomationStep | AutomationTrigger,
+      pathTo: Array<any> | null,
+      stepIdx: number,
+      branchIdx: number | null,
+      terminating: boolean
+    ) => {
       const pathToCurrentNode = [
         ...(pathTo || []),
         {
@@ -418,14 +473,16 @@ const automationActions = store => ({
           id: block.id,
         },
       ]
-      const branches = block.inputs?.branches || []
+      const branches: Branch[] = block.inputs?.branches || []
 
       branches.forEach((branch, bIdx) => {
-        block.inputs?.children[branch.id].forEach((bBlock, sIdx, array) => {
-          const ended =
-            array.length - 1 === sIdx && !bBlock.inputs?.branches?.length
-          treeTraverse(bBlock, pathToCurrentNode, sIdx, bIdx, ended)
-        })
+        block.inputs?.children[branch.id].forEach(
+          (bBlock: AutomationStep, sIdx: number, array: AutomationStep[]) => {
+            const ended =
+              array.length - 1 === sIdx && !bBlock.inputs?.branches?.length
+            treeTraverse(bBlock, pathToCurrentNode, sIdx, bIdx, ended)
+          }
+        )
       })
 
       store.actions.registerBlock(
@@ -444,21 +501,13 @@ const automationActions = store => ({
     return blockRefs
   },
 
-  /**
-   * Build a list of all bindings specifically on the path
-   * preceding the provided block.
-   *
-   * @param {Object} block step object
-   * @param {Object} automation The complete automation
-   * @returns
-   */
-  getAvailableBindings: (block, automation) => {
+  getAvailableBindings: (block: any, automation: Automation | null) => {
     if (!block || !automation?.definition) {
       return []
     }
 
     // Registered blocks
-    const blocks = get(selectedAutomation).blockRefs
+    const blocks = get(selectedAutomation)?.blockRefs
 
     // Get all preceeding steps, including the trigger
     // Filter out the target step as we don't want to include itself
@@ -466,20 +515,39 @@ const automationActions = store => ({
       .getPathSteps(block.pathTo, automation)
       .slice(0, -1)
 
-    // Extract all outputs from all previous steps as available bindingsx§x
-    let bindings = []
+    // Current step will always be the last step of the path
+    const currentBlock = store.actions
+      .getPathSteps(block.pathTo, automation)
+      .at(-1)
 
-    const addBinding = (name, value, icon, idx, isLoopBlock, bindingName) => {
+    // Extract all outputs from all previous steps as available bindings
+    let bindings: any[] = []
+    const addBinding = (
+      name: string,
+      value: any,
+      icon: string,
+      idx: number,
+      isLoopBlock: boolean,
+      bindingName?: string
+    ) => {
       if (!name) return
-      const runtimeBinding = determineRuntimeBinding(
+      const runtimeBinding = store.actions.determineRuntimeBinding(
         name,
         idx,
         isLoopBlock,
-        bindingName
+        bindingName,
+        automation,
+        currentBlock,
+        pathSteps
+      )
+      const categoryName = store.actions.determineCategoryName(
+        idx,
+        isLoopBlock,
+        bindingName,
+        loopBlockCount
       )
-      const categoryName = determineCategoryName(idx, isLoopBlock, bindingName)
       bindings.push(
-        createBindingObject(
+        store.actions.createBindingObject(
           name,
           value,
           icon,
@@ -493,78 +561,6 @@ const automationActions = store => ({
       )
     }
 
-    const determineRuntimeBinding = (name, idx, isLoopBlock) => {
-      let runtimeName
-
-      /* Begin special cases for generating custom schemas based on triggers */
-      if (
-        idx === 0 &&
-        automation.definition.trigger?.event === AutomationEventType.APP_TRIGGER
-      ) {
-        return `trigger.fields.${name}`
-      }
-
-      if (
-        idx === 0 &&
-        (automation.definition.trigger?.event ===
-          AutomationEventType.ROW_UPDATE ||
-          automation.definition.trigger?.event === AutomationEventType.ROW_SAVE)
-      ) {
-        let noRowKeywordBindings = ["id", "revision", "oldRow"]
-        if (!noRowKeywordBindings.includes(name)) return `trigger.row.${name}`
-      }
-      /* End special cases for generating custom schemas based on triggers */
-
-      if (isLoopBlock) {
-        runtimeName = `loop.${name}`
-      } else if (idx === 0) {
-        runtimeName = `trigger.${name}`
-      } else {
-        runtimeName = `steps.${pathSteps[idx]?.id}.${name}`
-      }
-      return runtimeName
-    }
-
-    const determineCategoryName = (idx, isLoopBlock, bindingName) => {
-      if (idx === 0) return "Trigger outputs"
-      if (isLoopBlock) return "Loop Outputs"
-      return bindingName
-        ? `${bindingName} outputs`
-        : `Step ${idx - loopBlockCount} outputs`
-    }
-
-    const createBindingObject = (
-      name,
-      value,
-      icon,
-      idx,
-      loopBlockCount,
-      isLoopBlock,
-      runtimeBinding,
-      categoryName,
-      bindingName
-    ) => {
-      const field = Object.values(FIELDS).find(
-        field => field.type === value.type && field.subtype === value.subtype
-      )
-      return {
-        readableBinding:
-          bindingName && !isLoopBlock && idx !== 0
-            ? `steps.${bindingName}.${name}`
-            : runtimeBinding,
-        runtimeBinding,
-        type: value.type,
-        description: value.description,
-        icon,
-        category: categoryName,
-        display: {
-          type: field?.name || value.type,
-          name,
-          rank: isLoopBlock ? idx + 1 : idx - loopBlockCount,
-        },
-      }
-    }
-
     let loopBlockCount = 0
 
     for (let blockIdx = 0; blockIdx < pathSteps.length; blockIdx++) {
@@ -573,20 +569,18 @@ const automationActions = store => ({
         automation.definition.stepNames?.[pathBlock.id] || pathBlock.name
 
       let schema = cloneDeep(pathBlock?.schema?.outputs?.properties) ?? {}
-
-      const isLoopBlock =
-        pathBlock.stepId === ActionStepID.LOOP &&
-        pathBlock.blockToLoop in blocks
-
+      let isLoopBlock = false
+      if (pathBlock.blockToLoop) {
+        isLoopBlock =
+          pathBlock.stepId === ActionStepID.LOOP &&
+          pathBlock.blockToLoop in blocks
+      }
       const isTrigger = pathBlock.type === AutomationStepType.TRIGGER
 
-      // Add the loop schema
-      // Should only be visible for blocks[pathBlock.id].looped
-      // Only a once otherwise there will be 1 per loop block
       if (isLoopBlock && loopBlockCount == 0) {
         schema = {
           currentItem: {
-            type: "string",
+            type: AutomationIOType.STRING,
             description: "the item currently being executed",
           },
         }
@@ -603,17 +597,16 @@ const automationActions = store => ({
           pathBlock.event === AutomationEventType.ROW_UPDATE ||
           pathBlock.event === AutomationEventType.ROW_SAVE
         ) {
-          let table = get(tables).list.find(
-            table => table._id === pathBlock.inputs.tableId
+          let table: any = get(tables).list.find(
+            (table: Table) => table._id === pathBlock.inputs.tableId
           )
-          // We want to generate our own schema for the bindings from the table schema itself
+
           for (const key in table?.schema) {
             schema[key] = {
               type: table.schema[key].type,
               subtype: table.schema[key].subtype,
             }
           }
-          // remove the original binding
           delete schema.row
         } else if (pathBlock.event === AutomationEventType.APP_TRIGGER) {
           schema = Object.fromEntries(
@@ -637,7 +630,6 @@ const automationActions = store => ({
           console.error("Loop block missing.")
         }
       }
-
       Object.entries(schema).forEach(([name, value]) => {
         addBinding(name, value, icon, blockIdx, isLoopBlock, bindingName)
       })
@@ -649,117 +641,113 @@ const automationActions = store => ({
     }
     return bindings
   },
-  definitions: async () => {
-    const response = await API.getAutomationDefinitions()
-    store.update(state => {
-      state.blockDefinitions = getFinalDefinitions(
-        response.trigger,
-        response.action
-      )
-      return state
-    })
-    return response
-  },
-  fetch: async () => {
-    const [automationResponse, definitions] = await Promise.all([
-      API.getAutomations(),
-      API.getAutomationDefinitions(),
-    ])
-    store.update(state => {
-      state.automations = automationResponse.automations
-      state.automations.sort((a, b) => {
-        return a.name < b.name ? -1 : 1
-      })
-      state.blockDefinitions = getFinalDefinitions(
-        definitions.trigger,
-        definitions.action
-      )
-      return state
-    })
-  },
-  create: async (name, trigger) => {
-    const automation = {
-      name,
-      type: "automation",
-      definition: {
-        steps: [],
-        trigger,
-      },
-      disabled: false,
-    }
-    const response = await store.actions.save(automation)
-    return response
-  },
-  duplicate: async automation => {
-    const response = await store.actions.save({
-      ...automation,
-      name: `${automation.name} - copy`,
-      _id: undefined,
-      _ref: undefined,
-    })
-    return response
-  },
-  save: async automation => {
-    const response = await API.updateAutomation(automation)
 
-    await store.actions.fetch()
-    store.actions.select(response._id)
-    return response.automation
-  },
-  delete: async automation => {
-    const isRowAction = sdk.automations.isRowAction(automation)
-    if (isRowAction) {
-      await rowActions.delete(
-        automation.definition.trigger.inputs.tableId,
-        automation.definition.trigger.inputs.rowActionId
-      )
+  determineRuntimeBinding: (
+    name: string,
+    idx: number,
+    isLoopBlock: boolean,
+    bindingName: string | undefined,
+    automation: Automation,
+    currentBlock: AutomationStep | AutomationTrigger | undefined,
+    pathSteps: (AutomationStep | AutomationTrigger)[]
+  ) => {
+    let runtimeName: string | null
+
+    /* Begin special cases for generating custom schemas based on triggers */
+    if (
+      idx === 0 &&
+      automation.definition.trigger?.event === AutomationEventType.APP_TRIGGER
+    ) {
+      return `trigger.fields.${name}`
+    }
+
+    if (
+      idx === 0 &&
+      (automation.definition.trigger?.event ===
+        AutomationEventType.ROW_UPDATE ||
+        automation.definition.trigger?.event === AutomationEventType.ROW_SAVE)
+    ) {
+      let noRowKeywordBindings = ["id", "revision", "oldRow"]
+      if (!noRowKeywordBindings.includes(name)) return `trigger.row.${name}`
+    }
+    /* End special cases for generating custom schemas based on triggers */
+
+    if (isLoopBlock) {
+      runtimeName = `loop.${name}`
+    } else if (idx === 0) {
+      runtimeName = `trigger.${name}`
+    } else if (currentBlock?.stepId === AutomationActionStepId.EXECUTE_SCRIPT) {
+      const stepId = pathSteps[idx].id
+      if (!stepId) {
+        notifications.error("Error generating binding: Step ID not found.")
+        return null
+      }
+      runtimeName = `steps["${stepId}"].${name}`
     } else {
-      await API.deleteAutomation({
-        automationId: automation?._id,
-        automationRev: automation?._rev,
-      })
+      const stepId = pathSteps[idx].id
+      if (!stepId) {
+        notifications.error("Error generating binding: Step ID not found.")
+        return null
+      }
+      runtimeName = `steps.${stepId}.${name}`
     }
 
-    store.update(state => {
-      // Remove the automation
-      state.automations = state.automations.filter(
-        x => x._id !== automation._id
-      )
-
-      // Select a new automation if required
-      if (automation._id === state.selectedAutomationId) {
-        state.selectedAutomationId = state.automations[0]?._id || null
-      }
-
-      return state
-    })
+    return runtimeName
   },
-  toggleDisabled: async automationId => {
-    let automation
-    try {
-      automation = store.actions.getDefinition(automationId)
-      if (!automation) {
-        return
-      }
-      automation.disabled = !automation.disabled
-      await store.actions.save(automation)
-      notifications.success(
-        `Automation ${
-          automation.disabled ? "disabled" : "enabled"
-        } successfully`
-      )
-    } catch (error) {
-      notifications.error(
-        `Error ${
-          automation && automation.disabled ? "disabling" : "enabling"
-        } automation`
-      )
+
+  determineCategoryName: (
+    idx: number,
+    isLoopBlock: boolean,
+    bindingName: string | undefined,
+    loopBlockCount: number
+  ) => {
+    if (idx === 0) return "Trigger outputs"
+    if (isLoopBlock) return "Loop Outputs"
+    return bindingName
+      ? `${bindingName} outputs`
+      : `Step ${idx - loopBlockCount} outputs`
+  },
+
+  createBindingObject: (
+    name: string,
+    value: any,
+    icon: string,
+    idx: number,
+    loopBlockCount: number,
+    isLoopBlock: boolean,
+    runtimeBinding: string | null,
+    categoryName: string,
+    bindingName?: string
+  ) => {
+    const field = Object.values(FIELDS).find(
+      field =>
+        field.type === value.type &&
+        ("subtype" in field ? field.subtype === value.subtype : true)
+    )
+    return {
+      readableBinding:
+        bindingName && !isLoopBlock && idx !== 0
+          ? `steps.${bindingName}.${name}`
+          : runtimeBinding,
+      runtimeBinding,
+      type: value.type,
+      description: value.description,
+      icon,
+      category: categoryName,
+      display: {
+        type: field?.name || value.type,
+        name,
+        rank: isLoopBlock ? idx + 1 : idx - loopBlockCount,
+      },
     }
   },
 
-  processBlockInputs: async (block, data) => {
+  processBlockInputs: async (
+    block: AutomationStep,
+    data: Record<string, any>
+  ) => {
     // Create new modified block
-    let newBlock = {
+    let newBlock: AutomationStep & { inputs: any } = {
       ...block,
       inputs: {
         ...block.inputs,
@@ -776,7 +764,10 @@ const automationActions = store => ({
     })
 
     // Create new modified automation
-    const automation = get(selectedAutomation).data
+    const automation = get(selectedAutomation)?.data
+    if (!automation) {
+      return false
+    }
     const newAutomation = store.actions.getUpdatedDefinition(
       automation,
       newBlock
@@ -789,21 +780,23 @@ const automationActions = store => ({
 
     return newAutomation
   },
-  updateBlockInputs: async (block, data) => {
+
+  updateBlockInputs: async (
+    block: AutomationStep,
+    data: Record<string, any>
+  ) => {
     const newAutomation = await store.actions.processBlockInputs(block, data)
     if (newAutomation === false) {
       return
     }
     await store.actions.save(newAutomation)
   },
-  test: async (automation, testData) => {
-    let result
+
+  test: async (automation: Automation, testData: any) => {
+    let result: any
     try {
-      result = await API.testAutomation({
-        automationId: automation?._id,
-        testData,
-      })
-    } catch (err) {
+      result = await API.testAutomation(automation._id!, testData)
+    } catch (err: any) {
       const message = err.message || err.status || JSON.stringify(err)
       throw `Automation test failed - ${message}`
     }
@@ -818,36 +811,33 @@ const automationActions = store => ({
       return state
     })
   },
-  getDefinition: id => {
-    return get(store).automations?.find(x => x._id === id)
-  },
-  getUpdatedDefinition: (automation, block) => {
-    let newAutomation
+
+  getUpdatedDefinition: (
+    automation: Automation,
+    block: AutomationStep | AutomationTrigger
+  ): Automation => {
+    let newAutomation: Automation
     if (automation.definition.trigger?.id === block.id) {
       newAutomation = cloneDeep(automation)
-      newAutomation.definition.trigger = block
+      newAutomation.definition.trigger = block as AutomationTrigger
     } else {
-      const pathToStep = get(selectedAutomation).blockRefs[block.id].pathTo
-      newAutomation = automationStore.actions.updateStep(
-        pathToStep,
-        automation,
-        block
-      )
+      const pathToStep = get(selectedAutomation)!.blockRefs[block.id].pathTo
+      newAutomation = store.actions.updateStep(pathToStep, automation, block)
     }
     return newAutomation
   },
-  select: id => {
-    if (!id || id === get(store).selectedAutomationId) {
-      return
-    }
-    store.update(state => {
-      state.selectedAutomationId = id
-      state.testResults = null
-      state.showTestPanel = false
-      return state
-    })
-  },
-  getLogs: async ({ automationId, startDate, status, page } = {}) => {
+
+  getLogs: async ({
+    automationId,
+    startDate,
+    status,
+    page,
+  }: {
+    automationId?: string
+    startDate?: string
+    status?: AutomationStatus
+    page?: string
+  } = {}) => {
     return await API.getAutomationLogs({
       automationId,
       startDate,
@@ -855,22 +845,33 @@ const automationActions = store => ({
       page,
     })
   },
-  clearLogErrors: async ({ automationId, appId } = {}) => {
-    return await API.clearAutomationLogErrors({
-      automationId,
-      appId,
-    })
+
+  clearLogErrors: async ({
+    automationId,
+    appId,
+  }: {
+    automationId: string
+    appId: string
+  }) => {
+    if (!automationId || !appId) {
+      throw new Error("automationId and appId are required")
+    }
+    return await API.clearAutomationLogErrors(automationId, appId)
   },
-  addTestDataToAutomation: async data => {
-    let newAutomation = cloneDeep(get(selectedAutomation).data)
+
+  addTestDataToAutomation: (data: any) => {
+    let newAutomation = cloneDeep(get(selectedAutomation)?.data)
+    if (!newAutomation) {
+      return newAutomation
+    }
     newAutomation.testData = {
       ...newAutomation.testData,
       ...data,
     }
-    await store.actions.save(newAutomation)
+    return newAutomation
   },
-  constructBlock(type, stepId, blockDefinition) {
-    let newName
+
+  constructBlock: (type: string, stepId: string, blockDefinition: any) => {
     const newStep = {
       ...blockDefinition,
       inputs: blockDefinition.inputs || {},
@@ -878,10 +879,11 @@ const automationActions = store => ({
       type,
       id: generate(),
     }
-    newName = getNewStepName(get(selectedAutomation)?.data, newStep)
+    const newName = getNewStepName(get(selectedAutomation)?.data, newStep)
     newStep.name = newName
     return newStep
   },
+
   /**
    * Generate a new branch block for adding to the automation
    * There are a minimum of 2 empty branches by default.
@@ -889,13 +891,8 @@ const automationActions = store => ({
    * @returns {Object} - a default branch block
    */
   generateBranchBlock: () => {
-    const branchDefinition = get(automationStore).blockDefinitions.ACTION.BRANCH
-    const branchBlock = automationStore.actions.constructBlock(
-      "ACTION",
-      "BRANCH",
-      branchDefinition
-    )
-    return branchBlock
+    const branchDefinition = get(store).blockDefinitions.ACTION.BRANCH
+    return store.actions.constructBlock("ACTION", "BRANCH", branchDefinition)
   },
 
   /**
@@ -905,8 +902,11 @@ const automationActions = store => ({
    * @param {Object} block the new block
    * @param {Array<Object>} pathWay location of insert point
    */
-  addBlockToAutomation: async (block, pathWay) => {
-    const automation = get(selectedAutomation).data
+  addBlockToAutomation: async (block: AutomationStep, pathWay: Array<any>) => {
+    const automation = get(selectedAutomation)?.data
+    if (!automation) {
+      return
+    }
     let newAutomation = cloneDeep(automation)
 
     const steps = [
@@ -914,24 +914,23 @@ const automationActions = store => ({
       ...newAutomation.definition.steps,
     ]
 
-    let cache
+    let cache:
+      | AutomationStepSchema<AutomationActionStepId>
+      | AutomationTriggerSchema<AutomationTriggerStepId>
+
     pathWay.forEach((path, pathIdx, array) => {
       const { stepIdx, branchIdx } = path
       const final = pathIdx === array.length - 1
 
-      const insertBlock = (steps, stepIdx) => {
+      const insertBlock = (steps: AutomationStep[], stepIdx: number) => {
         const isBranchNode = !Number.isInteger(stepIdx)
-
-        // If it's a loop block, insert at the looped block stepIdx
         const insertIdx =
           block.blockToLoop || isBranchNode ? stepIdx : stepIdx + 1
-
         steps.splice(insertIdx, 0, block)
       }
 
       if (!cache) {
         if (final) {
-          // Offset path to accommodate the trigger
           insertBlock(newAutomation.definition.steps, stepIdx - 1)
           cache = block
         } else {
@@ -939,7 +938,6 @@ const automationActions = store => ({
         }
         return
       }
-
       if (Number.isInteger(branchIdx)) {
         const branchId = cache.inputs.branches[branchIdx].id
         const children = cache.inputs.children[branchId]
@@ -969,8 +967,8 @@ const automationActions = store => ({
    */
   generateDefaultConditions: () => {
     const baseConditionUI = {
-      logicalOperator: "all",
-      onEmptyFilter: "none",
+      logicalOperator: UILogicalOperator.ALL,
+      onEmptyFilter: EmptyFilterOption.RETURN_NONE,
       groups: [],
     }
     return {
@@ -987,16 +985,16 @@ const automationActions = store => ({
    * @param {Array<Object>} path - the insertion point on the tree.
    * @param {Object} automation - the target automation to update.
    */
-  branchAutomation: async (path, automation) => {
+  branchAutomation: async (path: Array<any>, automation: Automation) => {
     const insertPoint = path.at(-1)
     let newAutomation = cloneDeep(automation)
-    let cache = null
+    let cache: any
     let atRoot = false
 
     // Generate a default empty branch
-    const createBranch = name => {
+    const createBranch = (name: string) => {
       return {
-        name: name,
+        name,
         ...store.actions.generateDefaultConditions(),
         id: generate(),
       }
@@ -1061,7 +1059,7 @@ const automationActions = store => ({
     // Init the branch children. Shift all steps following the new branch step
     // into the 0th branch.
     newBranch.inputs.children = newBranch.inputs.branches.reduce(
-      (acc, branch, idx) => {
+      (acc: Record<string, AutomationStep[]>, branch: Branch, idx: number) => {
         acc[branch.id] = idx == 0 ? cache.slice(insertIdx + 1) : []
         return acc
       },
@@ -1089,14 +1087,20 @@ const automationActions = store => ({
    * @param {Object} automation
    * @param {Object} block
    */
-  branchLeft: async (pathTo, automation, block) => {
+  branchLeft: async (
+    pathTo: Array<any>,
+    automation: Automation,
+    block: AutomationStep
+  ) => {
     const update = store.actions.shiftBranch(pathTo, block)
-    const updatedAuto = store.actions.updateStep(
-      pathTo.slice(0, -1),
-      automation,
-      update
-    )
-    await store.actions.save(updatedAuto)
+    if (update) {
+      const updatedAuto = store.actions.updateStep(
+        pathTo.slice(0, -1),
+        automation,
+        update
+      )
+      await store.actions.save(updatedAuto)
+    }
   },
 
   /**
@@ -1106,14 +1110,20 @@ const automationActions = store => ({
    * @param {Object} automation
    * @param {Object} block
    */
-  branchRight: async (pathTo, automation, block) => {
+  branchRight: async (
+    pathTo: Array<BranchPath>,
+    automation: Automation,
+    block: AutomationStep
+  ) => {
     const update = store.actions.shiftBranch(pathTo, block, 1)
-    const updatedAuto = store.actions.updateStep(
-      pathTo.slice(0, -1),
-      automation,
-      update
-    )
-    await store.actions.save(updatedAuto)
+    if (update) {
+      const updatedAuto = store.actions.updateStep(
+        pathTo.slice(0, -1),
+        automation,
+        update
+      )
+      await store.actions.save(updatedAuto)
+    }
   },
 
   /**
@@ -1123,7 +1133,7 @@ const automationActions = store => ({
    * @param {Number} direction - the direction of the swap. Defaults to -1 for left, add 1 for right
    * @returns
    */
-  shiftBranch(pathTo, block, direction = -1) {
+  shiftBranch: (pathTo: Array<any>, block: AutomationStep, direction = -1) => {
     let newBlock = cloneDeep(block)
     const branchPath = pathTo.at(-1)
     const targetIdx = branchPath.branchIdx
@@ -1134,10 +1144,7 @@ const automationActions = store => ({
     }
 
     let [neighbour] = newBlock.inputs.branches.splice(targetIdx + direction, 1)
-
-    // Put it back in the previous position.
     newBlock.inputs.branches.splice(targetIdx, 0, neighbour)
-
     return newBlock
   },
 
@@ -1149,9 +1156,9 @@ const automationActions = store => ({
    * @param {Array<Object>} path
    * @param {Array<Object>} automation
    */
-  deleteBranch: async (path, automation) => {
+  deleteBranch: async (path: Array<any>, automation: Automation) => {
     let newAutomation = cloneDeep(automation)
-    let cache = []
+    let cache: any = []
 
     path.forEach((path, pathIdx, array) => {
       const { stepIdx, branchIdx } = path
@@ -1218,15 +1225,14 @@ const automationActions = store => ({
     }
   },
 
-  saveAutomationName: async (blockId, name) => {
-    const automation = get(selectedAutomation).data
+  saveAutomationName: async (blockId: string, name: string) => {
+    const automation = get(selectedAutomation)?.data
     let newAutomation = cloneDeep(automation)
     if (!newAutomation) {
       return
     }
 
     const newName = name.trim()
-
     newAutomation.definition.stepNames = {
       ...newAutomation.definition.stepNames,
       [blockId]: newName,
@@ -1234,13 +1240,14 @@ const automationActions = store => ({
 
     await store.actions.save(newAutomation)
   },
-  deleteAutomationName: async blockId => {
-    const automation = get(selectedAutomation).data
+
+  deleteAutomationName: async (blockId: string) => {
+    const automation = get(selectedAutomation)?.data
     let newAutomation = cloneDeep(automation)
-    if (!automation) {
+    if (!automation || !newAutomation) {
       return
     }
-    if (newAutomation.definition.stepNames) {
+    if (newAutomation?.definition.stepNames) {
       delete newAutomation.definition.stepNames[blockId]
     }
 
@@ -1253,8 +1260,11 @@ const automationActions = store => ({
    *
    * @param {Array<Object>} pathTo the path to the target node
    */
-  deleteAutomationBlock: async pathTo => {
+  deleteAutomationBlock: async (pathTo: Array<BranchPath>) => {
     const automation = get(selectedAutomation)?.data
+    if (!automation) {
+      return
+    }
 
     const { newAutomation } = store.actions.deleteBlock(pathTo, automation)
 
@@ -1266,83 +1276,240 @@ const automationActions = store => ({
     }
   },
 
-  replace: async (automationId, automation) => {
+  replace: (automationId: string, automation?: Automation) => {
     if (!automation) {
-      store.update(state => {
-        // Remove the automation
+      store.store.update(state => {
         state.automations = state.automations.filter(
           x => x._id !== automationId
         )
-        // Select a new automation if required
         if (automationId === state.selectedAutomationId) {
-          store.actions.select(state.automations[0]?._id)
+          store.actions.select(state.automations[0]?._id || null)
         }
         return state
       })
     } else {
-      const index = get(store).automations.findIndex(
+      const index = get(store.store).automations.findIndex(
         x => x._id === automation._id
       )
       if (index === -1) {
-        // Automation addition
-        store.update(state => ({
+        store.store.update(state => ({
           ...state,
           automations: [...state.automations, automation],
         }))
       } else {
-        // Automation update
-        store.update(state => {
+        store.store.update(state => {
           state.automations[index] = automation
           return state
         })
       }
     }
   },
+
+  create: async (name: string, trigger: AutomationTrigger) => {
+    const automation: Automation = {
+      name,
+      type: "automation",
+      appId: get(appStore).appId,
+      definition: {
+        steps: [],
+        trigger,
+      },
+      disabled: false,
+    }
+    const response = await store.actions.save(automation)
+    return response
+  },
+
+  duplicate: async (automation: Automation) => {
+    const response = await store.actions.save({
+      ...automation,
+      name: `${automation.name} - copy`,
+      _id: undefined,
+      _rev: undefined,
+    })
+    return response
+  },
+
+  toggleDisabled: async (automationId: string) => {
+    let automation: Automation | undefined
+    try {
+      automation = store.actions.getDefinition(automationId)
+      if (!automation) {
+        return
+      }
+      automation.disabled = !automation.disabled
+      await store.actions.save(automation)
+      notifications.success(
+        `Automation ${
+          automation.disabled ? "disabled" : "enabled"
+        } successfully`
+      )
+    } catch (error) {
+      notifications.error(
+        `Error ${automation?.disabled ? "disabling" : "enabling"} automation`
+      )
+    }
+  },
+
+  definitions: async () => {
+    const response = await API.getAutomationDefinitions()
+    store.update(state => {
+      state.blockDefinitions = getFinalDefinitions(
+        response.trigger,
+        response.action
+      )
+      return state
+    })
+    return response
+  },
+
+  fetch: async () => {
+    const [automationResponse, definitions] = await Promise.all([
+      API.getAutomations(),
+      API.getAutomationDefinitions(),
+    ])
+    store.update(state => {
+      state.automations = automationResponse.automations
+      state.automations.sort((a, b) => {
+        return a.name < b.name ? -1 : 1
+      })
+      state.blockDefinitions = getFinalDefinitions(
+        definitions.trigger,
+        definitions.action
+      )
+      return state
+    })
+  },
+
+  select: (id: string | null) => {
+    if (!id || id === get(store).selectedAutomationId) {
+      return
+    }
+    store.update(state => {
+      state.selectedAutomationId = id
+      state.testResults = null
+      state.showTestPanel = false
+      return state
+    })
+  },
+
+  getDefinition: (id: string): Automation | undefined => {
+    return get(store.store).automations?.find(x => x._id === id)
+  },
+
+  save: async (automation: Automation) => {
+    const response = await API.updateAutomation(automation)
+    await store.actions.fetch()
+    store.actions.select(response.automation._id!)
+    return response.automation
+  },
+
+  delete: async (automation: Automation) => {
+    const isRowAction = sdk.automations.isRowAction(automation)
+    if (isRowAction) {
+      await rowActions.delete(
+        automation.definition.trigger.inputs.tableId,
+        automation.definition.trigger.inputs.rowActionId
+      )
+    } else {
+      await API.deleteAutomation(automation._id!, automation._rev!)
+    }
+
+    store.update(state => {
+      state.automations = state.automations.filter(
+        x => x._id !== automation._id
+      )
+      if (automation._id === state.selectedAutomationId) {
+        state.selectedAutomationId = state.automations[0]?._id || null
+      }
+      return state
+    })
+  },
 })
 
-const automations = createAutomationStore()
+class AutomationStore extends BudiStore<AutomationState> {
+  history: any
+  actions: ReturnType<typeof automationActions>
 
-export const automationStore = automations.store
-
-export const automationHistoryStore = automations.history
-
-// Derived automation state
-export const selectedAutomation = derived(automationStore, $automationStore => {
-  if (!$automationStore.selectedAutomationId) {
-    return null
-  }
-
-  const selected = $automationStore.automations?.find(
-    x => x._id === $automationStore.selectedAutomationId
-  )
-
-  // Traverse the entire tree and record all nodes found
-  // Also store any info relevant to the UX
-  const blockRefs = {}
-  automationStore.actions.traverse(blockRefs, selected)
-
-  // Parse the steps for references to sequential binding
-  // Replace all bindings with id based alternatives
-  const updatedAuto = cloneDeep(selected)
-  Object.values(blockRefs)
-    .filter(blockRef => {
-      // Pulls out all distinct terminating nodes
-      return blockRef.terminating
-    })
-    .forEach(blockRef => {
-      automationStore.actions
-        .getPathSteps(blockRef.pathTo, updatedAuto)
-        .forEach((step, idx, steps) => {
-          migrateReferencesInObject({
-            obj: step,
-            originalIndex: idx,
-            steps,
-          })
-        })
+  constructor() {
+    super(initialAutomationState)
+    this.actions = automationActions(this)
+    this.history = createHistoryStore({
+      getDoc: this.actions.getDefinition.bind(this),
+      selectDoc: this.actions.select.bind(this),
+      beforeAction: () => {},
+      afterAction: () => {},
     })
 
-  return {
-    data: updatedAuto,
-    blockRefs,
+    // Then wrap save and delete with history
+    const originalSave = this.actions.save.bind(this.actions)
+    const originalDelete = this.actions.delete.bind(this.actions)
+    this.actions.save = this.history.wrapSaveDoc(originalSave)
+    this.actions.delete = this.history.wrapDeleteDoc(originalDelete)
   }
-})
+}
+
+export const automationStore = new AutomationStore()
+export const automationHistoryStore = automationStore.history
+
+export class SelectedAutomationStore extends DerivedBudiStore<
+  AutomationState,
+  DerivedAutomationState
+> {
+  constructor(automationStore: AutomationStore) {
+    const makeDerivedStore = () => {
+      return derived(automationStore, $store => {
+        if (!$store.selectedAutomationId) {
+          return {
+            data: null,
+            blockRefs: {},
+            ...$store,
+          }
+        }
+
+        const selected = $store.automations?.find(
+          x => x._id === $store.selectedAutomationId
+        )
+
+        if (!selected) {
+          return {
+            data: null,
+            blockRefs: {},
+            ...$store,
+          }
+        }
+
+        const blockRefs: Record<string, any> = {}
+        const updatedAuto = cloneDeep(selected)
+
+        // Only traverse if we have a valid automation
+        if (updatedAuto) {
+          automationStore.actions.traverse(blockRefs, updatedAuto)
+
+          Object.values(blockRefs)
+            .filter(blockRef => blockRef.terminating)
+            .forEach(blockRef => {
+              automationStore.actions
+                .getPathSteps(blockRef.pathTo, updatedAuto)
+                .forEach((step, idx, steps) => {
+                  migrateReferencesInObject({
+                    obj: step,
+                    originalIndex: idx,
+                    steps,
+                  })
+                })
+            })
+        }
+
+        return {
+          data: updatedAuto,
+          blockRefs,
+          ...$store,
+        }
+      })
+    }
+
+    super(initialAutomationState, makeDerivedStore)
+  }
+}
+export const selectedAutomation = new SelectedAutomationStore(automationStore)
diff --git a/packages/builder/src/stores/builder/builder.js b/packages/builder/src/stores/builder/builder.ts
similarity index 70%
rename from packages/builder/src/stores/builder/builder.js
rename to packages/builder/src/stores/builder/builder.ts
index d002062da9..e4cbbba7f1 100644
--- a/packages/builder/src/stores/builder/builder.js
+++ b/packages/builder/src/stores/builder/builder.ts
@@ -1,10 +1,28 @@
 import { get } from "svelte/store"
 import { createBuilderWebsocket } from "./websocket.js"
+import { Socket } from "socket.io-client"
 import { BuilderSocketEvent } from "@budibase/shared-core"
-import BudiStore from "../BudiStore.js"
-import { TOUR_KEYS } from "components/portal/onboarding/tours.js"
+import { BudiStore } from "../BudiStore.js"
+import { TOUR_KEYS } from "@/components/portal/onboarding/tours.js"
+import { App } from "@budibase/types"
 
-export const INITIAL_BUILDER_STATE = {
+interface BuilderState {
+  previousTopNavPath: Record<string, string>
+  highlightedSetting: {
+    key: string
+    type: "info" | string
+  } | null
+  propertyFocus: string | null
+  builderSidePanel: boolean
+  onboarding: boolean
+  tourNodes: Record<string, HTMLElement> | null
+  tourKey: string | null
+  tourStepKey: string | null
+  hoveredComponentId: string | null
+  websocket?: Socket
+}
+
+export const INITIAL_BUILDER_STATE: BuilderState = {
   previousTopNavPath: {},
   highlightedSetting: null,
   propertyFocus: null,
@@ -16,7 +34,9 @@ export const INITIAL_BUILDER_STATE = {
   hoveredComponentId: null,
 }
 
-export class BuilderStore extends BudiStore {
+export class BuilderStore extends BudiStore<BuilderState> {
+  websocket?: Socket
+
   constructor() {
     super({ ...INITIAL_BUILDER_STATE })
 
@@ -32,11 +52,9 @@ export class BuilderStore extends BudiStore {
     this.registerTourNode = this.registerTourNode.bind(this)
     this.destroyTourNode = this.destroyTourNode.bind(this)
     this.startBuilderOnboarding = this.startBuilderOnboarding.bind(this)
-
-    this.websocket
   }
 
-  init(app) {
+  init(app: App) {
     if (!app?.appId) {
       console.error("BuilderStore: No appId supplied for websocket")
       return
@@ -47,23 +65,24 @@ export class BuilderStore extends BudiStore {
   }
 
   refresh() {
-    this.store.set(this.store.get())
+    const currentState = get(this.store)
+    this.store.set(currentState)
   }
 
   reset() {
     this.store.set({ ...INITIAL_BUILDER_STATE })
     this.websocket?.disconnect()
-    this.websocket = null
+    this.websocket = undefined
   }
 
-  highlightSetting(key, type) {
+  highlightSetting(key?: string, type?: string) {
     this.update(state => ({
       ...state,
       highlightedSetting: key ? { key, type: type || "info" } : null,
     }))
   }
 
-  propertyFocus(key) {
+  propertyFocus(key: string | null) {
     this.update(state => ({
       ...state,
       propertyFocus: key,
@@ -84,7 +103,7 @@ export class BuilderStore extends BudiStore {
     }))
   }
 
-  setPreviousTopNavPath(route, url) {
+  setPreviousTopNavPath(route: string, url: string) {
     this.update(state => ({
       ...state,
       previousTopNavPath: {
@@ -94,13 +113,13 @@ export class BuilderStore extends BudiStore {
     }))
   }
 
-  selectResource(id) {
-    this.websocket.emit(BuilderSocketEvent.SelectResource, {
+  selectResource(id: string) {
+    this.websocket?.emit(BuilderSocketEvent.SelectResource, {
       resourceId: id,
     })
   }
 
-  registerTourNode(tourStepKey, node) {
+  registerTourNode(tourStepKey: string, node: HTMLElement) {
     this.update(state => {
       const update = {
         ...state,
@@ -113,7 +132,7 @@ export class BuilderStore extends BudiStore {
     })
   }
 
-  destroyTourNode(tourStepKey) {
+  destroyTourNode(tourStepKey: string) {
     const store = get(this.store)
     if (store.tourNodes?.[tourStepKey]) {
       const nodes = { ...store.tourNodes }
@@ -140,12 +159,12 @@ export class BuilderStore extends BudiStore {
     }))
   }
 
-  setTour(tourKey) {
+  setTour(tourKey?: string | null) {
     this.update(state => ({
       ...state,
       tourStepKey: null,
       tourNodes: null,
-      tourKey: tourKey,
+      tourKey: tourKey || null,
     }))
   }
 }
diff --git a/packages/builder/src/stores/builder/componentTreeNodes.js b/packages/builder/src/stores/builder/componentTreeNodes.js
deleted file mode 100644
index a8e09a2051..0000000000
--- a/packages/builder/src/stores/builder/componentTreeNodes.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { get } from "svelte/store"
-import { createSessionStorageStore } from "@budibase/frontend-core"
-import { selectedScreen as selectedScreenStore } from "./screens"
-import { findComponentPath } from "helpers/components"
-
-const baseStore = createSessionStorageStore("openNodes", {})
-
-const toggleNode = componentId => {
-  baseStore.update(openNodes => {
-    openNodes[`nodeOpen-${componentId}`] = !openNodes[`nodeOpen-${componentId}`]
-
-    return openNodes
-  })
-}
-
-const expandNodes = componentIds => {
-  baseStore.update(openNodes => {
-    const newNodes = Object.fromEntries(
-      componentIds.map(id => [`nodeOpen-${id}`, true])
-    )
-
-    return { ...openNodes, ...newNodes }
-  })
-}
-
-const collapseNodes = componentIds => {
-  baseStore.update(openNodes => {
-    const newNodes = Object.fromEntries(
-      componentIds.map(id => [`nodeOpen-${id}`, false])
-    )
-
-    return { ...openNodes, ...newNodes }
-  })
-}
-
-// Will ensure all parents of a node are expanded so that it is visible in the tree
-const makeNodeVisible = componentId => {
-  const selectedScreen = get(selectedScreenStore)
-
-  const path = findComponentPath(selectedScreen.props, componentId)
-
-  const componentIds = path.map(component => component._id)
-
-  baseStore.update(openNodes => {
-    const newNodes = Object.fromEntries(
-      componentIds.map(id => [`nodeOpen-${id}`, true])
-    )
-
-    return { ...openNodes, ...newNodes }
-  })
-}
-
-const isNodeExpanded = componentId => {
-  const openNodes = get(baseStore)
-  return !!openNodes[`nodeOpen-${componentId}`]
-}
-
-const store = {
-  subscribe: baseStore.subscribe,
-  toggleNode,
-  expandNodes,
-  makeNodeVisible,
-  collapseNodes,
-  isNodeExpanded,
-}
-
-export default store
diff --git a/packages/builder/src/stores/builder/componentTreeNodes.ts b/packages/builder/src/stores/builder/componentTreeNodes.ts
new file mode 100644
index 0000000000..cec4e3a4a0
--- /dev/null
+++ b/packages/builder/src/stores/builder/componentTreeNodes.ts
@@ -0,0 +1,78 @@
+import { get } from "svelte/store"
+import { selectedScreen as selectedScreenStore } from "./screens"
+import { findComponentPath } from "@/helpers/components"
+import { Screen, Component } from "@budibase/types"
+import { BudiStore, PersistenceType } from "@/stores/BudiStore"
+
+interface OpenNodesState {
+  [key: string]: boolean
+}
+
+export class ComponentTreeNodesStore extends BudiStore<OpenNodesState> {
+  constructor() {
+    super({} as OpenNodesState, {
+      persistence: {
+        type: PersistenceType.SESSION,
+        key: "openNodes",
+      },
+    })
+  }
+
+  toggleNode(componentId: string) {
+    this.update((openNodes: OpenNodesState) => {
+      openNodes[`nodeOpen-${componentId}`] =
+        !openNodes[`nodeOpen-${componentId}`]
+
+      return openNodes
+    })
+  }
+
+  expandNodes(componentIds: string[]) {
+    this.update((openNodes: OpenNodesState) => {
+      const newNodes = Object.fromEntries(
+        componentIds.map(id => [`nodeOpen-${id}`, true])
+      )
+
+      return { ...openNodes, ...newNodes }
+    })
+  }
+
+  collapseNodes(componentIds: string[]) {
+    this.update((openNodes: OpenNodesState) => {
+      const newNodes = Object.fromEntries(
+        componentIds.map(id => [`nodeOpen-${id}`, false])
+      )
+
+      return { ...openNodes, ...newNodes }
+    })
+  }
+
+  // Will ensure all parents of a node are expanded so that it is visible in the tree
+  makeNodeVisible(componentId: string) {
+    const selectedScreen: Screen | undefined = get(selectedScreenStore)
+
+    if (!selectedScreen) {
+      console.error("Invalid node " + componentId)
+      return {}
+    }
+
+    const path = findComponentPath(selectedScreen.props, componentId)
+
+    const componentIds = path.map((component: Component) => component._id)
+
+    this.update((openNodes: OpenNodesState) => {
+      const newNodes = Object.fromEntries(
+        componentIds.map((id: string) => [`nodeOpen-${id}`, true])
+      )
+
+      return { ...openNodes, ...newNodes }
+    })
+  }
+
+  isNodeExpanded(componentId: string): boolean {
+    const openNodes = get(this)
+    return !!openNodes[`nodeOpen-${componentId}`]
+  }
+}
+
+export default new ComponentTreeNodesStore()
diff --git a/packages/builder/src/stores/builder/components.js b/packages/builder/src/stores/builder/components.ts
similarity index 82%
rename from packages/builder/src/stores/builder/components.js
rename to packages/builder/src/stores/builder/components.ts
index faa6a086ca..46d3e07eae 100644
--- a/packages/builder/src/stores/builder/components.js
+++ b/packages/builder/src/stores/builder/components.ts
@@ -1,8 +1,8 @@
 import { get, derived } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { API } from "api"
+import { API } from "@/api"
 import { Helpers } from "@budibase/bbui"
-import analytics, { Events } from "analytics"
+import analytics, { Events } from "@/analytics"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import {
   findComponentPath,
@@ -11,8 +11,8 @@ import {
   findComponentParent,
   findAllMatchingComponents,
   makeComponentUnique,
-} from "helpers/components"
-import { getComponentFieldOptions } from "helpers/formFields"
+} from "@/helpers/components"
+import { getComponentFieldOptions } from "@/helpers/formFields"
 import { selectedScreen } from "./screens"
 import {
   screenStore,
@@ -20,28 +20,58 @@ import {
   previewStore,
   tables,
   componentTreeNodesStore,
-} from "stores/builder"
-import { buildFormSchema, getSchemaForDatasource } from "dataBinding"
+} from "@/stores/builder"
+import { buildFormSchema, getSchemaForDatasource } from "@/dataBinding"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DEFAULT_BB_DATASOURCE_ID,
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
-} from "constants/backend"
-import BudiStore from "../BudiStore"
+} from "@/constants/backend"
+import { BudiStore } from "../BudiStore"
 import { Utils } from "@budibase/frontend-core"
-import { FieldType } from "@budibase/types"
+import { Component, FieldType, Screen, Table } from "@budibase/types"
 import { utils } from "@budibase/shared-core"
 
-export const INITIAL_COMPONENTS_STATE = {
+export interface ComponentState {
+  components: Record<string, ComponentDefinition>
+  customComponents: string[]
+  selectedComponentId?: string
+  componentToPaste?: Component
+  settingsCache: Record<string, ComponentSetting[]>
+  selectedScreenId?: string | null
+}
+
+export interface ComponentDefinition {
+  component: string
+  name: string
+  friendlyName?: string
+  hasChildren?: boolean
+  settings?: ComponentSetting[]
+  features?: Record<string, boolean>
+  typeSupportPresets?: Record<string, any>
+  legalDirectChildren: string[]
+  illegalChildren: string[]
+}
+
+export interface ComponentSetting {
+  key: string
+  type: string
+  section?: string
+  name?: string
+  defaultValue?: any
+  selectAllFields?: boolean
+  resetOn?: string | string[]
+  settings?: ComponentSetting[]
+}
+
+export const INITIAL_COMPONENTS_STATE: ComponentState = {
   components: {},
   customComponents: [],
-  selectedComponentId: null,
-  componentToPaste: null,
   settingsCache: {},
 }
 
-export class ComponentStore extends BudiStore {
+export class ComponentStore extends BudiStore<ComponentState> {
   constructor() {
     super(INITIAL_COMPONENTS_STATE)
 
@@ -89,14 +119,14 @@ export class ComponentStore extends BudiStore {
    * @param {string} appId
    * @returns
    */
-  async refreshDefinitions(appId) {
+  async refreshDefinitions(appId: string) {
     if (!appId) {
       return
     }
 
     // Fetch definitions and filter out custom component definitions so we
     // can flag them
-    const components = await API.fetchComponentLibDefinitions(appId)
+    const components: any = await API.fetchComponentLibDefinitions(appId)
     const customComponents = Object.keys(components).filter(key =>
       key.startsWith("plugin/")
     )
@@ -122,7 +152,7 @@ export class ComponentStore extends BudiStore {
    * '@budibase/standard-components/container'
    * @returns {object}
    */
-  getDefinition(componentType) {
+  getDefinition(componentType: string) {
     if (!componentType) {
       return null
     }
@@ -169,7 +199,7 @@ export class ComponentStore extends BudiStore {
    * @param {object} enrichedComponent
    * @returns {object} migrated Component
    */
-  migrateSettings(enrichedComponent) {
+  migrateSettings(enrichedComponent: Component) {
     const componentPrefix = "@budibase/standard-components"
     let migrated = false
 
@@ -224,7 +254,7 @@ export class ComponentStore extends BudiStore {
    * @param {object} opts
    * @returns
    */
-  enrichEmptySettings(component, opts) {
+  enrichEmptySettings(component: Component, opts: any) {
     if (!component?._component) {
       return
     }
@@ -235,7 +265,7 @@ export class ComponentStore extends BudiStore {
     if (!screen) {
       return
     }
-    settings.forEach(setting => {
+    settings.forEach((setting: ComponentSetting) => {
       const value = component[setting.key]
 
       // Fill empty settings
@@ -257,7 +287,7 @@ export class ComponentStore extends BudiStore {
         } else if (setting.type === "dataProvider") {
           // Pick closest data provider where required
           const path = findComponentPath(screen.props, treeId)
-          const providers = path.filter(component =>
+          const providers = path.filter((component: Component) =>
             component._component?.endsWith("/dataprovider")
           )
           if (providers.length) {
@@ -278,7 +308,8 @@ export class ComponentStore extends BudiStore {
           const form = findClosestMatchingComponent(
             screen.props,
             treeId,
-            x => x._component === "@budibase/standard-components/form"
+            (x: Component) =>
+              x._component === "@budibase/standard-components/form"
           )
           const usedFields = Object.keys(buildFormSchema(form) || {})
 
@@ -302,7 +333,8 @@ export class ComponentStore extends BudiStore {
           // Validate data provider exists, or else clear it
           const providers = findAllMatchingComponents(
             screen?.props,
-            x => x._component === "@budibase/standard-components/dataprovider"
+            (x: Component) =>
+              x._component === "@budibase/standard-components/dataprovider"
           )
           const valid = providers?.some(dp => value.includes?.(dp._id))
           if (!valid) {
@@ -325,10 +357,14 @@ export class ComponentStore extends BudiStore {
       if (cardKeys.every(key => !component[key]) && !component.cardImageURL) {
         const { _id, dataSource } = component
         if (dataSource) {
-          const { schema, table } = getSchemaForDatasource(screen, dataSource)
+          const {
+            schema,
+            table,
+          }: { schema: Record<string, any>; table: Table } =
+            getSchemaForDatasource(screen, dataSource, {})
 
           // Finds fields by types from the schema of the configured datasource
-          const findFieldTypes = fieldTypes => {
+          const findFieldTypes = (fieldTypes: any) => {
             if (!Array.isArray(fieldTypes)) {
               fieldTypes = [fieldTypes]
             }
@@ -345,7 +381,11 @@ export class ComponentStore extends BudiStore {
           }
 
           // Inserts a card binding for a certain setting
-          const addBinding = (key, fallback, ...parts) => {
+          const addBinding = (
+            key: string,
+            fallback: string | null,
+            ...parts: any[]
+          ) => {
             if (parts.some(x => x == null)) {
               component[key] = fallback
             } else {
@@ -363,7 +403,7 @@ export class ComponentStore extends BudiStore {
             ...findFieldTypes(FieldType.NUMBER),
           ]
           const longFields = findFieldTypes(FieldType.LONGFORM)
-          if (schema?.[table?.primaryDisplay]) {
+          if (table?.primaryDisplay && schema?.[table.primaryDisplay]) {
             shortFields.unshift(table.primaryDisplay)
           }
 
@@ -399,7 +439,12 @@ export class ComponentStore extends BudiStore {
    * @param {object} parent
    * @returns
    */
-  createInstance(componentName, presetProps, parent) {
+  createInstance(componentName: string, presetProps: any, parent: any) {
+    const screen = get(selectedScreen)
+    if (!screen) {
+      throw "A valid screen must be selected"
+    }
+
     const definition = this.getDefinition(componentName)
     if (!definition) {
       return null
@@ -421,7 +466,7 @@ export class ComponentStore extends BudiStore {
     // Standard post processing
     this.enrichEmptySettings(instance, {
       parent,
-      screen: get(selectedScreen),
+      screen,
       useDefaultValues: true,
     })
 
@@ -433,7 +478,7 @@ export class ComponentStore extends BudiStore {
     }
 
     // Custom post processing for creation only
-    let extras = {}
+    let extras: any = {}
     if (definition.hasChildren) {
       extras._children = []
     }
@@ -441,12 +486,13 @@ export class ComponentStore extends BudiStore {
     // Add step name to form steps
     if (componentName.endsWith("/formstep")) {
       const parentForm = findClosestMatchingComponent(
-        get(selectedScreen).props,
+        screen.props,
         get(selectedComponent)._id,
-        component => component._component.endsWith("/form")
+        (component: Component) => component._component.endsWith("/form")
       )
-      const formSteps = findAllMatchingComponents(parentForm, component =>
-        component._component.endsWith("/formstep")
+      const formSteps = findAllMatchingComponents(
+        parentForm,
+        (component: Component) => component._component.endsWith("/formstep")
       )
       extras.step = formSteps.length + 1
       extras._instanceName = `Step ${formSteps.length + 1}`
@@ -466,7 +512,12 @@ export class ComponentStore extends BudiStore {
    * @param {number} index
    * @returns
    */
-  async create(componentName, presetProps, parent, index) {
+  async create(
+    componentName: string,
+    presetProps: any,
+    parent: any,
+    index: number
+  ) {
     const state = get(this.store)
     const componentInstance = this.createInstance(
       componentName,
@@ -479,23 +530,23 @@ export class ComponentStore extends BudiStore {
 
     // Insert in position if specified
     if (parent && index != null) {
-      await screenStore.patch(screen => {
+      await screenStore.patch((screen: Screen) => {
         let parentComponent = findComponent(screen.props, parent)
         if (!parentComponent._children?.length) {
           parentComponent._children = [componentInstance]
         } else {
           parentComponent._children.splice(index, 0, componentInstance)
         }
-      })
+      }, null)
     }
 
     // Otherwise we work out where this component should be inserted
     else {
-      await screenStore.patch(screen => {
+      await screenStore.patch((screen: Screen) => {
         // Find the selected component
         let selectedComponentId = state.selectedComponentId
-        if (selectedComponentId.startsWith(`${screen._id}-`)) {
-          selectedComponentId = screen?.props._id
+        if (selectedComponentId?.startsWith(`${screen._id}-`)) {
+          selectedComponentId = screen.props._id
         }
         const currentComponent = findComponent(
           screen.props,
@@ -533,7 +584,7 @@ export class ComponentStore extends BudiStore {
           parentComponent._children = []
         }
         parentComponent._children.push(componentInstance)
-      })
+      }, null)
     }
 
     // Select new component
@@ -559,18 +610,22 @@ export class ComponentStore extends BudiStore {
    * @param {string} screenId
    * @returns
    */
-  async patch(patchFn, componentId, screenId) {
+  async patch(
+    patchFn: (component: Component, screen: Screen) => any,
+    componentId?: string,
+    screenId?: string
+  ) {
     // Use selected component by default
     if (!componentId || !screenId) {
       const state = get(this.store)
-      componentId = componentId || state.selectedComponentId
+      componentId = componentId ?? state.selectedComponentId ?? undefined
       const screenState = get(screenStore)
       screenId = screenId || screenState.selectedScreenId
     }
     if (!componentId || !screenId || !patchFn) {
       return
     }
-    const patchScreen = screen => {
+    const patchScreen = (screen: Screen) => {
       let component = findComponent(screen.props, componentId)
       if (!component) {
         return false
@@ -594,7 +649,7 @@ export class ComponentStore extends BudiStore {
    * @param {object} component
    * @returns
    */
-  async delete(component) {
+  async delete(component: Component) {
     if (!component) {
       return
     }
@@ -602,7 +657,7 @@ export class ComponentStore extends BudiStore {
     // Determine the next component to select, and select it before deletion
     // to avoid an intermediate state of no component selection
     const state = get(this.store)
-    let nextId
+    let nextId = ""
     if (state.selectedComponentId === component._id) {
       nextId = this.getNext()
       if (!nextId) {
@@ -621,7 +676,7 @@ export class ComponentStore extends BudiStore {
     }
 
     // Patch screen
-    await screenStore.patch(screen => {
+    await screenStore.patch((screen: Screen) => {
       // Check component exists
       component = findComponent(screen.props, component._id)
       if (!component) {
@@ -634,12 +689,12 @@ export class ComponentStore extends BudiStore {
         return false
       }
       parent._children = parent._children.filter(
-        child => child._id !== component._id
+        (child: Component) => child._id !== component._id
       )
-    })
+    }, null)
   }
 
-  copy(component, cut = false, selectParent = true) {
+  copy(component: Component, cut = false, selectParent = true) {
     // Update store with copied component
     this.update(state => {
       state.componentToPaste = cloneDeep(component)
@@ -665,7 +720,7 @@ export class ComponentStore extends BudiStore {
    *
    * @param {string} componentId
    */
-  select(componentId) {
+  select(componentId: string) {
     this.update(state => {
       state.selectedComponentId = componentId
       return state
@@ -679,12 +734,17 @@ export class ComponentStore extends BudiStore {
    * @param {object} targetScreen
    * @returns
    */
-  async paste(targetComponent, mode, targetScreen, selectComponent = true) {
+  async paste(
+    targetComponent: Component,
+    mode: string,
+    targetScreen: Screen,
+    selectComponent = true
+  ) {
     const state = get(this.store)
     if (!state.componentToPaste) {
       return
     }
-    let newComponentId
+    let newComponentId = ""
 
     // Remove copied component if cutting, regardless if pasting works
     let componentToPaste = cloneDeep(state.componentToPaste)
@@ -696,7 +756,7 @@ export class ComponentStore extends BudiStore {
     }
 
     // Patch screen
-    const patch = screen => {
+    const patch = (screen: Screen) => {
       // Get up to date ref to target
       targetComponent = findComponent(screen.props, targetComponent._id)
       if (!targetComponent) {
@@ -712,7 +772,7 @@ export class ComponentStore extends BudiStore {
       if (!cut) {
         componentToPaste = makeComponentUnique(componentToPaste)
       }
-      newComponentId = componentToPaste._id
+      newComponentId = componentToPaste._id!
 
       // Strip grid position metadata if pasting into a new screen, but keep
       // alignment metadata
@@ -732,7 +792,7 @@ export class ComponentStore extends BudiStore {
         const parent = findComponentParent(screen.props, originalId)
         if (parent?._children) {
           parent._children = parent._children.filter(
-            component => component._id !== originalId
+            (component: Component) => component._id !== originalId
           )
         }
       }
@@ -740,7 +800,7 @@ export class ComponentStore extends BudiStore {
       // Check inside is valid
       if (mode === "inside") {
         const definition = this.getDefinition(targetComponent._component)
-        if (!definition.hasChildren) {
+        if (!definition?.hasChildren) {
           mode = "below"
         }
       }
@@ -758,14 +818,16 @@ export class ComponentStore extends BudiStore {
         if (!parent?._children) {
           return false
         }
-        const targetIndex = parent._children.findIndex(component => {
-          return component._id === targetComponent._id
-        })
+        const targetIndex = parent._children.findIndex(
+          (component: Component) => {
+            return component._id === targetComponent._id
+          }
+        )
         const index = mode === "above" ? targetIndex : targetIndex + 1
         parent._children.splice(index, 0, componentToPaste)
       }
     }
-    const targetScreenId = targetScreen?._id || state.selectedScreenId
+    const targetScreenId = targetScreen?._id ?? state.selectedScreenId ?? null
     await screenStore.patch(patch, targetScreenId)
 
     // Select the new component
@@ -784,8 +846,13 @@ export class ComponentStore extends BudiStore {
     const state = get(this.store)
     const componentId = state.selectedComponentId
     const screen = get(selectedScreen)
+    if (!screen) {
+      throw "A valid screen must be selected"
+    }
     const parent = findComponentParent(screen.props, componentId)
-    const index = parent?._children.findIndex(x => x._id === componentId)
+    const index = parent?._children.findIndex(
+      (x: Component) => x._id === componentId
+    )
 
     // Check for screen and navigation component edge cases
     const screenComponentId = `${screen._id}-screen`
@@ -831,8 +898,13 @@ export class ComponentStore extends BudiStore {
     const component = get(selectedComponent)
     const componentId = component?._id
     const screen = get(selectedScreen)
+    if (!screen) {
+      throw "A valid screen must be selected"
+    }
     const parent = findComponentParent(screen.props, componentId)
-    const index = parent?._children.findIndex(x => x._id === componentId)
+    const index = parent?._children.findIndex(
+      (x: Component) => x._id === componentId
+    )
 
     // Check for screen and navigation component edge cases
     const screenComponentId = `${screen._id}-screen`
@@ -862,7 +934,7 @@ export class ComponentStore extends BudiStore {
     let target = parent
     let targetParent = findComponentParent(screen.props, target._id)
     let targetIndex = targetParent?._children.findIndex(
-      child => child._id === target._id
+      (child: Component) => child._id === target._id
     )
     while (
       targetParent != null &&
@@ -871,7 +943,7 @@ export class ComponentStore extends BudiStore {
       target = targetParent
       targetParent = findComponentParent(screen.props, target._id)
       targetIndex = targetParent?._children.findIndex(
-        child => child._id === target._id
+        (child: Component) => child._id === target._id
       )
     }
     if (targetParent) {
@@ -901,13 +973,15 @@ export class ComponentStore extends BudiStore {
     }
   }
 
-  async moveUp(component) {
-    await screenStore.patch(screen => {
+  async moveUp(component: Component) {
+    await screenStore.patch((screen: Screen) => {
       const componentId = component?._id
       const parent = findComponentParent(screen.props, componentId)
 
       // Check we aren't right at the top of the tree
-      const index = parent?._children.findIndex(x => x._id === componentId)
+      const index = parent?._children.findIndex(
+        (x: Component) => x._id === componentId
+      )
       if (!parent || (index === 0 && parent._id === screen.props._id)) {
         return
       }
@@ -915,7 +989,7 @@ export class ComponentStore extends BudiStore {
       // Copy original component and remove it from the parent
       const originalComponent = cloneDeep(parent._children[index])
       parent._children = parent._children.filter(
-        component => component._id !== componentId
+        (component: Component) => component._id !== componentId
       )
 
       // If we have siblings above us, move up
@@ -925,7 +999,7 @@ export class ComponentStore extends BudiStore {
         const previousSibling = parent._children[index - 1]
         const definition = this.getDefinition(previousSibling._component)
         if (
-          definition.hasChildren &&
+          definition?.hasChildren &&
           componentTreeNodesStore.isNodeExpanded(previousSibling._id)
         ) {
           previousSibling._children.push(originalComponent)
@@ -942,15 +1016,15 @@ export class ComponentStore extends BudiStore {
       else if (parent._id !== screen.props._id) {
         const grandParent = findComponentParent(screen.props, parent._id)
         const parentIndex = grandParent._children.findIndex(
-          child => child._id === parent._id
+          (child: Component) => child._id === parent._id
         )
         grandParent._children.splice(parentIndex, 0, originalComponent)
       }
-    })
+    }, null)
   }
 
-  async moveDown(component) {
-    await screenStore.patch(screen => {
+  async moveDown(component: Component) {
+    await screenStore.patch((screen: Screen) => {
       const componentId = component?._id
       const parent = findComponentParent(screen.props, componentId)
 
@@ -960,7 +1034,9 @@ export class ComponentStore extends BudiStore {
       }
 
       // Check we aren't right at the bottom of the tree
-      const index = parent._children.findIndex(x => x._id === componentId)
+      const index = parent._children.findIndex(
+        (x: Component) => x._id === componentId
+      )
       if (
         index === parent._children.length - 1 &&
         parent._id === screen.props._id
@@ -971,7 +1047,7 @@ export class ComponentStore extends BudiStore {
       // Copy the original component and remove from parent
       const originalComponent = cloneDeep(parent._children[index])
       parent._children = parent._children.filter(
-        component => component._id !== componentId
+        (component: Component) => component._id !== componentId
       )
 
       // Move below the next sibling if we are not the last sibling
@@ -980,7 +1056,7 @@ export class ComponentStore extends BudiStore {
         const nextSibling = parent._children[index]
         const definition = this.getDefinition(nextSibling._component)
         if (
-          definition.hasChildren &&
+          definition?.hasChildren &&
           componentTreeNodesStore.isNodeExpanded(nextSibling._id)
         ) {
           nextSibling._children.splice(0, 0, originalComponent)
@@ -996,15 +1072,15 @@ export class ComponentStore extends BudiStore {
       else {
         const grandParent = findComponentParent(screen.props, parent._id)
         const parentIndex = grandParent._children.findIndex(
-          child => child._id === parent._id
+          (child: Component) => child._id === parent._id
         )
         grandParent._children.splice(parentIndex + 1, 0, originalComponent)
       }
-    })
+    }, null)
   }
 
-  async updateStyle(name, value) {
-    await this.patch(component => {
+  async updateStyle(name: string, value: string) {
+    await this.patch((component: Component) => {
       if (value == null || value === "") {
         delete component._styles.normal[name]
       } else {
@@ -1013,8 +1089,8 @@ export class ComponentStore extends BudiStore {
     })
   }
 
-  async updateStyles(styles, id) {
-    const patchFn = component => {
+  async updateStyles(styles: Record<string, string>, id: string) {
+    const patchFn = (component: Component) => {
       component._styles.normal = {
         ...component._styles.normal,
         ...styles,
@@ -1023,24 +1099,24 @@ export class ComponentStore extends BudiStore {
     await this.patch(patchFn, id)
   }
 
-  async updateCustomStyle(style) {
-    await this.patch(component => {
+  async updateCustomStyle(style: Record<string, string>) {
+    await this.patch((component: Component) => {
       component._styles.custom = style
     })
   }
 
-  async updateConditions(conditions) {
-    await this.patch(component => {
+  async updateConditions(conditions: Record<string, any>) {
+    await this.patch((component: Component) => {
       component._conditions = conditions
     })
   }
 
-  async updateSetting(name, value) {
+  async updateSetting(name: string, value: any) {
     await this.patch(this.updateComponentSetting(name, value))
   }
 
-  updateComponentSetting(name, value) {
-    return component => {
+  updateComponentSetting(name: string, value: any) {
+    return (component: Component) => {
       if (!name || !component) {
         return false
       }
@@ -1050,10 +1126,12 @@ export class ComponentStore extends BudiStore {
       }
 
       const settings = this.getComponentSettings(component._component)
-      const updatedSetting = settings.find(setting => setting.key === name)
+      const updatedSetting = settings.find(
+        (setting: ComponentSetting) => setting.key === name
+      )
 
       // Reset dependent fields
-      settings.forEach(setting => {
+      settings.forEach((setting: ComponentSetting) => {
         const needsReset =
           name === setting.resetOn ||
           (Array.isArray(setting.resetOn) && setting.resetOn.includes(name))
@@ -1066,15 +1144,16 @@ export class ComponentStore extends BudiStore {
         updatedSetting?.type === "dataSource" ||
         updatedSetting?.type === "table"
       ) {
-        const { schema } = getSchemaForDatasource(null, value)
+        const { schema }: { schema: Record<string, any> } =
+          getSchemaForDatasource(null, value, null)
         const columnNames = Object.keys(schema || {})
         const multifieldKeysToSelectAll = settings
-          .filter(setting => {
+          .filter((setting: ComponentSetting) => {
             return setting.type === "multifield" && setting.selectAllFields
           })
-          .map(setting => setting.key)
+          .map((setting: ComponentSetting) => setting.key)
 
-        multifieldKeysToSelectAll.forEach(key => {
+        multifieldKeysToSelectAll.forEach((key: string) => {
           component[key] = columnNames
         })
       }
@@ -1083,14 +1162,14 @@ export class ComponentStore extends BudiStore {
     }
   }
 
-  requestEjectBlock(componentId) {
+  requestEjectBlock(componentId: string) {
     previewStore.sendEvent("eject-block", componentId)
   }
 
-  async handleEjectBlock(componentId, ejectedDefinition) {
-    let nextSelectedComponentId
+  async handleEjectBlock(componentId: string, ejectedDefinition: Component) {
+    let nextSelectedComponentId: string | undefined
 
-    await screenStore.patch(screen => {
+    await screenStore.patch((screen: Screen) => {
       const block = findComponent(screen.props, componentId)
       const parent = findComponentParent(screen.props, componentId)
 
@@ -1108,7 +1187,7 @@ export class ComponentStore extends BudiStore {
       // _containsSlot flag to know where to insert them
       const slotContainer = findAllMatchingComponents(
         ejectedDefinition,
-        x => x._containsSlot
+        (x: Component) => x._containsSlot
       )[0]
       if (slotContainer) {
         delete slotContainer._containsSlot
@@ -1120,10 +1199,12 @@ export class ComponentStore extends BudiStore {
 
       // Replace block with ejected definition
       ejectedDefinition = makeComponentUnique(ejectedDefinition)
-      const index = parent._children.findIndex(x => x._id === componentId)
+      const index = parent._children.findIndex(
+        (x: Component) => x._id === componentId
+      )
       parent._children[index] = ejectedDefinition
       nextSelectedComponentId = ejectedDefinition._id
-    })
+    }, null)
 
     // Select new root component
     if (nextSelectedComponentId) {
@@ -1134,7 +1215,7 @@ export class ComponentStore extends BudiStore {
     }
   }
 
-  async addParent(componentId, parentType) {
+  async addParent(componentId: string, parentType: string) {
     if (!componentId || !parentType) {
       return
     }
@@ -1146,7 +1227,7 @@ export class ComponentStore extends BudiStore {
     }
 
     // Replace component with a version wrapped in a new parent
-    await screenStore.patch(screen => {
+    await screenStore.patch((screen: Screen) => {
       // Get this component definition and parent definition
       let definition = findComponent(screen.props, componentId)
       let oldParentDefinition = findComponentParent(screen.props, componentId)
@@ -1156,7 +1237,7 @@ export class ComponentStore extends BudiStore {
 
       // Replace component with parent
       const index = oldParentDefinition._children.findIndex(
-        component => component._id === componentId
+        (component: Component) => component._id === componentId
       )
       if (index === -1) {
         return false
@@ -1165,7 +1246,7 @@ export class ComponentStore extends BudiStore {
         ...newParentDefinition,
         _children: [definition],
       }
-    })
+    }, null)
 
     // Select the new parent
     this.update(state => {
@@ -1181,7 +1262,7 @@ export class ComponentStore extends BudiStore {
    * '@budibase/standard-components/container'
    * @returns {boolean}
    */
-  isCached(componentType) {
+  isCached(componentType: string) {
     const settings = get(this.store).settingsCache
     return componentType in settings
   }
@@ -1194,8 +1275,8 @@ export class ComponentStore extends BudiStore {
    * '@budibase/standard-components/container'
    * @returns {array} the settings
    */
-  cacheSettings(componentType, definition) {
-    let settings = []
+  cacheSettings(componentType: string, definition: ComponentDefinition | null) {
+    let settings: ComponentSetting[] = []
     if (definition) {
       settings = definition.settings?.filter(setting => !setting.section) ?? []
       definition.settings
@@ -1229,7 +1310,7 @@ export class ComponentStore extends BudiStore {
    * '@budibase/standard-components/container'
    * @returns {Array<object>}
    */
-  getComponentSettings(componentType) {
+  getComponentSettings(componentType: string) {
     if (!componentType) {
       return []
     }
diff --git a/packages/builder/src/stores/builder/contextMenu.js b/packages/builder/src/stores/builder/contextMenu.js
deleted file mode 100644
index 2b8808570e..0000000000
--- a/packages/builder/src/stores/builder/contextMenu.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { writable } from "svelte/store"
-
-export const INITIAL_CONTEXT_MENU_STATE = {
-  id: null,
-  items: [],
-  position: { x: 0, y: 0 },
-  visible: false,
-}
-
-export function createViewsStore() {
-  const store = writable({ ...INITIAL_CONTEXT_MENU_STATE })
-
-  const open = (id, items, position) => {
-    store.set({ id, items, position, visible: true })
-  }
-
-  const close = () => {
-    store.set({ ...INITIAL_CONTEXT_MENU_STATE })
-  }
-
-  return {
-    subscribe: store.subscribe,
-    open,
-    close,
-  }
-}
-
-export const contextMenuStore = createViewsStore()
diff --git a/packages/builder/src/stores/builder/contextMenu.ts b/packages/builder/src/stores/builder/contextMenu.ts
new file mode 100644
index 0000000000..dc205c7fea
--- /dev/null
+++ b/packages/builder/src/stores/builder/contextMenu.ts
@@ -0,0 +1,46 @@
+import { writable } from "svelte/store"
+
+interface Position {
+  x: number
+  y: number
+}
+
+interface MenuItem {
+  label: string
+  icon?: string
+  action: () => void
+}
+
+interface ContextMenuState {
+  id: string | null
+  items: MenuItem[]
+  position: Position
+  visible: boolean
+}
+
+export const INITIAL_CONTEXT_MENU_STATE: ContextMenuState = {
+  id: null,
+  items: [],
+  position: { x: 0, y: 0 },
+  visible: false,
+}
+
+export function createViewsStore() {
+  const store = writable<ContextMenuState>({ ...INITIAL_CONTEXT_MENU_STATE })
+
+  const open = (id: string, items: MenuItem[], position: Position): void => {
+    store.set({ id, items, position, visible: true })
+  }
+
+  const close = (): void => {
+    store.set({ ...INITIAL_CONTEXT_MENU_STATE })
+  }
+
+  return {
+    subscribe: store.subscribe,
+    open,
+    close,
+  }
+}
+
+export const contextMenuStore = createViewsStore()
diff --git a/packages/builder/src/stores/builder/datasources.js b/packages/builder/src/stores/builder/datasources.js
deleted file mode 100644
index 6a2a026ae4..0000000000
--- a/packages/builder/src/stores/builder/datasources.js
+++ /dev/null
@@ -1,222 +0,0 @@
-import { writable, derived, get } from "svelte/store"
-import {
-  IntegrationTypes,
-  DEFAULT_BB_DATASOURCE_ID,
-  BUDIBASE_INTERNAL_DB_ID,
-} from "constants/backend"
-import { tables } from "./tables"
-import { queries } from "./queries"
-import { API } from "api"
-import { DatasourceFeature } from "@budibase/types"
-import { TableNames } from "constants"
-
-class TableImportError extends Error {
-  constructor(errors) {
-    super()
-    this.name = "TableImportError"
-    this.errors = errors
-  }
-
-  get description() {
-    let message = ""
-    for (const key in this.errors) {
-      message += `${key}: ${this.errors[key]}\n`
-    }
-    return message
-  }
-}
-
-export function createDatasourcesStore() {
-  const store = writable({
-    list: [],
-    selectedDatasourceId: null,
-  })
-
-  const derivedStore = derived([store, tables], ([$store, $tables]) => {
-    // Set the internal datasource entities from the table list, which we're
-    // able to keep updated unlike the egress generated definition of the
-    // internal datasource
-    let internalDS = $store.list?.find(ds => ds._id === BUDIBASE_INTERNAL_DB_ID)
-    let otherDS = $store.list?.filter(ds => ds._id !== BUDIBASE_INTERNAL_DB_ID)
-    if (internalDS) {
-      internalDS = {
-        ...internalDS,
-        entities: $tables.list?.filter(table => {
-          return (
-            table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
-            table._id !== TableNames.USERS
-          )
-        }),
-      }
-    }
-
-    // Build up enriched DS list
-    // Only add the internal DS if we have at least one non-users table
-    let list = []
-    if (internalDS?.entities?.length) {
-      list.push(internalDS)
-    }
-    list = list.concat(otherDS || [])
-
-    return {
-      ...$store,
-      list,
-      selected: list?.find(ds => ds._id === $store.selectedDatasourceId),
-      hasDefaultData: list?.some(ds => ds._id === DEFAULT_BB_DATASOURCE_ID),
-      hasData: list?.length > 0,
-    }
-  })
-
-  const fetch = async () => {
-    const datasources = await API.getDatasources()
-    store.update(state => ({
-      ...state,
-      list: datasources,
-    }))
-  }
-
-  const select = id => {
-    store.update(state => ({
-      ...state,
-      selectedDatasourceId: id,
-    }))
-  }
-
-  const updateDatasource = (response, { ignoreErrors } = {}) => {
-    const { datasource, errors } = response
-    if (!ignoreErrors && errors && Object.keys(errors).length > 0) {
-      throw new TableImportError(errors)
-    }
-    replaceDatasource(datasource._id, datasource)
-    select(datasource._id)
-    return datasource
-  }
-
-  const updateSchema = async (datasource, tablesFilter) => {
-    const response = await API.buildDatasourceSchema({
-      datasourceId: datasource?._id,
-      tablesFilter,
-    })
-    updateDatasource(response)
-  }
-
-  const sourceCount = source => {
-    return get(store).list.filter(datasource => datasource.source === source)
-      .length
-  }
-
-  const checkDatasourceValidity = async (integration, datasource) => {
-    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
-      const { connected, error } = await API.validateDatasource(datasource)
-      if (connected) {
-        return
-      }
-
-      throw new Error(`Unable to connect: ${error}`)
-    }
-  }
-
-  const create = async ({ integration, config }) => {
-    const count = sourceCount(integration.name)
-    const nameModifier = count === 0 ? "" : ` ${count + 1}`
-
-    const datasource = {
-      type: "datasource",
-      source: integration.name,
-      config,
-      name: `${integration.friendlyName}${nameModifier}`,
-      plus: integration.plus && integration.name !== IntegrationTypes.REST,
-      isSQL: integration.isSQL,
-    }
-
-    if (await checkDatasourceValidity(integration, datasource)) {
-      throw new Error("Unable to connect")
-    }
-
-    const response = await API.createDatasource({
-      datasource,
-      fetchSchema: integration.plus,
-    })
-
-    return updateDatasource(response, { ignoreErrors: true })
-  }
-
-  const update = async ({ integration, datasource }) => {
-    if (await checkDatasourceValidity(integration, datasource)) {
-      throw new Error("Unable to connect")
-    }
-
-    const response = await API.updateDatasource(datasource)
-
-    return updateDatasource(response)
-  }
-
-  const deleteDatasource = async datasource => {
-    if (!datasource?._id || !datasource?._rev) {
-      return
-    }
-    await API.deleteDatasource({
-      datasourceId: datasource._id,
-      datasourceRev: datasource._rev,
-    })
-    replaceDatasource(datasource._id, null)
-  }
-
-  const replaceDatasource = (datasourceId, datasource) => {
-    if (!datasourceId) {
-      return
-    }
-
-    // Handle deletion
-    if (!datasource) {
-      store.update(state => ({
-        ...state,
-        list: state.list.filter(x => x._id !== datasourceId),
-      }))
-      tables.removeDatasourceTables(datasourceId)
-      queries.removeDatasourceQueries(datasourceId)
-      return
-    }
-
-    // Add new datasource
-    const index = get(store).list.findIndex(x => x._id === datasource._id)
-    if (index === -1) {
-      store.update(state => ({
-        ...state,
-        list: [...state.list, datasource],
-      }))
-
-      // If this is a new datasource then we should refresh the tables list,
-      // because otherwise we'll never see the new tables
-      tables.fetch()
-    }
-
-    // Update existing datasource
-    else if (datasource) {
-      store.update(state => {
-        state.list[index] = datasource
-        return state
-      })
-    }
-  }
-
-  const getTableNames = async datasource => {
-    const info = await API.fetchInfoForDatasource(datasource)
-    return info.tableNames || []
-  }
-
-  return {
-    subscribe: derivedStore.subscribe,
-    fetch,
-    init: fetch,
-    select,
-    updateSchema,
-    create,
-    update,
-    delete: deleteDatasource,
-    replaceDatasource,
-    getTableNames,
-  }
-}
-
-export const datasources = createDatasourcesStore()
diff --git a/packages/builder/src/stores/builder/datasources.ts b/packages/builder/src/stores/builder/datasources.ts
new file mode 100644
index 0000000000..6b00911830
--- /dev/null
+++ b/packages/builder/src/stores/builder/datasources.ts
@@ -0,0 +1,296 @@
+import { derived, get, Writable } from "svelte/store"
+import {
+  IntegrationTypes,
+  DEFAULT_BB_DATASOURCE_ID,
+  BUDIBASE_INTERNAL_DB_ID,
+} from "@/constants/backend"
+import { tables } from "./tables"
+import { queries } from "./queries"
+import { API } from "@/api"
+import {
+  DatasourceFeature,
+  Datasource,
+  Table,
+  Integration,
+  UIIntegration,
+  SourceName,
+} from "@budibase/types"
+import { TableNames } from "@/constants"
+import { DerivedBudiStore } from "@/stores/BudiStore"
+
+// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
+interface InternalDatasource extends Omit<Datasource, "entities"> {
+  entities: Table[]
+}
+
+class TableImportError extends Error {
+  errors: Record<string, string>
+
+  constructor(errors: Record<string, string>) {
+    super()
+    this.name = "TableImportError"
+    this.errors = errors
+  }
+
+  get description() {
+    let message = ""
+    for (const key in this.errors) {
+      message += `${key}: ${this.errors[key]}\n`
+    }
+    return message
+  }
+}
+
+// when building the internal DS - seems to represent it slightly differently to the backend typing of a DS
+interface InternalDatasource extends Omit<Datasource, "entities"> {
+  entities: Table[]
+}
+
+interface BuilderDatasourceStore {
+  rawList: Datasource[]
+  selectedDatasourceId: null | string
+}
+
+interface DerivedDatasourceStore extends BuilderDatasourceStore {
+  list: (Datasource | InternalDatasource)[]
+  selected?: Datasource | InternalDatasource
+  hasDefaultData: boolean
+  hasData: boolean
+}
+
+export class DatasourceStore extends DerivedBudiStore<
+  BuilderDatasourceStore,
+  DerivedDatasourceStore
+> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<BuilderDatasourceStore>) => {
+      return derived([store, tables], ([$store, $tables]) => {
+        // Set the internal datasource entities from the table list, which we're
+        // able to keep updated unlike the egress generated definition of the
+        // internal datasource
+        let internalDS: Datasource | InternalDatasource | undefined =
+          $store.rawList?.find(ds => ds._id === BUDIBASE_INTERNAL_DB_ID)
+        let otherDS = $store.rawList?.filter(
+          ds => ds._id !== BUDIBASE_INTERNAL_DB_ID
+        )
+        if (internalDS) {
+          const tables: Table[] = $tables.list?.filter((table: Table) => {
+            return (
+              table.sourceId === BUDIBASE_INTERNAL_DB_ID &&
+              table._id !== TableNames.USERS
+            )
+          })
+          internalDS = {
+            ...internalDS,
+            entities: tables,
+          }
+        }
+
+        // Build up enriched DS list
+        // Only add the internal DS if we have at least one non-users table
+        let list: (InternalDatasource | Datasource)[] = []
+        if (internalDS?.entities?.length) {
+          list.push(internalDS)
+        }
+        list = list.concat(otherDS || [])
+
+        return {
+          ...$store,
+          list,
+          selected: list?.find(ds => ds._id === $store.selectedDatasourceId),
+          hasDefaultData: list?.some(ds => ds._id === DEFAULT_BB_DATASOURCE_ID),
+          hasData: list?.length > 0,
+        }
+      })
+    }
+
+    super(
+      {
+        rawList: [],
+        selectedDatasourceId: null,
+      },
+      makeDerivedStore
+    )
+
+    this.fetch = this.fetch.bind(this)
+    this.init = this.fetch.bind(this)
+    this.select = this.select.bind(this)
+    this.updateSchema = this.updateSchema.bind(this)
+    this.create = this.create.bind(this)
+    this.delete = this.deleteDatasource.bind(this)
+    this.save = this.save.bind(this)
+    this.replaceDatasource = this.replaceDatasource.bind(this)
+    this.getTableNames = this.getTableNames.bind(this)
+  }
+
+  async fetch() {
+    const datasources = await API.getDatasources()
+    this.store.update(state => ({
+      ...state,
+      rawList: datasources,
+    }))
+  }
+
+  async init() {
+    return this.fetch()
+  }
+
+  select(id: string) {
+    this.store.update(state => ({
+      ...state,
+      selectedDatasourceId: id,
+    }))
+  }
+
+  private updateDatasourceInStore(
+    response: { datasource: Datasource; errors?: Record<string, string> },
+    { ignoreErrors }: { ignoreErrors?: boolean } = {}
+  ) {
+    const { datasource, errors } = response
+    if (!ignoreErrors && errors && Object.keys(errors).length > 0) {
+      throw new TableImportError(errors)
+    }
+    this.replaceDatasource(datasource._id!, datasource)
+    this.select(datasource._id!)
+    return datasource
+  }
+
+  async updateSchema(datasource: Datasource, tablesFilter: string[]) {
+    const response = await API.buildDatasourceSchema(
+      datasource?._id!,
+      tablesFilter
+    )
+    this.updateDatasourceInStore(response)
+  }
+
+  sourceCount(source: string) {
+    return get(this.store).rawList.filter(
+      datasource => datasource.source === source
+    ).length
+  }
+
+  async checkDatasourceValidity(
+    integration: Integration,
+    datasource: Datasource
+  ): Promise<{ valid: boolean; error?: string }> {
+    if (integration.features?.[DatasourceFeature.CONNECTION_CHECKING]) {
+      const { connected, error } = await API.validateDatasource(datasource)
+      if (connected) {
+        return { valid: true }
+      } else {
+        return { valid: false, error }
+      }
+    }
+    return { valid: true }
+  }
+
+  async create({
+    integration,
+    config,
+  }: {
+    integration: UIIntegration
+    config: Record<string, any>
+  }) {
+    const count = this.sourceCount(integration.name)
+    const nameModifier = count === 0 ? "" : ` ${count + 1}`
+
+    const datasource: Datasource = {
+      type: "datasource",
+      source: integration.name as SourceName,
+      config,
+      name: `${integration.friendlyName}${nameModifier}`,
+      plus: integration.plus && integration.name !== IntegrationTypes.REST,
+      isSQL: integration.isSQL,
+    }
+
+    const { valid, error } = await this.checkDatasourceValidity(
+      integration,
+      datasource
+    )
+    if (!valid) {
+      throw new Error(`Unable to connect - ${error}`)
+    }
+
+    const response = await API.createDatasource({
+      datasource,
+      fetchSchema: integration.plus,
+    })
+
+    return this.updateDatasourceInStore(response, { ignoreErrors: true })
+  }
+
+  async save({
+    integration,
+    datasource,
+  }: {
+    integration: Integration
+    datasource: Datasource
+  }) {
+    if (!(await this.checkDatasourceValidity(integration, datasource)).valid) {
+      throw new Error("Unable to connect")
+    }
+
+    const response = await API.updateDatasource(datasource)
+
+    return this.updateDatasourceInStore(response)
+  }
+
+  async deleteDatasource(datasource: Datasource) {
+    if (!datasource?._id || !datasource?._rev) {
+      return
+    }
+    await API.deleteDatasource(datasource._id, datasource._rev)
+    this.replaceDatasource(datasource._id)
+  }
+
+  async delete(datasource: Datasource) {
+    return this.deleteDatasource(datasource)
+  }
+
+  replaceDatasource(datasourceId: string, datasource?: Datasource) {
+    if (!datasourceId) {
+      return
+    }
+
+    // Handle deletion
+    if (!datasource) {
+      this.store.update(state => ({
+        ...state,
+        rawList: state.rawList.filter(x => x._id !== datasourceId),
+      }))
+      tables.removeDatasourceTables(datasourceId)
+      queries.removeDatasourceQueries(datasourceId)
+      return
+    }
+
+    // Add new datasource
+    const index = get(this.store).rawList.findIndex(
+      x => x._id === datasource._id
+    )
+    if (index === -1) {
+      this.store.update(state => ({
+        ...state,
+        rawList: [...state.rawList, datasource],
+      }))
+
+      // If this is a new datasource then we should refresh the tables list,
+      // because otherwise we'll never see the new tables
+      tables.fetch()
+    }
+
+    // Update existing datasource
+    else if (datasource) {
+      this.store.update(state => {
+        state.rawList[index] = datasource
+        return state
+      })
+    }
+  }
+
+  async getTableNames(datasource: Datasource) {
+    const info = await API.fetchInfoForDatasource(datasource)
+    return info.tableNames || []
+  }
+}
+
+export const datasources = new DatasourceStore()
diff --git a/packages/builder/src/stores/builder/deployments.js b/packages/builder/src/stores/builder/deployments.ts
similarity index 58%
rename from packages/builder/src/stores/builder/deployments.js
rename to packages/builder/src/stores/builder/deployments.ts
index dafdb1dabc..122ee43c20 100644
--- a/packages/builder/src/stores/builder/deployments.js
+++ b/packages/builder/src/stores/builder/deployments.ts
@@ -1,11 +1,12 @@
-import { writable } from "svelte/store"
-import { API } from "api"
+import { writable, type Writable } from "svelte/store"
+import { API } from "@/api"
 import { notifications } from "@budibase/bbui"
+import { DeploymentProgressResponse } from "@budibase/types"
 
 export const createDeploymentStore = () => {
-  let store = writable([])
+  let store: Writable<DeploymentProgressResponse[]> = writable([])
 
-  const load = async () => {
+  const load = async (): Promise<void> => {
     try {
       store.set(await API.getAppDeployments())
     } catch (err) {
diff --git a/packages/builder/src/stores/builder/flags.js b/packages/builder/src/stores/builder/flags.js
deleted file mode 100644
index 9f1652676c..0000000000
--- a/packages/builder/src/stores/builder/flags.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-export function createFlagsStore() {
-  const { subscribe, set } = writable({})
-
-  const actions = {
-    fetch: async () => {
-      const flags = await API.getFlags()
-      set(flags)
-    },
-    updateFlag: async (flag, value) => {
-      await API.updateFlag({
-        flag,
-        value,
-      })
-      await actions.fetch()
-    },
-    toggleUiFeature: async feature => {
-      await API.toggleUiFeature({ value: feature })
-    },
-  }
-
-  return {
-    subscribe,
-    ...actions,
-  }
-}
-
-export const flags = createFlagsStore()
diff --git a/packages/builder/src/stores/builder/flags.ts b/packages/builder/src/stores/builder/flags.ts
new file mode 100644
index 0000000000..6d2150f49b
--- /dev/null
+++ b/packages/builder/src/stores/builder/flags.ts
@@ -0,0 +1,40 @@
+import { API } from "@/api"
+import { GetUserFlagsResponse } from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+interface FlagsState {
+  flags: GetUserFlagsResponse
+}
+
+const INITIAL_FLAGS_STATE: FlagsState = {
+  flags: {},
+}
+
+export class FlagsStore extends BudiStore<FlagsState> {
+  constructor() {
+    super(INITIAL_FLAGS_STATE)
+
+    this.fetch = this.fetch.bind(this)
+    this.updateFlag = this.updateFlag.bind(this)
+    this.toggleUiFeature = this.toggleUiFeature.bind(this)
+  }
+
+  async fetch() {
+    const flags = await API.getFlags()
+    this.update(state => ({
+      ...state,
+      flags,
+    }))
+  }
+
+  async updateFlag(flag: string, value: any) {
+    await API.updateFlag(flag, value)
+    await this.fetch()
+  }
+
+  async toggleUiFeature(feature: string) {
+    await API.toggleUiFeature(feature)
+  }
+}
+
+export const flags = new FlagsStore()
diff --git a/packages/builder/src/stores/builder/hover.js b/packages/builder/src/stores/builder/hover.ts
similarity index 65%
rename from packages/builder/src/stores/builder/hover.js
rename to packages/builder/src/stores/builder/hover.ts
index 98cdc9e416..8f9b77075c 100644
--- a/packages/builder/src/stores/builder/hover.js
+++ b/packages/builder/src/stores/builder/hover.ts
@@ -1,20 +1,25 @@
 import { get } from "svelte/store"
-import { previewStore } from "stores/builder"
-import BudiStore from "../BudiStore"
+import { BudiStore } from "../BudiStore"
+import { previewStore } from "@/stores/builder"
+
+interface BuilderHoverStore {
+  hoverTimeout?: NodeJS.Timeout
+  componentId: string | null
+}
 
 export const INITIAL_HOVER_STATE = {
   componentId: null,
 }
 
-export class HoverStore extends BudiStore {
-  hoverTimeout
+export class HoverStore extends BudiStore<BuilderHoverStore> {
+  hoverTimeout?: NodeJS.Timeout
 
   constructor() {
     super({ ...INITIAL_HOVER_STATE })
     this.hover = this.hover.bind(this)
   }
 
-  hover(componentId, notifyClient = true) {
+  hover(componentId: string, notifyClient = true) {
     clearTimeout(this.hoverTimeout)
     if (componentId) {
       this.processHover(componentId, notifyClient)
@@ -25,7 +30,7 @@ export class HoverStore extends BudiStore {
     }
   }
 
-  processHover(componentId, notifyClient) {
+  processHover(componentId: string, notifyClient?: boolean) {
     if (componentId === get(this.store).componentId) {
       return
     }
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
index 08d87bebf5..54c1aa39a2 100644
--- a/packages/builder/src/stores/builder/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -3,7 +3,7 @@ import { appStore } from "./app.js"
 import { componentStore, selectedComponent } from "./components"
 import { navigationStore } from "./navigation.js"
 import { themeStore } from "./theme.js"
-import { screenStore, selectedScreen, sortedScreens } from "./screens.js"
+import { screenStore, selectedScreen, sortedScreens } from "./screens"
 import { builderStore } from "./builder.js"
 import { hoverStore } from "./hover.js"
 import { previewStore } from "./preview.js"
@@ -16,6 +16,7 @@ import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
 import { deploymentStore } from "./deployments.js"
 import { contextMenuStore } from "./contextMenu.js"
 import { snippets } from "./snippets"
+import { screenComponentErrors } from "./screenComponent"
 
 // Backend
 import { tables } from "./tables"
@@ -67,6 +68,7 @@ export {
   snippets,
   rowActions,
   appPublished,
+  screenComponentErrors,
 }
 
 export const reset = () => {
diff --git a/packages/builder/src/stores/builder/integrations.js b/packages/builder/src/stores/builder/integrations.js
deleted file mode 100644
index 6ee58961c7..0000000000
--- a/packages/builder/src/stores/builder/integrations.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-const createIntegrationsStore = () => {
-  const store = writable({})
-
-  const init = async () => {
-    const integrations = await API.getIntegrations()
-    store.set(integrations)
-  }
-
-  return {
-    ...store,
-    init,
-  }
-}
-
-export const integrations = createIntegrationsStore()
diff --git a/packages/builder/src/stores/builder/integrations.ts b/packages/builder/src/stores/builder/integrations.ts
new file mode 100644
index 0000000000..b48f45a654
--- /dev/null
+++ b/packages/builder/src/stores/builder/integrations.ts
@@ -0,0 +1,34 @@
+import { writable, type Writable } from "svelte/store"
+import { API } from "@/api"
+import { Integration } from "@budibase/types"
+
+type IntegrationsState = Record<string, Integration>
+
+const INITIAL_STATE: IntegrationsState = {}
+
+const createIntegrationsStore = () => {
+  const store: Writable<IntegrationsState> = writable(INITIAL_STATE)
+
+  const init = async () => {
+    const response = await API.getIntegrations()
+
+    // Filter out undefineds
+    const integrations = Object.entries(response).reduce(
+      (acc, [key, value]) => {
+        if (value) {
+          acc[key] = value
+        }
+        return acc
+      },
+      {} as IntegrationsState
+    )
+    store.set(integrations)
+  }
+
+  return {
+    ...store,
+    init,
+  }
+}
+
+export const integrations = createIntegrationsStore()
diff --git a/packages/builder/src/stores/builder/layouts.js b/packages/builder/src/stores/builder/layouts.ts
similarity index 69%
rename from packages/builder/src/stores/builder/layouts.js
rename to packages/builder/src/stores/builder/layouts.ts
index 30d6935b19..af7b17fcc7 100644
--- a/packages/builder/src/stores/builder/layouts.js
+++ b/packages/builder/src/stores/builder/layouts.ts
@@ -1,14 +1,20 @@
 import { derived, get } from "svelte/store"
-import { componentStore } from "stores/builder"
-import BudiStore from "../BudiStore"
-import { API } from "api"
+import { componentStore } from "@/stores/builder"
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import { Layout } from "@budibase/types"
 
-export const INITIAL_LAYOUT_STATE = {
+interface LayoutState {
+  layouts: Layout[]
+  selectedLayoutId: string | null
+}
+
+export const INITIAL_LAYOUT_STATE: LayoutState = {
   layouts: [],
   selectedLayoutId: null,
 }
 
-export class LayoutStore extends BudiStore {
+export class LayoutStore extends BudiStore<LayoutState> {
   constructor() {
     super(INITIAL_LAYOUT_STATE)
 
@@ -22,14 +28,14 @@ export class LayoutStore extends BudiStore {
     this.store.set({ ...INITIAL_LAYOUT_STATE })
   }
 
-  syncAppLayouts(pkg) {
+  syncAppLayouts(pkg: { layouts: Layout[] }) {
     this.update(state => ({
       ...state,
       layouts: [...pkg.layouts],
     }))
   }
 
-  select(layoutId) {
+  select(layoutId: string) {
     // Check this layout exists
     const state = get(this.store)
     const componentState = get(componentStore)
@@ -48,21 +54,18 @@ export class LayoutStore extends BudiStore {
 
     // Select new layout
     this.update(state => {
-      state.selectedLayoutId = layout._id
+      state.selectedLayoutId = layout._id!
       return state
     })
 
     componentStore.select(layout.props?._id)
   }
 
-  async deleteLayout(layout) {
-    if (!layout?._id) {
+  async deleteLayout(layout: Layout) {
+    if (!layout?._id || !layout?._rev) {
       return
     }
-    await API.deleteLayout({
-      layoutId: layout._id,
-      layoutRev: layout._rev,
-    })
+    await API.deleteLayout(layout._id, layout._rev)
     this.update(state => {
       state.layouts = state.layouts.filter(x => x._id !== layout._id)
       return state
diff --git a/packages/builder/src/stores/builder/navigation.js b/packages/builder/src/stores/builder/navigation.ts
similarity index 65%
rename from packages/builder/src/stores/builder/navigation.js
rename to packages/builder/src/stores/builder/navigation.ts
index 86e484b0a6..1574efee2a 100644
--- a/packages/builder/src/stores/builder/navigation.js
+++ b/packages/builder/src/stores/builder/navigation.ts
@@ -1,28 +1,23 @@
 import { get } from "svelte/store"
-import { API } from "api"
-import { appStore } from "stores/builder"
-import BudiStore from "../BudiStore"
+import { API } from "@/api"
+import { appStore } from "@/stores/builder"
+import { BudiStore } from "../BudiStore"
+import { AppNavigation, AppNavigationLink, UIObject } from "@budibase/types"
+
+interface BuilderNavigationStore extends AppNavigation {}
 
 export const INITIAL_NAVIGATION_STATE = {
   navigation: "Top",
   links: [],
-  title: null,
-  sticky: null,
-  hideLogo: null,
-  logoUrl: null,
-  hideTitle: null,
   textAlign: "Left",
-  navBackground: null,
-  navWidth: null,
-  navTextColor: null,
 }
 
-export class NavigationStore extends BudiStore {
+export class NavigationStore extends BudiStore<BuilderNavigationStore> {
   constructor() {
     super(INITIAL_NAVIGATION_STATE)
   }
 
-  syncAppNavigation(nav) {
+  syncAppNavigation(nav: AppNavigation) {
     this.update(state => ({
       ...state,
       ...nav,
@@ -33,18 +28,17 @@ export class NavigationStore extends BudiStore {
     this.store.set({ ...INITIAL_NAVIGATION_STATE })
   }
 
-  async save(navigation) {
+  async save(navigation: AppNavigation) {
     const appId = get(appStore).appId
-    const app = await API.saveAppMetadata({
-      appId,
-      metadata: { navigation },
-    })
-    this.syncAppNavigation(app.navigation)
+    const app = await API.saveAppMetadata(appId, { navigation })
+    if (app.navigation) {
+      this.syncAppNavigation(app.navigation)
+    }
   }
 
-  async saveLink(url, title, roleId) {
+  async saveLink(url: string, title: string, roleId: string) {
     const navigation = get(this.store)
-    let links = [...(navigation?.links ?? [])]
+    let links: AppNavigationLink[] = [...(navigation?.links ?? [])]
 
     // Skip if we have an identical link
     if (links.find(link => link.url === url && link.text === title)) {
@@ -63,7 +57,7 @@ export class NavigationStore extends BudiStore {
     })
   }
 
-  async deleteLink(urls) {
+  async deleteLink(urls: string[] | string) {
     const navigation = get(this.store)
     let links = navigation?.links
     if (!links?.length) {
@@ -89,7 +83,7 @@ export class NavigationStore extends BudiStore {
     })
   }
 
-  syncMetadata(metadata) {
+  syncMetadata(metadata: UIObject) {
     const { navigation } = metadata
     this.syncAppNavigation(navigation)
   }
diff --git a/packages/builder/src/stores/builder/permissions.js b/packages/builder/src/stores/builder/permissions.js
deleted file mode 100644
index 0113f221c0..0000000000
--- a/packages/builder/src/stores/builder/permissions.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-export function createPermissionStore() {
-  const { subscribe } = writable([])
-
-  return {
-    subscribe,
-    save: async ({ level, role, resource }) => {
-      return await API.updatePermissionForResource({
-        resourceId: resource,
-        roleId: role,
-        level,
-      })
-    },
-    remove: async ({ level, role, resource }) => {
-      return await API.removePermissionFromResource({
-        resourceId: resource,
-        roleId: role,
-        level,
-      })
-    },
-    forResource: async resourceId => {
-      return (await API.getPermissionForResource(resourceId)).permissions
-    },
-    forResourceDetailed: async resourceId => {
-      return await API.getPermissionForResource(resourceId)
-    },
-    getDependantsInfo: async resourceId => {
-      return await API.getDependants(resourceId)
-    },
-  }
-}
-
-export const permissions = createPermissionStore()
diff --git a/packages/builder/src/stores/builder/permissions.ts b/packages/builder/src/stores/builder/permissions.ts
new file mode 100644
index 0000000000..6056449150
--- /dev/null
+++ b/packages/builder/src/stores/builder/permissions.ts
@@ -0,0 +1,50 @@
+import { BudiStore } from "../BudiStore"
+import { API } from "@/api"
+import {
+  PermissionLevel,
+  GetResourcePermsResponse,
+  GetDependantResourcesResponse,
+  ResourcePermissionInfo,
+} from "@budibase/types"
+
+interface Permission {
+  level: PermissionLevel
+  role: string
+  resource: string
+}
+
+export class PermissionStore extends BudiStore<Permission[]> {
+  constructor() {
+    super([])
+  }
+
+  save = async (permission: Permission) => {
+    const { level, role, resource } = permission
+    return await API.updatePermissionForResource(resource, role, level)
+  }
+
+  remove = async (permission: Permission) => {
+    const { level, role, resource } = permission
+    return await API.removePermissionFromResource(resource, role, level)
+  }
+
+  forResource = async (
+    resourceId: string
+  ): Promise<Record<string, ResourcePermissionInfo>> => {
+    return (await API.getPermissionForResource(resourceId)).permissions
+  }
+
+  forResourceDetailed = async (
+    resourceId: string
+  ): Promise<GetResourcePermsResponse> => {
+    return await API.getPermissionForResource(resourceId)
+  }
+
+  getDependantsInfo = async (
+    resourceId: string
+  ): Promise<GetDependantResourcesResponse> => {
+    return await API.getDependants(resourceId)
+  }
+}
+
+export const permissions = new PermissionStore()
diff --git a/packages/builder/src/stores/builder/preview.js b/packages/builder/src/stores/builder/preview.js
deleted file mode 100644
index 4923185ee7..0000000000
--- a/packages/builder/src/stores/builder/preview.js
+++ /dev/null
@@ -1,80 +0,0 @@
-import { writable, get } from "svelte/store"
-
-const INITIAL_PREVIEW_STATE = {
-  previewDevice: "desktop",
-  previewEventHandler: null,
-  showPreview: false,
-  selectedComponentContext: null,
-}
-
-export const createPreviewStore = () => {
-  const store = writable({
-    ...INITIAL_PREVIEW_STATE,
-  })
-
-  const setDevice = device => {
-    store.update(state => {
-      state.previewDevice = device
-      return state
-    })
-  }
-
-  // Potential evt names "eject-block", "dragging-new-component"
-  const sendEvent = (name, payload) => {
-    const { previewEventHandler } = get(store)
-    previewEventHandler?.(name, payload)
-  }
-
-  const registerEventHandler = handler => {
-    store.update(state => {
-      state.previewEventHandler = handler
-      return state
-    })
-  }
-
-  const startDrag = component => {
-    sendEvent("dragging-new-component", {
-      dragging: true,
-      component,
-    })
-  }
-
-  const stopDrag = () => {
-    sendEvent("dragging-new-component", {
-      dragging: false,
-    })
-  }
-
-  //load preview?
-  const showPreview = isVisible => {
-    store.update(state => {
-      state.showPreview = isVisible
-      return state
-    })
-  }
-
-  const setSelectedComponentContext = context => {
-    store.update(state => {
-      state.selectedComponentContext = context
-      return state
-    })
-  }
-
-  const requestComponentContext = () => {
-    sendEvent("request-context")
-  }
-
-  return {
-    subscribe: store.subscribe,
-    setDevice,
-    sendEvent, //may not be required
-    registerEventHandler,
-    startDrag,
-    stopDrag,
-    showPreview,
-    setSelectedComponentContext,
-    requestComponentContext,
-  }
-}
-
-export const previewStore = createPreviewStore()
diff --git a/packages/builder/src/stores/builder/preview.ts b/packages/builder/src/stores/builder/preview.ts
new file mode 100644
index 0000000000..fe14c02535
--- /dev/null
+++ b/packages/builder/src/stores/builder/preview.ts
@@ -0,0 +1,90 @@
+import { get } from "svelte/store"
+import { BudiStore } from "../BudiStore"
+
+type PreviewDevice = "desktop" | "tablet" | "mobile"
+type PreviewEventHandler = (name: string, payload?: any) => void
+type ComponentContext = Record<string, any>
+
+interface PreviewState {
+  previewDevice: PreviewDevice
+  previewEventHandler: PreviewEventHandler | null
+  showPreview: boolean
+  selectedComponentContext: ComponentContext | null
+}
+
+const INITIAL_PREVIEW_STATE: PreviewState = {
+  previewDevice: "desktop",
+  previewEventHandler: null,
+  showPreview: false,
+  selectedComponentContext: null,
+}
+
+export class PreviewStore extends BudiStore<PreviewState> {
+  constructor() {
+    super(INITIAL_PREVIEW_STATE)
+
+    this.setDevice = this.setDevice.bind(this)
+    this.sendEvent = this.sendEvent.bind(this)
+    this.registerEventHandler = this.registerEventHandler.bind(this)
+    this.startDrag = this.startDrag.bind(this)
+    this.stopDrag = this.stopDrag.bind(this)
+    this.showPreview = this.showPreview.bind(this)
+    this.setSelectedComponentContext =
+      this.setSelectedComponentContext.bind(this)
+    this.requestComponentContext = this.requestComponentContext.bind(this)
+  }
+
+  setDevice(device: PreviewDevice) {
+    this.update(state => ({
+      ...state,
+      previewDevice: device,
+    }))
+  }
+
+  // Potential evt names "eject-block", "dragging-new-component"
+  sendEvent(name: string, payload?: any) {
+    const { previewEventHandler } = get(this.store)
+    previewEventHandler?.(name, payload)
+  }
+
+  registerEventHandler(handler: PreviewEventHandler) {
+    this.update(state => ({
+      ...state,
+      previewEventHandler: handler,
+    }))
+  }
+
+  startDrag(component: any) {
+    this.sendEvent("dragging-new-component", {
+      dragging: true,
+      component,
+    })
+  }
+
+  stopDrag() {
+    this.sendEvent("dragging-new-component", {
+      dragging: false,
+    })
+  }
+
+  //load preview?
+  showPreview(isVisible: boolean) {
+    this.update(state => ({
+      ...state,
+      showPreview: isVisible,
+    }))
+  }
+
+  setSelectedComponentContext(context: ComponentContext) {
+    this.update(state => ({
+      ...state,
+      selectedComponentContext: context,
+    }))
+  }
+
+  requestComponentContext() {
+    this.sendEvent("request-context")
+  }
+}
+
+export const previewStore = new PreviewStore()
diff --git a/packages/builder/src/stores/builder/published.js b/packages/builder/src/stores/builder/published.js
deleted file mode 100644
index 6ae9392f40..0000000000
--- a/packages/builder/src/stores/builder/published.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { appStore } from "./app"
-import { appsStore } from "stores/portal/apps"
-import { deploymentStore } from "./deployments"
-import { derived } from "svelte/store"
-
-export const appPublished = derived(
-  [appStore, appsStore, deploymentStore],
-  ([$appStore, $appsStore, $deploymentStore]) => {
-    const app = $appsStore.apps.find(app => app.devId === $appStore.appId)
-    const deployments = $deploymentStore.filter(x => x.status === "SUCCESS")
-    return app?.status === "published" && deployments.length > 0
-  }
-)
diff --git a/packages/builder/src/stores/builder/published.ts b/packages/builder/src/stores/builder/published.ts
new file mode 100644
index 0000000000..c38f3bb718
--- /dev/null
+++ b/packages/builder/src/stores/builder/published.ts
@@ -0,0 +1,16 @@
+import { appStore } from "./app"
+import { appsStore } from "@/stores/portal/apps"
+import { deploymentStore } from "./deployments"
+import { derived, type Readable } from "svelte/store"
+import { DeploymentProgressResponse, DeploymentStatus } from "@budibase/types"
+
+export const appPublished: Readable<boolean> = derived(
+  [appStore, appsStore, deploymentStore],
+  ([$appStore, $appsStore, $deploymentStore]) => {
+    const app = $appsStore.apps.find(app => app.devId === $appStore.appId)
+    const deployments = $deploymentStore.filter(
+      (x: DeploymentProgressResponse) => x.status === DeploymentStatus.SUCCESS
+    )
+    return app?.status === "published" && deployments.length > 0
+  }
+)
diff --git a/packages/builder/src/stores/builder/queries.js b/packages/builder/src/stores/builder/queries.js
deleted file mode 100644
index b717a17f97..0000000000
--- a/packages/builder/src/stores/builder/queries.js
+++ /dev/null
@@ -1,136 +0,0 @@
-import { writable, get, derived } from "svelte/store"
-import { datasources } from "./datasources"
-import { integrations } from "./integrations"
-import { API } from "api"
-import { duplicateName } from "helpers/duplicate"
-
-const sortQueries = queryList => {
-  queryList.sort((q1, q2) => {
-    return q1.name.localeCompare(q2.name)
-  })
-}
-
-export function createQueriesStore() {
-  const store = writable({
-    list: [],
-    selectedQueryId: null,
-  })
-  const derivedStore = derived(store, $store => ({
-    ...$store,
-    selected: $store.list?.find(q => q._id === $store.selectedQueryId),
-  }))
-
-  const fetch = async () => {
-    const queries = await API.getQueries()
-    sortQueries(queries)
-    store.update(state => ({
-      ...state,
-      list: queries,
-    }))
-  }
-
-  const save = async (datasourceId, query) => {
-    const _integrations = get(integrations)
-    const dataSource = get(datasources).list.filter(
-      ds => ds._id === datasourceId
-    )
-    // Check if readable attribute is found
-    if (dataSource.length !== 0) {
-      const integration = _integrations[dataSource[0].source]
-      const readable = integration.query[query.queryVerb].readable
-      if (readable) {
-        query.readable = readable
-      }
-    }
-    query.datasourceId = datasourceId
-    const savedQuery = await API.saveQuery(query)
-    store.update(state => {
-      const idx = state.list.findIndex(query => query._id === savedQuery._id)
-      const queries = state.list
-      if (idx >= 0) {
-        queries.splice(idx, 1, savedQuery)
-      } else {
-        queries.push(savedQuery)
-      }
-      sortQueries(queries)
-      return {
-        list: queries,
-        selectedQueryId: savedQuery._id,
-      }
-    })
-    return savedQuery
-  }
-
-  const importQueries = async ({ data, datasourceId }) => {
-    return await API.importQueries({
-      datasourceId,
-      data,
-    })
-  }
-
-  const select = id => {
-    store.update(state => ({
-      ...state,
-      selectedQueryId: id,
-    }))
-  }
-
-  const preview = async query => {
-    const result = await API.previewQuery(query)
-    // Assume all the fields are strings and create a basic schema from the
-    // unique fields returned by the server
-    const schema = {}
-    for (let [field, metadata] of Object.entries(result.schema)) {
-      schema[field] = metadata || { type: "string" }
-    }
-    return { ...result, schema, rows: result.rows || [] }
-  }
-
-  const deleteQuery = async query => {
-    await API.deleteQuery({
-      queryId: query?._id,
-      queryRev: query?._rev,
-    })
-    store.update(state => {
-      state.list = state.list.filter(existing => existing._id !== query._id)
-      return state
-    })
-  }
-
-  const duplicate = async query => {
-    let list = get(store).list
-    const newQuery = { ...query }
-    const datasourceId = query.datasourceId
-
-    delete newQuery._id
-    delete newQuery._rev
-    newQuery.name = duplicateName(
-      query.name,
-      list.map(q => q.name)
-    )
-
-    return await save(datasourceId, newQuery)
-  }
-
-  const removeDatasourceQueries = datasourceId => {
-    store.update(state => ({
-      ...state,
-      list: state.list.filter(table => table.datasourceId !== datasourceId),
-    }))
-  }
-
-  return {
-    subscribe: derivedStore.subscribe,
-    fetch,
-    init: fetch,
-    select,
-    save,
-    import: importQueries,
-    delete: deleteQuery,
-    preview,
-    duplicate,
-    removeDatasourceQueries,
-  }
-}
-
-export const queries = createQueriesStore()
diff --git a/packages/builder/src/stores/builder/queries.ts b/packages/builder/src/stores/builder/queries.ts
new file mode 100644
index 0000000000..c6511dc346
--- /dev/null
+++ b/packages/builder/src/stores/builder/queries.ts
@@ -0,0 +1,156 @@
+import { derived, get, Writable } from "svelte/store"
+import { datasources } from "./datasources"
+import { integrations } from "./integrations"
+import { API } from "@/api"
+import { duplicateName } from "@/helpers/duplicate"
+import { DerivedBudiStore } from "@/stores/BudiStore"
+import {
+  Query,
+  QueryPreview,
+  PreviewQueryResponse,
+  SaveQueryRequest,
+  ImportRestQueryRequest,
+  QuerySchema,
+} from "@budibase/types"
+
+const sortQueries = (queryList: Query[]) => {
+  queryList.sort((q1, q2) => {
+    return q1.name.localeCompare(q2.name)
+  })
+}
+
+interface BuilderQueryStore {
+  list: Query[]
+  selectedQueryId: string | null
+}
+
+interface DerivedQueryStore extends BuilderQueryStore {
+  selected?: Query
+}
+
+export class QueryStore extends DerivedBudiStore<
+  BuilderQueryStore,
+  DerivedQueryStore
+> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<BuilderQueryStore>) => {
+      return derived(store, ($store): DerivedQueryStore => {
+        return {
+          list: $store.list,
+          selectedQueryId: $store.selectedQueryId,
+          selected: $store.list?.find(q => q._id === $store.selectedQueryId),
+        }
+      })
+    }
+
+    super(
+      {
+        list: [],
+        selectedQueryId: null,
+      },
+      makeDerivedStore
+    )
+
+    this.select = this.select.bind(this)
+  }
+
+  async fetch() {
+    const queries = await API.getQueries()
+    sortQueries(queries)
+    this.store.update(state => ({
+      ...state,
+      list: queries,
+    }))
+  }
+
+  async save(datasourceId: string, query: SaveQueryRequest) {
+    const _integrations = get(integrations)
+    const dataSource = get(datasources).list.filter(
+      ds => ds._id === datasourceId
+    )
+    // Check if readable attribute is found
+    if (dataSource.length !== 0) {
+      const integration = _integrations[dataSource[0].source]
+      const readable = integration.query[query.queryVerb].readable
+      if (readable) {
+        query.readable = readable
+      }
+    }
+    query.datasourceId = datasourceId
+    const savedQuery = await API.saveQuery(query)
+    this.store.update(state => {
+      const idx = state.list.findIndex(query => query._id === savedQuery._id)
+      const queries = state.list
+      if (idx >= 0) {
+        queries.splice(idx, 1, savedQuery)
+      } else {
+        queries.push(savedQuery)
+      }
+      sortQueries(queries)
+      return {
+        list: queries,
+        selectedQueryId: savedQuery._id || null,
+      }
+    })
+    return savedQuery
+  }
+
+  async importQueries(data: ImportRestQueryRequest) {
+    return await API.importQueries(data)
+  }
+
+  select(id: string | null) {
+    this.store.update(state => ({
+      ...state,
+      selectedQueryId: id,
+    }))
+  }
+
+  async preview(query: QueryPreview): Promise<PreviewQueryResponse> {
+    const result = await API.previewQuery(query)
+    // Assume all the fields are strings and create a basic schema from the
+    // unique fields returned by the server
+    const schema: Record<string, QuerySchema> = {}
+    for (let [field, metadata] of Object.entries(result.schema)) {
+      schema[field] = (metadata as QuerySchema) || { type: "string" }
+    }
+    return { ...result, schema, rows: result.rows || [] }
+  }
+
+  async delete(query: Query) {
+    if (!query._id || !query._rev) {
+      throw new Error("Query ID or Revision is missing")
+    }
+    await API.deleteQuery(query._id, query._rev)
+    this.store.update(state => ({
+      ...state,
+      list: state.list.filter(existing => existing._id !== query._id),
+    }))
+  }
+
+  async duplicate(query: Query) {
+    let list = get(this.store).list
+    const newQuery = { ...query }
+    const datasourceId = query.datasourceId
+
+    delete newQuery._id
+    delete newQuery._rev
+    newQuery.name = duplicateName(
+      query.name,
+      list.map(q => q.name)
+    )
+
+    return await this.save(datasourceId, newQuery)
+  }
+
+  removeDatasourceQueries(datasourceId: string) {
+    this.store.update(state => ({
+      ...state,
+      list: state.list.filter(table => table.datasourceId !== datasourceId),
+    }))
+  }
+
+  init = this.fetch
+}
+
+export const queries = new QueryStore()
diff --git a/packages/builder/src/stores/builder/roles.js b/packages/builder/src/stores/builder/roles.js
deleted file mode 100644
index fd3581f1d4..0000000000
--- a/packages/builder/src/stores/builder/roles.js
+++ /dev/null
@@ -1,91 +0,0 @@
-import { derived, writable, get } from "svelte/store"
-import { API } from "api"
-import { RoleUtils } from "@budibase/frontend-core"
-
-export function createRolesStore() {
-  const store = writable([])
-  const enriched = derived(store, $store => {
-    return $store.map(role => ({
-      ...role,
-
-      // Ensure we have new metadata for all roles
-      uiMetadata: {
-        displayName: role.uiMetadata?.displayName || role.name,
-        color:
-          role.uiMetadata?.color || "var(--spectrum-global-color-magenta-400)",
-        description: role.uiMetadata?.description || "Custom role",
-      },
-    }))
-  })
-
-  function setRoles(roles) {
-    store.set(
-      roles.sort((a, b) => {
-        const priorityA = RoleUtils.getRolePriority(a._id)
-        const priorityB = RoleUtils.getRolePriority(b._id)
-        if (priorityA !== priorityB) {
-          return priorityA > priorityB ? -1 : 1
-        }
-        const nameA = a.uiMetadata?.displayName || a.name
-        const nameB = b.uiMetadata?.displayName || b.name
-        return nameA < nameB ? -1 : 1
-      })
-    )
-  }
-
-  const actions = {
-    fetch: async () => {
-      const roles = await API.getRoles()
-      setRoles(roles)
-    },
-    fetchByAppId: async appId => {
-      const { roles } = await API.getRolesForApp(appId)
-      setRoles(roles)
-    },
-    delete: async role => {
-      await API.deleteRole({
-        roleId: role?._id,
-        roleRev: role?._rev,
-      })
-      await actions.fetch()
-    },
-    save: async role => {
-      const savedRole = await API.saveRole(role)
-      await actions.fetch()
-      return savedRole
-    },
-    replace: (roleId, role) => {
-      // Handles external updates of roles
-      if (!roleId) {
-        return
-      }
-
-      // Handle deletion
-      if (!role) {
-        store.update(state => state.filter(x => x._id !== roleId))
-        return
-      }
-
-      // Add new role
-      const index = get(store).findIndex(x => x._id === role._id)
-      if (index === -1) {
-        store.update(state => [...state, role])
-      }
-
-      // Update existing role
-      else if (role) {
-        store.update(state => {
-          state[index] = role
-          return [...state]
-        })
-      }
-    },
-  }
-
-  return {
-    subscribe: enriched.subscribe,
-    ...actions,
-  }
-}
-
-export const roles = createRolesStore()
diff --git a/packages/builder/src/stores/builder/roles.ts b/packages/builder/src/stores/builder/roles.ts
new file mode 100644
index 0000000000..732f50d6be
--- /dev/null
+++ b/packages/builder/src/stores/builder/roles.ts
@@ -0,0 +1,94 @@
+import { derived, get, type Writable } from "svelte/store"
+import { API } from "@/api"
+import { RoleUtils } from "@budibase/frontend-core"
+import { DerivedBudiStore } from "../BudiStore"
+import { Role } from "@budibase/types"
+
+export class RoleStore extends DerivedBudiStore<Role[], Role[]> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<Role[]>) =>
+      derived(store, $store => {
+        return $store.map((role: Role) => ({
+          ...role,
+          // Ensure we have new metadata for all roles
+          uiMetadata: {
+            displayName: role.uiMetadata?.displayName || role.name,
+            color:
+              role.uiMetadata?.color ||
+              "var(--spectrum-global-color-magenta-400)",
+            description: role.uiMetadata?.description || "Custom role",
+          },
+        }))
+      })
+
+    super([], makeDerivedStore)
+  }
+
+  setRoles = (roles: Role[]) => {
+    this.set(
+      roles.sort((a, b) => {
+        // Ensure we have valid IDs for priority comparison
+        const priorityA = RoleUtils.getRolePriority(a._id)
+        const priorityB = RoleUtils.getRolePriority(b._id)
+        if (priorityA !== priorityB) {
+          return priorityA > priorityB ? -1 : 1
+        }
+        const nameA = a.uiMetadata?.displayName || a.name
+        const nameB = b.uiMetadata?.displayName || b.name
+        return nameA < nameB ? -1 : 1
+      })
+    )
+  }
+
+  fetch = async () => {
+    const roles = await API.getRoles()
+    this.setRoles(roles)
+  }
+
+  fetchByAppId = async (appId: string) => {
+    const { roles } = await API.getRolesForApp(appId)
+    this.setRoles(roles)
+  }
+
+  delete = async (role: Role) => {
+    if (!role._id || !role._rev) {
+      return
+    }
+    await API.deleteRole(role._id, role._rev)
+    await this.fetch()
+  }
+
+  save = async (role: Role) => {
+    const savedRole = await API.saveRole(role)
+    await this.fetch()
+    return savedRole
+  }
+
+  replace = (roleId: string, role?: Role) => {
+    // Handles external updates of roles
+    if (!roleId) {
+      return
+    }
+
+    // Handle deletion
+    if (!role) {
+      this.update(state => state.filter(x => x._id !== roleId))
+      return
+    }
+
+    // Add new role
+    const index = get(this).findIndex(x => x._id === role._id)
+    if (index === -1) {
+      this.update(state => [...state, role])
+    }
+    // Update existing role
+    else if (role) {
+      this.update(state => {
+        state[index] = role
+        return [...state]
+      })
+    }
+  }
+}
+
+export const roles = new RoleStore()
diff --git a/packages/builder/src/stores/builder/rowActions.js b/packages/builder/src/stores/builder/rowActions.ts
similarity index 57%
rename from packages/builder/src/stores/builder/rowActions.js
rename to packages/builder/src/stores/builder/rowActions.ts
index b1f4e7067f..2b3077926e 100644
--- a/packages/builder/src/stores/builder/rowActions.js
+++ b/packages/builder/src/stores/builder/rowActions.ts
@@ -1,23 +1,34 @@
 import { get, derived } from "svelte/store"
-import BudiStore from "stores/BudiStore"
+import { BudiStore } from "@/stores/BudiStore"
 import { tables } from "./tables"
 import { viewsV2 } from "./viewsV2"
 import { automationStore } from "./automations"
-import { API } from "api"
-import { getSequentialName } from "helpers/duplicate"
+import { API } from "@/api"
+import { getSequentialName } from "@/helpers/duplicate"
 
-const initialState = {}
+interface RowAction {
+  id: string
+  name: string
+  tableId: string
+  allowedSources?: string[]
+}
 
-export class RowActionStore extends BudiStore {
+interface RowActionState {
+  [tableId: string]: RowAction[]
+}
+
+const initialState: RowActionState = {}
+
+export class RowActionStore extends BudiStore<RowActionState> {
   constructor() {
     super(initialState)
   }
 
   reset = () => {
-    this.store.set(initialState)
+    this.set(initialState)
   }
 
-  refreshRowActions = async sourceId => {
+  refreshRowActions = async (sourceId: string) => {
     if (!sourceId) {
       return
     }
@@ -34,36 +45,37 @@ export class RowActionStore extends BudiStore {
 
     // Fetch row actions for this table
     const res = await API.rowActions.fetch(tableId)
-    const actions = Object.values(res || {})
+    const actions = Object.values(res || {}) as RowAction[]
     this.update(state => ({
       ...state,
       [tableId]: actions,
     }))
   }
 
-  createRowAction = async (tableId, viewId, name) => {
+  createRowAction = async (tableId: string, viewId?: string, name?: string) => {
     if (!tableId) {
       return
     }
 
     // Get a unique name for this action
     if (!name) {
-      const existingRowActions = get(this.store)[tableId] || []
+      const existingRowActions = get(this)[tableId] || []
       name = getSequentialName(existingRowActions, "New row action ", {
         getName: x => x.name,
-      })
+      })!
+    }
+
+    if (!name) {
+      throw new Error("Failed to generate a unique name for the row action")
     }
 
     // Create the action
-    const res = await API.rowActions.create({
-      name,
-      tableId,
-    })
+    const res = await API.rowActions.create(tableId, name)
 
     // Enable action on this view if adding via a view
     if (viewId) {
       await Promise.all([
-        this.enableView(tableId, viewId, res.id),
+        this.enableView(tableId, res.id, viewId),
         automationStore.actions.fetch(),
       ])
     } else {
@@ -76,56 +88,35 @@ export class RowActionStore extends BudiStore {
     return res
   }
 
-  enableView = async (tableId, viewId, rowActionId) => {
-    await API.rowActions.enableView({
-      tableId,
-      viewId,
-      rowActionId,
-    })
+  enableView = async (tableId: string, rowActionId: string, viewId: string) => {
+    await API.rowActions.enableView(tableId, rowActionId, viewId)
     await this.refreshRowActions(tableId)
   }
 
-  disableView = async (tableId, viewId, rowActionId) => {
-    await API.rowActions.disableView({
-      tableId,
-      viewId,
-      rowActionId,
-    })
+  disableView = async (
+    tableId: string,
+    rowActionId: string,
+    viewId: string
+  ) => {
+    await API.rowActions.disableView(tableId, rowActionId, viewId)
     await this.refreshRowActions(tableId)
   }
 
-  rename = async (tableId, rowActionId, name) => {
-    await API.rowActions.update({
-      tableId,
-      rowActionId,
-      name,
-    })
-    await this.refreshRowActions(tableId)
-    automationStore.actions.fetch()
-  }
-
-  delete = async (tableId, rowActionId) => {
-    await API.rowActions.delete({
-      tableId,
-      rowActionId,
-    })
+  delete = async (tableId: string, rowActionId: string) => {
+    await API.rowActions.delete(tableId, rowActionId)
     await this.refreshRowActions(tableId)
     // We don't need to refresh automations as we can only delete row actions
     // from the automations store, so we already handle the state update there
   }
 
-  trigger = async (sourceId, rowActionId, rowId) => {
-    await API.rowActions.trigger({
-      sourceId,
-      rowActionId,
-      rowId,
-    })
+  trigger = async (sourceId: string, rowActionId: string, rowId: string) => {
+    await API.rowActions.trigger(sourceId, rowActionId, rowId)
   }
 }
 
 const store = new RowActionStore()
-const derivedStore = derived(store, $store => {
-  let map = {}
+const derivedStore = derived<RowActionStore, RowActionState>(store, $store => {
+  const map: RowActionState = {}
 
   // Generate an entry for every view as well
   Object.keys($store || {}).forEach(tableId => {
@@ -133,7 +124,7 @@ const derivedStore = derived(store, $store => {
     map[tableId] = $store[tableId]
     for (let action of $store[tableId]) {
       const otherSources = (action.allowedSources || []).filter(
-        sourceId => sourceId !== tableId
+        (sourceId: string) => sourceId !== tableId
       )
       for (let source of otherSources) {
         map[source] ??= []
diff --git a/packages/builder/src/stores/builder/screenComponent.ts b/packages/builder/src/stores/builder/screenComponent.ts
new file mode 100644
index 0000000000..226d233090
--- /dev/null
+++ b/packages/builder/src/stores/builder/screenComponent.ts
@@ -0,0 +1,113 @@
+import { derived } from "svelte/store"
+import { tables } from "./tables"
+import { selectedScreen } from "./screens"
+import { viewsV2 } from "./viewsV2"
+import { findComponentsBySettingsType } from "@/helpers/screen"
+import { UIDatasourceType, Screen } from "@budibase/types"
+import { queries } from "./queries"
+import { views } from "./views"
+import { bindings, featureFlag } from "@/helpers"
+import { getBindableProperties } from "@/dataBinding"
+
+function reduceBy<TItem extends {}, TKey extends keyof TItem>(
+  key: TKey,
+  list: TItem[]
+): Record<string, any> {
+  return list.reduce(
+    (result, item) => ({
+      ...result,
+      [item[key] as string]: item,
+    }),
+    {}
+  )
+}
+
+const friendlyNameByType: Partial<Record<UIDatasourceType, string>> = {
+  viewV2: "view",
+}
+
+const validationKeyByType: Record<UIDatasourceType, string | null> = {
+  table: "tableId",
+  view: "name",
+  viewV2: "id",
+  query: "_id",
+  custom: null,
+  link: "rowId",
+  field: "value",
+  jsonarray: "value",
+}
+
+export const screenComponentErrors = derived(
+  [selectedScreen, tables, views, viewsV2, queries],
+  ([$selectedScreen, $tables, $views, $viewsV2, $queries]): Record<
+    string,
+    string[]
+  > => {
+    if (!featureFlag.isEnabled("CHECK_SCREEN_COMPONENT_SETTINGS_ERRORS")) {
+      return {}
+    }
+    function getInvalidDatasources(
+      screen: Screen,
+      datasources: Record<string, any>
+    ) {
+      const result: Record<string, string[]> = {}
+      for (const { component, setting } of findComponentsBySettingsType(
+        screen,
+        ["table", "dataSource"]
+      )) {
+        const componentSettings = component[setting.key]
+        if (!componentSettings) {
+          continue
+        }
+        const { label } = componentSettings
+        const type = componentSettings.type as UIDatasourceType
+
+        const validationKey = validationKeyByType[type]
+        if (!validationKey) {
+          continue
+        }
+
+        const componentBindings = getBindableProperties(
+          $selectedScreen,
+          component._id
+        )
+
+        const componentDatasources = {
+          ...reduceBy(
+            "rowId",
+            bindings.extractRelationships(componentBindings)
+          ),
+          ...reduceBy("value", bindings.extractFields(componentBindings)),
+          ...reduceBy(
+            "value",
+            bindings.extractJSONArrayFields(componentBindings)
+          ),
+        }
+
+        const resourceId = componentSettings[validationKey]
+        if (!{ ...datasources, ...componentDatasources }[resourceId]) {
+          const friendlyTypeName = friendlyNameByType[type] ?? type
+          result[component._id!] = [
+            `The ${friendlyTypeName} named "${label}" could not be found`,
+          ]
+        }
+      }
+
+      return result
+    }
+
+    const datasources = {
+      ...reduceBy("_id", $tables.list),
+      ...reduceBy("name", $views.list),
+      ...reduceBy("id", $viewsV2.list),
+      ...reduceBy("_id", $queries.list),
+    }
+
+    if (!$selectedScreen) {
+      // Skip validation if a screen is not selected.
+      return {}
+    }
+
+    return getInvalidDatasources($selectedScreen, datasources)
+  }
+)
diff --git a/packages/builder/src/stores/builder/screens.js b/packages/builder/src/stores/builder/screens.ts
similarity index 75%
rename from packages/builder/src/stores/builder/screens.js
rename to packages/builder/src/stores/builder/screens.ts
index 10c4265e73..5163c6a3ea 100644
--- a/packages/builder/src/stores/builder/screens.js
+++ b/packages/builder/src/stores/builder/screens.ts
@@ -2,26 +2,43 @@ import { derived, get } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
 import { Helpers } from "@budibase/bbui"
 import { RoleUtils, Utils } from "@budibase/frontend-core"
-import { findAllMatchingComponents } from "helpers/components"
+import { findAllMatchingComponents } from "@/helpers/components"
 import {
   layoutStore,
   appStore,
   componentStore,
   navigationStore,
   selectedComponent,
-} from "stores/builder"
-import { createHistoryStore } from "stores/builder/history"
-import { API } from "api"
-import BudiStore from "../BudiStore"
+} from "@/stores/builder"
+import { createHistoryStore } from "@/stores/builder/history"
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import {
+  FetchAppPackageResponse,
+  DeleteScreenResponse,
+  Screen,
+  Component,
+  SaveScreenResponse,
+} from "@budibase/types"
+import { ComponentDefinition } from "./components"
 
-export const INITIAL_SCREENS_STATE = {
-  screens: [],
-  selectedScreenId: null,
+interface ScreenState {
+  screens: Screen[]
+  selectedScreenId?: string
 }
 
-export class ScreenStore extends BudiStore {
+export const initialScreenState: ScreenState = {
+  screens: [],
+}
+
+// Review the nulls
+export class ScreenStore extends BudiStore<ScreenState> {
+  history: any
+  delete: any
+  save: any
+
   constructor() {
-    super(INITIAL_SCREENS_STATE)
+    super(initialScreenState)
 
     // Bind scope
     this.select = this.select.bind(this)
@@ -38,14 +55,16 @@ export class ScreenStore extends BudiStore {
     this.removeCustomLayout = this.removeCustomLayout.bind(this)
 
     this.history = createHistoryStore({
-      getDoc: id => get(this.store).screens?.find(screen => screen._id === id),
+      getDoc: (id: string) =>
+        get(this.store).screens?.find(screen => screen._id === id),
       selectDoc: this.select,
+      beforeAction: () => {},
       afterAction: () => {
         // Ensure a valid component is selected
         if (!get(selectedComponent)) {
           this.update(state => ({
             ...state,
-            selectedComponentId: get(this.store).selected?.props._id,
+            selectedComponentId: get(selectedScreen)?.props._id,
           }))
         }
       },
@@ -59,14 +78,14 @@ export class ScreenStore extends BudiStore {
    * Reset entire store back to base config
    */
   reset() {
-    this.store.set({ ...INITIAL_SCREENS_STATE })
+    this.store.set({ ...initialScreenState })
   }
 
   /**
    * Replace ALL store screens with application package screens
-   * @param {object} pkg
+   * @param {FetchAppPackageResponse} pkg
    */
-  syncAppScreens(pkg) {
+  syncAppScreens(pkg: FetchAppPackageResponse) {
     this.update(state => ({
       ...state,
       screens: [...pkg.screens],
@@ -79,7 +98,7 @@ export class ScreenStore extends BudiStore {
    * @param {string} screenId
    * @returns
    */
-  select(screenId) {
+  select(screenId: string) {
     // Check this screen exists
     const state = get(this.store)
     const screen = state.screens.find(screen => screen._id === screenId)
@@ -103,18 +122,18 @@ export class ScreenStore extends BudiStore {
    * Recursively parses the entire screen doc and checks for components
    * violating illegal child configurations.
    *
-   * @param {object} screen
+   * @param {Screen} screen
    * @throws Will throw an error containing the name of the component causing
    * the invalid screen state
    */
-  validate(screen) {
+  validate(screen: Screen) {
     // Recursive function to find any illegal children in component trees
     const findIllegalChild = (
-      component,
-      illegalChildren = [],
-      legalDirectChildren = []
-    ) => {
-      const type = component._component
+      component: Component,
+      illegalChildren: string[] = [],
+      legalDirectChildren: string[] = []
+    ): string | undefined => {
+      const type: string = component._component
 
       if (illegalChildren.includes(type)) {
         return type
@@ -137,7 +156,13 @@ export class ScreenStore extends BudiStore {
         illegalChildren = []
       }
 
-      const definition = componentStore.getDefinition(component._component)
+      const definition: ComponentDefinition | null =
+        componentStore.getDefinition(component._component)
+
+      if (definition == null) {
+        throw `Invalid defintion ${component._component}`
+      }
+
       // Reset whitelist for direct children
       legalDirectChildren = []
       if (definition?.legalDirectChildren?.length) {
@@ -172,7 +197,7 @@ export class ScreenStore extends BudiStore {
     const illegalChild = findIllegalChild(screen.props)
     if (illegalChild) {
       const def = componentStore.getDefinition(illegalChild)
-      throw `You can't place a ${def.name} here`
+      throw `You can't place a ${def?.name} here`
     }
   }
 
@@ -180,10 +205,9 @@ export class ScreenStore extends BudiStore {
    * Core save method. If creating a new screen, the store will sync the target
    * screen id to ensure that it is selected in the builder
    *
-   * @param {object} screen
-   * @returns {object}
+   * @param {Screen} screen The screen being modified/created
    */
-  async saveScreen(screen) {
+  async saveScreen(screen: Screen) {
     const appState = get(appStore)
 
     // Validate screen structure if the app supports it
@@ -228,9 +252,9 @@ export class ScreenStore extends BudiStore {
 
   /**
    * After saving a screen, sync plugins and routes to the appStore
-   * @param {object} savedScreen
+   * @param {Screen} savedScreen
    */
-  async syncScreenData(savedScreen) {
+  async syncScreenData(savedScreen: Screen) {
     const appState = get(appStore)
     // If plugins changed we need to fetch the latest app metadata
     let usedPlugins = appState.usedPlugins
@@ -256,28 +280,32 @@ export class ScreenStore extends BudiStore {
    * This is slightly better than just a traditional "patch" endpoint and this
    * supports deeply mutating the current doc rather than just appending data.
    */
-  sequentialScreenPatch = Utils.sequential(async (patchFn, screenId) => {
-    const state = get(this.store)
-    const screen = state.screens.find(screen => screen._id === screenId)
-    if (!screen) {
-      return
-    }
-    let clone = cloneDeep(screen)
-    const result = patchFn(clone)
+  sequentialScreenPatch = Utils.sequential(
+    async (patchFn: (screen: Screen) => any, screenId: string) => {
+      const state = get(this.store)
+      const screen = state.screens.find(screen => screen._id === screenId)
+      if (!screen) {
+        return
+      }
+      let clone = cloneDeep(screen)
+      const result = patchFn(clone)
 
-    // An explicit false result means skip this change
-    if (result === false) {
-      return
+      // An explicit false result means skip this change
+      if (result === false) {
+        return
+      }
+      return this.save(clone)
     }
-    return this.save(clone)
-  })
+  )
 
   /**
-   * @param {function} patchFn
-   * @param {string} screenId
-   * @returns
+   * @param {Function} patchFn the patch action to be applied
+   * @param {string | null} screenId
    */
-  async patch(patchFn, screenId) {
+  async patch(
+    patchFn: (screen: Screen) => any,
+    screenId?: string | null
+  ): Promise<SaveScreenResponse | void> {
     // Default to the currently selected screen
     if (!screenId) {
       const state = get(this.store)
@@ -294,11 +322,11 @@ export class ScreenStore extends BudiStore {
    * the screen supplied. If no screen is provided, the target has
    * been removed by another user and will be filtered from the store.
    * Used to marshal updates for the websocket
-   * @param {string} screenId
-   * @param {object} screen
-   * @returns
+   *
+   * @param {string} screenId the target screen id
+   * @param {Screen} screen the replacement screen
    */
-  async replace(screenId, screen) {
+  async replace(screenId: string, screen: Screen) {
     if (!screenId) {
       return
     }
@@ -334,25 +362,27 @@ export class ScreenStore extends BudiStore {
    * Any deleted screens will then have their routes/links purged
    *
    * Wrapped by {@link delete}
-   * @param {object | array} screens
-   * @returns
+   * @param {Screen | Screen[]} screens
    */
-  async deleteScreen(screens) {
+  async deleteScreen(screens: Screen | Screen[]) {
     const screensToDelete = Array.isArray(screens) ? screens : [screens]
     // Build array of promises to speed up bulk deletions
-    let promises = []
-    let deleteUrls = []
-    screensToDelete.forEach(screen => {
-      // Delete the screen
-      promises.push(
-        API.deleteScreen({
-          screenId: screen._id,
-          screenRev: screen._rev,
-        })
+    let promises: Promise<DeleteScreenResponse>[] = []
+    let deleteUrls: string[] = []
+
+    // In this instance _id will have been set
+    // Underline the expectation that _id and _rev will be set after filtering
+    screensToDelete
+      .filter(
+        (screen): screen is Screen & { _id: string; _rev: string } =>
+          !!screen._id || !!screen._rev
       )
-      // Remove links to this screen
-      deleteUrls.push(screen.routing.route)
-    })
+      .forEach(screen => {
+        // Delete the screen
+        promises.push(API.deleteScreen(screen._id, screen._rev))
+        // Remove links to this screen
+        deleteUrls.push(screen.routing.route)
+      })
     await Promise.all(promises)
     await navigationStore.deleteLink(deleteUrls)
     const deletedIds = screensToDelete.map(screen => screen._id)
@@ -364,12 +394,15 @@ export class ScreenStore extends BudiStore {
       })
 
       // Deselect the current screen if it was deleted
-      if (deletedIds.includes(state.selectedScreenId)) {
-        state.selectedScreenId = null
-        componentStore.update(state => ({
-          ...state,
-          selectedComponentId: null,
-        }))
+      if (
+        state.selectedScreenId &&
+        deletedIds.includes(state.selectedScreenId)
+      ) {
+        delete state.selectedScreenId
+        componentStore.update(state => {
+          delete state.selectedComponentId
+          return state
+        })
       }
 
       // Update routing
@@ -380,7 +413,6 @@ export class ScreenStore extends BudiStore {
 
       return state
     })
-    return null
   }
 
   /**
@@ -389,18 +421,17 @@ export class ScreenStore extends BudiStore {
    * After a successful update, this method ensures that there is only
    * ONE home screen per user Role.
    *
-   * @param {object} screen
+   * @param {Screen} screen
    * @param {string} name e.g "routing.homeScreen" or "showNavigation"
    * @param {any} value
-   * @returns
    */
-  async updateSetting(screen, name, value) {
+  async updateSetting(screen: Screen, name: string, value: any) {
     if (!screen || !name) {
       return
     }
 
     // Apply setting update
-    const patchFn = screen => {
+    const patchFn = (screen: Screen) => {
       if (!screen) {
         return false
       }
@@ -427,7 +458,7 @@ export class ScreenStore extends BudiStore {
       )
     })
     if (otherHomeScreens.length && updatedScreen.routing.homeScreen) {
-      const patchFn = screen => {
+      const patchFn = (screen: Screen) => {
         screen.routing.homeScreen = false
       }
       for (let otherHomeScreen of otherHomeScreens) {
@@ -437,11 +468,11 @@ export class ScreenStore extends BudiStore {
   }
 
   // Move to layouts store
-  async removeCustomLayout(screen) {
+  async removeCustomLayout(screen: Screen) {
     // Pull relevant settings from old layout, if required
     const layout = get(layoutStore).layouts.find(x => x._id === screen.layoutId)
-    const patchFn = screen => {
-      screen.layoutId = null
+    const patchFn = (screen: Screen) => {
+      delete screen.layoutId
       screen.showNavigation = layout?.props.navigation !== "None"
       screen.width = layout?.props.width || "Large"
     }
@@ -451,11 +482,14 @@ export class ScreenStore extends BudiStore {
   /**
    * Parse the entire screen component tree and ensure settings are valid
    * and up-to-date. Ensures stability after a product update.
-   * @param {object} screen
+   * @param {Screen} screen
    */
-  async enrichEmptySettings(screen) {
+  async enrichEmptySettings(screen: Screen) {
     // Flatten the recursive component tree
-    const components = findAllMatchingComponents(screen.props, x => x)
+    const components = findAllMatchingComponents(
+      screen.props,
+      (x: Component) => x
+    )
 
     // Iterate over all components and run checks
     components.forEach(component => {
diff --git a/packages/builder/src/stores/builder/snippets.js b/packages/builder/src/stores/builder/snippets.js
deleted file mode 100644
index 72ab274730..0000000000
--- a/packages/builder/src/stores/builder/snippets.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { appStore } from "./app"
-
-const createsnippets = () => {
-  const store = writable([])
-
-  const syncMetadata = metadata => {
-    store.set(metadata?.snippets || [])
-  }
-
-  const saveSnippet = async updatedSnippet => {
-    const snippets = [
-      ...get(store).filter(snippet => snippet.name !== updatedSnippet.name),
-      updatedSnippet,
-    ]
-    const app = await API.saveAppMetadata({
-      appId: get(appStore).appId,
-      metadata: { snippets },
-    })
-    syncMetadata(app)
-  }
-
-  const deleteSnippet = async snippetName => {
-    const snippets = get(store).filter(snippet => snippet.name !== snippetName)
-    const app = await API.saveAppMetadata({
-      appId: get(appStore).appId,
-      metadata: { snippets },
-    })
-    syncMetadata(app)
-  }
-
-  return {
-    ...store,
-    syncMetadata,
-    saveSnippet,
-    deleteSnippet,
-  }
-}
-
-export const snippets = createsnippets()
diff --git a/packages/builder/src/stores/builder/snippets.ts b/packages/builder/src/stores/builder/snippets.ts
new file mode 100644
index 0000000000..a6a63f7c89
--- /dev/null
+++ b/packages/builder/src/stores/builder/snippets.ts
@@ -0,0 +1,32 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { appStore } from "./app"
+import { BudiStore } from "../BudiStore"
+import { Snippet, UpdateAppResponse } from "@budibase/types"
+
+export class SnippetStore extends BudiStore<Snippet[]> {
+  constructor() {
+    super([])
+  }
+
+  syncMetadata = (metadata: UpdateAppResponse) => {
+    this.set(metadata?.snippets || [])
+  }
+
+  saveSnippet = async (updatedSnippet: Snippet) => {
+    const snippets = [
+      ...get(this).filter(snippet => snippet.name !== updatedSnippet.name),
+      updatedSnippet,
+    ]
+    const app = await API.saveAppMetadata(get(appStore).appId, { snippets })
+    this.syncMetadata(app)
+  }
+
+  deleteSnippet = async (snippetName: string) => {
+    const snippets = get(this).filter(snippet => snippet.name !== snippetName)
+    const app = await API.saveAppMetadata(get(appStore).appId, { snippets })
+    this.syncMetadata(app)
+  }
+}
+
+export const snippets = new SnippetStore()
diff --git a/packages/builder/src/stores/builder/sortedIntegrations.js b/packages/builder/src/stores/builder/sortedIntegrations.js
deleted file mode 100644
index 3f5dd850ab..0000000000
--- a/packages/builder/src/stores/builder/sortedIntegrations.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { integrations } from "./integrations"
-import { derived } from "svelte/store"
-
-import { DatasourceTypes } from "constants/backend"
-
-const getIntegrationOrder = type => {
-  if (type === DatasourceTypes.API) return 1
-  if (type === DatasourceTypes.RELATIONAL) return 2
-  if (type === DatasourceTypes.NON_RELATIONAL) return 3
-
-  // Sort all others arbitrarily by the first character of their name.
-  // Character codes can technically be as low as 0, so make sure the number is at least 4
-  return type.charCodeAt(0) + 4
-}
-
-export const createSortedIntegrationsStore = () => {
-  return derived(integrations, $integrations => {
-    const integrationsAsArray = Object.entries($integrations).map(
-      ([name, integration]) => ({
-        name,
-        ...integration,
-      })
-    )
-
-    return integrationsAsArray.sort((integrationA, integrationB) => {
-      const integrationASortOrder = getIntegrationOrder(integrationA.type)
-      const integrationBSortOrder = getIntegrationOrder(integrationB.type)
-      if (integrationASortOrder === integrationBSortOrder) {
-        return integrationA.friendlyName.localeCompare(
-          integrationB.friendlyName
-        )
-      }
-
-      return integrationASortOrder < integrationBSortOrder ? -1 : 1
-    })
-  })
-}
-
-export const sortedIntegrations = createSortedIntegrationsStore()
diff --git a/packages/builder/src/stores/builder/sortedIntegrations.ts b/packages/builder/src/stores/builder/sortedIntegrations.ts
new file mode 100644
index 0000000000..95c52f4479
--- /dev/null
+++ b/packages/builder/src/stores/builder/sortedIntegrations.ts
@@ -0,0 +1,52 @@
+import { integrations } from "./integrations"
+import { derived } from "svelte/store"
+import { DatasourceTypes } from "@/constants/backend"
+import { UIIntegration, Integration } from "@budibase/types"
+import { BudiStore } from "@/stores/BudiStore"
+
+const getIntegrationOrder = (type: string | undefined) => {
+  // if type is not known, sort to end
+  if (!type) {
+    return Number.MAX_SAFE_INTEGER
+  }
+  if (type === DatasourceTypes.API) return 1
+  if (type === DatasourceTypes.RELATIONAL) return 2
+  if (type === DatasourceTypes.NON_RELATIONAL) return 3
+
+  // Sort all others arbitrarily by the first character of their name.
+  // Character codes can technically be as low as 0, so make sure the number is at least 4
+  return type.charCodeAt(0) + 4
+}
+
+export class SortedIntegrationStore extends BudiStore<UIIntegration[]> {
+  constructor() {
+    super([])
+
+    const derivedStore = derived<typeof integrations, UIIntegration[]>(
+      integrations,
+      $integrations => {
+        const entries: [string, Integration][] = Object.entries($integrations)
+        const integrationsAsArray = entries.map(([name, integration]) => ({
+          name,
+          ...integration,
+        }))
+
+        return integrationsAsArray.sort((integrationA, integrationB) => {
+          const integrationASortOrder = getIntegrationOrder(integrationA.type)
+          const integrationBSortOrder = getIntegrationOrder(integrationB.type)
+          if (integrationASortOrder === integrationBSortOrder) {
+            return integrationA.friendlyName.localeCompare(
+              integrationB.friendlyName
+            )
+          }
+
+          return integrationASortOrder < integrationBSortOrder ? -1 : 1
+        })
+      }
+    )
+
+    this.subscribe = derivedStore.subscribe
+  }
+}
+
+export const sortedIntegrations = new SortedIntegrationStore()
diff --git a/packages/builder/src/stores/builder/tables.js b/packages/builder/src/stores/builder/tables.ts
similarity index 62%
rename from packages/builder/src/stores/builder/tables.js
rename to packages/builder/src/stores/builder/tables.ts
index 88b26929ad..e38731026c 100644
--- a/packages/builder/src/stores/builder/tables.js
+++ b/packages/builder/src/stores/builder/tables.ts
@@ -1,30 +1,64 @@
-import { FieldType } from "@budibase/types"
+import {
+  FieldSchema,
+  FieldType,
+  SaveTableRequest,
+  Table,
+} from "@budibase/types"
 import { SWITCHABLE_TYPES } from "@budibase/shared-core"
-import { get, writable, derived } from "svelte/store"
+import { get, derived, Writable } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
-import { API } from "api"
+import { API } from "@/api"
+import { DerivedBudiStore } from "@/stores/BudiStore"
 
-export function createTablesStore() {
-  const store = writable({
-    list: [],
-    selectedTableId: null,
-  })
-  const derivedStore = derived(store, $store => ({
-    ...$store,
-    selected: $store.list?.find(table => table._id === $store.selectedTableId),
-  }))
+interface BuilderTableStore {
+  list: Table[]
+  selectedTableId?: string
+}
 
-  const fetch = async () => {
+interface DerivedTableStore extends BuilderTableStore {
+  selected?: Table
+}
+
+export class TableStore extends DerivedBudiStore<
+  BuilderTableStore,
+  DerivedTableStore
+> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<BuilderTableStore>) => {
+      return derived(store, $store => ({
+        ...$store,
+        selected: $store.list?.find(
+          table => table._id === $store.selectedTableId
+        ),
+      }))
+    }
+
+    super(
+      {
+        list: [],
+        selectedTableId: undefined,
+      },
+      makeDerivedStore
+    )
+
+    this.select = this.select.bind(this)
+  }
+
+  async init() {
+    return this.fetch()
+  }
+
+  async fetch() {
     const tables = await API.getTables()
-    store.update(state => ({
+    this.store.update(state => ({
       ...state,
       list: tables,
     }))
   }
 
-  const singleFetch = async tableId => {
+  private async singleFetch(tableId: string) {
     const table = await API.getTable(tableId)
-    store.update(state => {
+    this.store.update(state => {
       const list = []
       // update the list, keep order accurate
       for (let tbl of state.list) {
@@ -39,16 +73,16 @@ export function createTablesStore() {
     })
   }
 
-  const select = tableId => {
-    store.update(state => ({
+  select(tableId: string | undefined) {
+    this.store.update(state => ({
       ...state,
       selectedTableId: tableId,
     }))
   }
 
-  const save = async table => {
-    const updatedTable = cloneDeep(table)
-    const oldTable = get(store).list.filter(t => t._id === table._id)[0]
+  async save(table: Table) {
+    const updatedTable: SaveTableRequest = cloneDeep(table)
+    const oldTable = get(this.store).list.filter(t => t._id === table._id)[0]
 
     const fieldNames = []
     // Update any renamed schema keys to reflect their names
@@ -79,8 +113,8 @@ export function createTablesStore() {
     }
 
     const savedTable = await API.saveTable(updatedTable)
-    replaceTable(savedTable._id, savedTable)
-    select(savedTable._id)
+    this.replaceTable(savedTable._id, savedTable)
+    this.select(savedTable._id)
     // make sure tables up to date (related)
     let newTableIds = []
     for (let column of Object.values(updatedTable?.schema || {})) {
@@ -99,31 +133,30 @@ export function createTablesStore() {
     const tableIdsToFetch = [...new Set([...newTableIds, ...oldTableIds])]
     // too many tables to fetch, just get all
     if (tableIdsToFetch.length > 3) {
-      await fetch()
+      await this.fetch()
     } else {
-      await Promise.all(tableIdsToFetch.map(id => singleFetch(id)))
+      await Promise.all(tableIdsToFetch.map(id => this.singleFetch(id)))
     }
     return savedTable
   }
 
-  const deleteTable = async table => {
-    if (!table?._id) {
-      return
-    }
-    await API.deleteTable({
-      tableId: table._id,
-      tableRev: table._rev || "rev",
-    })
-    replaceTable(table._id, null)
+  async delete(table: { _id: string; _rev: string }) {
+    await API.deleteTable(table._id, table._rev)
+    this.replaceTable(table._id, null)
   }
 
-  const saveField = async ({
+  async saveField({
     originalName,
     field,
     primaryDisplay = false,
     indexes,
-  }) => {
-    let draft = cloneDeep(get(derivedStore).selected)
+  }: {
+    originalName: string
+    field: FieldSchema
+    primaryDisplay: boolean
+    indexes: Record<string, any>
+  }) {
+    const draft: SaveTableRequest = cloneDeep(get(this.derivedStore).selected!)
 
     // delete the original if renaming
     // need to handle if the column had no name, empty string
@@ -142,7 +175,7 @@ export function createTablesStore() {
       const fields = Object.keys(draft.schema)
       // pick another display column randomly if unselecting
       draft.primaryDisplay = fields.filter(
-        name => name !== originalName || name !== field
+        name => name !== originalName || name !== field.name
       )[0]
     }
     if (indexes) {
@@ -153,24 +186,24 @@ export function createTablesStore() {
       [field.name]: cloneDeep(field),
     }
 
-    await save(draft)
+    await this.save(draft)
   }
 
-  const deleteField = async field => {
-    let draft = cloneDeep(get(derivedStore).selected)
+  async deleteField(field: { name: string | number }) {
+    let draft = cloneDeep(get(this.derivedStore).selected!)
     delete draft.schema[field.name]
-    await save(draft)
+    await this.save(draft)
   }
 
   // Handles external updates of tables
-  const replaceTable = (tableId, table) => {
+  replaceTable(tableId: string | undefined, table: Table | null) {
     if (!tableId) {
       return
     }
 
     // Handle deletion
     if (!table) {
-      store.update(state => ({
+      this.store.update(state => ({
         ...state,
         list: state.list.filter(x => x._id !== tableId),
       }))
@@ -178,9 +211,9 @@ export function createTablesStore() {
     }
 
     // Add new table
-    const index = get(store).list.findIndex(x => x._id === table._id)
+    const index = get(this.store).list.findIndex(x => x._id === table._id)
     if (index === -1) {
-      store.update(state => ({
+      this.store.update(state => ({
         ...state,
         list: [...state.list, table],
       }))
@@ -191,7 +224,7 @@ export function createTablesStore() {
       // This function has to merge state as there discrepancies with the table
       // API endpoints. The table list endpoint and get table endpoint use the
       // "type" property to mean different things.
-      store.update(state => {
+      this.store.update(state => {
         state.list[index] = {
           ...table,
           type: state.list[index].type,
@@ -201,26 +234,12 @@ export function createTablesStore() {
     }
   }
 
-  const removeDatasourceTables = datasourceId => {
-    store.update(state => ({
+  removeDatasourceTables(datasourceId: string) {
+    this.store.update(state => ({
       ...state,
       list: state.list.filter(table => table.sourceId !== datasourceId),
     }))
   }
-
-  return {
-    ...store,
-    subscribe: derivedStore.subscribe,
-    fetch,
-    init: fetch,
-    select,
-    save,
-    delete: deleteTable,
-    saveField,
-    deleteField,
-    replaceTable,
-    removeDatasourceTables,
-  }
 }
 
-export const tables = createTablesStore()
+export const tables = new TableStore()
diff --git a/packages/builder/src/stores/builder/tests/app.test.js b/packages/builder/src/stores/builder/tests/app.test.js
index 728f472317..6a7cb85bd5 100644
--- a/packages/builder/src/stores/builder/tests/app.test.js
+++ b/packages/builder/src/stores/builder/tests/app.test.js
@@ -1,6 +1,6 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get } from "svelte/store"
-import { INITIAL_APP_META_STATE, AppMetaStore } from "stores/builder/app"
+import { INITIAL_APP_META_STATE, AppMetaStore } from "@/stores/builder/app"
 import {
   clientFeaturesResp,
   generateAppPackage,
@@ -8,9 +8,9 @@ import {
   getScreenFixture,
   getScreenDocId,
 } from "./fixtures"
-import { API } from "api"
+import { API } from "@/api"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchAppRoutes: vi.fn(),
diff --git a/packages/builder/src/stores/builder/tests/builder.test.js b/packages/builder/src/stores/builder/tests/builder.test.js
index e6f52689aa..a1ff37df7d 100644
--- a/packages/builder/src/stores/builder/tests/builder.test.js
+++ b/packages/builder/src/stores/builder/tests/builder.test.js
@@ -1,6 +1,6 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get } from "svelte/store"
-import { INITIAL_BUILDER_STATE, BuilderStore } from "stores/builder/builder"
+import { INITIAL_BUILDER_STATE, BuilderStore } from "@/stores/builder/builder"
 import { createBuilderWebsocket } from "../websocket.js"
 import { BuilderSocketEvent } from "@budibase/shared-core"
 
@@ -65,7 +65,7 @@ describe("Builder store", () => {
     ctx.test.builderStore.reset()
     expect(disconnected).toBe(true)
     expect(ctx.test.store).toStrictEqual(INITIAL_BUILDER_STATE)
-    expect(ctx.test.builderStore.websocket).toBeNull()
+    expect(ctx.test.builderStore.websocket).toBeUndefined()
   })
 
   it("Attempt to emit a resource select event to the websocket on select", ctx => {
diff --git a/packages/builder/src/stores/builder/tests/component.test.js b/packages/builder/src/stores/builder/tests/component.test.js
index 80a0c8077d..9f700cfdbf 100644
--- a/packages/builder/src/stores/builder/tests/component.test.js
+++ b/packages/builder/src/stores/builder/tests/component.test.js
@@ -3,9 +3,9 @@ import { get, writable } from "svelte/store"
 import {
   INITIAL_COMPONENTS_STATE,
   ComponentStore,
-} from "stores/builder/components"
-import { API } from "api"
-import { appStore, tables } from "stores/builder"
+} from "@/stores/builder/components"
+import { API } from "@/api"
+import { appStore, tables } from "@/stores/builder"
 import {
   componentDefinitionMap,
   getComponentFixture,
@@ -22,13 +22,13 @@ import {
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
   DEFAULT_BB_DATASOURCE_ID,
-} from "constants/backend"
+} from "@/constants/backend"
 import { makePropSafe as safe } from "@budibase/string-templates"
 
 // Could move to fixtures
 const COMP_PREFIX = "@budibase/standard-components"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchComponentLibDefinitions: vi.fn(),
@@ -36,7 +36,7 @@ vi.mock("api", () => {
   }
 })
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const appStore = {
     subscribe: mockAppStore.subscribe,
diff --git a/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
index 772aaf36a2..fa8746306a 100644
--- a/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/datasources.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/fixtures/index.js b/packages/builder/src/stores/builder/tests/fixtures/index.js
index b742397f5c..03b6ceeb52 100644
--- a/packages/builder/src/stores/builder/tests/fixtures/index.js
+++ b/packages/builder/src/stores/builder/tests/fixtures/index.js
@@ -1,13 +1,13 @@
 import { v4 } from "uuid"
-import { Component } from "templates/Component"
-import { Screen } from "templates/screenTemplating/Screen"
+import { Component } from "@/templates/Component"
+import { Screen } from "@/templates/screenTemplating/Screen"
 import { get } from "svelte/store"
 import {
   BUDIBASE_INTERNAL_DB_ID,
   DB_TYPE_INTERNAL,
   DB_TYPE_EXTERNAL,
   DEFAULT_BB_DATASOURCE_ID,
-} from "constants/backend"
+} from "@/constants/backend"
 import { FieldType } from "@budibase/types"
 
 const getDocId = () => {
diff --git a/packages/builder/src/stores/builder/tests/navigation.test.js b/packages/builder/src/stores/builder/tests/navigation.test.js
index 365b7f497b..1d04496c40 100644
--- a/packages/builder/src/stores/builder/tests/navigation.test.js
+++ b/packages/builder/src/stores/builder/tests/navigation.test.js
@@ -1,13 +1,13 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get, writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import {
   INITIAL_NAVIGATION_STATE,
   NavigationStore,
-} from "stores/builder/navigation"
-import { appStore } from "stores/builder"
+} from "@/stores/builder/navigation"
+import { appStore } from "@/stores/builder"
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       saveAppMetadata: vi.fn(),
@@ -15,7 +15,7 @@ vi.mock("api", () => {
   }
 })
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const appStore = {
     subscribe: mockAppStore.subscribe,
@@ -264,10 +264,7 @@ describe("Navigation store", () => {
 
     await ctx.test.navigationStore.save(update)
 
-    expect(saveSpy).toHaveBeenCalledWith({
-      appId: "testing_123",
-      metadata: { navigation: update },
-    })
+    expect(saveSpy).toHaveBeenCalledWith("testing_123", { navigation: update })
 
     expect(ctx.test.store.links.length).toBe(3)
 
diff --git a/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
index d3c19964f2..83bb0d7381 100644
--- a/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/permissions.spec.js.disabled
@@ -1,4 +1,4 @@
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/queries.spec.js.disabled b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
index 20db8e4a95..ee5bc1d0b8 100644
--- a/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/queries.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/roles.spec.js.disabled b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
index b729c27ce6..1ac35af445 100644
--- a/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/roles.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/tests/screens.test.js b/packages/builder/src/stores/builder/tests/screens.test.js
index 51e3a8d830..ea916c8d59 100644
--- a/packages/builder/src/stores/builder/tests/screens.test.js
+++ b/packages/builder/src/stores/builder/tests/screens.test.js
@@ -1,9 +1,9 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
 import { get, writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 import { Constants } from "@budibase/frontend-core"
-import { componentStore, appStore } from "stores/builder"
-import { INITIAL_SCREENS_STATE, ScreenStore } from "stores/builder/screens"
+import { componentStore, appStore } from "@/stores/builder"
+import { initialScreenState, ScreenStore } from "@/stores/builder/screens"
 import {
   getScreenFixture,
   getComponentFixture,
@@ -16,7 +16,7 @@ import {
 
 const COMP_PREFIX = "@budibase/standard-components"
 
-vi.mock("stores/builder", async () => {
+vi.mock("@/stores/builder", async () => {
   const mockAppStore = writable()
   const mockComponentStore = writable()
   const mockLayoutStore = writable()
@@ -49,7 +49,7 @@ vi.mock("stores/builder", async () => {
   }
 })
 
-vi.mock("stores/builder/components/utils", () => {
+vi.mock("@/stores/builder/components/utils", () => {
   return {
     findAllMatchingComponents: vi.fn().mockImplementation(() => {
       return []
@@ -57,7 +57,7 @@ vi.mock("stores/builder/components/utils", () => {
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       fetchAppPackage: vi.fn(),
@@ -73,7 +73,7 @@ describe("Screens store", () => {
     vi.clearAllMocks()
 
     const screenStore = new ScreenStore()
-    ctx.test = {
+    ctx.bb = {
       get store() {
         return get(screenStore)
       },
@@ -81,74 +81,76 @@ describe("Screens store", () => {
     }
   })
 
-  it("Create base screen store with defaults", ctx => {
-    expect(ctx.test.store).toStrictEqual(INITIAL_SCREENS_STATE)
+  it("Create base screen store with defaults", ({ bb }) => {
+    expect(bb.store).toStrictEqual(initialScreenState)
   })
 
-  it("Syncs all screens from the app package", ctx => {
-    expect(ctx.test.store.screens.length).toBe(0)
+  it("Syncs all screens from the app package", ({ bb }) => {
+    expect(bb.store.screens.length).toBe(0)
 
     const screens = Array(2)
       .fill()
       .map(() => getScreenFixture().json())
 
-    ctx.test.screenStore.syncAppScreens({ screens })
+    bb.screenStore.syncAppScreens({ screens })
 
-    expect(ctx.test.store.screens).toStrictEqual(screens)
+    expect(bb.store.screens).toStrictEqual(screens)
   })
 
-  it("Reset the screen store back to the default state", ctx => {
-    expect(ctx.test.store.screens.length).toBe(0)
+  it("Reset the screen store back to the default state", ({ bb }) => {
+    expect(bb.store.screens.length).toBe(0)
 
     const screens = Array(2)
       .fill()
       .map(() => getScreenFixture().json())
 
-    ctx.test.screenStore.syncAppScreens({ screens })
-    expect(ctx.test.store.screens).toStrictEqual(screens)
+    bb.screenStore.syncAppScreens({ screens })
+    expect(bb.store.screens).toStrictEqual(screens)
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       selectedScreenId: screens[0]._id,
     }))
 
-    ctx.test.screenStore.reset()
+    bb.screenStore.reset()
 
-    expect(ctx.test.store).toStrictEqual(INITIAL_SCREENS_STATE)
+    expect(bb.store).toStrictEqual(initialScreenState)
   })
 
-  it("Marks a valid screen as selected", ctx => {
+  it("Marks a valid screen as selected", ({ bb }) => {
     const screens = Array(2)
       .fill()
       .map(() => getScreenFixture().json())
 
-    ctx.test.screenStore.syncAppScreens({ screens })
-    expect(ctx.test.store.screens.length).toBe(2)
+    bb.screenStore.syncAppScreens({ screens })
+    expect(bb.store.screens.length).toBe(2)
 
-    ctx.test.screenStore.select(screens[0]._id)
+    bb.screenStore.select(screens[0]._id)
 
-    expect(ctx.test.store.selectedScreenId).toEqual(screens[0]._id)
+    expect(bb.store.selectedScreenId).toEqual(screens[0]._id)
   })
 
-  it("Skip selecting a screen if it is not present", ctx => {
+  it("Skip selecting a screen if it is not present", ({ bb }) => {
     const screens = Array(2)
       .fill()
       .map(() => getScreenFixture().json())
 
-    ctx.test.screenStore.syncAppScreens({ screens })
-    expect(ctx.test.store.screens.length).toBe(2)
+    bb.screenStore.syncAppScreens({ screens })
+    expect(bb.store.screens.length).toBe(2)
 
-    ctx.test.screenStore.select("screen_abc")
+    bb.screenStore.select("screen_abc")
 
-    expect(ctx.test.store.selectedScreenId).toBeNull()
+    expect(bb.store.selectedScreenId).toBeUndefined()
   })
 
-  it("Approve a valid empty screen config", ctx => {
+  it("Approve a valid empty screen config", ({ bb }) => {
     const coreScreen = getScreenFixture()
-    ctx.test.screenStore.validate(coreScreen.json())
+    bb.screenStore.validate(coreScreen.json())
   })
 
-  it("Approve a valid screen config with one component and no illegal children", ctx => {
+  it("Approve a valid screen config with one component and no illegal children", ({
+    bb,
+  }) => {
     const coreScreen = getScreenFixture()
     const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`)
 
@@ -157,12 +159,12 @@ describe("Screens store", () => {
     const defSpy = vi.spyOn(componentStore, "getDefinition")
     defSpy.mockReturnValueOnce(COMPONENT_DEFINITIONS.formblock)
 
-    ctx.test.screenStore.validate(coreScreen.json())
+    bb.screenStore.validate(coreScreen.json())
 
     expect(defSpy).toHaveBeenCalled()
   })
 
-  it("Reject an attempt to nest invalid components", ctx => {
+  it("Reject an attempt to nest invalid components", ({ bb }) => {
     const coreScreen = getScreenFixture()
 
     const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
@@ -178,14 +180,14 @@ describe("Screens store", () => {
         return defMap[comp]
       })
 
-    expect(() => ctx.test.screenStore.validate(coreScreen.json())).toThrowError(
+    expect(() => bb.screenStore.validate(coreScreen.json())).toThrowError(
       `You can't place a ${COMPONENT_DEFINITIONS.form.name} here`
     )
 
     expect(defSpy).toHaveBeenCalled()
   })
 
-  it("Reject an attempt to deeply nest invalid components", ctx => {
+  it("Reject an attempt to deeply nest invalid components", ({ bb }) => {
     const coreScreen = getScreenFixture()
 
     const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
@@ -210,14 +212,16 @@ describe("Screens store", () => {
         return defMap[comp]
       })
 
-    expect(() => ctx.test.screenStore.validate(coreScreen.json())).toThrowError(
+    expect(() => bb.screenStore.validate(coreScreen.json())).toThrowError(
       `You can't place a ${COMPONENT_DEFINITIONS.form.name} here`
     )
 
     expect(defSpy).toHaveBeenCalled()
   })
 
-  it("Save a brand new screen and add it to the store. No validation", async ctx => {
+  it("Save a brand new screen and add it to the store. No validation", async ({
+    bb,
+  }) => {
     const coreScreen = getScreenFixture()
     const formOne = getComponentFixture(`${COMP_PREFIX}/form`)
 
@@ -225,7 +229,7 @@ describe("Screens store", () => {
 
     appStore.set({ features: { componentValidation: false } })
 
-    expect(ctx.test.store.screens.length).toBe(0)
+    expect(bb.store.screens.length).toBe(0)
 
     const newDocId = getScreenDocId()
     const newDoc = { ...coreScreen.json(), _id: newDocId }
@@ -235,15 +239,15 @@ describe("Screens store", () => {
     vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
       routes: [],
     })
-    await ctx.test.screenStore.save(coreScreen.json())
+    await bb.screenStore.save(coreScreen.json())
 
     expect(saveSpy).toHaveBeenCalled()
 
-    expect(ctx.test.store.screens.length).toBe(1)
+    expect(bb.store.screens.length).toBe(1)
 
-    expect(ctx.test.store.screens[0]).toStrictEqual(newDoc)
+    expect(bb.store.screens[0]).toStrictEqual(newDoc)
 
-    expect(ctx.test.store.selectedScreenId).toBe(newDocId)
+    expect(bb.store.selectedScreenId).toBe(newDocId)
 
     // The new screen should be selected
     expect(get(componentStore).selectedComponentId).toBe(
@@ -251,7 +255,7 @@ describe("Screens store", () => {
     )
   })
 
-  it("Sync an updated screen to the screen store on save", async ctx => {
+  it("Sync an updated screen to the screen store on save", async ({ bb }) => {
     const existingScreens = Array(4)
       .fill()
       .map(() => {
@@ -261,7 +265,7 @@ describe("Screens store", () => {
         return screenDoc
       })
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
     }))
@@ -279,16 +283,18 @@ describe("Screens store", () => {
     })
 
     // Saved the existing screen having modified it.
-    await ctx.test.screenStore.save(existingScreens[2].json())
+    await bb.screenStore.save(existingScreens[2].json())
 
     expect(routeSpy).toHaveBeenCalled()
     expect(saveSpy).toHaveBeenCalled()
 
     // On save, the screen is spliced back into the store with the saved content
-    expect(ctx.test.store.screens[2]).toStrictEqual(existingScreens[2].json())
+    expect(bb.store.screens[2]).toStrictEqual(existingScreens[2].json())
   })
 
-  it("Sync API data to relevant stores on save. Updated plugins", async ctx => {
+  it("Sync API data to relevant stores on save. Updated plugins", async ({
+    bb,
+  }) => {
     const coreScreen = getScreenFixture()
 
     const newDocId = getScreenDocId()
@@ -318,7 +324,7 @@ describe("Screens store", () => {
       routes: [],
     })
 
-    await ctx.test.screenStore.syncScreenData(newDoc)
+    await bb.screenStore.syncScreenData(newDoc)
 
     expect(routeSpy).toHaveBeenCalled()
     expect(appPackageSpy).toHaveBeenCalled()
@@ -326,7 +332,9 @@ describe("Screens store", () => {
     expect(get(appStore).usedPlugins).toStrictEqual(plugins)
   })
 
-  it("Sync API updates to relevant stores on save. Plugins unchanged", async ctx => {
+  it("Sync API updates to relevant stores on save. Plugins unchanged", async ({
+    bb,
+  }) => {
     const coreScreen = getScreenFixture()
 
     const newDocId = getScreenDocId()
@@ -343,7 +351,7 @@ describe("Screens store", () => {
       routes: [],
     })
 
-    await ctx.test.screenStore.syncScreenData(newDoc)
+    await bb.screenStore.syncScreenData(newDoc)
 
     expect(routeSpy).toHaveBeenCalled()
     expect(appPackageSpy).not.toHaveBeenCalled()
@@ -352,46 +360,48 @@ describe("Screens store", () => {
     expect(get(appStore).usedPlugins).toStrictEqual([plugin])
   })
 
-  it("Proceed to patch if appropriate config are supplied", async ctx => {
-    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch").mockImplementation(
-      () => {
-        return false
-      }
-    )
+  it("Proceed to patch if appropriate config are supplied", async ({ bb }) => {
+    vi.spyOn(bb.screenStore, "sequentialScreenPatch").mockImplementation(() => {
+      return false
+    })
     const noop = () => {}
 
-    await ctx.test.screenStore.patch(noop, "test")
-    expect(ctx.test.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
+    await bb.screenStore.patch(noop, "test")
+    expect(bb.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
       noop,
       "test"
     )
   })
 
-  it("Return from the patch if all valid config are not present", async ctx => {
-    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch")
-    await ctx.test.screenStore.patch()
-    expect(ctx.test.screenStore.sequentialScreenPatch).not.toBeCalled()
+  it("Return from the patch if all valid config are not present", async ({
+    bb,
+  }) => {
+    vi.spyOn(bb.screenStore, "sequentialScreenPatch")
+    await bb.screenStore.patch()
+    expect(bb.screenStore.sequentialScreenPatch).not.toBeCalled()
   })
 
-  it("Acquire the currently selected screen on patch, if not specified", async ctx => {
-    vi.spyOn(ctx.test.screenStore, "sequentialScreenPatch")
-    await ctx.test.screenStore.patch()
+  it("Acquire the currently selected screen on patch, if not specified", async ({
+    bb,
+  }) => {
+    vi.spyOn(bb.screenStore, "sequentialScreenPatch")
+    await bb.screenStore.patch()
 
     const noop = () => {}
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       selectedScreenId: "screen_123",
     }))
 
-    await ctx.test.screenStore.patch(noop)
-    expect(ctx.test.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
+    await bb.screenStore.patch(noop)
+    expect(bb.screenStore.sequentialScreenPatch).toHaveBeenCalledWith(
       noop,
       "screen_123"
     )
   })
 
   // Used by the websocket
-  it("Ignore a call to replace if no screenId is provided", ctx => {
+  it("Ignore a call to replace if no screenId is provided", ({ bb }) => {
     const existingScreens = Array(4)
       .fill()
       .map(() => {
@@ -400,14 +410,16 @@ describe("Screens store", () => {
         screenDoc._json._id = existingDocId
         return screenDoc.json()
       })
-    ctx.test.screenStore.syncAppScreens({ screens: existingScreens })
+    bb.screenStore.syncAppScreens({ screens: existingScreens })
 
-    ctx.test.screenStore.replace()
+    bb.screenStore.replace()
 
-    expect(ctx.test.store.screens).toStrictEqual(existingScreens)
+    expect(bb.store.screens).toStrictEqual(existingScreens)
   })
 
-  it("Remove a screen from the store if a single screenId is supplied", ctx => {
+  it("Remove a screen from the store if a single screenId is supplied", ({
+    bb,
+  }) => {
     const existingScreens = Array(4)
       .fill()
       .map(() => {
@@ -416,17 +428,17 @@ describe("Screens store", () => {
         screenDoc._json._id = existingDocId
         return screenDoc.json()
       })
-    ctx.test.screenStore.syncAppScreens({ screens: existingScreens })
+    bb.screenStore.syncAppScreens({ screens: existingScreens })
 
-    ctx.test.screenStore.replace(existingScreens[1]._id)
+    bb.screenStore.replace(existingScreens[1]._id)
 
     const filtered = existingScreens.filter(
       screen => screen._id != existingScreens[1]._id
     )
-    expect(ctx.test.store.screens).toStrictEqual(filtered)
+    expect(bb.store.screens).toStrictEqual(filtered)
   })
 
-  it("Replace an existing screen with a new version of itself", ctx => {
+  it("Replace an existing screen with a new version of itself", ({ bb }) => {
     const existingScreens = Array(4)
       .fill()
       .map(() => {
@@ -436,7 +448,7 @@ describe("Screens store", () => {
         return screenDoc
       })
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
     }))
@@ -444,15 +456,14 @@ describe("Screens store", () => {
     const formBlock = getComponentFixture(`${COMP_PREFIX}/formblock`)
     existingScreens[2].addChild(formBlock)
 
-    ctx.test.screenStore.replace(
-      existingScreens[2]._id,
-      existingScreens[2].json()
-    )
+    bb.screenStore.replace(existingScreens[2]._id, existingScreens[2].json())
 
-    expect(ctx.test.store.screens.length).toBe(4)
+    expect(bb.store.screens.length).toBe(4)
   })
 
-  it("Add a screen when attempting to replace one not present in the store", ctx => {
+  it("Add a screen when attempting to replace one not present in the store", ({
+    bb,
+  }) => {
     const existingScreens = Array(4)
       .fill()
       .map(() => {
@@ -462,7 +473,7 @@ describe("Screens store", () => {
         return screenDoc
       })
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
     }))
@@ -470,13 +481,13 @@ describe("Screens store", () => {
     const newScreenDoc = getScreenFixture()
     newScreenDoc._json._id = getScreenDocId()
 
-    ctx.test.screenStore.replace(newScreenDoc._json._id, newScreenDoc.json())
+    bb.screenStore.replace(newScreenDoc._json._id, newScreenDoc.json())
 
-    expect(ctx.test.store.screens.length).toBe(5)
-    expect(ctx.test.store.screens[4]).toStrictEqual(newScreenDoc.json())
+    expect(bb.store.screens.length).toBe(5)
+    expect(bb.store.screens[4]).toStrictEqual(newScreenDoc.json())
   })
 
-  it("Delete a single screen and remove it from the store", async ctx => {
+  it("Delete a single screen and remove it from the store", async ({ bb }) => {
     const existingScreens = Array(3)
       .fill()
       .map(() => {
@@ -486,14 +497,14 @@ describe("Screens store", () => {
         return screenDoc
       })
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
     }))
 
     const deleteSpy = vi.spyOn(API, "deleteScreen")
 
-    await ctx.test.screenStore.delete(existingScreens[2].json())
+    await bb.screenStore.delete(existingScreens[2].json())
 
     vi.spyOn(API, "fetchAppRoutes").mockResolvedValue({
       routes: [],
@@ -501,13 +512,15 @@ describe("Screens store", () => {
 
     expect(deleteSpy).toBeCalled()
 
-    expect(ctx.test.store.screens.length).toBe(2)
+    expect(bb.store.screens.length).toBe(2)
 
     // Just confirm that the routes at are being initialised
     expect(get(appStore).routes).toEqual([])
   })
 
-  it("Upon delete, reset selected screen and component ids if the screen was selected", async ctx => {
+  it("Upon delete, reset selected screen and component ids if the screen was selected", async ({
+    bb,
+  }) => {
     const existingScreens = Array(3)
       .fill()
       .map(() => {
@@ -517,7 +530,7 @@ describe("Screens store", () => {
         return screenDoc
       })
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
       selectedScreenId: existingScreens[2]._json._id,
@@ -528,14 +541,16 @@ describe("Screens store", () => {
       selectedComponentId: existingScreens[2]._json._id,
     }))
 
-    await ctx.test.screenStore.delete(existingScreens[2].json())
+    await bb.screenStore.delete(existingScreens[2].json())
 
-    expect(ctx.test.store.screens.length).toBe(2)
-    expect(get(componentStore).selectedComponentId).toBeNull()
-    expect(ctx.test.store.selectedScreenId).toBeNull()
+    expect(bb.store.screens.length).toBe(2)
+    expect(get(componentStore).selectedComponentId).toBeUndefined()
+    expect(bb.store.selectedScreenId).toBeUndefined()
   })
 
-  it("Delete multiple is not supported and should leave the store unchanged", async ctx => {
+  it("Delete multiple is not supported and should leave the store unchanged", async ({
+    bb,
+  }) => {
     const existingScreens = Array(3)
       .fill()
       .map(() => {
@@ -547,7 +562,7 @@ describe("Screens store", () => {
 
     const storeScreens = existingScreens.map(screen => screen.json())
 
-    ctx.test.screenStore.update(state => ({
+    bb.screenStore.update(state => ({
       ...state,
       screens: existingScreens.map(screen => screen.json()),
     }))
@@ -556,42 +571,40 @@ describe("Screens store", () => {
 
     const deleteSpy = vi.spyOn(API, "deleteScreen")
 
-    await ctx.test.screenStore.delete(targets)
+    await bb.screenStore.delete(targets)
 
     expect(deleteSpy).not.toHaveBeenCalled()
-    expect(ctx.test.store.screens.length).toBe(3)
-    expect(ctx.test.store.screens).toStrictEqual(storeScreens)
+    expect(bb.store.screens.length).toBe(3)
+    expect(bb.store.screens).toStrictEqual(storeScreens)
   })
 
-  it("Update a screen setting", async ctx => {
+  it("Update a screen setting", async ({ bb }) => {
     const screenDoc = getScreenFixture()
     const existingDocId = getScreenDocId()
     screenDoc._json._id = existingDocId
 
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: [screenDoc.json()],
     }))
 
     const patchedDoc = screenDoc.json()
     const patchSpy = vi
-      .spyOn(ctx.test.screenStore, "patch")
+      .spyOn(bb.screenStore, "patch")
       .mockImplementation(async patchFn => {
         patchFn(patchedDoc)
         return
       })
 
-    await ctx.test.screenStore.updateSetting(
-      patchedDoc,
-      "showNavigation",
-      false
-    )
+    await bb.screenStore.updateSetting(patchedDoc, "showNavigation", false)
 
     expect(patchSpy).toBeCalled()
     expect(patchedDoc.showNavigation).toBe(false)
   })
 
-  it("Ensure only one homescreen per role after updating setting. All screens same role", async ctx => {
+  it("Ensure only one homescreen per role after updating setting. All screens same role", async ({
+    bb,
+  }) => {
     const existingScreens = Array(3)
       .fill()
       .map(() => {
@@ -611,23 +624,21 @@ describe("Screens store", () => {
     // Set the 2nd screen as the home screen
     storeScreens[1].routing.homeScreen = true
 
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: storeScreens,
     }))
 
     const patchSpy = vi
-      .spyOn(ctx.test.screenStore, "patch")
+      .spyOn(bb.screenStore, "patch")
       .mockImplementation(async (patchFn, screenId) => {
-        const target = ctx.test.store.screens.find(
-          screen => screen._id === screenId
-        )
+        const target = bb.store.screens.find(screen => screen._id === screenId)
         patchFn(target)
 
-        await ctx.test.screenStore.replace(screenId, target)
+        await bb.screenStore.replace(screenId, target)
       })
 
-    await ctx.test.screenStore.updateSetting(
+    await bb.screenStore.updateSetting(
       storeScreens[0],
       "routing.homeScreen",
       true
@@ -637,13 +648,15 @@ describe("Screens store", () => {
     expect(patchSpy).toBeCalledTimes(2)
 
     // The new homescreen for BASIC
-    expect(ctx.test.store.screens[0].routing.homeScreen).toBe(true)
+    expect(bb.store.screens[0].routing.homeScreen).toBe(true)
 
     // The previous home screen for the BASIC role is now unset
-    expect(ctx.test.store.screens[1].routing.homeScreen).toBe(false)
+    expect(bb.store.screens[1].routing.homeScreen).toBe(false)
   })
 
-  it("Ensure only one homescreen per role when updating screen setting. Multiple screen roles", async ctx => {
+  it("Ensure only one homescreen per role when updating screen setting. Multiple screen roles", async ({
+    bb,
+  }) => {
     const expectedRoles = [
       Constants.Roles.BASIC,
       Constants.Roles.POWER,
@@ -675,30 +688,24 @@ describe("Screens store", () => {
     sorted[9].routing.homeScreen = true
 
     // Set screens state
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: sorted,
     }))
 
     const patchSpy = vi
-      .spyOn(ctx.test.screenStore, "patch")
+      .spyOn(bb.screenStore, "patch")
       .mockImplementation(async (patchFn, screenId) => {
-        const target = ctx.test.store.screens.find(
-          screen => screen._id === screenId
-        )
+        const target = bb.store.screens.find(screen => screen._id === screenId)
         patchFn(target)
 
-        await ctx.test.screenStore.replace(screenId, target)
+        await bb.screenStore.replace(screenId, target)
       })
 
     // ADMIN homeScreen updated from 0 to 2
-    await ctx.test.screenStore.updateSetting(
-      sorted[2],
-      "routing.homeScreen",
-      true
-    )
+    await bb.screenStore.updateSetting(sorted[2], "routing.homeScreen", true)
 
-    const results = ctx.test.store.screens.reduce((acc, screen) => {
+    const results = bb.store.screens.reduce((acc, screen) => {
       if (screen.routing.homeScreen) {
         acc[screen.routing.roleId] = acc[screen.routing.roleId] || []
         acc[screen.routing.roleId].push(screen)
@@ -706,7 +713,7 @@ describe("Screens store", () => {
       return acc
     }, {})
 
-    const screens = ctx.test.store.screens
+    const screens = bb.store.screens
     // Should still only be one of each homescreen
     expect(results[Constants.Roles.ADMIN].length).toBe(1)
     expect(screens[2].routing.homeScreen).toBe(true)
@@ -724,74 +731,80 @@ describe("Screens store", () => {
     expect(patchSpy).toBeCalledTimes(2)
   })
 
-  it("Sequential patch check. Exit if the screenId is not valid.", async ctx => {
+  it("Sequential patch check. Exit if the screenId is not valid.", async ({
+    bb,
+  }) => {
     const screenDoc = getScreenFixture()
     const existingDocId = getScreenDocId()
     screenDoc._json._id = existingDocId
 
     const original = screenDoc.json()
 
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: [original],
     }))
 
     const saveSpy = vi
-      .spyOn(ctx.test.screenStore, "save")
+      .spyOn(bb.screenStore, "save")
       .mockImplementation(async () => {
         return
       })
 
     // A screen with this Id does not exist
-    await ctx.test.screenStore.sequentialScreenPatch(() => {}, "123")
+    await bb.screenStore.sequentialScreenPatch(() => {}, "123")
     expect(saveSpy).not.toBeCalled()
   })
 
-  it("Sequential patch check. Exit if the patchFn result is false", async ctx => {
+  it("Sequential patch check. Exit if the patchFn result is false", async ({
+    bb,
+  }) => {
     const screenDoc = getScreenFixture()
     const existingDocId = getScreenDocId()
     screenDoc._json._id = existingDocId
 
     const original = screenDoc.json()
     // Set screens state
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: [original],
     }))
 
     const saveSpy = vi
-      .spyOn(ctx.test.screenStore, "save")
+      .spyOn(bb.screenStore, "save")
       .mockImplementation(async () => {
         return
       })
 
     // Returning false from the patch will abort the save
-    await ctx.test.screenStore.sequentialScreenPatch(() => {
+    await bb.screenStore.sequentialScreenPatch(() => {
       return false
     }, "123")
 
     expect(saveSpy).not.toBeCalled()
   })
 
-  it("Sequential patch check. Patch applied and save requested", async ctx => {
+  it("Sequential patch check. Patch applied and save requested", async ({
+    bb,
+  }) => {
     const screenDoc = getScreenFixture()
     const existingDocId = getScreenDocId()
     screenDoc._json._id = existingDocId
 
     const original = screenDoc.json()
 
-    await ctx.test.screenStore.update(state => ({
+    await bb.screenStore.update(state => ({
       ...state,
       screens: [original],
     }))
 
     const saveSpy = vi
-      .spyOn(ctx.test.screenStore, "save")
+      .spyOn(bb.screenStore, "save")
       .mockImplementation(async () => {
         return
       })
 
-    await ctx.test.screenStore.sequentialScreenPatch(screen => {
+    await bb.screenStore.sequentialScreenPatch(screen => {
       screen.name = "updated"
     }, existingDocId)
 
diff --git a/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
similarity index 73%
rename from packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
rename to packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
index d57aa19148..e2d777ed99 100644
--- a/packages/builder/src/stores/builder/tests/sortedIntegrations.test.js
+++ b/packages/builder/src/stores/builder/tests/sortedIntegrations.test.ts
@@ -1,18 +1,22 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { createSortedIntegrationsStore } from "stores/builder/sortedIntegrations"
-import { DatasourceTypes } from "constants/backend"
+import { SortedIntegrationStore } from "@/stores/builder/sortedIntegrations"
+import { DatasourceTypes } from "@/constants/backend"
 
 import { derived } from "svelte/store"
-import { integrations } from "stores/builder/integrations"
+import { integrations } from "@/stores/builder/integrations"
 
 vi.mock("svelte/store", () => ({
-  derived: vi.fn(),
+  derived: vi.fn(() => ({
+    subscribe: vi.fn(),
+  })),
   writable: vi.fn(() => ({
     subscribe: vi.fn(),
   })),
 }))
 
-vi.mock("stores/builder/integrations", () => ({ integrations: vi.fn() }))
+vi.mock("@/stores/builder/integrations", () => ({ integrations: vi.fn() }))
+
+const mockedDerived = vi.mocked(derived)
 
 const inputA = {
   nonRelationalA: {
@@ -104,25 +108,28 @@ const expectedOutput = [
 ]
 
 describe("sorted integrations store", () => {
-  beforeEach(ctx => {
+  interface LocalContext {
+    returnedStore: SortedIntegrationStore
+    derivedCallback: any
+  }
+
+  beforeEach<LocalContext>(ctx => {
     vi.clearAllMocks()
 
-    ctx.returnedStore = createSortedIntegrationsStore()
-
-    ctx.derivedCallback = derived.mock.calls[0][1]
+    ctx.returnedStore = new SortedIntegrationStore()
+    ctx.derivedCallback = mockedDerived.mock.calls[0]?.[1]
   })
 
   it("calls derived with the correct parameters", () => {
-    expect(derived).toHaveBeenCalledTimes(1)
-    expect(derived).toHaveBeenCalledWith(integrations, expect.toBeFunc())
+    expect(mockedDerived).toHaveBeenCalledTimes(1)
+    expect(mockedDerived).toHaveBeenCalledWith(
+      integrations,
+      expect.any(Function)
+    )
   })
 
   describe("derived callback", () => {
-    it("When no integrations are loaded", ctx => {
-      expect(ctx.derivedCallback({})).toEqual([])
-    })
-
-    it("When integrations are present", ctx => {
+    it<LocalContext>("When integrations are present", ctx => {
       expect(ctx.derivedCallback(inputA)).toEqual(expectedOutput)
       expect(ctx.derivedCallback(inputB)).toEqual(expectedOutput)
     })
diff --git a/packages/builder/src/stores/builder/tests/tables.spec.js.disabled b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
index 26b4d90229..1e4d3d3cb7 100644
--- a/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
+++ b/packages/builder/src/stores/builder/tests/tables.spec.js.disabled
@@ -1,5 +1,5 @@
 import { get } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 jest.mock("api")
 
diff --git a/packages/builder/src/stores/builder/theme.js b/packages/builder/src/stores/builder/theme.js
deleted file mode 100644
index 8e03e856b3..0000000000
--- a/packages/builder/src/stores/builder/theme.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { ensureValidTheme, DefaultAppTheme } from "@budibase/shared-core"
-
-export const createThemeStore = () => {
-  const store = writable({
-    theme: DefaultAppTheme,
-    customTheme: {},
-  })
-
-  const syncAppTheme = app => {
-    store.update(state => {
-      const theme = ensureValidTheme(app.theme, DefaultAppTheme)
-      return {
-        ...state,
-        theme,
-        customTheme: app.customTheme,
-      }
-    })
-  }
-
-  const save = async (theme, appId) => {
-    const app = await API.saveAppMetadata({
-      appId,
-      metadata: { theme },
-    })
-    store.update(state => {
-      state.theme = app.theme
-      return state
-    })
-  }
-
-  const saveCustom = async (theme, appId) => {
-    const updated = { ...get(store).customTheme, ...theme }
-    const app = await API.saveAppMetadata({
-      appId,
-      metadata: { customTheme: updated },
-    })
-    store.update(state => {
-      state.customTheme = app.customTheme
-      return state
-    })
-  }
-
-  const syncMetadata = metadata => {
-    const { theme, customTheme } = metadata
-    store.update(state => ({
-      ...state,
-      theme: ensureValidTheme(theme, DefaultAppTheme),
-      customTheme,
-    }))
-  }
-
-  return {
-    subscribe: store.subscribe,
-    update: store.update,
-    syncMetadata,
-    syncAppTheme,
-    save,
-    saveCustom,
-  }
-}
-
-export const themeStore = createThemeStore()
diff --git a/packages/builder/src/stores/builder/theme.ts b/packages/builder/src/stores/builder/theme.ts
new file mode 100644
index 0000000000..604add9410
--- /dev/null
+++ b/packages/builder/src/stores/builder/theme.ts
@@ -0,0 +1,58 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import { ensureValidTheme, DefaultAppTheme } from "@budibase/shared-core"
+import { App, UpdateAppResponse, Theme, AppCustomTheme } from "@budibase/types"
+
+interface ThemeState {
+  theme: Theme
+  customTheme: AppCustomTheme
+}
+
+export class ThemeStore extends BudiStore<ThemeState> {
+  constructor() {
+    super({
+      theme: DefaultAppTheme,
+      customTheme: {},
+    })
+  }
+
+  syncAppTheme = (app: App) => {
+    this.update(state => {
+      const theme = ensureValidTheme(app.theme, DefaultAppTheme)
+      return {
+        ...state,
+        theme,
+        customTheme: app.customTheme || {},
+      }
+    })
+  }
+
+  save = async (theme: Theme, appId: string) => {
+    const app = await API.saveAppMetadata(appId, { theme })
+    this.update(state => ({
+      ...state,
+      theme: ensureValidTheme(app.theme, DefaultAppTheme),
+    }))
+  }
+
+  saveCustom = async (theme: Partial<AppCustomTheme>, appId: string) => {
+    const updated = { ...get(this).customTheme, ...theme }
+    const app = await API.saveAppMetadata(appId, { customTheme: updated })
+    this.update(state => ({
+      ...state,
+      customTheme: app.customTheme || {},
+    }))
+  }
+
+  syncMetadata = (metadata: UpdateAppResponse) => {
+    const { theme, customTheme } = metadata
+    this.update(state => ({
+      ...state,
+      theme: ensureValidTheme(theme, DefaultAppTheme),
+      customTheme: customTheme || {},
+    }))
+  }
+}
+
+export const themeStore = new ThemeStore()
diff --git a/packages/builder/src/stores/builder/users.js b/packages/builder/src/stores/builder/users.js
deleted file mode 100644
index 0794c63289..0000000000
--- a/packages/builder/src/stores/builder/users.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { writable, get, derived } from "svelte/store"
-
-export const createUserStore = () => {
-  const store = writable([])
-
-  const init = users => {
-    store.set(users)
-  }
-
-  const updateUser = user => {
-    const $users = get(store)
-    if (!$users.some(x => x.sessionId === user.sessionId)) {
-      store.set([...$users, user])
-    } else {
-      store.update(state => {
-        const index = state.findIndex(x => x.sessionId === user.sessionId)
-        state[index] = user
-        return state.slice()
-      })
-    }
-  }
-
-  const removeUser = sessionId => {
-    store.update(state => {
-      return state.filter(x => x.sessionId !== sessionId)
-    })
-  }
-
-  const reset = () => {
-    store.set([])
-  }
-
-  return {
-    ...store,
-    actions: {
-      init,
-      updateUser,
-      removeUser,
-      reset,
-    },
-  }
-}
-
-export const userStore = createUserStore()
-
-export const userSelectedResourceMap = derived(userStore, $userStore => {
-  let map = {}
-  $userStore.forEach(user => {
-    const resource = user.builderMetadata?.selectedResourceId
-    if (resource) {
-      if (!map[resource]) {
-        map[resource] = []
-      }
-      map[resource].push(user)
-    }
-  })
-  return map
-})
-
-export const isOnlyUser = derived(userStore, $userStore => {
-  return $userStore.length < 2
-})
diff --git a/packages/builder/src/stores/builder/users.ts b/packages/builder/src/stores/builder/users.ts
new file mode 100644
index 0000000000..5350b2af90
--- /dev/null
+++ b/packages/builder/src/stores/builder/users.ts
@@ -0,0 +1,59 @@
+import { get, derived } from "svelte/store"
+import { BudiStore } from "../BudiStore"
+import { UIUser } from "@budibase/types"
+
+export class UserStore extends BudiStore<UIUser[]> {
+  constructor() {
+    super([])
+  }
+
+  init(users: UIUser[]) {
+    this.set(users)
+  }
+
+  updateUser(user: UIUser) {
+    const $users = get(this)
+    if (!$users.some(x => x.sessionId === user.sessionId)) {
+      this.set([...$users, user])
+    } else {
+      this.update(state => {
+        const index = state.findIndex(x => x.sessionId === user.sessionId)
+        state[index] = user
+        return state.slice()
+      })
+    }
+  }
+
+  removeUser(sessionId: string) {
+    this.update(state => {
+      return state.filter(x => x.sessionId !== sessionId)
+    })
+  }
+
+  reset() {
+    this.set([])
+  }
+}
+
+export const userStore = new UserStore()
+
+export const userSelectedResourceMap = derived(
+  userStore,
+  ($userStore): Record<string, UIUser[]> => {
+    let map: Record<string, UIUser[]> = {}
+    $userStore.forEach(user => {
+      const resource = user.builderMetadata?.selectedResourceId
+      if (resource) {
+        if (!map[resource]) {
+          map[resource] = []
+        }
+        map[resource].push(user)
+      }
+    })
+    return map
+  }
+)
+
+export const isOnlyUser = derived(userStore, $userStore => {
+  return $userStore.length < 2
+})
diff --git a/packages/builder/src/stores/builder/views.js b/packages/builder/src/stores/builder/views.js
deleted file mode 100644
index 1d2463e2e2..0000000000
--- a/packages/builder/src/stores/builder/views.js
+++ /dev/null
@@ -1,67 +0,0 @@
-import { writable, derived } from "svelte/store"
-import { tables } from "./tables"
-import { API } from "api"
-
-export function createViewsStore() {
-  const store = writable({
-    selectedViewName: null,
-  })
-  const derivedStore = derived([store, tables], ([$store, $tables]) => {
-    let list = []
-    $tables.list?.forEach(table => {
-      const views = Object.values(table?.views || {}).filter(view => {
-        return view.version !== 2
-      })
-      list = list.concat(views)
-    })
-    return {
-      ...$store,
-      list,
-      selected: list.find(view => view.name === $store.selectedViewName),
-    }
-  })
-
-  const select = name => {
-    store.update(state => ({
-      ...state,
-      selectedViewName: name,
-    }))
-  }
-
-  const deleteView = async view => {
-    await API.deleteView(view.name)
-
-    // Update tables
-    tables.update(state => {
-      const table = state.list.find(table => table._id === view.tableId)
-      delete table.views[view.name]
-      return { ...state }
-    })
-  }
-
-  const save = async view => {
-    const savedView = await API.saveView(view)
-    select(view.name)
-
-    // Update tables
-    tables.update(state => {
-      const table = state.list.find(table => table._id === view.tableId)
-      if (table) {
-        if (view.originalName) {
-          delete table.views[view.originalName]
-        }
-        table.views[view.name] = savedView
-      }
-      return { ...state }
-    })
-  }
-
-  return {
-    subscribe: derivedStore.subscribe,
-    select,
-    delete: deleteView,
-    save,
-  }
-}
-
-export const views = createViewsStore()
diff --git a/packages/builder/src/stores/builder/views.ts b/packages/builder/src/stores/builder/views.ts
new file mode 100644
index 0000000000..81085fcb42
--- /dev/null
+++ b/packages/builder/src/stores/builder/views.ts
@@ -0,0 +1,94 @@
+import { DerivedBudiStore } from "../BudiStore"
+import { tables } from "./tables"
+import { API } from "@/api"
+import { View } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
+import { derived, Writable } from "svelte/store"
+
+interface BuilderViewStore {
+  selectedViewName: string | null
+}
+
+interface DerivedViewStore extends BuilderViewStore {
+  list: View[]
+  selected?: View
+}
+
+export class ViewsStore extends DerivedBudiStore<
+  BuilderViewStore,
+  DerivedViewStore
+> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<BuilderViewStore>) => {
+      return derived([store, tables], ([$store, $tables]): DerivedViewStore => {
+        let list: View[] = []
+        $tables.list?.forEach(table => {
+          const views = Object.values(table?.views || {}).filter(
+            (view): view is View => !helpers.views.isV2(view)
+          )
+          list = list.concat(views)
+        })
+        return {
+          selectedViewName: $store.selectedViewName,
+          list,
+          selected: list.find(view => view.name === $store.selectedViewName),
+        }
+      })
+    }
+
+    super(
+      {
+        selectedViewName: null,
+      },
+      makeDerivedStore
+    )
+
+    this.select = this.select.bind(this)
+  }
+
+  select = (name: string) => {
+    this.store.update(state => ({
+      ...state,
+      selectedViewName: name,
+    }))
+  }
+
+  delete = async (view: View) => {
+    if (!view.name) {
+      throw new Error("View name is required")
+    }
+    await API.deleteView(view.name)
+
+    // Update tables
+    tables.update(state => {
+      const table = state.list.find(table => table._id === view.tableId)
+      if (table?.views && view.name) {
+        delete table.views[view.name]
+      }
+      return { ...state }
+    })
+  }
+
+  save = async (view: View & { originalName?: string }) => {
+    if (!view.name) {
+      throw new Error("View name is required")
+    }
+
+    const savedView = await API.saveView(view)
+    this.select(view.name)
+
+    // Update tables
+    tables.update(state => {
+      const table = state.list.find(table => table._id === view.tableId)
+      if (table?.views && view.name) {
+        if (view.originalName) {
+          delete table.views[view.originalName]
+        }
+        table.views[view.name] = savedView
+      }
+      return { ...state }
+    })
+  }
+}
+
+export const views = new ViewsStore()
diff --git a/packages/builder/src/stores/builder/viewsV2.js b/packages/builder/src/stores/builder/viewsV2.js
deleted file mode 100644
index 9bd32f4a24..0000000000
--- a/packages/builder/src/stores/builder/viewsV2.js
+++ /dev/null
@@ -1,102 +0,0 @@
-import { writable, derived, get } from "svelte/store"
-import { tables } from "./tables"
-import { API } from "api"
-
-export function createViewsV2Store() {
-  const store = writable({
-    selectedViewId: null,
-  })
-  const derivedStore = derived([store, tables], ([$store, $tables]) => {
-    let list = []
-    $tables.list?.forEach(table => {
-      const views = Object.values(table?.views || {}).filter(view => {
-        return view.version === 2
-      })
-      list = list.concat(views)
-    })
-    return {
-      ...$store,
-      list,
-      selected: list.find(view => view.id === $store.selectedViewId),
-    }
-  })
-
-  const select = id => {
-    store.update(state => ({
-      ...state,
-      selectedViewId: id,
-    }))
-  }
-
-  const deleteView = async view => {
-    await API.viewV2.delete(view.id)
-    replaceView(view.id, null)
-  }
-
-  const create = async view => {
-    const savedViewResponse = await API.viewV2.create(view)
-    const savedView = savedViewResponse.data
-    replaceView(savedView.id, savedView)
-    return savedView
-  }
-
-  const save = async view => {
-    const res = await API.viewV2.update(view)
-    const savedView = res?.data
-    replaceView(view.id, savedView)
-  }
-
-  // Handles external updates of tables
-  const replaceView = (viewId, view) => {
-    if (!viewId) {
-      return
-    }
-    const existingView = get(derivedStore).list.find(view => view.id === viewId)
-    const tableIndex = get(tables).list.findIndex(table => {
-      return table._id === view?.tableId || table._id === existingView?.tableId
-    })
-    if (tableIndex === -1) {
-      return
-    }
-
-    // Handle deletion
-    if (!view) {
-      tables.update(state => {
-        delete state.list[tableIndex].views[existingView.name]
-        return state
-      })
-      return
-    }
-
-    // Add new view
-    if (!existingView) {
-      tables.update(state => {
-        state.list[tableIndex].views[view.name] = view
-        return state
-      })
-    }
-
-    // Update existing view
-    else {
-      tables.update(state => {
-        // Remove old view
-        delete state.list[tableIndex].views[existingView.name]
-
-        // Add new view
-        state.list[tableIndex].views[view.name] = view
-        return state
-      })
-    }
-  }
-
-  return {
-    subscribe: derivedStore.subscribe,
-    select,
-    delete: deleteView,
-    create,
-    save,
-    replaceView,
-  }
-}
-
-export const viewsV2 = createViewsV2Store()
diff --git a/packages/builder/src/stores/builder/viewsV2.ts b/packages/builder/src/stores/builder/viewsV2.ts
new file mode 100644
index 0000000000..75a833a80b
--- /dev/null
+++ b/packages/builder/src/stores/builder/viewsV2.ts
@@ -0,0 +1,122 @@
+import { derived, get, Writable } from "svelte/store"
+import { tables } from "./tables"
+import { API } from "@/api"
+import { DerivedBudiStore } from "@/stores/BudiStore"
+import { CreateViewRequest, UpdateViewRequest, ViewV2 } from "@budibase/types"
+import { helpers } from "@budibase/shared-core"
+
+interface BuilderViewV2Store {
+  selectedViewId: string | null
+}
+
+interface DerivedViewV2Store extends BuilderViewV2Store {
+  list: ViewV2[]
+  selected?: ViewV2
+}
+
+export class ViewV2Store extends DerivedBudiStore<
+  BuilderViewV2Store,
+  DerivedViewV2Store
+> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<BuilderViewV2Store>) => {
+      return derived(
+        [store, tables],
+        ([$store, $tables]): DerivedViewV2Store => {
+          let list: ViewV2[] = []
+          $tables.list?.forEach(table => {
+            const views = Object.values(table?.views || {}).filter(
+              helpers.views.isV2
+            )
+            list = list.concat(views)
+          })
+          return {
+            ...$store,
+            list,
+            selected: list.find(view => view.id === $store.selectedViewId),
+          }
+        }
+      )
+    }
+
+    super(
+      {
+        selectedViewId: null,
+      },
+      makeDerivedStore
+    )
+
+    this.select = this.select.bind(this)
+  }
+
+  select(id: string) {
+    this.store.update(state => ({
+      ...state,
+      selectedViewId: id,
+    }))
+  }
+
+  async delete(view: { id: string }) {
+    await API.viewV2.delete(view.id)
+    this.replaceView(view.id, null)
+  }
+
+  async create(view: CreateViewRequest) {
+    const savedViewResponse = await API.viewV2.create(view)
+    const savedView = savedViewResponse.data
+    this.replaceView(savedView.id, savedView)
+    return savedView
+  }
+
+  async save(view: UpdateViewRequest) {
+    const res = await API.viewV2.update(view)
+    const savedView = res?.data
+    this.replaceView(view.id, savedView)
+  }
+
+  // Handles external updates of tables
+  replaceView(viewId: string, view: ViewV2 | null) {
+    const existingView = get(this.derivedStore).list.find(
+      view => view.id === viewId
+    )
+    const tableIndex = get(tables).list.findIndex(table => {
+      return table._id === view?.tableId || table._id === existingView?.tableId
+    })
+    if (tableIndex === -1) {
+      return
+    }
+
+    // Handle deletion
+    if (!view && existingView) {
+      tables.update(state => {
+        delete state.list[tableIndex].views![existingView.name]
+        return state
+      })
+      return
+    }
+
+    // Add new view
+    else if (!existingView && view) {
+      tables.update(state => {
+        state.list[tableIndex].views ??= {}
+        state.list[tableIndex].views[view.name] = view
+        return state
+      })
+    }
+
+    // Update existing view
+    else if (existingView && view) {
+      tables.update(state => {
+        // Remove old view
+        state.list[tableIndex].views ??= {}
+        delete state.list[tableIndex].views[existingView.name]
+
+        // Add new view
+        state.list[tableIndex].views[view.name] = view
+        return state
+      })
+    }
+  }
+}
+
+export const viewsV2 = new ViewV2Store()
diff --git a/packages/builder/src/stores/builder/websocket.js b/packages/builder/src/stores/builder/websocket.js
deleted file mode 100644
index 8a0d83abc1..0000000000
--- a/packages/builder/src/stores/builder/websocket.js
+++ /dev/null
@@ -1,95 +0,0 @@
-import { createWebsocket } from "@budibase/frontend-core"
-import {
-  automationStore,
-  userStore,
-  appStore,
-  themeStore,
-  navigationStore,
-  deploymentStore,
-  snippets,
-  datasources,
-  tables,
-  roles,
-} from "stores/builder"
-import { get } from "svelte/store"
-import { auth, appsStore } from "stores/portal"
-import { screenStore } from "./screens"
-import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
-import { notifications } from "@budibase/bbui"
-
-export const createBuilderWebsocket = appId => {
-  const socket = createWebsocket("/socket/builder")
-
-  // Built-in events
-  socket.on("connect", () => {
-    socket.emit(BuilderSocketEvent.SelectApp, { appId }, ({ users }) => {
-      userStore.actions.init(users)
-    })
-  })
-  socket.on("connect_error", err => {
-    console.error("Failed to connect to builder websocket:", err.message)
-  })
-  socket.on("disconnect", () => {
-    userStore.actions.reset()
-  })
-
-  // User events
-  socket.onOther(SocketEvent.UserUpdate, ({ user }) => {
-    userStore.actions.updateUser(user)
-  })
-  socket.onOther(SocketEvent.UserDisconnect, ({ sessionId }) => {
-    userStore.actions.removeUser(sessionId)
-  })
-  socket.onOther(BuilderSocketEvent.LockTransfer, ({ userId }) => {
-    if (userId === get(auth)?.user?._id) {
-      appStore.update(state => ({
-        ...state,
-        hasLock: true,
-      }))
-    }
-  })
-
-  // Data section events
-  socket.onOther(BuilderSocketEvent.TableChange, ({ id, table }) => {
-    tables.replaceTable(id, table)
-  })
-  socket.onOther(BuilderSocketEvent.DatasourceChange, ({ id, datasource }) => {
-    datasources.replaceDatasource(id, datasource)
-  })
-
-  // Role events
-  socket.onOther(BuilderSocketEvent.RoleChange, ({ id, role }) => {
-    roles.replace(id, role)
-  })
-
-  // Design section events
-  socket.onOther(BuilderSocketEvent.ScreenChange, ({ id, screen }) => {
-    screenStore.replace(id, screen)
-  })
-
-  // App events
-  socket.onOther(BuilderSocketEvent.AppMetadataChange, ({ metadata }) => {
-    appStore.syncMetadata(metadata)
-    themeStore.syncMetadata(metadata)
-    navigationStore.syncMetadata(metadata)
-    snippets.syncMetadata(metadata)
-  })
-  socket.onOther(
-    BuilderSocketEvent.AppPublishChange,
-    async ({ user, published }) => {
-      await appsStore.load()
-      if (published) {
-        await deploymentStore.load()
-      }
-      const verb = published ? "published" : "unpublished"
-      notifications.success(`${helpers.getUserLabel(user)} ${verb} this app`)
-    }
-  )
-
-  // Automation events
-  socket.onOther(BuilderSocketEvent.AutomationChange, ({ id, automation }) => {
-    automationStore.actions.replace(id, automation)
-  })
-
-  return socket
-}
diff --git a/packages/builder/src/stores/builder/websocket.ts b/packages/builder/src/stores/builder/websocket.ts
new file mode 100644
index 0000000000..a56fec2227
--- /dev/null
+++ b/packages/builder/src/stores/builder/websocket.ts
@@ -0,0 +1,131 @@
+import { createWebsocket } from "@budibase/frontend-core"
+import {
+  automationStore,
+  userStore,
+  appStore,
+  themeStore,
+  navigationStore,
+  deploymentStore,
+  snippets,
+  datasources,
+  tables,
+  roles,
+} from "@/stores/builder"
+import { get } from "svelte/store"
+import { auth, appsStore } from "@/stores/portal"
+import { screenStore } from "./screens"
+import { SocketEvent, BuilderSocketEvent, helpers } from "@budibase/shared-core"
+import { notifications } from "@budibase/bbui"
+import {
+  Automation,
+  Datasource,
+  Role,
+  Table,
+  UIUser,
+  Screen,
+} from "@budibase/types"
+
+export const createBuilderWebsocket = (appId: string) => {
+  const socket = createWebsocket("/socket/builder")
+
+  // Built-in events
+  socket.on("connect", () => {
+    socket.emit(
+      BuilderSocketEvent.SelectApp,
+      { appId },
+      ({ users }: { users: UIUser[] }) => {
+        userStore.init(users)
+      }
+    )
+  })
+  socket.on("connect_error", err => {
+    console.error("Failed to connect to builder websocket:", err.message)
+  })
+  socket.on("disconnect", () => {
+    userStore.reset()
+  })
+
+  // User events
+  socket.onOther(SocketEvent.UserUpdate, ({ user }: { user: UIUser }) => {
+    userStore.updateUser(user)
+  })
+  socket.onOther(
+    SocketEvent.UserDisconnect,
+    ({ sessionId }: { sessionId: string }) => {
+      userStore.removeUser(sessionId)
+    }
+  )
+  socket.onOther(
+    BuilderSocketEvent.LockTransfer,
+    ({ userId }: { userId: string }) => {
+      if (userId === get(auth)?.user?._id) {
+        appStore.update(state => ({
+          ...state,
+          hasLock: true,
+        }))
+      }
+    }
+  )
+
+  // Data section events
+  socket.onOther(
+    BuilderSocketEvent.TableChange,
+    ({ id, table }: { id: string; table: Table }) => {
+      tables.replaceTable(id, table)
+    }
+  )
+  socket.onOther(
+    BuilderSocketEvent.DatasourceChange,
+    ({ id, datasource }: { id: string; datasource: Datasource }) => {
+      datasources.replaceDatasource(id, datasource)
+    }
+  )
+
+  // Role events
+  socket.onOther(
+    BuilderSocketEvent.RoleChange,
+    ({ id, role }: { id: string; role: Role }) => {
+      roles.replace(id, role)
+    }
+  )
+
+  // Design section events
+  socket.onOther(
+    BuilderSocketEvent.ScreenChange,
+    ({ id, screen }: { id: string; screen: Screen }) => {
+      screenStore.replace(id, screen)
+    }
+  )
+
+  // App events
+  socket.onOther(
+    BuilderSocketEvent.AppMetadataChange,
+    ({ metadata }: { metadata: any }) => {
+      appStore.syncMetadata(metadata)
+      themeStore.syncMetadata(metadata)
+      navigationStore.syncMetadata(metadata)
+      snippets.syncMetadata(metadata)
+    }
+  )
+  socket.onOther(
+    BuilderSocketEvent.AppPublishChange,
+    async ({ user, published }: { user: UIUser; published: boolean }) => {
+      await appsStore.load()
+      if (published) {
+        await deploymentStore.load()
+      }
+      const verb = published ? "published" : "unpublished"
+      notifications.success(`${helpers.getUserLabel(user)} ${verb} this app`)
+    }
+  )
+
+  // Automation events
+  socket.onOther(
+    BuilderSocketEvent.AutomationChange,
+    ({ id, automation }: { id: string; automation: Automation }) => {
+      automationStore.actions.replace(id, automation)
+    }
+  )
+
+  return socket
+}
diff --git a/packages/builder/src/stores/portal/admin.js b/packages/builder/src/stores/portal/admin.js
deleted file mode 100644
index 54757fb314..0000000000
--- a/packages/builder/src/stores/portal/admin.js
+++ /dev/null
@@ -1,97 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
-import { banner } from "@budibase/bbui"
-
-export const DEFAULT_CONFIG = {
-  loaded: false,
-  multiTenancy: false,
-  cloud: false,
-  isDev: false,
-  disableAccountPortal: false,
-  accountPortalUrl: "",
-  importComplete: false,
-  checklist: {
-    apps: { checked: false },
-    smtp: { checked: false },
-    adminUser: { checked: false },
-    sso: { checked: false },
-  },
-  maintenance: [],
-  offlineMode: false,
-}
-
-export function createAdminStore() {
-  const admin = writable(DEFAULT_CONFIG)
-
-  async function init() {
-    await getChecklist()
-    await getEnvironment()
-    // enable system status checks in the cloud
-    if (get(admin).cloud) {
-      await getSystemStatus()
-      checkStatus()
-    }
-
-    admin.update(store => {
-      store.loaded = true
-      return store
-    })
-  }
-
-  async function getEnvironment() {
-    const environment = await API.getEnvironment()
-    admin.update(store => {
-      store.multiTenancy = environment.multiTenancy
-      store.cloud = environment.cloud
-      store.disableAccountPortal = environment.disableAccountPortal
-      store.accountPortalUrl = environment.accountPortalUrl
-      store.isDev = environment.isDev
-      store.baseUrl = environment.baseUrl
-      store.offlineMode = environment.offlineMode
-      store.maintenance = environment.maintenance
-      store.passwordMinLength = environment.passwordMinLength
-      return store
-    })
-  }
-
-  const checkStatus = async () => {
-    const health = get(admin)?.status?.health
-    if (!health?.passing) {
-      await banner.showStatus()
-    }
-  }
-
-  async function getSystemStatus() {
-    const status = await API.getSystemStatus()
-    admin.update(store => {
-      store.status = status
-      return store
-    })
-  }
-
-  async function getChecklist() {
-    const tenantId = get(auth).tenantId
-    const checklist = await API.getChecklist(tenantId)
-    admin.update(store => {
-      store.checklist = checklist
-      return store
-    })
-  }
-
-  function unload() {
-    admin.update(store => {
-      store.loaded = false
-      return store
-    })
-  }
-
-  return {
-    subscribe: admin.subscribe,
-    init,
-    unload,
-    getChecklist,
-  }
-}
-
-export const admin = createAdminStore()
diff --git a/packages/builder/src/stores/portal/admin.test.js b/packages/builder/src/stores/portal/admin.test.js
index a3f1e645c3..8924a5e6fb 100644
--- a/packages/builder/src/stores/portal/admin.test.js
+++ b/packages/builder/src/stores/portal/admin.test.js
@@ -1,12 +1,11 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { DEFAULT_CONFIG, createAdminStore } from "./admin"
-
+import { AdminStore } from "./admin"
 import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
 import { banner } from "@budibase/bbui"
 
-vi.mock("stores/portal", () => {
+vi.mock("@/stores/portal", () => {
   return { auth: vi.fn() }
 })
 
@@ -21,7 +20,7 @@ vi.mock("svelte/store", () => {
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       getEnvironment: vi.fn(),
@@ -32,7 +31,12 @@ vi.mock("api", () => {
 })
 
 vi.mock("@budibase/bbui", () => {
-  return { banner: { showStatus: vi.fn() } }
+  return {
+    banner: { showStatus: vi.fn() },
+    Helpers: {
+      uuid: vi.fn(),
+    },
+  }
 })
 
 describe("admin store", () => {
@@ -42,21 +46,7 @@ describe("admin store", () => {
     ctx.writableReturn = { update: vi.fn(), subscribe: vi.fn() }
     writable.mockReturnValue(ctx.writableReturn)
 
-    ctx.returnedStore = createAdminStore()
-  })
-
-  it("inits the writable store with the default config", () => {
-    expect(writable).toHaveBeenCalledTimes(1)
-    expect(writable).toHaveBeenCalledWith(DEFAULT_CONFIG)
-  })
-
-  it("returns the created store", ctx => {
-    expect(ctx.returnedStore).toEqual({
-      subscribe: expect.toBe(ctx.writableReturn.subscribe),
-      init: expect.toBeFunc(),
-      unload: expect.toBeFunc(),
-      getChecklist: expect.toBeFunc(),
-    })
+    ctx.returnedStore = new AdminStore()
   })
 
   describe("init method", () => {
diff --git a/packages/builder/src/stores/portal/admin.ts b/packages/builder/src/stores/portal/admin.ts
new file mode 100644
index 0000000000..90e3a5cdc9
--- /dev/null
+++ b/packages/builder/src/stores/portal/admin.ts
@@ -0,0 +1,93 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
+import { banner } from "@budibase/bbui"
+import {
+  ConfigChecklistResponse,
+  GetEnvironmentResponse,
+  SystemStatusResponse,
+} from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+interface AdminState extends GetEnvironmentResponse {
+  loaded: boolean
+  checklist?: ConfigChecklistResponse
+  status?: SystemStatusResponse
+}
+
+export class AdminStore extends BudiStore<AdminState> {
+  constructor() {
+    super({
+      loaded: false,
+      multiTenancy: false,
+      cloud: false,
+      isDev: false,
+      disableAccountPortal: false,
+      offlineMode: false,
+      maintenance: [],
+    })
+  }
+
+  async init() {
+    await this.getChecklist()
+    await this.getEnvironment()
+    // enable system status checks in the cloud
+    if (get(this.store).cloud) {
+      await this.getSystemStatus()
+      this.checkStatus()
+    }
+    this.update(store => {
+      store.loaded = true
+      return store
+    })
+  }
+
+  async getEnvironment() {
+    const environment = await API.getEnvironment()
+    this.update(store => {
+      store.multiTenancy = environment.multiTenancy
+      store.cloud = environment.cloud
+      store.disableAccountPortal = environment.disableAccountPortal
+      store.accountPortalUrl = environment.accountPortalUrl
+      store.isDev = environment.isDev
+      store.baseUrl = environment.baseUrl
+      store.offlineMode = environment.offlineMode
+      store.maintenance = environment.maintenance
+      store.passwordMinLength = environment.passwordMinLength
+      return store
+    })
+  }
+
+  async checkStatus() {
+    const health = get(this.store).status?.health
+    if (!health?.passing) {
+      await banner.showStatus()
+    }
+  }
+
+  async getSystemStatus() {
+    const status = await API.getSystemStatus()
+    this.update(store => {
+      store.status = status
+      return store
+    })
+  }
+
+  async getChecklist() {
+    const tenantId = get(auth).tenantId
+    const checklist = await API.getChecklist(tenantId)
+    this.update(store => {
+      store.checklist = checklist
+      return store
+    })
+  }
+
+  unload() {
+    this.update(store => {
+      store.loaded = false
+      return store
+    })
+  }
+}
+
+export const admin = new AdminStore()
diff --git a/packages/builder/src/stores/portal/apps.js b/packages/builder/src/stores/portal/apps.ts
similarity index 66%
rename from packages/builder/src/stores/portal/apps.js
rename to packages/builder/src/stores/portal/apps.ts
index 60f17da481..0c3e3b6017 100644
--- a/packages/builder/src/stores/portal/apps.js
+++ b/packages/builder/src/stores/portal/apps.ts
@@ -1,19 +1,38 @@
 import { derived } from "svelte/store"
-import { AppStatus } from "constants"
-import { API } from "api"
+import { AppStatus } from "@/constants"
+import { API } from "@/api"
 import { auth } from "./auth"
-import BudiStore from "../BudiStore" // move this
+import { BudiStore } from "../BudiStore"
+import { App, UpdateAppRequest } from "@budibase/types"
 
-// properties that should always come from the dev app, not the deployed
-const DEV_PROPS = ["updatedBy", "updatedAt"]
-
-export const INITIAL_APPS_STATE = {
-  apps: [],
+interface AppIdentifierMetadata {
+  devId?: string
+  devRev?: string
+  prodId?: string
+  prodRev?: string
 }
 
-export class AppsStore extends BudiStore {
+interface AppUIMetadata {
+  deployed: boolean
+  lockedYou: boolean
+  lockedOther: boolean
+  favourite: boolean
+}
+
+interface StoreApp extends App, AppIdentifierMetadata {}
+
+interface EnrichedApp extends StoreApp, AppUIMetadata {}
+
+interface PortalAppsStore {
+  apps: StoreApp[]
+  sortBy?: string
+}
+
+export class AppsStore extends BudiStore<PortalAppsStore> {
   constructor() {
-    super({ ...INITIAL_APPS_STATE })
+    super({
+      apps: [],
+    })
 
     this.extractAppId = this.extractAppId.bind(this)
     this.getProdAppID = this.getProdAppID.bind(this)
@@ -22,12 +41,12 @@ export class AppsStore extends BudiStore {
     this.save = this.save.bind(this)
   }
 
-  extractAppId(id) {
-    const split = id?.split("_") || []
+  extractAppId(appId?: string) {
+    const split = appId?.split("_") || []
     return split.length ? split[split.length - 1] : null
   }
 
-  getProdAppID(appId) {
+  getProdAppID(appId: string) {
     if (!appId) {
       return appId
     }
@@ -47,15 +66,15 @@ export class AppsStore extends BudiStore {
     return `app${separator}${rest}`
   }
 
-  updateSort(sortBy) {
+  async updateSort(sortBy: string) {
     this.update(state => ({
       ...state,
       sortBy,
     }))
-    this.updateUserSort(sortBy)
+    await this.updateUserSort(sortBy)
   }
 
-  async updateUserSort(sortBy) {
+  async updateUserSort(sortBy: string) {
     try {
       await auth.updateSelf({ appSort: sortBy })
     } catch (err) {
@@ -64,16 +83,19 @@ export class AppsStore extends BudiStore {
   }
 
   async load() {
-    const json = await API.getApps()
+    const json = (await API.getApps()) as App[]
     if (Array.isArray(json)) {
       // Merge apps into one sensible list
-      let appMap = {}
+      let appMap: Record<string, StoreApp> = {}
       let devApps = json.filter(app => app.status === AppStatus.DEV)
       let deployedApps = json.filter(app => app.status === AppStatus.DEPLOYED)
 
       // First append all dev app version
       devApps.forEach(app => {
         const id = this.extractAppId(app.appId)
+        if (!id) {
+          return
+        }
         appMap[id] = {
           ...app,
           devId: app.appId,
@@ -84,20 +106,22 @@ export class AppsStore extends BudiStore {
       // Then merge with all prod app versions
       deployedApps.forEach(app => {
         const id = this.extractAppId(app.appId)
+        if (!id) {
+          return
+        }
 
         // Skip any deployed apps which don't have a dev counterpart
         if (!appMap[id]) {
           return
         }
 
-        let devProps = {}
+        // Extract certain properties from the dev app to override the prod app
+        let devProps: Pick<App, "updatedBy" | "updatedAt"> = {}
         if (appMap[id]) {
-          const entries = Object.entries(appMap[id]).filter(
-            ([key]) => DEV_PROPS.indexOf(key) !== -1
-          )
-          entries.forEach(entry => {
-            devProps[entry[0]] = entry[1]
-          })
+          devProps = {
+            updatedBy: appMap[id].updatedBy,
+            updatedAt: appMap[id].updatedAt,
+          }
         }
         appMap[id] = {
           ...appMap[id],
@@ -111,7 +135,10 @@ export class AppsStore extends BudiStore {
       // Transform into an array and clean up
       const apps = Object.values(appMap)
       apps.forEach(app => {
-        app.appId = this.extractAppId(app.devId)
+        const appId = this.extractAppId(app.devId)
+        if (appId) {
+          app.appId = appId
+        }
         delete app._id
         delete app._rev
       })
@@ -127,11 +154,8 @@ export class AppsStore extends BudiStore {
     }
   }
 
-  async save(appId, value) {
-    await API.saveAppMetadata({
-      appId,
-      metadata: value,
-    })
+  async save(appId: string, value: UpdateAppRequest) {
+    await API.saveAppMetadata(appId, value)
     this.update(state => {
       const updatedAppIndex = state.apps.findIndex(
         app => app.instance._id === appId
@@ -156,15 +180,16 @@ export const sortBy = derived([appsStore, auth], ([$store, $auth]) => {
 export const enrichedApps = derived(
   [appsStore, auth, sortBy],
   ([$store, $auth, $sortBy]) => {
-    const enrichedApps = $store.apps
-      ? $store.apps.map(app => ({
-          ...app,
-          deployed: app.status === AppStatus.DEPLOYED,
-          lockedYou: app.lockedBy && app.lockedBy.email === $auth.user?.email,
-          lockedOther: app.lockedBy && app.lockedBy.email !== $auth.user?.email,
-          favourite: $auth.user?.appFavourites?.includes(app.appId),
-        }))
-      : []
+    const enrichedApps: EnrichedApp[] = $store.apps.map(app => {
+      const user = $auth.user
+      return {
+        ...app,
+        deployed: app.status === AppStatus.DEPLOYED,
+        lockedYou: app.lockedBy != null && app.lockedBy.email === user?.email,
+        lockedOther: app.lockedBy != null && app.lockedBy.email !== user?.email,
+        favourite: !!user?.appFavourites?.includes(app.appId),
+      }
+    })
 
     if ($sortBy === "status") {
       return enrichedApps.sort((a, b) => {
diff --git a/packages/builder/src/stores/portal/auditLogs.js b/packages/builder/src/stores/portal/auditLogs.js
deleted file mode 100644
index 9abf8ec11b..0000000000
--- a/packages/builder/src/stores/portal/auditLogs.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { licensing } from "stores/portal"
-
-export function createAuditLogsStore() {
-  const { subscribe, update } = writable({
-    events: {},
-    logs: {},
-  })
-
-  async function search(opts = {}) {
-    if (get(licensing).auditLogsEnabled) {
-      const paged = await API.searchAuditLogs(opts)
-
-      update(state => {
-        return { ...state, logs: { ...paged, opts } }
-      })
-
-      return paged
-    }
-  }
-
-  async function getEventDefinitions() {
-    const events = await API.getEventDefinitions()
-
-    update(state => {
-      return { ...state, ...events }
-    })
-  }
-
-  function getDownloadUrl(opts = {}) {
-    return API.getDownloadUrl(opts)
-  }
-
-  return {
-    subscribe,
-    search,
-    getEventDefinitions,
-    getDownloadUrl,
-  }
-}
-
-export const auditLogs = createAuditLogsStore()
diff --git a/packages/builder/src/stores/portal/auditLogs.ts b/packages/builder/src/stores/portal/auditLogs.ts
new file mode 100644
index 0000000000..6f11f228d6
--- /dev/null
+++ b/packages/builder/src/stores/portal/auditLogs.ts
@@ -0,0 +1,45 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { licensing } from "./licensing"
+import { BudiStore } from "../BudiStore"
+import {
+  DownloadAuditLogsRequest,
+  SearchAuditLogsRequest,
+  SearchAuditLogsResponse,
+} from "@budibase/types"
+
+interface PortalAuditLogsStore {
+  events?: Record<string, string>
+  logs?: SearchAuditLogsResponse
+}
+
+class AuditLogsStore extends BudiStore<PortalAuditLogsStore> {
+  constructor() {
+    super({})
+  }
+
+  async search(opts: SearchAuditLogsRequest = {}) {
+    if (get(licensing).auditLogsEnabled) {
+      const res = await API.searchAuditLogs(opts)
+      this.update(state => ({
+        ...state,
+        logs: res,
+      }))
+      return res
+    }
+  }
+
+  async getEventDefinitions() {
+    const res = await API.getEventDefinitions()
+    this.update(state => ({
+      ...state,
+      events: res.events,
+    }))
+  }
+
+  getDownloadUrl(opts: DownloadAuditLogsRequest = {}) {
+    return API.getDownloadUrl(opts)
+  }
+}
+
+export const auditLogs = new AuditLogsStore()
diff --git a/packages/builder/src/stores/portal/auth.js b/packages/builder/src/stores/portal/auth.js
deleted file mode 100644
index 2d2b455b37..0000000000
--- a/packages/builder/src/stores/portal/auth.js
+++ /dev/null
@@ -1,172 +0,0 @@
-import { derived, writable, get } from "svelte/store"
-import { API } from "api"
-import { admin } from "stores/portal"
-import analytics from "analytics"
-
-export function createAuthStore() {
-  const auth = writable({
-    user: null,
-    accountPortalAccess: false,
-    tenantId: "default",
-    tenantSet: false,
-    loaded: false,
-    postLogout: false,
-  })
-  const store = derived(auth, $store => {
-    return {
-      user: $store.user,
-      accountPortalAccess: $store.accountPortalAccess,
-      tenantId: $store.tenantId,
-      tenantSet: $store.tenantSet,
-      loaded: $store.loaded,
-      postLogout: $store.postLogout,
-      isSSO: !!$store.user?.provider,
-    }
-  })
-
-  function setUser(user) {
-    auth.update(store => {
-      store.loaded = true
-      store.user = user
-      store.accountPortalAccess = user?.accountPortalAccess
-      if (user) {
-        store.tenantId = user.tenantId || "default"
-        store.tenantSet = true
-      }
-      return store
-    })
-
-    if (user) {
-      analytics
-        .activate()
-        .then(() => {
-          analytics.identify(user._id)
-        })
-        .catch(() => {
-          // This request may fail due to browser extensions blocking requests
-          // containing the word analytics, so we don't want to spam users with
-          // an error here.
-        })
-    }
-  }
-
-  async function setOrganisation(tenantId) {
-    const prevId = get(store).tenantId
-    auth.update(store => {
-      store.tenantId = tenantId
-      store.tenantSet = !!tenantId
-      return store
-    })
-    if (prevId !== tenantId) {
-      // re-init admin after setting org
-      await admin.init()
-    }
-  }
-
-  async function setInitInfo(info) {
-    await API.setInitInfo(info)
-    auth.update(store => {
-      store.initInfo = info
-      return store
-    })
-    return info
-  }
-
-  function setPostLogout() {
-    auth.update(store => {
-      store.postLogout = true
-      return store
-    })
-  }
-
-  async function getInitInfo() {
-    const info = await API.getInitInfo()
-    auth.update(store => {
-      store.initInfo = info
-      return store
-    })
-    return info
-  }
-
-  const actions = {
-    checkQueryString: async () => {
-      const urlParams = new URLSearchParams(window.location.search)
-      if (urlParams.has("tenantId")) {
-        const tenantId = urlParams.get("tenantId")
-        await setOrganisation(tenantId)
-      }
-    },
-    setOrg: async tenantId => {
-      await setOrganisation(tenantId)
-    },
-    getSelf: async () => {
-      // We need to catch this locally as we never want this to fail, even
-      // though normally we never want to swallow API errors at the store level.
-      // We're either logged in or we aren't.
-      // We also need to always update the loaded flag.
-      try {
-        const user = await API.fetchBuilderSelf()
-        setUser(user)
-      } catch (error) {
-        setUser(null)
-      }
-    },
-    login: async creds => {
-      const tenantId = get(store).tenantId
-      await API.logIn({
-        username: creds.username,
-        password: creds.password,
-        tenantId,
-      })
-      await actions.getSelf()
-    },
-    logout: async () => {
-      await API.logOut()
-      setPostLogout()
-      setUser(null)
-      await setInitInfo({})
-    },
-    updateSelf: async fields => {
-      await API.updateSelf({ ...fields })
-      // Refetch to enrich after update.
-      try {
-        const user = await API.fetchBuilderSelf()
-        setUser(user)
-      } catch (error) {
-        setUser(null)
-      }
-    },
-    forgotPassword: async email => {
-      const tenantId = get(store).tenantId
-      await API.requestForgotPassword({
-        tenantId,
-        email,
-      })
-    },
-    resetPassword: async (password, resetCode) => {
-      const tenantId = get(store).tenantId
-      await API.resetPassword({
-        tenantId,
-        password,
-        resetCode,
-      })
-    },
-    generateAPIKey: async () => {
-      return API.generateAPIKey()
-    },
-    fetchAPIKey: async () => {
-      const info = await API.fetchDeveloperInfo()
-      return info?.apiKey
-    },
-  }
-
-  return {
-    subscribe: store.subscribe,
-    setOrganisation,
-    getInitInfo,
-    setInitInfo,
-    ...actions,
-  }
-}
-
-export const auth = createAuthStore()
diff --git a/packages/builder/src/stores/portal/auth.ts b/packages/builder/src/stores/portal/auth.ts
new file mode 100644
index 0000000000..c3dcaa3663
--- /dev/null
+++ b/packages/builder/src/stores/portal/auth.ts
@@ -0,0 +1,168 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { admin } from "@/stores/portal"
+import analytics from "@/analytics"
+import { BudiStore } from "@/stores/BudiStore"
+import {
+  GetGlobalSelfResponse,
+  isSSOUser,
+  SetInitInfoRequest,
+  UpdateSelfRequest,
+} from "@budibase/types"
+
+interface PortalAuthStore {
+  user?: GetGlobalSelfResponse
+  initInfo?: Record<string, any>
+  accountPortalAccess: boolean
+  loaded: boolean
+  isSSO: boolean
+  tenantId: string
+  tenantSet: boolean
+  postLogout: boolean
+}
+
+class AuthStore extends BudiStore<PortalAuthStore> {
+  constructor() {
+    super({
+      accountPortalAccess: false,
+      tenantId: "default",
+      tenantSet: false,
+      loaded: false,
+      postLogout: false,
+      isSSO: false,
+    })
+  }
+
+  setUser(user?: GetGlobalSelfResponse) {
+    this.set({
+      loaded: true,
+      user: user,
+      accountPortalAccess: !!user?.accountPortalAccess,
+      tenantId: user?.tenantId || "default",
+      tenantSet: !!user,
+      isSSO: user != null && isSSOUser(user),
+      postLogout: false,
+    })
+
+    if (user) {
+      analytics
+        .activate()
+        .then(() => {
+          analytics.identify(user._id)
+        })
+        .catch(() => {
+          // This request may fail due to browser extensions blocking requests
+          // containing the word analytics, so we don't want to spam users with
+          // an error here.
+        })
+    }
+  }
+
+  async setOrganisation(tenantId: string) {
+    const prevId = get(this.store).tenantId
+    auth.update(store => {
+      store.tenantId = tenantId
+      store.tenantSet = !!tenantId
+      return store
+    })
+    if (prevId !== tenantId) {
+      // re-init admin after setting org
+      await admin.init()
+    }
+  }
+
+  async setInitInfo(info: SetInitInfoRequest) {
+    await API.setInitInfo(info)
+    auth.update(store => {
+      store.initInfo = info
+      return store
+    })
+    return info
+  }
+
+  setPostLogout() {
+    auth.update(store => {
+      store.postLogout = true
+      return store
+    })
+  }
+
+  async getInitInfo() {
+    const info = await API.getInitInfo()
+    auth.update(store => {
+      store.initInfo = info
+      return store
+    })
+    return info
+  }
+
+  async checkQueryString() {
+    const urlParams = new URLSearchParams(window.location.search)
+    const tenantId = urlParams.get("tenantId")
+    if (tenantId) {
+      await this.setOrganisation(tenantId)
+    }
+  }
+
+  async setOrg(tenantId: string) {
+    await this.setOrganisation(tenantId)
+  }
+
+  async getSelf() {
+    // We need to catch this locally as we never want this to fail, even
+    // though normally we never want to swallow API errors at the store level.
+    // We're either logged in or we aren't.
+    // We also need to always update the loaded flag.
+    try {
+      const user = await API.fetchBuilderSelf()
+      this.setUser(user)
+    } catch (error) {
+      this.setUser()
+    }
+  }
+
+  async login(username: string, password: string, targetTenantId?: string) {
+    const tenantId = targetTenantId || get(this.store).tenantId
+    await API.logIn(tenantId, username, password)
+    await this.getSelf()
+  }
+
+  async logout() {
+    await API.logOut()
+    this.setPostLogout()
+    this.setUser()
+    await this.setInitInfo({})
+  }
+
+  async updateSelf(fields: UpdateSelfRequest) {
+    await API.updateSelf(fields)
+    // Refetch to enrich after update.
+    try {
+      const user = await API.fetchBuilderSelf()
+      this.setUser(user)
+    } catch (error) {
+      this.setUser()
+    }
+  }
+
+  async forgotPassword(email: string) {
+    const tenantId = get(this.store).tenantId
+    await API.requestForgotPassword(tenantId, email)
+  }
+
+  async resetPassword(password: string, resetCode: string) {
+    const tenantId = get(this.store).tenantId
+    await API.resetPassword(tenantId, password, resetCode)
+  }
+
+  async generateAPIKey() {
+    return API.generateAPIKey()
+  }
+
+  async fetchAPIKey() {
+    const info = await API.fetchDeveloperInfo()
+    return info?.apiKey
+  }
+}
+
+export const auth = new AuthStore()
diff --git a/packages/builder/src/stores/portal/backups.js b/packages/builder/src/stores/portal/backups.js
deleted file mode 100644
index 6ac70ef36c..0000000000
--- a/packages/builder/src/stores/portal/backups.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-export function createBackupsStore() {
-  const store = writable({})
-
-  function selectBackup(backupId) {
-    store.update(state => {
-      state.selectedBackup = backupId
-      return state
-    })
-  }
-
-  async function searchBackups({
-    appId,
-    trigger,
-    type,
-    page,
-    startDate,
-    endDate,
-  }) {
-    return API.searchBackups({ appId, trigger, type, page, startDate, endDate })
-  }
-
-  async function restoreBackup({ appId, backupId, name }) {
-    return API.restoreBackup({ appId, backupId, name })
-  }
-
-  async function deleteBackup({ appId, backupId }) {
-    return API.deleteBackup({ appId, backupId })
-  }
-
-  async function createManualBackup(appId) {
-    return API.createManualBackup(appId)
-  }
-
-  async function updateBackup({ appId, backupId, name }) {
-    return API.updateBackup({ appId, backupId, name })
-  }
-
-  return {
-    createManualBackup,
-    searchBackups,
-    selectBackup,
-    deleteBackup,
-    restoreBackup,
-    updateBackup,
-    subscribe: store.subscribe,
-  }
-}
-
-export const backups = createBackupsStore()
diff --git a/packages/builder/src/stores/portal/backups.test.js b/packages/builder/src/stores/portal/backups.test.js
index 18feb01938..93b2c8a2e0 100644
--- a/packages/builder/src/stores/portal/backups.test.js
+++ b/packages/builder/src/stores/portal/backups.test.js
@@ -1,8 +1,7 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { createBackupsStore } from "./backups"
-
+import { BackupStore } from "./backups"
 import { writable } from "svelte/store"
-import { API } from "api"
+import { API } from "@/api"
 
 vi.mock("svelte/store", () => {
   return {
@@ -10,17 +9,19 @@ vi.mock("svelte/store", () => {
       subscribe: vi.fn(),
       update: vi.fn(),
     })),
+    derived: vi.fn(() => ({
+      subscribe: vi.fn(),
+    })),
   }
 })
 
-vi.mock("api", () => {
+vi.mock("@/api", () => {
   return {
     API: {
       searchBackups: vi.fn(() => "searchBackupsReturn"),
       restoreBackup: vi.fn(() => "restoreBackupReturn"),
       deleteBackup: vi.fn(() => "deleteBackupReturn"),
       createManualBackup: vi.fn(() => "createManualBackupReturn"),
-      updateBackup: vi.fn(() => "updateBackupReturn"),
     },
   }
 })
@@ -32,7 +33,7 @@ describe("backups store", () => {
     ctx.writableReturn = { update: vi.fn(), subscribe: vi.fn() }
     writable.mockReturnValue(ctx.writableReturn)
 
-    ctx.returnedStore = createBackupsStore()
+    ctx.returnedStore = new BackupStore()
   })
 
   it("inits the writable store with the default config", () => {
@@ -61,8 +62,7 @@ describe("backups store", () => {
       ctx.page = "page"
       ctx.startDate = "startDate"
       ctx.endDate = "endDate"
-      ctx.value = await ctx.returnedStore.searchBackups({
-        appId: ctx.appId,
+      ctx.value = await ctx.returnedStore.searchBackups(ctx.appId, {
         trigger: ctx.trigger,
         type: ctx.type,
         page: ctx.page,
@@ -73,8 +73,7 @@ describe("backups store", () => {
 
     it("calls and returns the API searchBackups method", ctx => {
       expect(API.searchBackups).toHaveBeenCalledTimes(1)
-      expect(API.searchBackups).toHaveBeenCalledWith({
-        appId: ctx.appId,
+      expect(API.searchBackups).toHaveBeenCalledWith(ctx.appId, {
         trigger: ctx.trigger,
         type: ctx.type,
         page: ctx.page,
@@ -103,18 +102,12 @@ describe("backups store", () => {
     beforeEach(async ctx => {
       ctx.appId = "appId"
       ctx.backupId = "backupId"
-      ctx.value = await ctx.returnedStore.deleteBackup({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-      })
+      ctx.value = await ctx.returnedStore.deleteBackup(ctx.appId, ctx.backupId)
     })
 
     it("calls and returns the API deleteBackup method", ctx => {
       expect(API.deleteBackup).toHaveBeenCalledTimes(1)
-      expect(API.deleteBackup).toHaveBeenCalledWith({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-      })
+      expect(API.deleteBackup).toHaveBeenCalledWith(ctx.appId, ctx.backupId)
       expect(ctx.value).toBe("deleteBackupReturn")
     })
   })
@@ -124,47 +117,24 @@ describe("backups store", () => {
       ctx.appId = "appId"
       ctx.backupId = "backupId"
       ctx.$name = "name" // `name` is used by some sort of internal ctx thing and is readonly
-      ctx.value = await ctx.returnedStore.restoreBackup({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
+      ctx.value = await ctx.returnedStore.restoreBackup(
+        ctx.appId,
+        ctx.backupId,
+        ctx.$name
+      )
     })
 
     it("calls and returns the API restoreBackup method", ctx => {
       expect(API.restoreBackup).toHaveBeenCalledTimes(1)
-      expect(API.restoreBackup).toHaveBeenCalledWith({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
+      expect(API.restoreBackup).toHaveBeenCalledWith(
+        ctx.appId,
+        ctx.backupId,
+        ctx.$name
+      )
       expect(ctx.value).toBe("restoreBackupReturn")
     })
   })
 
-  describe("updateBackup", () => {
-    beforeEach(async ctx => {
-      ctx.appId = "appId"
-      ctx.backupId = "backupId"
-      ctx.$name = "name" // `name` is used by some sort of internal ctx thing and is readonly
-      ctx.value = await ctx.returnedStore.updateBackup({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
-    })
-
-    it("calls and returns the API updateBackup method", ctx => {
-      expect(API.updateBackup).toHaveBeenCalledTimes(1)
-      expect(API.updateBackup).toHaveBeenCalledWith({
-        appId: ctx.appId,
-        backupId: ctx.backupId,
-        name: ctx.$name,
-      })
-      expect(ctx.value).toBe("updateBackupReturn")
-    })
-  })
-
   describe("subscribe", () => {
     it("calls and returns the API updateBackup method", ctx => {
       expect(ctx.returnedStore.subscribe).toBe(ctx.writableReturn.subscribe)
diff --git a/packages/builder/src/stores/portal/backups.ts b/packages/builder/src/stores/portal/backups.ts
new file mode 100644
index 0000000000..050d509555
--- /dev/null
+++ b/packages/builder/src/stores/portal/backups.ts
@@ -0,0 +1,38 @@
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import { SearchAppBackupsRequest } from "@budibase/types"
+
+interface BackupState {
+  selectedBackup?: string
+}
+
+export class BackupStore extends BudiStore<BackupState> {
+  constructor() {
+    super({})
+  }
+
+  selectBackup(backupId: string) {
+    this.update(state => {
+      state.selectedBackup = backupId
+      return state
+    })
+  }
+
+  async searchBackups(appId: string, opts: SearchAppBackupsRequest) {
+    return API.searchBackups(appId, opts)
+  }
+
+  async restoreBackup(appId: string, backupId: string, name?: string) {
+    return API.restoreBackup(appId, backupId, name)
+  }
+
+  async deleteBackup(appId: string, backupId: string) {
+    return API.deleteBackup(appId, backupId)
+  }
+
+  async createManualBackup(appId: string) {
+    return API.createManualBackup(appId)
+  }
+}
+
+export const backups = new BackupStore()
diff --git a/packages/builder/src/stores/portal/email.js b/packages/builder/src/stores/portal/email.js
deleted file mode 100644
index 2e222d34c4..0000000000
--- a/packages/builder/src/stores/portal/email.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-export function createEmailStore() {
-  const store = writable({})
-
-  return {
-    subscribe: store.subscribe,
-    templates: {
-      fetch: async () => {
-        // Fetch the email template definitions and templates
-        const definitions = await API.getEmailTemplateDefinitions()
-        const templates = await API.getEmailTemplates()
-        store.set({
-          definitions,
-          templates,
-        })
-      },
-      save: async template => {
-        // Save your template config
-        const savedTemplate = await API.saveEmailTemplate(template)
-        template._rev = savedTemplate._rev
-        template._id = savedTemplate._id
-        store.update(state => {
-          const currentIdx = state.templates.findIndex(
-            template => template.purpose === savedTemplate.purpose
-          )
-          state.templates.splice(currentIdx, 1, template)
-          return state
-        })
-      },
-    },
-  }
-}
-
-export const email = createEmailStore()
diff --git a/packages/builder/src/stores/portal/email.ts b/packages/builder/src/stores/portal/email.ts
new file mode 100644
index 0000000000..290f443c78
--- /dev/null
+++ b/packages/builder/src/stores/portal/email.ts
@@ -0,0 +1,43 @@
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import {
+  FetchGlobalTemplateDefinitionResponse,
+  Template,
+} from "@budibase/types"
+
+interface EmailState {
+  definitions?: FetchGlobalTemplateDefinitionResponse
+  templates: Template[]
+}
+
+class EmailStore extends BudiStore<EmailState> {
+  constructor() {
+    super({
+      templates: [],
+    })
+  }
+
+  async fetchTemplates() {
+    const definitions = await API.getEmailTemplateDefinitions()
+    const templates = await API.getEmailTemplates()
+    this.set({
+      definitions,
+      templates,
+    })
+  }
+
+  async saveTemplate(template: Template) {
+    const savedTemplate = await API.saveEmailTemplate(template)
+    template._rev = savedTemplate._rev
+    template._id = savedTemplate._id
+    this.update(state => {
+      const currentIdx = state.templates.findIndex(
+        template => template.purpose === savedTemplate.purpose
+      )
+      state.templates.splice(currentIdx, 1, template)
+      return state
+    })
+  }
+}
+
+export const email = new EmailStore()
diff --git a/packages/builder/src/stores/portal/environment.js b/packages/builder/src/stores/portal/environment.js
deleted file mode 100644
index b3e46cf7bf..0000000000
--- a/packages/builder/src/stores/portal/environment.js
+++ /dev/null
@@ -1,71 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { Constants } from "@budibase/frontend-core"
-import { licensing } from "stores/portal"
-
-export function createEnvironmentStore() {
-  const { subscribe, update } = writable({
-    variables: [],
-    status: {},
-  })
-
-  async function checkStatus() {
-    const status = await API.checkEnvironmentVariableStatus()
-    update(store => {
-      store.status = status
-      return store
-    })
-  }
-
-  async function loadVariables() {
-    if (get(licensing).environmentVariablesEnabled) {
-      const envVars = await API.fetchEnvironmentVariables()
-      const mappedVars = envVars.variables.map(name => ({ name }))
-      update(store => {
-        store.variables = mappedVars
-        return store
-      })
-    }
-  }
-
-  async function createVariable(data) {
-    await API.createEnvironmentVariable(data)
-    let mappedVar = { name: data.name }
-    update(store => {
-      store.variables = [mappedVar, ...store.variables]
-      return store
-    })
-  }
-
-  async function deleteVariable(varName) {
-    await API.deleteEnvironmentVariable(varName)
-    update(store => {
-      store.variables = store.variables.filter(
-        envVar => envVar.name !== varName
-      )
-      return store
-    })
-  }
-
-  async function updateVariable(data) {
-    await API.updateEnvironmentVariable(data)
-  }
-
-  async function upgradePanelOpened() {
-    await API.publishEvent(
-      Constants.EventPublishType.ENV_VAR_UPGRADE_PANEL_OPENED
-    )
-  }
-
-  return {
-    subscribe,
-    checkStatus,
-    loadVariables,
-    createVariable,
-    deleteVariable,
-    updateVariable,
-    upgradePanelOpened,
-  }
-}
-
-export const environment = createEnvironmentStore()
diff --git a/packages/builder/src/stores/portal/environment.ts b/packages/builder/src/stores/portal/environment.ts
new file mode 100644
index 0000000000..2269ba48ab
--- /dev/null
+++ b/packages/builder/src/stores/portal/environment.ts
@@ -0,0 +1,79 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { licensing } from "@/stores/portal"
+import { BudiStore } from "../BudiStore"
+import {
+  CreateEnvironmentVariableRequest,
+  EventPublishType,
+  StatusEnvironmentVariableResponse,
+  UpdateEnvironmentVariableRequest,
+} from "@budibase/types"
+
+type EnvVar = {
+  name: string
+}
+
+interface EnvironmentState {
+  variables: EnvVar[]
+  status: StatusEnvironmentVariableResponse
+}
+
+class EnvironmentStore extends BudiStore<EnvironmentState> {
+  constructor() {
+    super({
+      variables: [],
+      status: {
+        encryptionKeyAvailable: false,
+      },
+    })
+  }
+
+  async checkStatus() {
+    const status = await API.checkEnvironmentVariableStatus()
+    this.update(store => {
+      store.status = status
+      return store
+    })
+  }
+
+  async loadVariables() {
+    if (get(licensing).environmentVariablesEnabled) {
+      const envVars: string[] = (await API.fetchEnvironmentVariables())
+        .variables
+      const mappedVars = envVars.map(name => ({ name }))
+      this.update(store => {
+        store.variables = mappedVars
+        return store
+      })
+    }
+  }
+
+  async createVariable(data: CreateEnvironmentVariableRequest) {
+    await API.createEnvironmentVariable(data)
+    let mappedVar = { name: data.name }
+    this.update(state => {
+      state.variables = [mappedVar, ...state.variables]
+      return state
+    })
+  }
+
+  async deleteVariable(name: string) {
+    await API.deleteEnvironmentVariable(name)
+    this.update(state => {
+      state.variables = state.variables.filter(envVar => envVar.name !== name)
+      return state
+    })
+  }
+
+  async updateVariable(name: string, data: UpdateEnvironmentVariableRequest) {
+    await API.updateEnvironmentVariable(name, data)
+  }
+
+  async upgradePanelOpened() {
+    await API.publishEvent(
+      EventPublishType.ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED
+    )
+  }
+}
+
+export const environment = new EnvironmentStore()
diff --git a/packages/builder/src/stores/portal/featureFlags.js b/packages/builder/src/stores/portal/featureFlags.js
deleted file mode 100644
index 902a8b488b..0000000000
--- a/packages/builder/src/stores/portal/featureFlags.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { derived } from "svelte/store"
-import { auth } from "stores/portal"
-
-export const INITIAL_FEATUREFLAG_STATE = {
-  SQS: false,
-  DEFAULT_VALUES: false,
-  BUDIBASE_AI: false,
-  AI_CUSTOM_CONFIGS: false,
-}
-
-export const featureFlags = derived([auth], ([$auth]) => {
-  return {
-    ...INITIAL_FEATUREFLAG_STATE,
-    ...($auth?.user?.flags || {}),
-  }
-})
diff --git a/packages/builder/src/stores/portal/featureFlags.ts b/packages/builder/src/stores/portal/featureFlags.ts
new file mode 100644
index 0000000000..0e40d0c7b4
--- /dev/null
+++ b/packages/builder/src/stores/portal/featureFlags.ts
@@ -0,0 +1,8 @@
+import { derived, Readable } from "svelte/store"
+import { auth } from "@/stores/portal"
+import { FeatureFlags, FeatureFlagDefaults } from "@budibase/types"
+
+export const featureFlags: Readable<FeatureFlags> = derived(auth, $auth => ({
+  ...FeatureFlagDefaults,
+  ...($auth?.user?.flags || {}),
+}))
diff --git a/packages/builder/src/stores/portal/features.js b/packages/builder/src/stores/portal/features.js
deleted file mode 100644
index e2ecb4c66a..0000000000
--- a/packages/builder/src/stores/portal/features.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-import { licensing } from "./licensing"
-import { ConfigType } from "@budibase/types"
-
-export const createFeatureStore = () => {
-  const internalStore = writable({
-    scim: {
-      isFeatureFlagEnabled: false,
-      isConfigFlagEnabled: false,
-    },
-  })
-
-  const store = writable({
-    isScimEnabled: false,
-  })
-
-  internalStore.subscribe(s => {
-    store.update(state => ({
-      ...state,
-      isScimEnabled: s.scim.isFeatureFlagEnabled && s.scim.isConfigFlagEnabled,
-    }))
-  })
-
-  licensing.subscribe(v => {
-    internalStore.update(state => ({
-      ...state,
-      scim: {
-        ...state.scim,
-        isFeatureFlagEnabled: v.scimEnabled,
-      },
-    }))
-  })
-
-  const actions = {
-    init: async () => {
-      const scimConfig = await API.getConfig(ConfigType.SCIM)
-      internalStore.update(state => ({
-        ...state,
-        scim: {
-          ...state.scim,
-          isConfigFlagEnabled: scimConfig?.config?.enabled,
-        },
-      }))
-    },
-  }
-
-  return {
-    subscribe: store.subscribe,
-    ...actions,
-  }
-}
-
-export const features = createFeatureStore()
diff --git a/packages/builder/src/stores/portal/features.ts b/packages/builder/src/stores/portal/features.ts
new file mode 100644
index 0000000000..049c7485a6
--- /dev/null
+++ b/packages/builder/src/stores/portal/features.ts
@@ -0,0 +1,35 @@
+import { derived, Writable } from "svelte/store"
+import { API } from "@/api"
+import { licensing } from "./licensing"
+import { ConfigType, isConfig, isSCIMConfig } from "@budibase/types"
+import { DerivedBudiStore } from "../BudiStore"
+
+interface FeatureState {
+  scimConfigEnabled: Boolean
+}
+
+interface DerivedFeatureState {
+  isScimEnabled: Boolean
+}
+
+class FeatureStore extends DerivedBudiStore<FeatureState, DerivedFeatureState> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<FeatureState>) => {
+      return derived([store, licensing], ([$state, $licensing]) => ({
+        isScimEnabled: $state.scimConfigEnabled && $licensing.scimEnabled,
+      }))
+    }
+    super({ scimConfigEnabled: false }, makeDerivedStore)
+  }
+
+  async init() {
+    const config = await API.getConfig(ConfigType.SCIM)
+    this.update(state => ({
+      ...state,
+      scimConfigEnabled:
+        isConfig(config) && isSCIMConfig(config) && config.config.enabled,
+    }))
+  }
+}
+
+export const features = new FeatureStore()
diff --git a/packages/builder/src/stores/portal/groups.js b/packages/builder/src/stores/portal/groups.js
deleted file mode 100644
index 1edc8a461c..0000000000
--- a/packages/builder/src/stores/portal/groups.js
+++ /dev/null
@@ -1,106 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { licensing } from "stores/portal"
-
-export function createGroupsStore() {
-  const store = writable([])
-
-  const updateStore = group => {
-    store.update(state => {
-      const currentIdx = state.findIndex(gr => gr._id === group._id)
-      if (currentIdx >= 0) {
-        state.splice(currentIdx, 1, group)
-      } else {
-        state.push(group)
-      }
-      return state
-    })
-  }
-
-  const getGroup = async groupId => {
-    const group = await API.getGroup(groupId)
-    updateStore(group)
-  }
-
-  const actions = {
-    init: async () => {
-      // only init if there is a groups license, just to be sure but the feature will be blocked
-      // on the backend anyway
-      if (get(licensing).groupsEnabled) {
-        const groups = await API.getGroups()
-        store.set(groups.data)
-      }
-    },
-
-    get: getGroup,
-
-    save: async group => {
-      const { ...dataToSave } = group
-      delete dataToSave.scimInfo
-      delete dataToSave.userGroups
-      const response = await API.saveGroup(dataToSave)
-      group._id = response._id
-      group._rev = response._rev
-      updateStore(group)
-      return group
-    },
-
-    delete: async group => {
-      await API.deleteGroup({
-        id: group._id,
-        rev: group._rev,
-      })
-      store.update(state => {
-        state = state.filter(state => state._id !== group._id)
-        return state
-      })
-    },
-
-    addUser: async (groupId, userId) => {
-      await API.addUsersToGroup(groupId, userId)
-      // refresh the group enrichment
-      await getGroup(groupId)
-    },
-
-    removeUser: async (groupId, userId) => {
-      await API.removeUsersFromGroup(groupId, userId)
-      // refresh the group enrichment
-      await getGroup(groupId)
-    },
-
-    addApp: async (groupId, appId, roleId) => {
-      await API.addAppsToGroup(groupId, [{ appId, roleId }])
-      // refresh the group roles
-      await getGroup(groupId)
-    },
-
-    removeApp: async (groupId, appId) => {
-      await API.removeAppsFromGroup(groupId, [{ appId }])
-      // refresh the group roles
-      await getGroup(groupId)
-    },
-
-    getGroupAppIds: group => {
-      let groupAppIds = Object.keys(group?.roles || {})
-      if (group?.builder?.apps) {
-        groupAppIds = groupAppIds.concat(group.builder.apps)
-      }
-      return groupAppIds
-    },
-
-    addGroupAppBuilder: async (groupId, appId) => {
-      return await API.addGroupAppBuilder({ groupId, appId })
-    },
-
-    removeGroupAppBuilder: async (groupId, appId) => {
-      return await API.removeGroupAppBuilder({ groupId, appId })
-    },
-  }
-
-  return {
-    subscribe: store.subscribe,
-    actions,
-  }
-}
-
-export const groups = createGroupsStore()
diff --git a/packages/builder/src/stores/portal/groups.ts b/packages/builder/src/stores/portal/groups.ts
new file mode 100644
index 0000000000..028f300d2c
--- /dev/null
+++ b/packages/builder/src/stores/portal/groups.ts
@@ -0,0 +1,96 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { licensing } from "@/stores/portal"
+import { UserGroup } from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+class GroupStore extends BudiStore<UserGroup[]> {
+  constructor() {
+    super([])
+  }
+
+  updateStore = (group: UserGroup) => {
+    this.update(state => {
+      const currentIdx = state.findIndex(gr => gr._id === group._id)
+      if (currentIdx >= 0) {
+        state.splice(currentIdx, 1, group)
+      } else {
+        state.push(group)
+      }
+      return state
+    })
+  }
+
+  async init() {
+    // Only init if there is a groups license, just to be sure but the feature will be blocked
+    // on the backend anyway
+    if (get(licensing).groupsEnabled) {
+      const groups = await API.getGroups()
+      this.set(groups)
+    }
+  }
+
+  private async refreshGroup(groupId: string) {
+    const group = await API.getGroup(groupId)
+    this.updateStore(group)
+  }
+
+  async save(group: UserGroup) {
+    const { ...dataToSave } = group
+    delete dataToSave.scimInfo
+    const response = await API.saveGroup(dataToSave)
+    group._id = response._id
+    group._rev = response._rev
+    this.updateStore(group)
+    return group
+  }
+
+  async delete(group: UserGroup) {
+    await API.deleteGroup(group._id!, group._rev!)
+    this.update(groups => {
+      const index = groups.findIndex(g => g._id === group._id)
+      if (index !== -1) {
+        groups.splice(index, 1)
+      }
+      return groups
+    })
+  }
+
+  async addUser(groupId: string, userId: string) {
+    await API.addUsersToGroup(groupId, [userId])
+    await this.refreshGroup(groupId)
+  }
+
+  async removeUser(groupId: string, userId: string) {
+    await API.removeUsersFromGroup(groupId, [userId])
+    await this.refreshGroup(groupId)
+  }
+
+  async addApp(groupId: string, appId: string, roleId: string) {
+    await API.addAppsToGroup(groupId, [{ appId, roleId }])
+    await this.refreshGroup(groupId)
+  }
+
+  async removeApp(groupId: string, appId: string) {
+    await API.removeAppsFromGroup(groupId, [{ appId }])
+    await this.refreshGroup(groupId)
+  }
+
+  getGroupAppIds(group: UserGroup) {
+    let groupAppIds = Object.keys(group?.roles || {})
+    if (group?.builder?.apps) {
+      groupAppIds = groupAppIds.concat(group.builder.apps)
+    }
+    return groupAppIds
+  }
+
+  async addGroupAppBuilder(groupId: string, appId: string) {
+    return await API.addGroupAppBuilder(groupId, appId)
+  }
+
+  async removeGroupAppBuilder(groupId: string, appId: string) {
+    return await API.removeGroupAppBuilder(groupId, appId)
+  }
+}
+
+export const groups = new GroupStore()
diff --git a/packages/builder/src/stores/portal/index.js b/packages/builder/src/stores/portal/index.ts
similarity index 100%
rename from packages/builder/src/stores/portal/index.js
rename to packages/builder/src/stores/portal/index.ts
diff --git a/packages/builder/src/stores/portal/licensing.js b/packages/builder/src/stores/portal/licensing.js
deleted file mode 100644
index 9abc376cd0..0000000000
--- a/packages/builder/src/stores/portal/licensing.js
+++ /dev/null
@@ -1,277 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth, admin } from "stores/portal"
-import { Constants } from "@budibase/frontend-core"
-import { StripeStatus } from "components/portal/licensing/constants"
-import { PlanModel } from "@budibase/types"
-
-const UNLIMITED = -1
-
-export const createLicensingStore = () => {
-  const DEFAULT = {
-    // navigation
-    goToUpgradePage: () => {},
-    goToPricingPage: () => {},
-    // the top level license
-    license: undefined,
-    isFreePlan: true,
-    isEnterprisePlan: true,
-    isBusinessPlan: true,
-    // features
-    groupsEnabled: false,
-    backupsEnabled: false,
-    brandingEnabled: false,
-    scimEnabled: false,
-    budibaseAIEnabled: false,
-    customAIConfigsEnabled: false,
-    // the currently used quotas from the db
-    quotaUsage: undefined,
-    // derived quota metrics for percentages used
-    usageMetrics: undefined,
-    // quota reset
-    quotaResetDaysRemaining: undefined,
-    quotaResetDate: undefined,
-    // failed payments
-    accountPastDue: undefined,
-    pastDueEndDate: undefined,
-    pastDueDaysRemaining: undefined,
-    accountDowngraded: undefined,
-    // user limits
-    userCount: undefined,
-    userLimit: undefined,
-    userLimitReached: false,
-    errUserLimit: false,
-  }
-
-  const oneDayInMilliseconds = 86400000
-
-  const store = writable(DEFAULT)
-
-  function usersLimitReached(userCount, userLimit) {
-    if (userLimit === UNLIMITED) {
-      return false
-    }
-    return userCount >= userLimit
-  }
-
-  function usersLimitExceeded(userCount, userLimit) {
-    if (userLimit === UNLIMITED) {
-      return false
-    }
-    return userCount > userLimit
-  }
-
-  async function isCloud() {
-    let adminStore = get(admin)
-    if (!adminStore.loaded) {
-      await admin.init()
-      adminStore = get(admin)
-    }
-    return adminStore.cloud
-  }
-
-  const actions = {
-    init: async () => {
-      actions.setNavigation()
-      actions.setLicense()
-      await actions.setQuotaUsage()
-    },
-    setNavigation: () => {
-      const adminStore = get(admin)
-      const authStore = get(auth)
-
-      const upgradeUrl = authStore?.user?.accountPortalAccess
-        ? `${adminStore.accountPortalUrl}/portal/upgrade`
-        : "/builder/portal/account/upgrade"
-
-      const goToUpgradePage = () => {
-        window.location.href = upgradeUrl
-      }
-      const goToPricingPage = () => {
-        window.open("https://budibase.com/pricing/", "_blank")
-      }
-      store.update(state => {
-        return {
-          ...state,
-          goToUpgradePage,
-          goToPricingPage,
-        }
-      })
-    },
-    setLicense: () => {
-      const license = get(auth).user.license
-      const planType = license?.plan.type
-      const isEnterprisePlan = planType === Constants.PlanType.ENTERPRISE
-      const isFreePlan = planType === Constants.PlanType.FREE
-      const isBusinessPlan = planType === Constants.PlanType.BUSINESS
-      const isEnterpriseTrial =
-        planType === Constants.PlanType.ENTERPRISE_BASIC_TRIAL
-      const groupsEnabled = license.features.includes(
-        Constants.Features.USER_GROUPS
-      )
-      const backupsEnabled = license.features.includes(
-        Constants.Features.APP_BACKUPS
-      )
-      const scimEnabled = license.features.includes(Constants.Features.SCIM)
-      const environmentVariablesEnabled = license.features.includes(
-        Constants.Features.ENVIRONMENT_VARIABLES
-      )
-      const enforceableSSO = license.features.includes(
-        Constants.Features.ENFORCEABLE_SSO
-      )
-      const brandingEnabled = license.features.includes(
-        Constants.Features.BRANDING
-      )
-      const auditLogsEnabled = license.features.includes(
-        Constants.Features.AUDIT_LOGS
-      )
-      const syncAutomationsEnabled = license.features.includes(
-        Constants.Features.SYNC_AUTOMATIONS
-      )
-      const triggerAutomationRunEnabled = license.features.includes(
-        Constants.Features.TRIGGER_AUTOMATION_RUN
-      )
-      const perAppBuildersEnabled = license.features.includes(
-        Constants.Features.APP_BUILDERS
-      )
-      const budibaseAIEnabled = license.features.includes(
-        Constants.Features.BUDIBASE_AI
-      )
-      const customAIConfigsEnabled = license.features.includes(
-        Constants.Features.AI_CUSTOM_CONFIGS
-      )
-      store.update(state => {
-        return {
-          ...state,
-          license,
-          isEnterprisePlan,
-          isFreePlan,
-          isBusinessPlan,
-          isEnterpriseTrial,
-          groupsEnabled,
-          backupsEnabled,
-          brandingEnabled,
-          budibaseAIEnabled,
-          customAIConfigsEnabled,
-          scimEnabled,
-          environmentVariablesEnabled,
-          auditLogsEnabled,
-          enforceableSSO,
-          syncAutomationsEnabled,
-          triggerAutomationRunEnabled,
-          perAppBuildersEnabled,
-        }
-      })
-    },
-    setQuotaUsage: async () => {
-      const quotaUsage = await API.getQuotaUsage()
-      store.update(state => {
-        return {
-          ...state,
-          quotaUsage,
-        }
-      })
-      await actions.setUsageMetrics()
-    },
-    usersLimitReached: userCount => {
-      return usersLimitReached(userCount, get(store).userLimit)
-    },
-    usersLimitExceeded(userCount) {
-      return usersLimitExceeded(userCount, get(store).userLimit)
-    },
-    setUsageMetrics: async () => {
-      const usage = get(store).quotaUsage
-      const license = get(auth).user.license
-      const now = new Date()
-
-      const getMetrics = (keys, license, quota) => {
-        if (!license || !quota || !keys) {
-          return {}
-        }
-        return keys.reduce((acc, key) => {
-          const quotaLimit = license[key].value
-          const quotaUsed = (quota[key] / quotaLimit) * 100
-          acc[key] = quotaLimit > -1 ? Math.floor(quotaUsed) : -1
-          return acc
-        }, {})
-      }
-      const monthlyMetrics = getMetrics(
-        ["queries", "automations"],
-        license.quotas.usage.monthly,
-        usage.monthly.current
-      )
-      const staticMetrics = getMetrics(
-        ["apps", "rows"],
-        license.quotas.usage.static,
-        usage.usageQuota
-      )
-
-      const getDaysBetween = (dateStart, dateEnd) => {
-        return dateEnd > dateStart
-          ? Math.round(
-              (dateEnd.getTime() - dateStart.getTime()) / oneDayInMilliseconds
-            )
-          : 0
-      }
-
-      const quotaResetDate = new Date(usage.quotaReset)
-      const quotaResetDaysRemaining = getDaysBetween(now, quotaResetDate)
-
-      const accountDowngraded =
-        license?.billing?.subscription?.downgradeAt &&
-        license?.billing?.subscription?.downgradeAt <= now.getTime() &&
-        license?.billing?.subscription?.status === StripeStatus.PAST_DUE &&
-        license?.plan.type === Constants.PlanType.FREE
-
-      const pastDueAtMilliseconds = license?.billing?.subscription?.pastDueAt
-      const downgradeAtMilliseconds =
-        license?.billing?.subscription?.downgradeAt
-      let pastDueDaysRemaining
-      let pastDueEndDate
-
-      if (pastDueAtMilliseconds && downgradeAtMilliseconds) {
-        pastDueEndDate = new Date(downgradeAtMilliseconds)
-        pastDueDaysRemaining = getDaysBetween(
-          new Date(pastDueAtMilliseconds),
-          pastDueEndDate
-        )
-      }
-
-      const userQuota = license.quotas.usage.static.users
-      const userLimit = userQuota?.value
-      const userCount = usage.usageQuota.users
-      const userLimitReached = usersLimitReached(userCount, userLimit)
-      const userLimitExceeded = usersLimitExceeded(userCount, userLimit)
-      const isCloudAccount = await isCloud()
-      const errUserLimit =
-        isCloudAccount &&
-        license.plan.model === PlanModel.PER_USER &&
-        userLimitExceeded
-
-      store.update(state => {
-        return {
-          ...state,
-          usageMetrics: { ...monthlyMetrics, ...staticMetrics },
-          quotaResetDaysRemaining,
-          quotaResetDate,
-          accountDowngraded,
-          accountPastDue: pastDueAtMilliseconds != null,
-          pastDueEndDate,
-          pastDueDaysRemaining,
-          // user limits
-          userCount,
-          userLimit,
-          userLimitReached,
-          errUserLimit,
-        }
-      })
-    },
-  }
-
-  return {
-    subscribe: store.subscribe,
-    ...actions,
-  }
-}
-
-export const licensing = createLicensingStore()
diff --git a/packages/builder/src/stores/portal/licensing.ts b/packages/builder/src/stores/portal/licensing.ts
new file mode 100644
index 0000000000..99970313e2
--- /dev/null
+++ b/packages/builder/src/stores/portal/licensing.ts
@@ -0,0 +1,305 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { auth, admin } from "@/stores/portal"
+import { Constants } from "@budibase/frontend-core"
+import { StripeStatus } from "@/components/portal/licensing/constants"
+import {
+  License,
+  MonthlyQuotaName,
+  PlanModel,
+  QuotaUsage,
+  StaticQuotaName,
+} from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+const UNLIMITED = -1
+const ONE_DAY_MILLIS = 86400000
+
+type MonthlyMetrics = { [key in MonthlyQuotaName]?: number }
+type StaticMetrics = { [key in StaticQuotaName]?: number }
+type UsageMetrics = MonthlyMetrics & StaticMetrics
+
+interface LicensingState {
+  goToUpgradePage: () => void
+  goToPricingPage: () => void
+  // the top level license
+  license?: License
+  isFreePlan: boolean
+  isEnterprisePlan: boolean
+  isBusinessPlan: boolean
+  // features
+  groupsEnabled: boolean
+  backupsEnabled: boolean
+  brandingEnabled: boolean
+  scimEnabled: boolean
+  environmentVariablesEnabled: boolean
+  budibaseAIEnabled: boolean
+  customAIConfigsEnabled: boolean
+  auditLogsEnabled: boolean
+  // the currently used quotas from the db
+  quotaUsage?: QuotaUsage
+  // derived quota metrics for percentages used
+  usageMetrics?: UsageMetrics
+  // quota reset
+  quotaResetDaysRemaining?: number
+  quotaResetDate?: Date
+  // failed payments
+  accountPastDue: boolean
+  pastDueEndDate?: Date
+  pastDueDaysRemaining?: number
+  accountDowngraded: boolean
+  // user limits
+  userCount?: number
+  userLimit?: number
+  userLimitReached: boolean
+  errUserLimit: boolean
+}
+
+class LicensingStore extends BudiStore<LicensingState> {
+  constructor() {
+    super({
+      // navigation
+      goToUpgradePage: () => {},
+      goToPricingPage: () => {},
+      // the top level license
+      license: undefined,
+      isFreePlan: true,
+      isEnterprisePlan: true,
+      isBusinessPlan: true,
+      // features
+      groupsEnabled: false,
+      backupsEnabled: false,
+      brandingEnabled: false,
+      scimEnabled: false,
+      environmentVariablesEnabled: false,
+      budibaseAIEnabled: false,
+      customAIConfigsEnabled: false,
+      auditLogsEnabled: false,
+      // the currently used quotas from the db
+      quotaUsage: undefined,
+      // derived quota metrics for percentages used
+      usageMetrics: undefined,
+      // quota reset
+      quotaResetDaysRemaining: undefined,
+      quotaResetDate: undefined,
+      // failed payments
+      accountPastDue: false,
+      pastDueEndDate: undefined,
+      pastDueDaysRemaining: undefined,
+      accountDowngraded: false,
+      // user limits
+      userCount: undefined,
+      userLimit: undefined,
+      userLimitReached: false,
+      errUserLimit: false,
+    })
+  }
+
+  usersLimitReached(userCount: number, userLimit = get(this.store).userLimit) {
+    if (userLimit === UNLIMITED || userLimit === undefined) {
+      return false
+    }
+    return userCount >= userLimit
+  }
+
+  usersLimitExceeded(userCount: number, userLimit = get(this.store).userLimit) {
+    if (userLimit === UNLIMITED || userLimit === undefined) {
+      return false
+    }
+    return userCount > userLimit
+  }
+
+  async isCloud() {
+    let adminStore = get(admin)
+    if (!adminStore.loaded) {
+      await admin.init()
+      adminStore = get(admin)
+    }
+    return adminStore.cloud
+  }
+
+  async init() {
+    this.setNavigation()
+    this.setLicense()
+    await this.setQuotaUsage()
+  }
+
+  setNavigation() {
+    const adminStore = get(admin)
+    const authStore = get(auth)
+
+    const upgradeUrl = authStore?.user?.accountPortalAccess
+      ? `${adminStore.accountPortalUrl}/portal/upgrade`
+      : "/builder/portal/account/upgrade"
+
+    const goToUpgradePage = () => {
+      window.location.href = upgradeUrl
+    }
+    const goToPricingPage = () => {
+      window.open("https://budibase.com/pricing/", "_blank")
+    }
+    this.update(state => {
+      return {
+        ...state,
+        goToUpgradePage,
+        goToPricingPage,
+      }
+    })
+  }
+
+  setLicense() {
+    const license = get(auth).user?.license
+    const planType = license?.plan.type
+    const features = license?.features || []
+    const isEnterprisePlan = planType === Constants.PlanType.ENTERPRISE
+    const isFreePlan = planType === Constants.PlanType.FREE
+    const isBusinessPlan = planType === Constants.PlanType.BUSINESS
+    const isEnterpriseTrial =
+      planType === Constants.PlanType.ENTERPRISE_BASIC_TRIAL
+    const groupsEnabled = features.includes(Constants.Features.USER_GROUPS)
+    const backupsEnabled = features.includes(Constants.Features.APP_BACKUPS)
+    const scimEnabled = features.includes(Constants.Features.SCIM)
+    const environmentVariablesEnabled = features.includes(
+      Constants.Features.ENVIRONMENT_VARIABLES
+    )
+    const enforceableSSO = features.includes(Constants.Features.ENFORCEABLE_SSO)
+    const brandingEnabled = features.includes(Constants.Features.BRANDING)
+    const auditLogsEnabled = features.includes(Constants.Features.AUDIT_LOGS)
+    const syncAutomationsEnabled = features.includes(
+      Constants.Features.SYNC_AUTOMATIONS
+    )
+    const triggerAutomationRunEnabled = features.includes(
+      Constants.Features.TRIGGER_AUTOMATION_RUN
+    )
+    const perAppBuildersEnabled = features.includes(
+      Constants.Features.APP_BUILDERS
+    )
+    const budibaseAIEnabled = features.includes(Constants.Features.BUDIBASE_AI)
+    const customAIConfigsEnabled = features.includes(
+      Constants.Features.AI_CUSTOM_CONFIGS
+    )
+    this.update(state => {
+      return {
+        ...state,
+        license,
+        isEnterprisePlan,
+        isFreePlan,
+        isBusinessPlan,
+        isEnterpriseTrial,
+        groupsEnabled,
+        backupsEnabled,
+        brandingEnabled,
+        budibaseAIEnabled,
+        customAIConfigsEnabled,
+        scimEnabled,
+        environmentVariablesEnabled,
+        auditLogsEnabled,
+        enforceableSSO,
+        syncAutomationsEnabled,
+        triggerAutomationRunEnabled,
+        perAppBuildersEnabled,
+      }
+    })
+  }
+
+  async setQuotaUsage() {
+    const quotaUsage = await API.getQuotaUsage()
+    this.update(state => {
+      return {
+        ...state,
+        quotaUsage,
+      }
+    })
+    await this.setUsageMetrics()
+  }
+
+  async setUsageMetrics() {
+    const usage = get(this.store).quotaUsage
+    const license = get(auth).user?.license
+    const now = new Date()
+    if (!license || !usage) {
+      return
+    }
+
+    // Process monthly metrics
+    const monthlyMetrics = [
+      MonthlyQuotaName.QUERIES,
+      MonthlyQuotaName.AUTOMATIONS,
+    ].reduce((acc: MonthlyMetrics, key) => {
+      const limit = license.quotas.usage.monthly[key].value
+      const used = ((usage.monthly.current?.[key] || 0) / limit) * 100
+      acc[key] = limit > -1 ? Math.floor(used) : -1
+      return acc
+    }, {})
+
+    // Process static metrics
+    const staticMetrics = [StaticQuotaName.APPS, StaticQuotaName.ROWS].reduce(
+      (acc: StaticMetrics, key) => {
+        const limit = license.quotas.usage.static[key].value
+        const used = ((usage.usageQuota[key] || 0) / limit) * 100
+        acc[key] = limit > -1 ? Math.floor(used) : -1
+        return acc
+      },
+      {}
+    )
+
+    const getDaysBetween = (dateStart: Date, dateEnd: Date) => {
+      return dateEnd > dateStart
+        ? Math.round((dateEnd.getTime() - dateStart.getTime()) / ONE_DAY_MILLIS)
+        : 0
+    }
+
+    const quotaResetDate = new Date(usage.quotaReset)
+    const quotaResetDaysRemaining = getDaysBetween(now, quotaResetDate)
+
+    const accountDowngraded =
+      !!license.billing?.subscription?.downgradeAt &&
+      license.billing?.subscription?.downgradeAt <= now.getTime() &&
+      license.billing?.subscription?.status === StripeStatus.PAST_DUE &&
+      license.plan.type === Constants.PlanType.FREE
+
+    const pastDueAtMilliseconds = license.billing?.subscription?.pastDueAt
+    const downgradeAtMilliseconds = license.billing?.subscription?.downgradeAt
+    let pastDueDaysRemaining: number
+    let pastDueEndDate: Date
+
+    if (pastDueAtMilliseconds && downgradeAtMilliseconds) {
+      pastDueEndDate = new Date(downgradeAtMilliseconds)
+      pastDueDaysRemaining = getDaysBetween(
+        new Date(pastDueAtMilliseconds),
+        pastDueEndDate
+      )
+    }
+
+    const userQuota = license.quotas.usage.static.users
+    const userLimit = userQuota.value
+    const userCount = usage.usageQuota.users
+    const userLimitReached = this.usersLimitReached(userCount, userLimit)
+    const userLimitExceeded = this.usersLimitExceeded(userCount, userLimit)
+    const isCloudAccount = await this.isCloud()
+    const errUserLimit =
+      isCloudAccount &&
+      license.plan.model === PlanModel.PER_USER &&
+      userLimitExceeded
+
+    this.update(state => {
+      return {
+        ...state,
+        usageMetrics: { ...monthlyMetrics, ...staticMetrics },
+        quotaResetDaysRemaining,
+        quotaResetDate,
+        accountDowngraded,
+        accountPastDue: pastDueAtMilliseconds != null,
+        pastDueEndDate,
+        pastDueDaysRemaining,
+        // user limits
+        userCount,
+        userLimit,
+        userLimitReached,
+        errUserLimit,
+      }
+    })
+  }
+}
+
+export const licensing = new LicensingStore()
diff --git a/packages/builder/src/stores/portal/menu.js b/packages/builder/src/stores/portal/menu.js
deleted file mode 100644
index a1b5450ea4..0000000000
--- a/packages/builder/src/stores/portal/menu.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import { derived } from "svelte/store"
-import { admin } from "./admin"
-import { auth } from "./auth"
-import { isEnabled } from "helpers/featureFlags"
-import { sdk } from "@budibase/shared-core"
-import { FeatureFlag } from "@budibase/types"
-
-export const menu = derived([admin, auth], ([$admin, $auth]) => {
-  const user = $auth?.user
-  const isAdmin = sdk.users.isAdmin(user)
-  const cloud = $admin?.cloud
-  // Determine user sub pages
-  let userSubPages = [
-    {
-      title: "Users",
-      href: "/builder/portal/users/users",
-    },
-  ]
-  userSubPages.push({
-    title: "Groups",
-    href: "/builder/portal/users/groups",
-  })
-
-  // Pages that all devs and admins can access
-  let menu = [
-    {
-      title: "Apps",
-      href: "/builder/portal/apps",
-    },
-  ]
-  if (sdk.users.isGlobalBuilder(user)) {
-    menu.push({
-      title: "Users",
-      href: "/builder/portal/users",
-      subPages: userSubPages,
-    })
-    menu.push({
-      title: "Plugins",
-      href: "/builder/portal/plugins",
-    })
-  }
-
-  // Add settings page for admins
-  if (isAdmin) {
-    let settingsSubPages = [
-      {
-        title: "Auth",
-        href: "/builder/portal/settings/auth",
-      },
-      {
-        title: "Email",
-        href: "/builder/portal/settings/email",
-      },
-      {
-        title: "Organisation",
-        href: "/builder/portal/settings/organisation",
-      },
-      {
-        title: "Branding",
-        href: "/builder/portal/settings/branding",
-      },
-      {
-        title: "Environment",
-        href: "/builder/portal/settings/environment",
-      },
-    ]
-    if (isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) {
-      settingsSubPages.push({
-        title: "AI",
-        href: "/builder/portal/settings/ai",
-      })
-    }
-
-    if (!cloud) {
-      settingsSubPages.push({
-        title: "Version",
-        href: "/builder/portal/settings/version",
-      })
-      settingsSubPages.push({
-        title: "Diagnostics",
-        href: "/builder/portal/settings/diagnostics",
-      })
-    }
-    menu.push({
-      title: "Settings",
-      href: "/builder/portal/settings",
-      subPages: [...settingsSubPages].sort((a, b) =>
-        a.title.localeCompare(b.title)
-      ),
-    })
-  }
-
-  // Add account page
-  let accountSubPages = [
-    {
-      title: "Usage",
-      href: "/builder/portal/account/usage",
-    },
-  ]
-  if (isAdmin) {
-    accountSubPages.push({
-      title: "Audit Logs",
-      href: "/builder/portal/account/auditLogs",
-    })
-
-    if (!cloud) {
-      accountSubPages.push({
-        title: "System Logs",
-        href: "/builder/portal/account/systemLogs",
-      })
-    }
-  }
-  if (cloud && user?.accountPortalAccess) {
-    accountSubPages.push({
-      title: "Upgrade",
-      href: $admin?.accountPortalUrl + "/portal/upgrade",
-    })
-  } else if (!cloud && isAdmin) {
-    accountSubPages.push({
-      title: "Upgrade",
-      href: "/builder/portal/account/upgrade",
-    })
-  }
-  // add license check here
-  if (user?.accountPortalAccess && user.account.stripeCustomerId) {
-    accountSubPages.push({
-      title: "Billing",
-      href: $admin?.accountPortalUrl + "/portal/billing",
-    })
-  }
-  menu.push({
-    title: "Account",
-    href: "/builder/portal/account",
-    subPages: accountSubPages,
-  })
-
-  return menu
-})
diff --git a/packages/builder/src/stores/portal/menu.ts b/packages/builder/src/stores/portal/menu.ts
new file mode 100644
index 0000000000..5cd619d4a9
--- /dev/null
+++ b/packages/builder/src/stores/portal/menu.ts
@@ -0,0 +1,145 @@
+import { derived, Readable } from "svelte/store"
+import { admin } from "./admin"
+import { auth } from "./auth"
+import { sdk } from "@budibase/shared-core"
+
+interface MenuItem {
+  title: string
+  href: string
+  subPages?: MenuItem[]
+}
+
+export const menu: Readable<MenuItem[]> = derived(
+  [admin, auth],
+  ([$admin, $auth]) => {
+    const user = $auth?.user
+    const isAdmin = user != null && sdk.users.isAdmin(user)
+    const isGlobalBuilder = user != null && sdk.users.isGlobalBuilder(user)
+    const cloud = $admin?.cloud
+
+    // Determine user sub pages
+    let userSubPages: MenuItem[] = [
+      {
+        title: "Users",
+        href: "/builder/portal/users/users",
+      },
+    ]
+    userSubPages.push({
+      title: "Groups",
+      href: "/builder/portal/users/groups",
+    })
+
+    // Pages that all devs and admins can access
+    let menu: MenuItem[] = [
+      {
+        title: "Apps",
+        href: "/builder/portal/apps",
+      },
+    ]
+    if (isGlobalBuilder) {
+      menu.push({
+        title: "Users",
+        href: "/builder/portal/users",
+        subPages: userSubPages,
+      })
+      menu.push({
+        title: "Plugins",
+        href: "/builder/portal/plugins",
+      })
+    }
+
+    // Add settings page for admins
+    if (isAdmin) {
+      let settingsSubPages: MenuItem[] = [
+        {
+          title: "Auth",
+          href: "/builder/portal/settings/auth",
+        },
+        {
+          title: "Email",
+          href: "/builder/portal/settings/email",
+        },
+        {
+          title: "Organisation",
+          href: "/builder/portal/settings/organisation",
+        },
+        {
+          title: "Branding",
+          href: "/builder/portal/settings/branding",
+        },
+        {
+          title: "Environment",
+          href: "/builder/portal/settings/environment",
+        },
+        {
+          title: "AI",
+          href: "/builder/portal/settings/ai",
+        },
+      ]
+
+      if (!cloud) {
+        settingsSubPages.push({
+          title: "Version",
+          href: "/builder/portal/settings/version",
+        })
+        settingsSubPages.push({
+          title: "Diagnostics",
+          href: "/builder/portal/settings/diagnostics",
+        })
+      }
+      menu.push({
+        title: "Settings",
+        href: "/builder/portal/settings",
+        subPages: [...settingsSubPages].sort((a, b) =>
+          a.title.localeCompare(b.title)
+        ),
+      })
+    }
+
+    // Add account page
+    let accountSubPages: MenuItem[] = [
+      {
+        title: "Usage",
+        href: "/builder/portal/account/usage",
+      },
+    ]
+    if (isAdmin) {
+      accountSubPages.push({
+        title: "Audit Logs",
+        href: "/builder/portal/account/auditLogs",
+      })
+
+      if (!cloud) {
+        accountSubPages.push({
+          title: "System Logs",
+          href: "/builder/portal/account/systemLogs",
+        })
+      }
+    }
+    if (cloud && user?.accountPortalAccess) {
+      accountSubPages.push({
+        title: "Upgrade",
+        href: $admin?.accountPortalUrl + "/portal/upgrade",
+      })
+    } else if (!cloud && isAdmin) {
+      accountSubPages.push({
+        title: "Upgrade",
+        href: "/builder/portal/account/upgrade",
+      })
+    }
+    // add license check here
+    if (user?.accountPortalAccess && user?.account?.stripeCustomerId) {
+      accountSubPages.push({
+        title: "Billing",
+        href: $admin?.accountPortalUrl + "/portal/billing",
+      })
+    }
+    menu.push({
+      title: "Account",
+      href: "/builder/portal/account",
+      subPages: accountSubPages,
+    })
+
+    return menu
+  }
+)
diff --git a/packages/builder/src/stores/portal/navigation.js b/packages/builder/src/stores/portal/navigation.js
deleted file mode 100644
index 67a06eff53..0000000000
--- a/packages/builder/src/stores/portal/navigation.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { writable } from "svelte/store"
-
-export function createNavigationStore() {
-  const store = writable({
-    initialisated: false,
-    goto: undefined,
-  })
-  const { set, subscribe } = store
-
-  const init = gotoFunc => {
-    if (typeof gotoFunc !== "function") {
-      throw new Error(
-        `gotoFunc must be a function, found a "${typeof gotoFunc}" instead`
-      )
-    }
-
-    set({
-      initialisated: true,
-      goto: gotoFunc,
-    })
-  }
-
-  return {
-    subscribe,
-    actions: {
-      init,
-    },
-  }
-}
-
-export const navigation = createNavigationStore()
diff --git a/packages/builder/src/stores/portal/navigation.ts b/packages/builder/src/stores/portal/navigation.ts
new file mode 100644
index 0000000000..f289c86bf9
--- /dev/null
+++ b/packages/builder/src/stores/portal/navigation.ts
@@ -0,0 +1,31 @@
+import { BudiStore } from "../BudiStore"
+
+type GotoFuncType = (path: string) => void
+
+interface NavigationState {
+  initialisated: boolean
+  goto: GotoFuncType
+}
+
+class NavigationStore extends BudiStore<NavigationState> {
+  constructor() {
+    super({
+      initialisated: false,
+      goto: undefined as any,
+    })
+  }
+
+  init(gotoFunc: GotoFuncType) {
+    if (typeof gotoFunc !== "function") {
+      throw new Error(
+        `gotoFunc must be a function, found a "${typeof gotoFunc}" instead`
+      )
+    }
+    this.set({
+      initialisated: true,
+      goto: gotoFunc,
+    })
+  }
+}
+
+export const navigation = new NavigationStore()
diff --git a/packages/builder/src/stores/portal/oidc.js b/packages/builder/src/stores/portal/oidc.js
deleted file mode 100644
index 3a4b954753..0000000000
--- a/packages/builder/src/stores/portal/oidc.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
-
-const OIDC_CONFIG = {
-  logo: undefined,
-  name: undefined,
-  uuid: undefined,
-}
-
-export function createOidcStore() {
-  const store = writable(OIDC_CONFIG)
-  const { set, subscribe } = store
-  return {
-    subscribe,
-    set,
-    init: async () => {
-      const tenantId = get(auth).tenantId
-      const config = await API.getOIDCConfig(tenantId)
-      if (Object.keys(config || {}).length) {
-        // Just use the first config for now.
-        // We will be support multiple logins buttons later on.
-        set(...config)
-      } else {
-        set(OIDC_CONFIG)
-      }
-    },
-  }
-}
-
-export const oidc = createOidcStore()
diff --git a/packages/builder/src/stores/portal/oidc.ts b/packages/builder/src/stores/portal/oidc.ts
new file mode 100644
index 0000000000..6c3609f9d5
--- /dev/null
+++ b/packages/builder/src/stores/portal/oidc.ts
@@ -0,0 +1,21 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
+import { BudiStore } from "../BudiStore"
+import { PublicOIDCConfig } from "@budibase/types"
+
+class OIDCStore extends BudiStore<PublicOIDCConfig> {
+  constructor() {
+    super({})
+  }
+
+  async init() {
+    const tenantId = get(auth).tenantId
+    const configs = await API.getOIDCConfigs(tenantId)
+    // Just use the first config for now.
+    // We will be support multiple logins buttons later on.
+    this.set(configs[0] || {})
+  }
+}
+
+export const oidc = new OIDCStore()
diff --git a/packages/builder/src/stores/portal/organisation.js b/packages/builder/src/stores/portal/organisation.js
deleted file mode 100644
index ab33c7a5fa..0000000000
--- a/packages/builder/src/stores/portal/organisation.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import { writable, get } from "svelte/store"
-import { API } from "api"
-import { auth } from "stores/portal"
-import _ from "lodash"
-
-const DEFAULT_CONFIG = {
-  platformUrl: "",
-  logoUrl: undefined,
-  faviconUrl: undefined,
-  emailBrandingEnabled: true,
-  testimonialsEnabled: true,
-  platformTitle: "Budibase",
-  loginHeading: undefined,
-  loginButton: undefined,
-  metaDescription: undefined,
-  metaImageUrl: undefined,
-  metaTitle: undefined,
-  docsUrl: undefined,
-  company: "Budibase",
-  oidc: undefined,
-  google: undefined,
-  googleDatasourceConfigured: undefined,
-  oidcCallbackUrl: "",
-  googleCallbackUrl: "",
-  isSSOEnforced: false,
-  loaded: false,
-}
-
-export function createOrganisationStore() {
-  const store = writable(DEFAULT_CONFIG)
-  const { subscribe, set } = store
-
-  async function init() {
-    const tenantId = get(auth).tenantId
-    const settingsConfigDoc = await API.getTenantConfig(tenantId)
-    set({ ...DEFAULT_CONFIG, ...settingsConfigDoc.config, loaded: true })
-  }
-
-  async function save(config) {
-    // Delete non-persisted fields
-    const storeConfig = _.cloneDeep(get(store))
-    delete storeConfig.oidc
-    delete storeConfig.google
-    delete storeConfig.googleDatasourceConfigured
-    delete storeConfig.oidcCallbackUrl
-    delete storeConfig.googleCallbackUrl
-
-    // delete internal store field
-    delete storeConfig.loaded
-
-    await API.saveConfig({
-      type: "settings",
-      config: { ...storeConfig, ...config },
-    })
-    await init()
-  }
-
-  return {
-    subscribe,
-    set,
-    save,
-    init,
-  }
-}
-
-export const organisation = createOrganisationStore()
diff --git a/packages/builder/src/stores/portal/organisation.ts b/packages/builder/src/stores/portal/organisation.ts
new file mode 100644
index 0000000000..219245807a
--- /dev/null
+++ b/packages/builder/src/stores/portal/organisation.ts
@@ -0,0 +1,71 @@
+import { get } from "svelte/store"
+import { API } from "@/api"
+import { auth } from "@/stores/portal"
+import {
+  ConfigType,
+  PublicSettingsInnerConfig,
+  SettingsBrandingConfig,
+  SettingsInnerConfig,
+} from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+interface LocalOrganisationState {
+  loaded: boolean
+}
+
+type SavedOrganisationState = SettingsInnerConfig & SettingsBrandingConfig
+type OrganisationState = SavedOrganisationState &
+  PublicSettingsInnerConfig &
+  LocalOrganisationState
+
+const DEFAULT_STATE: OrganisationState = {
+  platformUrl: "",
+  emailBrandingEnabled: true,
+  testimonialsEnabled: true,
+  platformTitle: "Budibase",
+  company: "Budibase",
+  google: false,
+  googleDatasourceConfigured: false,
+  oidc: false,
+  oidcCallbackUrl: "",
+  googleCallbackUrl: "",
+  loaded: false,
+}
+
+class OrganisationStore extends BudiStore<OrganisationState> {
+  constructor() {
+    super(DEFAULT_STATE)
+  }
+
+  async init() {
+    const tenantId = get(auth).tenantId
+    const settingsConfigDoc = await API.getTenantConfig(tenantId)
+    this.set({ ...DEFAULT_STATE, ...settingsConfigDoc.config, loaded: true })
+  }
+
+  async save(changes: Partial<SavedOrganisationState>) {
+    // Strip non persisted fields
+    const {
+      oidc,
+      google,
+      googleDatasourceConfigured,
+      oidcCallbackUrl,
+      googleCallbackUrl,
+      loaded,
+      ...config
+    } = get(this.store)
+
+    // Save new config
+    const newConfig: SavedOrganisationState = {
+      ...config,
+      ...changes,
+    }
+    await API.saveConfig({
+      type: ConfigType.SETTINGS,
+      config: newConfig,
+    })
+    await this.init()
+  }
+}
+
+export const organisation = new OrganisationStore()
diff --git a/packages/builder/src/stores/portal/plugins.js b/packages/builder/src/stores/portal/plugins.ts
similarity index 76%
rename from packages/builder/src/stores/portal/plugins.js
rename to packages/builder/src/stores/portal/plugins.ts
index e259f9aa6d..635db4e31f 100644
--- a/packages/builder/src/stores/portal/plugins.js
+++ b/packages/builder/src/stores/portal/plugins.ts
@@ -1,16 +1,17 @@
 import { writable } from "svelte/store"
-import { API } from "api"
-import { PluginSource } from "constants"
+import { PluginSource } from "@/constants/index"
+import { Plugin } from "@budibase/types"
+import { API } from "@/api"
 
 export function createPluginsStore() {
-  const { subscribe, set, update } = writable([])
+  const { subscribe, set, update } = writable<Plugin[]>([])
 
   async function load() {
-    const plugins = await API.getPlugins()
+    const plugins: Plugin[] = await API.getPlugins()
     set(plugins)
   }
 
-  async function deletePlugin(pluginId) {
+  async function deletePlugin(pluginId: string) {
     await API.deletePlugin(pluginId)
     update(state => {
       state = state.filter(existing => existing._id !== pluginId)
@@ -18,8 +19,8 @@ export function createPluginsStore() {
     })
   }
 
-  async function createPlugin(source, url, auth = null) {
-    let pluginData = {
+  async function createPlugin(source: string, url: string, auth = null) {
+    let pluginData: any = {
       source,
       url,
     }
@@ -46,7 +47,7 @@ export function createPluginsStore() {
     })
   }
 
-  async function uploadPlugin(file) {
+  async function uploadPlugin(file: File) {
     if (!file) {
       return
     }
diff --git a/packages/builder/src/stores/portal/templates.js b/packages/builder/src/stores/portal/templates.js
deleted file mode 100644
index 904e9cfa8e..0000000000
--- a/packages/builder/src/stores/portal/templates.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-
-export function templatesStore() {
-  const { subscribe, set } = writable([])
-
-  return {
-    subscribe,
-    load: async () => {
-      const templates = await API.getAppTemplates()
-      set(templates)
-    },
-  }
-}
-
-export const templates = templatesStore()
diff --git a/packages/builder/src/stores/portal/templates.ts b/packages/builder/src/stores/portal/templates.ts
new file mode 100644
index 0000000000..caf1a54ced
--- /dev/null
+++ b/packages/builder/src/stores/portal/templates.ts
@@ -0,0 +1,16 @@
+import { API } from "@/api"
+import { BudiStore } from "../BudiStore"
+import { TemplateMetadata } from "@budibase/types"
+
+class TemplateStore extends BudiStore<TemplateMetadata[]> {
+  constructor() {
+    super([])
+  }
+
+  async load() {
+    const templates = await API.getAppTemplates()
+    this.set(templates)
+  }
+}
+
+export const templates = new TemplateStore()
diff --git a/packages/builder/src/stores/portal/temporal.js b/packages/builder/src/stores/portal/temporal.js
deleted file mode 100644
index 96b47d1c7f..0000000000
--- a/packages/builder/src/stores/portal/temporal.js
+++ /dev/null
@@ -1,45 +0,0 @@
-import { createLocalStorageStore } from "@budibase/frontend-core"
-import { get } from "svelte/store"
-
-export const createTemporalStore = () => {
-  const initialValue = {}
-
-  const localStorageKey = `bb-temporal`
-  const store = createLocalStorageStore(localStorageKey, initialValue)
-
-  const setExpiring = (key, data, duration) => {
-    const updated = {
-      ...data,
-      expiry: Date.now() + duration * 1000,
-    }
-
-    store.update(state => ({
-      ...state,
-      [key]: updated,
-    }))
-  }
-
-  const getExpiring = key => {
-    const entry = get(store)[key]
-    if (!entry) {
-      return
-    }
-    const currentExpiry = entry.expiry
-    if (currentExpiry < Date.now()) {
-      store.update(state => {
-        delete state[key]
-        return state
-      })
-      return null
-    } else {
-      return entry
-    }
-  }
-
-  return {
-    subscribe: store.subscribe,
-    actions: { setExpiring, getExpiring },
-  }
-}
-
-export const temporalStore = createTemporalStore()
diff --git a/packages/builder/src/stores/portal/temporal.ts b/packages/builder/src/stores/portal/temporal.ts
new file mode 100644
index 0000000000..acbe6feff2
--- /dev/null
+++ b/packages/builder/src/stores/portal/temporal.ts
@@ -0,0 +1,53 @@
+import { get } from "svelte/store"
+import { BudiStore, PersistenceType } from "../BudiStore"
+
+type TemporalItem = Record<string, any> & { expiry: number }
+type TemporalState = Record<string, TemporalItem>
+
+class TemporalStore extends BudiStore<TemporalState> {
+  constructor() {
+    super(
+      {},
+      {
+        persistence: {
+          key: "bb-temporal",
+          type: PersistenceType.LOCAL,
+        },
+      }
+    )
+  }
+
+  setExpiring = (
+    key: string,
+    data: Record<string, any>,
+    durationSeconds: number
+  ) => {
+    const updated: TemporalItem = {
+      ...data,
+      expiry: Date.now() + durationSeconds * 1000,
+    }
+    this.update(state => ({
+      ...state,
+      [key]: updated,
+    }))
+  }
+
+  getExpiring(key: string) {
+    const entry = get(this.store)[key]
+    if (!entry) {
+      return null
+    }
+    const currentExpiry = entry.expiry
+    if (currentExpiry < Date.now()) {
+      this.update(state => {
+        delete state[key]
+        return state
+      })
+      return null
+    } else {
+      return entry
+    }
+  }
+}
+
+export const temporalStore = new TemporalStore()
diff --git a/packages/builder/src/stores/portal/theme.js b/packages/builder/src/stores/portal/theme.js
deleted file mode 100644
index 11a87845e1..0000000000
--- a/packages/builder/src/stores/portal/theme.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { createLocalStorageStore } from "@budibase/frontend-core"
-import { derived } from "svelte/store"
-import {
-  DefaultBuilderTheme,
-  ensureValidTheme,
-  getThemeClassNames,
-  ThemeOptions,
-  ThemeClassPrefix,
-} from "@budibase/shared-core"
-
-export const getThemeStore = () => {
-  const themeElement = document.documentElement
-  const initialValue = {
-    theme: DefaultBuilderTheme,
-  }
-  const store = createLocalStorageStore("bb-theme", initialValue)
-  const derivedStore = derived(store, $store => ({
-    ...$store,
-    theme: ensureValidTheme($store.theme, DefaultBuilderTheme),
-  }))
-
-  // Update theme class when store changes
-  derivedStore.subscribe(({ theme }) => {
-    const classNames = getThemeClassNames(theme).split(" ")
-    ThemeOptions.forEach(option => {
-      const className = `${ThemeClassPrefix}${option.id}`
-      themeElement.classList.toggle(className, classNames.includes(className))
-    })
-  })
-
-  return {
-    ...store,
-    subscribe: derivedStore.subscribe,
-  }
-}
-
-export const themeStore = getThemeStore()
diff --git a/packages/builder/src/stores/portal/theme.ts b/packages/builder/src/stores/portal/theme.ts
new file mode 100644
index 0000000000..5198555024
--- /dev/null
+++ b/packages/builder/src/stores/portal/theme.ts
@@ -0,0 +1,45 @@
+import { derived, Writable } from "svelte/store"
+import {
+  DefaultBuilderTheme,
+  ensureValidTheme,
+  getThemeClassNames,
+  ThemeOptions,
+  ThemeClassPrefix,
+} from "@budibase/shared-core"
+import { Theme } from "@budibase/types"
+import { DerivedBudiStore, PersistenceType } from "../BudiStore"
+
+interface ThemeState {
+  theme: Theme
+}
+
+class ThemeStore extends DerivedBudiStore<ThemeState, ThemeState> {
+  constructor() {
+    const makeDerivedStore = (store: Writable<ThemeState>) => {
+      return derived(store, $store => ({
+        ...$store,
+        theme: ensureValidTheme($store.theme, DefaultBuilderTheme),
+      }))
+    }
+    super({ theme: DefaultBuilderTheme }, makeDerivedStore, {
+      persistence: {
+        key: "bb-theme",
+        type: PersistenceType.LOCAL,
+      },
+    })
+
+    // Update theme class when store changes
+    this.subscribe(({ theme }) => {
+      const classNames = getThemeClassNames(theme).split(" ")
+      ThemeOptions.forEach(option => {
+        const className = `${ThemeClassPrefix}${option.id}`
+        document.documentElement.classList.toggle(
+          className,
+          classNames.includes(className)
+        )
+      })
+    })
+  }
+}
+
+export const themeStore = new ThemeStore()
diff --git a/packages/builder/src/stores/portal/users.js b/packages/builder/src/stores/portal/users.js
deleted file mode 100644
index 747dc5144d..0000000000
--- a/packages/builder/src/stores/portal/users.js
+++ /dev/null
@@ -1,182 +0,0 @@
-import { writable } from "svelte/store"
-import { API } from "api"
-import { update } from "lodash"
-import { licensing } from "."
-import { sdk } from "@budibase/shared-core"
-import { Constants } from "@budibase/frontend-core"
-
-export function createUsersStore() {
-  const { subscribe, set } = writable({})
-
-  // opts can contain page and search params
-  async function search(opts = {}) {
-    const paged = await API.searchUsers(opts)
-    set({
-      ...paged,
-      ...opts,
-    })
-    return paged
-  }
-
-  async function get(userId) {
-    try {
-      return await API.getUser(userId)
-    } catch (err) {
-      return null
-    }
-  }
-  const fetch = async () => {
-    return await API.getUsers()
-  }
-
-  // One or more users.
-  async function onboard(payload) {
-    return await API.onboardUsers(payload)
-  }
-
-  async function invite(payload) {
-    return API.inviteUsers(payload)
-  }
-
-  async function removeInvites(payload) {
-    return API.removeUserInvites(payload)
-  }
-
-  async function acceptInvite(inviteCode, password, firstName, lastName) {
-    return API.acceptInvite({
-      inviteCode,
-      password,
-      firstName,
-      lastName: !lastName?.trim() ? undefined : lastName,
-    })
-  }
-
-  async function fetchInvite(inviteCode) {
-    return API.getUserInvite(inviteCode)
-  }
-
-  async function getInvites() {
-    return API.getUserInvites()
-  }
-
-  async function updateInvite(invite) {
-    return API.updateUserInvite(invite)
-  }
-
-  async function create(data) {
-    let mappedUsers = data.users.map(user => {
-      const body = {
-        email: user.email,
-        password: user.password,
-        roles: {},
-      }
-      if (user.forceResetPassword) {
-        body.forceResetPassword = user.forceResetPassword
-      }
-
-      switch (user.role) {
-        case "appUser":
-          body.builder = { global: false }
-          body.admin = { global: false }
-          break
-        case "developer":
-          body.builder = { global: true }
-          break
-        case "creator":
-          body.builder = { creator: true, global: false }
-          break
-        case "admin":
-          body.admin = { global: true }
-          body.builder = { global: true }
-          break
-      }
-
-      return body
-    })
-    const response = await API.createUsers({
-      users: mappedUsers,
-      groups: data.groups,
-    })
-
-    // re-search from first page
-    await search()
-    return response
-  }
-
-  async function del(id) {
-    await API.deleteUser(id)
-    update(users => users.filter(user => user._id !== id))
-  }
-
-  async function getUserCountByApp({ appId }) {
-    return await API.getUserCountByApp({ appId })
-  }
-
-  async function bulkDelete(users) {
-    return API.deleteUsers(users)
-  }
-
-  async function save(user) {
-    return await API.saveUser(user)
-  }
-
-  async function addAppBuilder(userId, appId) {
-    return await API.addAppBuilder({ userId, appId })
-  }
-
-  async function removeAppBuilder(userId, appId) {
-    return await API.removeAppBuilder({ userId, appId })
-  }
-
-  async function getAccountHolder() {
-    return await API.getAccountHolder()
-  }
-
-  const getUserRole = user => {
-    if (user && user.email === user.tenantOwnerEmail) {
-      return Constants.BudibaseRoles.Owner
-    } else if (sdk.users.isAdmin(user)) {
-      return Constants.BudibaseRoles.Admin
-    } else if (sdk.users.isBuilder(user)) {
-      return Constants.BudibaseRoles.Developer
-    } else if (sdk.users.hasCreatorPermissions(user)) {
-      return Constants.BudibaseRoles.Creator
-    } else {
-      return Constants.BudibaseRoles.AppUser
-    }
-  }
-
-  const refreshUsage =
-    fn =>
-    async (...args) => {
-      const response = await fn(...args)
-      await licensing.setQuotaUsage()
-      return response
-    }
-
-  return {
-    subscribe,
-    search,
-    get,
-    getUserRole,
-    fetch,
-    invite,
-    onboard,
-    fetchInvite,
-    getInvites,
-    removeInvites,
-    updateInvite,
-    getUserCountByApp,
-    addAppBuilder,
-    removeAppBuilder,
-    // any operation that adds or deletes users
-    acceptInvite,
-    create: refreshUsage(create),
-    save: refreshUsage(save),
-    bulkDelete: refreshUsage(bulkDelete),
-    delete: refreshUsage(del),
-    getAccountHolder,
-  }
-}
-
-export const users = createUsersStore()
diff --git a/packages/builder/src/stores/portal/users.ts b/packages/builder/src/stores/portal/users.ts
new file mode 100644
index 0000000000..605f8612aa
--- /dev/null
+++ b/packages/builder/src/stores/portal/users.ts
@@ -0,0 +1,207 @@
+import { API } from "@/api"
+import { licensing } from "."
+import { sdk } from "@budibase/shared-core"
+import { Constants } from "@budibase/frontend-core"
+import {
+  DeleteInviteUsersRequest,
+  InviteUsersRequest,
+  SearchUsersRequest,
+  SearchUsersResponse,
+  UpdateInviteRequest,
+  User,
+  UserIdentifier,
+  UnsavedUser,
+} from "@budibase/types"
+import { BudiStore } from "../BudiStore"
+
+interface UserInfo {
+  email: string
+  password: string
+  forceResetPassword?: boolean
+  role: keyof typeof Constants.BudibaseRoles
+}
+
+type UserState = SearchUsersResponse & SearchUsersRequest
+
+class UserStore extends BudiStore<UserState> {
+  constructor() {
+    super({
+      data: [],
+    })
+  }
+
+  async search(opts: SearchUsersRequest = {}) {
+    const paged = await API.searchUsers(opts)
+    this.set({
+      ...paged,
+      ...opts,
+    })
+    return paged
+  }
+
+  async get(userId: string) {
+    try {
+      return await API.getUser(userId)
+    } catch (err) {
+      return null
+    }
+  }
+
+  async fetch() {
+    return await API.getUsers()
+  }
+
+  async onboard(payload: InviteUsersRequest) {
+    return await API.onboardUsers(payload)
+  }
+
+  async invite(
+    payload: {
+      admin?: boolean
+      builder?: boolean
+      creator?: boolean
+      email: string
+      apps?: any[]
+      groups?: any[]
+    }[]
+  ) {
+    const users: InviteUsersRequest = payload.map(user => {
+      let builder = undefined
+      if (user.admin || user.builder) {
+        builder = { global: true }
+      } else if (user.creator) {
+        builder = { creator: true }
+      }
+      return {
+        email: user.email,
+        userInfo: {
+          admin: user.admin ? { global: true } : undefined,
+          builder,
+          userGroups: user.groups,
+          roles: user.apps ? user.apps : undefined,
+        },
+      }
+    })
+    return API.inviteUsers(users)
+  }
+
+  async removeInvites(payload: DeleteInviteUsersRequest) {
+    return API.removeUserInvites(payload)
+  }
+
+  async acceptInvite(
+    inviteCode: string,
+    password: string,
+    firstName: string,
+    lastName?: string
+  ) {
+    return API.acceptInvite({
+      inviteCode,
+      password,
+      firstName,
+      lastName: !lastName?.trim() ? undefined : lastName,
+    })
+  }
+
+  async fetchInvite(inviteCode: string) {
+    return API.getUserInvite(inviteCode)
+  }
+
+  async getInvites() {
+    return API.getUserInvites()
+  }
+
+  async updateInvite(code: string, invite: UpdateInviteRequest) {
+    return API.updateUserInvite(code, invite)
+  }
+
+  async getUserCountByApp(appId: string) {
+    return await API.getUserCountByApp(appId)
+  }
+
+  async create(data: { users: UserInfo[]; groups: any[] }) {
+    let mappedUsers: UnsavedUser[] = data.users.map((user: any) => {
+      const body: UnsavedUser = {
+        email: user.email,
+        password: user.password,
+        roles: {},
+      }
+      if (user.forceResetPassword) {
+        body.forceResetPassword = user.forceResetPassword
+      }
+
+      switch (user.role) {
+        case Constants.BudibaseRoles.AppUser:
+          body.builder = { global: false }
+          body.admin = { global: false }
+          break
+        case Constants.BudibaseRoles.Developer:
+          body.builder = { global: true }
+          break
+        case Constants.BudibaseRoles.Creator:
+          body.builder = { creator: true, global: false }
+          break
+        case Constants.BudibaseRoles.Admin:
+          body.admin = { global: true }
+          body.builder = { global: true }
+          break
+      }
+
+      return body
+    })
+    const response = await API.createUsers(mappedUsers, data.groups)
+    licensing.setQuotaUsage()
+
+    // re-search from first page
+    await this.search()
+    return response
+  }
+
+  async delete(id: string) {
+    await API.deleteUser(id)
+    licensing.setQuotaUsage()
+  }
+
+  async bulkDelete(users: UserIdentifier[]) {
+    const res = API.deleteUsers(users)
+    licensing.setQuotaUsage()
+    return res
+  }
+
+  async save(user: User) {
+    const res = await API.saveUser(user)
+    licensing.setQuotaUsage()
+    return res
+  }
+
+  async addAppBuilder(userId: string, appId: string) {
+    return await API.addAppBuilder(userId, appId)
+  }
+
+  async removeAppBuilder(userId: string, appId: string) {
+    return await API.removeAppBuilder(userId, appId)
+  }
+
+  async getAccountHolder() {
+    return await API.getAccountHolder()
+  }
+
+  getUserRole(user?: User & { tenantOwnerEmail?: string }) {
+    if (!user) {
+      return Constants.BudibaseRoles.AppUser
+    }
+    if (user.email === user.tenantOwnerEmail) {
+      return Constants.BudibaseRoles.Owner
+    } else if (sdk.users.isAdmin(user)) {
+      return Constants.BudibaseRoles.Admin
+    } else if (sdk.users.isBuilder(user)) {
+      return Constants.BudibaseRoles.Developer
+    } else if (sdk.users.hasCreatorPermissions(user)) {
+      return Constants.BudibaseRoles.Creator
+    } else {
+      return Constants.BudibaseRoles.AppUser
+    }
+  }
+}
+
+export const users = new UserStore()
diff --git a/packages/builder/src/stores/selectors.js b/packages/builder/src/stores/selectors.js
index f592250f25..af12f7d549 100644
--- a/packages/builder/src/stores/selectors.js
+++ b/packages/builder/src/stores/selectors.js
@@ -1,4 +1,4 @@
-import { DEFAULT_BB_DATASOURCE_ID } from "constants/backend"
+import { DEFAULT_BB_DATASOURCE_ID } from "@/constants/backend"
 import { DatasourceFeature } from "@budibase/types"
 
 export const integrationForDatasource = (integrations, datasource) => ({
diff --git a/packages/builder/src/stores/selectors.test.js b/packages/builder/src/stores/selectors.test.js
index 7bc790ad75..8ea0d7ac73 100644
--- a/packages/builder/src/stores/selectors.test.js
+++ b/packages/builder/src/stores/selectors.test.js
@@ -1,5 +1,5 @@
 import { it, expect, describe, beforeEach, vi } from "vitest"
-import { DEFAULT_BB_DATASOURCE_ID } from "constants/backend"
+import { DEFAULT_BB_DATASOURCE_ID } from "@/constants/backend"
 import { integrationForDatasource, hasData, hasDefaultData } from "./selectors"
 
 describe("selectors", () => {
diff --git a/packages/builder/src/templates/commonComponents.js b/packages/builder/src/templates/commonComponents.js
index 884419ae6c..ebc02669c8 100644
--- a/packages/builder/src/templates/commonComponents.js
+++ b/packages/builder/src/templates/commonComponents.js
@@ -1,6 +1,6 @@
-import { FieldTypeToComponentMap } from "components/design/settings/controls/FieldConfiguration/utils"
+import { FieldTypeToComponentMap } from "@/components/design/settings/controls/FieldConfiguration/utils"
 import { Component } from "./Component"
-import { getSchemaForDatasource } from "dataBinding"
+import { getSchemaForDatasource } from "@/dataBinding"
 
 export function makeDatasourceFormComponents(datasource) {
   const { schema } = getSchemaForDatasource(null, datasource, {
diff --git a/packages/builder/src/templates/rowActions.js b/packages/builder/src/templates/rowActions.js
index 639db09d00..356c20e68a 100644
--- a/packages/builder/src/templates/rowActions.js
+++ b/packages/builder/src/templates/rowActions.js
@@ -1,8 +1,8 @@
 import { get } from "svelte/store"
-import { getDatasourceForProvider } from "dataBinding"
-import { rowActions, selectedScreen, componentStore } from "stores/builder"
+import { getDatasourceForProvider } from "@/dataBinding"
+import { rowActions, selectedScreen, componentStore } from "@/stores/builder"
 import { Helpers } from "@budibase/bbui"
-import { findComponent } from "helpers/components"
+import { findComponent } from "@/helpers/components"
 
 export const getRowActionButtonTemplates = async ({
   screen,
diff --git a/packages/builder/src/templates/screenTemplating/blank.js b/packages/builder/src/templates/screenTemplating/blank.js
index 18859cc39d..81fec2030b 100644
--- a/packages/builder/src/templates/screenTemplating/blank.js
+++ b/packages/builder/src/templates/screenTemplating/blank.js
@@ -1,7 +1,7 @@
 import { Screen } from "./Screen"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "./getValidRoute"
-import { Roles } from "constants/backend"
+import { Roles } from "@/constants/backend"
 
 const blank = ({ route, screens }) => {
   const validRoute = getValidRoute(screens, route, Roles.BASIC)
diff --git a/packages/builder/src/templates/screenTemplating/form.js b/packages/builder/src/templates/screenTemplating/form.js
index e0fe815896..30070ce3cd 100644
--- a/packages/builder/src/templates/screenTemplating/form.js
+++ b/packages/builder/src/templates/screenTemplating/form.js
@@ -1,9 +1,9 @@
 import { Screen } from "./Screen"
 import { Component } from "../Component"
 import getValidRoute from "./getValidRoute"
-import { componentStore } from "stores/builder"
+import { componentStore } from "@/stores/builder"
 import { Helpers } from "@budibase/bbui"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 export const getTypeSpecificRoute = (tableOrView, type) => {
   if (type === "create") {
diff --git a/packages/builder/src/templates/screenTemplating/getValidRoute.js b/packages/builder/src/templates/screenTemplating/getValidRoute.js
index d49d6b6598..1fe2efb228 100644
--- a/packages/builder/src/templates/screenTemplating/getValidRoute.js
+++ b/packages/builder/src/templates/screenTemplating/getValidRoute.js
@@ -1,4 +1,4 @@
-import sanitizeUrl from "helpers/sanitizeUrl"
+import sanitizeUrl from "@/helpers/sanitizeUrl"
 
 const arbitraryMax = 10000
 
diff --git a/packages/builder/src/templates/screenTemplating/table/inline.js b/packages/builder/src/templates/screenTemplating/table/inline.js
index b7e0dd58b8..86f23582bb 100644
--- a/packages/builder/src/templates/screenTemplating/table/inline.js
+++ b/packages/builder/src/templates/screenTemplating/table/inline.js
@@ -1,8 +1,8 @@
 import { Screen } from "../Screen"
 import { Component } from "../../Component"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const inline = async ({ tableOrView, permissions, screens }) => {
   const heading = new Component("@budibase/standard-components/heading")
diff --git a/packages/builder/src/templates/screenTemplating/table/modal.js b/packages/builder/src/templates/screenTemplating/table/modal.js
index 6a97979b31..76c32ef278 100644
--- a/packages/builder/src/templates/screenTemplating/table/modal.js
+++ b/packages/builder/src/templates/screenTemplating/table/modal.js
@@ -3,9 +3,9 @@ import { Component } from "../../Component"
 import { generate } from "shortid"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Utils } from "@budibase/frontend-core"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const modal = async ({ tableOrView, permissions, screens }) => {
   /*
diff --git a/packages/builder/src/templates/screenTemplating/table/newScreen.js b/packages/builder/src/templates/screenTemplating/table/newScreen.js
index b8b06d3d44..285376a44a 100644
--- a/packages/builder/src/templates/screenTemplating/table/newScreen.js
+++ b/packages/builder/src/templates/screenTemplating/table/newScreen.js
@@ -1,10 +1,10 @@
 import { Screen } from "../Screen"
 import { Component } from "../../Component"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import getValidRoute from "../getValidRoute"
 import { Helpers } from "@budibase/bbui"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const getTableScreenTemplate = ({
   route,
diff --git a/packages/builder/src/templates/screenTemplating/table/sidePanel.js b/packages/builder/src/templates/screenTemplating/table/sidePanel.js
index 139b117d1b..966ecea2bd 100644
--- a/packages/builder/src/templates/screenTemplating/table/sidePanel.js
+++ b/packages/builder/src/templates/screenTemplating/table/sidePanel.js
@@ -3,9 +3,9 @@ import { Component } from "../../Component"
 import { generate } from "shortid"
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Utils } from "@budibase/frontend-core"
-import { capitalise } from "helpers"
+import { capitalise } from "@/helpers"
 import getValidRoute from "../getValidRoute"
-import { getRowActionButtonTemplates } from "templates/rowActions"
+import { getRowActionButtonTemplates } from "@/templates/rowActions"
 
 const sidePanel = async ({ tableOrView, permissions, screens }) => {
   /*
diff --git a/packages/builder/svelte.config.js b/packages/builder/svelte.config.js
new file mode 100644
index 0000000000..7d908c15d5
--- /dev/null
+++ b/packages/builder/svelte.config.js
@@ -0,0 +1,7 @@
+const { vitePreprocess } = require("@sveltejs/vite-plugin-svelte")
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+module.exports = config
diff --git a/packages/builder/tsconfig.build.json b/packages/builder/tsconfig.build.json
index 6a5ba315a1..119fe56c81 100644
--- a/packages/builder/tsconfig.build.json
+++ b/packages/builder/tsconfig.build.json
@@ -1,23 +1,8 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2019"],
-    "allowJs": true,
-    "outDir": "dist",
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true
+    "allowJs": true
   },
-  "include": [
-    "./src/**/*"
-  ],
-  "exclude": [
-    "node_modules",
-    "**/*.json",
-    "**/*.spec.ts",
-    "**/*.spec.js"
-  ]
+  "include": ["./src/**/*"],
+  "exclude": ["node_modules", "**/*.json", "**/*.spec.ts", "**/*.spec.js"]
 }
diff --git a/packages/builder/tsconfig.json b/packages/builder/tsconfig.json
index a7a4c3d800..d698e2fe1d 100644
--- a/packages/builder/tsconfig.json
+++ b/packages/builder/tsconfig.json
@@ -1,16 +1,18 @@
 {
   "extends": "./tsconfig.build.json",
   "compilerOptions": {
+    "outDir": "./dist",
+    "lib": ["ESNext"],
     "baseUrl": ".",
     "paths": {
-      "assets/*": ["./assets/*"],
       "@budibase/*": [
         "../*/src/index.ts",
         "../*/src/index.js",
         "../*",
         "../../node_modules/@budibase/*"
       ],
-      "*": ["./src/*"]
+      "assets/*": ["assets/*"],
+      "@/*": ["src/*"]
     }
   }
 }
diff --git a/packages/builder/vite.config.mjs b/packages/builder/vite.config.mjs
index f5ff388952..fb281f60bc 100644
--- a/packages/builder/vite.config.mjs
+++ b/packages/builder/vite.config.mjs
@@ -3,6 +3,7 @@ import replace from "@rollup/plugin-replace"
 import { defineConfig, loadEnv } from "vite"
 import { viteStaticCopy } from "vite-plugin-static-copy"
 import path from "path"
+import typescript from "@rollup/plugin-typescript"
 
 const ignoredWarnings = [
   "unused-export-let",
@@ -35,7 +36,7 @@ export default defineConfig(({ mode }) => {
     // Copy fonts to an additional path so that svelte's automatic
     // prefixing of the base URL path can still resolve assets
     copyFonts("builder/fonts"),
-]
+  ]
 
   return {
     test: {
@@ -61,6 +62,7 @@ export default defineConfig(({ mode }) => {
       sourcemap: !isProduction,
     },
     plugins: [
+      typescript({ outDir: "../server/builder/dist" }),
       svelte({
         hot: !isProduction,
         emitCss: true,
@@ -86,64 +88,13 @@ export default defineConfig(({ mode }) => {
     },
     resolve: {
       dedupe: ["@roxi/routify"],
-      alias: [
-        {
-          find: "assets",
-          replacement: path.resolve("./assets"),
-        },
-        {
-          find: "components",
-          replacement: path.resolve("./src/components"),
-        },
-        {
-          find: "pages",
-          replacement: path.resolve("./src/pages"),
-        },
-        {
-          find: "templates",
-          replacement: path.resolve("./src/templates"),
-        },
-        {
-          find: "stores",
-          replacement: path.resolve("./src/stores"),
-        },
-        {
-          find: "dataBinding",
-          replacement: path.resolve("./src/dataBinding.js"),
-        },
-        {
-          find: "api",
-          replacement: path.resolve("./src/api.js"),
-        },
-        {
-          find: "constants",
-          replacement: path.resolve("./src/constants"),
-        },
-        {
-          find: "analytics",
-          replacement: path.resolve("./src/analytics"),
-        },
-        {
-          find: "actions",
-          replacement: path.resolve("./src/actions"),
-        },
-        {
-          find: "helpers",
-          replacement: path.resolve("./src/helpers"),
-        },
-        {
-          find: "@budibase/types",
-          replacement: path.resolve("../types/src"),
-        },
-        {
-          find: "@budibase/shared-core",
-          replacement: path.resolve("../shared-core/src"),
-        },
-        {
-          find: "@budibase/bbui",
-          replacement: path.resolve("../bbui/src"),
-        },
-      ],
+      alias: {
+        "@budibase/types": path.resolve(__dirname, "../types/src"),
+        "@budibase/shared-core": path.resolve(__dirname, "../shared-core/src"),
+        "@budibase/bbui": path.resolve(__dirname, "../bbui/src"),
+        "@": path.resolve(__dirname, "src"),
+        assets: path.resolve(__dirname, "assets"),
+      },
     },
   }
 })
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8efdcc7816..662434957e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -11,13 +11,14 @@
   "scripts": {
     "tsc": "node ../../scripts/build.js",
     "build": "yarn tsc",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
     "start": "ts-node ./src/index.ts"
   },
   "dependencies": {
-    "@budibase/backend-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/backend-core": "*",
+    "@budibase/pouchdb-replication-stream": "1.2.11",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
     "chalk": "4.1.0",
     "cli-progress": "3.11.2",
     "commander": "7.1.0",
@@ -28,9 +29,9 @@
     "inquirer": "8.0.0",
     "lookpath": "1.1.0",
     "node-fetch": "2.6.7",
+    "open": "8.4.2",
     "posthog-node": "4.0.1",
     "pouchdb": "7.3.0",
-    "@budibase/pouchdb-replication-stream": "1.2.11",
     "randomstring": "1.1.5",
     "tar": "6.2.1",
     "yaml": "^2.1.1"
@@ -40,6 +41,6 @@
     "@types/node-fetch": "2.6.4",
     "@types/pouchdb": "^6.4.0",
     "ts-node": "10.8.1",
-    "typescript": "5.5.2"
+    "typescript": "5.7.2"
   }
 }
diff --git a/packages/cli/src/hosting/start.ts b/packages/cli/src/hosting/start.ts
index 75e3df451f..5b08268c94 100644
--- a/packages/cli/src/hosting/start.ts
+++ b/packages/cli/src/hosting/start.ts
@@ -3,6 +3,8 @@ import { info, success } from "../utils"
 import * as makeFiles from "./makeFiles"
 import compose from "docker-compose"
 import fs from "fs"
+import { confirmation } from "../questions"
+const open = require("open")
 
 export async function start() {
   await checkDockerConfigured()
@@ -22,6 +24,9 @@ export async function start() {
     // need to log as it makes it more clear
     await compose.upAll({ cwd: "./", log: true })
   })
+  if (await confirmation(`Do you wish to open http://localhost:${port} ?`)) {
+    await open(`http://localhost:${port}`)
+  }
   console.log(
     success(
       `Services started, please go to http://localhost:${port} for next steps.`
diff --git a/packages/cli/tsconfig.build.json b/packages/cli/tsconfig.build.json
index e52d886194..68ab2d45f9 100644
--- a/packages/cli/tsconfig.build.json
+++ b/packages/cli/tsconfig.build.json
@@ -1,25 +1,5 @@
 {
-  "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "types": ["node", "jest"],
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/backend-core": ["../backend-core/src"],
-      "@budibase/backend-core/*": ["../backend-core/*"],
-      "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/string-templates": ["../string-templates/src"]
-    }
-  },
+  "extends": "../../tsconfig.build.json",
   "include": ["src/**/*"],
   "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"]
 }
diff --git a/packages/client/manifest.json b/packages/client/manifest.json
index 393c08a282..c236dd1ad9 100644
--- a/packages/client/manifest.json
+++ b/packages/client/manifest.json
@@ -3096,7 +3096,6 @@
     "name": "Text Field",
     "icon": "Text",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3106,8 +3105,7 @@
       {
         "type": "field/string",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3226,13 +3224,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "numberfield": {
     "name": "Number Field",
     "icon": "123",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3242,8 +3249,7 @@
       {
         "type": "field/number",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3328,13 +3334,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "number"
+        }
+      ]
+    }
   },
   "bigintfield": {
     "name": "BigInt Field",
     "icon": "TagBold",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3344,8 +3359,7 @@
       {
         "type": "field/bigint",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3414,13 +3428,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "number"
+        }
+      ]
+    }
   },
   "passwordfield": {
     "name": "Password Field",
     "icon": "LockClosed",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3430,8 +3453,7 @@
       {
         "type": "field/string",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3500,13 +3522,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "optionsfield": {
     "name": "Options Picker",
     "icon": "Menu",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3516,8 +3547,7 @@
       {
         "type": "field/options",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3714,13 +3744,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "multifieldselect": {
     "name": "Multi-select Picker",
     "icon": "ViewList",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -3730,8 +3769,7 @@
       {
         "type": "field/array",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -3922,13 +3960,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "booleanfield": {
     "name": "Checkbox",
     "icon": "SelectBox",
     "editable": true,
-    "requiredAncestors": ["form"],
     "size": {
       "width": 400,
       "height": 60
@@ -3937,8 +3984,7 @@
       {
         "type": "field/boolean",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4047,13 +4093,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "boolean"
+        }
+      ]
+    }
   },
   "longformfield": {
     "name": "Long Form Field",
     "icon": "TextAlignLeft",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -4063,8 +4118,7 @@
       {
         "type": "field/longform",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4171,13 +4225,22 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "datetimefield": {
     "name": "Date Picker",
     "icon": "Date",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -4187,8 +4250,7 @@
       {
         "type": "field/datetime",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4291,7 +4353,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "datetime"
+        }
+      ]
+    }
   },
   "codescanner": {
     "name": "Barcode/QR Scanner",
@@ -4305,8 +4377,7 @@
       {
         "type": "field/barcodeqr",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -4451,7 +4522,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "signaturesinglefield": {
     "name": "Signature",
@@ -4924,7 +5005,6 @@
     "icon": "Brackets",
     "styles": ["size"],
     "editable": true,
-    "requiredAncestors": ["form"],
     "size": {
       "width": 400,
       "height": 100
@@ -4933,8 +5013,7 @@
       {
         "type": "field/json",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -5014,7 +5093,17 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   },
   "s3upload": {
     "name": "S3 File Upload",
@@ -5029,8 +5118,7 @@
       {
         "type": "field/s3",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -5051,7 +5139,8 @@
       {
         "type": "text",
         "label": "File name",
-        "key": "key"
+        "key": "key",
+        "nested": true
       },
       {
         "type": "event",
@@ -5075,7 +5164,17 @@
         "label": "Validation",
         "key": "validation"
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "dataprovider": {
     "name": "Data Provider",
@@ -7643,7 +7742,6 @@
     "name": "User List Field",
     "icon": "UserGroup",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -7653,8 +7751,7 @@
       {
         "type": "field/bb_reference",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -7744,14 +7841,23 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "array"
+        }
+      ]
+    }
   },
   "bbreferencesinglefield": {
     "devComment": "As bb reference is only used for user subtype for now, we are using user for icon and labels",
     "name": "User Field",
     "icon": "User",
     "styles": ["size"],
-    "requiredAncestors": ["form"],
     "editable": true,
     "size": {
       "width": 400,
@@ -7761,8 +7867,7 @@
       {
         "type": "field/bb_reference_single",
         "label": "Field",
-        "key": "field",
-        "required": true
+        "key": "field"
       },
       {
         "type": "text",
@@ -7852,6 +7957,16 @@
           }
         ]
       }
-    ]
+    ],
+    "context": {
+      "type": "static",
+      "values": [
+        {
+          "label": "Value",
+          "key": "value",
+          "type": "string"
+        }
+      ]
+    }
   }
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index fb9851e0a1..2ae049f6d0 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,15 +15,15 @@
     "./manifest.json": "./manifest.json"
   },
   "scripts": {
-    "build": "rollup -c",
-    "dev": "rollup -cw"
+    "build": "vite build",
+    "dev": "vite build --watch --mode=dev"
   },
   "dependencies": {
-    "@budibase/bbui": "0.0.0",
-    "@budibase/frontend-core": "0.0.0",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/bbui": "*",
+    "@budibase/frontend-core": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
     "@spectrum-css/card": "3.0.3",
     "apexcharts": "^3.48.0",
     "dayjs": "^1.10.8",
@@ -36,19 +36,9 @@
     "svelte-spa-router": "^4.0.1"
   },
   "devDependencies": {
-    "@rollup/plugin-alias": "^5.1.0",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-image": "^3.0.3",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "postcss": "^8.4.35",
-    "rollup": "^4.9.6",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-polyfill-node": "^0.13.0",
-    "rollup-plugin-postcss": "^4.0.2",
-    "rollup-plugin-svelte": "^7.1.6",
-    "rollup-plugin-svg": "^2.0.0",
-    "rollup-plugin-terser": "^7.0.2",
-    "rollup-plugin-visualizer": "^5.12.0"
+    "@sveltejs/vite-plugin-svelte": "1.4.0",
+    "vite": "^4.5.0",
+    "vite-plugin-css-injected-by-js": "3.5.2"
   },
   "resolutions": {
     "loader-utils": "1.4.1"
@@ -71,9 +61,7 @@
         "dependsOn": [
           {
             "projects": [
-              "@budibase/shared-core",
-              "@budibase/string-templates",
-              "@budibase/types"
+              "@budibase/string-templates"
             ],
             "target": "build"
           }
diff --git a/packages/client/rollup.config.js b/packages/client/rollup.config.js
deleted file mode 100644
index 9839414f7e..0000000000
--- a/packages/client/rollup.config.js
+++ /dev/null
@@ -1,117 +0,0 @@
-import commonjs from "@rollup/plugin-commonjs"
-import resolve from "@rollup/plugin-node-resolve"
-import alias from "@rollup/plugin-alias"
-import svelte from "rollup-plugin-svelte"
-import { terser } from "rollup-plugin-terser"
-import postcss from "rollup-plugin-postcss"
-import svg from "rollup-plugin-svg"
-import image from "@rollup/plugin-image"
-import json from "rollup-plugin-json"
-import nodePolyfills from "rollup-plugin-polyfill-node"
-import path from "path"
-import { visualizer } from "rollup-plugin-visualizer"
-
-const production = !process.env.ROLLUP_WATCH
-const ignoredWarnings = [
-  "unused-export-let",
-  "css-unused-selector",
-  "module-script-reactive-declaration",
-  "a11y-no-onchange",
-  "a11y-click-events-have-key-events",
-]
-
-const devPaths = production
-  ? []
-  : [
-      {
-        find: "@budibase/shared-core",
-        replacement: path.resolve("../shared-core/dist/index"),
-      },
-      {
-        find: "@budibase/types",
-        replacement: path.resolve("../types/dist/index"),
-      },
-    ]
-
-export default {
-  input: "src/index.js",
-  output: [
-    {
-      sourcemap: false,
-      format: "iife",
-      file: `./dist/budibase-client.js`,
-    },
-  ],
-  onwarn(warning, warn) {
-    if (
-      warning.code === "THIS_IS_UNDEFINED" ||
-      warning.code === "CIRCULAR_DEPENDENCY" ||
-      warning.code === "EVAL"
-    ) {
-      return
-    }
-    warn(warning)
-  },
-  plugins: [
-    alias({
-      entries: [
-        {
-          find: "manifest.json",
-          replacement: path.resolve("./manifest.json"),
-        },
-        {
-          find: "api",
-          replacement: path.resolve("./src/api"),
-        },
-        {
-          find: "components",
-          replacement: path.resolve("./src/components"),
-        },
-        {
-          find: "stores",
-          replacement: path.resolve("./src/stores"),
-        },
-        {
-          find: "utils",
-          replacement: path.resolve("./src/utils"),
-        },
-        {
-          find: "constants",
-          replacement: path.resolve("./src/constants"),
-        },
-        {
-          find: "sdk",
-          replacement: path.resolve("./src/sdk"),
-        },
-        ...devPaths,
-      ],
-    }),
-    svelte({
-      emitCss: true,
-      onwarn: (warning, handler) => {
-        // Ignore some warnings
-        if (!ignoredWarnings.includes(warning.code)) {
-          handler(warning)
-        }
-      },
-    }),
-    postcss(),
-    commonjs(),
-    nodePolyfills(),
-    resolve({
-      preferBuiltins: true,
-      browser: true,
-      dedupe: ["svelte", "svelte/internal"],
-    }),
-    svg(),
-    image({
-      exclude: "**/*.svg",
-    }),
-    json(),
-    production && terser(),
-    !production && visualizer(),
-  ],
-  watch: {
-    clearScreen: false,
-  },
-}
diff --git a/packages/client/src/api/api.js b/packages/client/src/api/api.ts
similarity index 94%
rename from packages/client/src/api/api.js
rename to packages/client/src/api/api.ts
index d4c8faa4d2..b944f7bd7c 100644
--- a/packages/client/src/api/api.js
+++ b/packages/client/src/api/api.ts
@@ -1,6 +1,10 @@
 import { createAPIClient } from "@budibase/frontend-core"
-import { authStore } from "../stores/auth.js"
-import { notificationStore, devToolsEnabled, devToolsStore } from "../stores/"
+import { authStore } from "../stores/auth"
+import {
+  notificationStore,
+  devToolsEnabled,
+  devToolsStore,
+} from "../stores/index"
 import { get } from "svelte/store"
 
 export const API = createAPIClient({
diff --git a/packages/client/src/api/index.js b/packages/client/src/api/index.ts
similarity index 73%
rename from packages/client/src/api/index.js
rename to packages/client/src/api/index.ts
index 5eb6b2b6f4..3c53045cfd 100644
--- a/packages/client/src/api/index.js
+++ b/packages/client/src/api/index.ts
@@ -1,5 +1,5 @@
-import { API } from "./api.js"
-import { patchAPI } from "./patches.js"
+import { API } from "./api"
+import { patchAPI } from "./patches"
 
 // Certain endpoints which return rows need patched so that they transform
 // and enrich the row docs, so that they can be correctly handled by the
diff --git a/packages/client/src/api/patches.js b/packages/client/src/api/patches.ts
similarity index 76%
rename from packages/client/src/api/patches.js
rename to packages/client/src/api/patches.ts
index faad9c81ec..9482644fa7 100644
--- a/packages/client/src/api/patches.js
+++ b/packages/client/src/api/patches.ts
@@ -1,19 +1,20 @@
-import { Constants } from "@budibase/frontend-core"
+import { Constants, APIClient } from "@budibase/frontend-core"
 import { FieldTypes } from "../constants"
+import { Row, Table } from "@budibase/types"
 
-export const patchAPI = API => {
+export const patchAPI = (API: APIClient) => {
   /**
    * Enriches rows which contain certain field types so that they can
    * be properly displayed.
    * The ability to create these bindings has been removed, but they will still
    * exist in client apps to support backwards compatibility.
    */
-  const enrichRows = async (rows, tableId) => {
+  const enrichRows = async (rows: Row[], tableId: string) => {
     if (!Array.isArray(rows)) {
       return []
     }
     if (rows.length) {
-      const tables = {}
+      const tables: Record<string, Table> = {}
       for (let row of rows) {
         // Fall back to passed in tableId if row doesn't have it specified
         let rowTableId = row.tableId || tableId
@@ -54,7 +55,7 @@ export const patchAPI = API => {
   const fetchSelf = API.fetchSelf
   API.fetchSelf = async () => {
     const user = await fetchSelf()
-    if (user && user._id) {
+    if (user && "_id" in user && user._id) {
       if (user.roleId === "PUBLIC") {
         // Don't try to enrich a public user as it will 403
         return user
@@ -66,10 +67,9 @@ export const patchAPI = API => {
     }
   }
   const fetchRelationshipData = API.fetchRelationshipData
-  API.fetchRelationshipData = async params => {
-    const tableId = params?.tableId
-    const rows = await fetchRelationshipData(params)
-    return await enrichRows(rows, tableId)
+  API.fetchRelationshipData = async (sourceId, rowId, fieldName) => {
+    const rows = await fetchRelationshipData(sourceId, rowId, fieldName)
+    return await enrichRows(rows, sourceId)
   }
   const fetchTableData = API.fetchTableData
   API.fetchTableData = async tableId => {
@@ -77,28 +77,28 @@ export const patchAPI = API => {
     return await enrichRows(rows, tableId)
   }
   const searchTable = API.searchTable
-  API.searchTable = async params => {
-    const tableId = params?.tableId
-    const output = await searchTable(params)
+  API.searchTable = async (sourceId, opts) => {
+    const output = await searchTable(sourceId, opts)
     return {
       ...output,
-      rows: await enrichRows(output?.rows, tableId),
+      rows: await enrichRows(output.rows, sourceId),
     }
   }
   const fetchViewData = API.fetchViewData
-  API.fetchViewData = async params => {
+  API.fetchViewData = async (viewName, params) => {
     const tableId = params?.tableId
-    const rows = await fetchViewData(params)
+    const rows = await fetchViewData(viewName, params)
     return await enrichRows(rows, tableId)
   }
 
-  // Wipe any HBS formulae from table definitions, as these interfere with
+  // Wipe any HBS formulas from table definitions, as these interfere with
   // handlebars enrichment
   const fetchTableDefinition = API.fetchTableDefinition
   API.fetchTableDefinition = async tableId => {
     const definition = await fetchTableDefinition(tableId)
     Object.keys(definition?.schema || {}).forEach(field => {
       if (definition.schema[field]?.type === "formula") {
+        // @ts-expect-error TODO check what use case removing that would break
         delete definition.schema[field].formula
       }
     })
diff --git a/packages/client/src/components/Block.svelte b/packages/client/src/components/Block.svelte
index a739065015..48c11f152a 100644
--- a/packages/client/src/components/Block.svelte
+++ b/packages/client/src/components/Block.svelte
@@ -1,7 +1,7 @@
 <script>
   import { getContext, onDestroy, onMount, setContext } from "svelte"
   import { builderStore } from "stores/builder.js"
-  import { blockStore } from "stores/blocks.js"
+  import { blockStore } from "stores/blocks"
 
   const component = getContext("component")
   const { styleable } = getContext("sdk")
diff --git a/packages/client/src/components/ClientApp.svelte b/packages/client/src/components/ClientApp.svelte
index 1610f36bdc..2840d82f47 100644
--- a/packages/client/src/components/ClientApp.svelte
+++ b/packages/client/src/components/ClientApp.svelte
@@ -2,7 +2,7 @@
   import { writable, get } from "svelte/store"
   import { setContext, onMount } from "svelte"
   import { Layout, Heading, Body } from "@budibase/bbui"
-  import ErrorSVG from "@budibase/frontend-core/assets/error.svg"
+  import ErrorSVG from "@budibase/frontend-core/assets/error.svg?raw"
   import { Constants, CookieUtils } from "@budibase/frontend-core"
   import { getThemeClassNames } from "@budibase/shared-core"
   import Component from "./Component.svelte"
diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 7a1341c67c..236bcb7c7e 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -39,7 +39,7 @@
     getActionContextKey,
     getActionDependentContextKeys,
   } from "../utils/buttonActions.js"
-  import { gridLayout } from "utils/grid.js"
+  import { gridLayout } from "utils/grid"
 
   export let instance = {}
   export let parent = null
@@ -103,6 +103,7 @@
   let settingsDefinition
   let settingsDefinitionMap
   let missingRequiredSettings = false
+  let componentErrors = false
 
   // Temporary styles which can be added in the app preview for things like
   // DND. We clear these whenever a new instance is received.
@@ -137,16 +138,21 @@
 
   // Derive definition properties which can all be optional, so need to be
   // coerced to booleans
+  $: componentErrors = instance?._meta?.errors
   $: hasChildren = !!definition?.hasChildren
   $: showEmptyState = definition?.showEmptyState !== false
   $: hasMissingRequiredSettings = missingRequiredSettings?.length > 0
   $: editable = !!definition?.editable && !hasMissingRequiredSettings
+  $: hasComponentErrors = componentErrors?.length > 0
   $: requiredAncestors = definition?.requiredAncestors || []
   $: missingRequiredAncestors = requiredAncestors.filter(
     ancestor => !$component.ancestors.includes(`${BudibasePrefix}${ancestor}`)
   )
   $: hasMissingRequiredAncestors = missingRequiredAncestors?.length > 0
-  $: errorState = hasMissingRequiredSettings || hasMissingRequiredAncestors
+  $: errorState =
+    hasMissingRequiredSettings ||
+    hasMissingRequiredAncestors ||
+    hasComponentErrors
 
   // Interactive components can be selected, dragged and highlighted inside
   // the builder preview
@@ -692,6 +698,7 @@
       <ComponentErrorState
         {missingRequiredSettings}
         {missingRequiredAncestors}
+        {componentErrors}
       />
     {:else}
       <svelte:component this={constructor} bind:this={ref} {...initialSettings}>
diff --git a/packages/client/src/components/app/DataProvider.svelte b/packages/client/src/components/app/DataProvider.svelte
index e6629aa3f3..a80b9a5f74 100644
--- a/packages/client/src/components/app/DataProvider.svelte
+++ b/packages/client/src/components/app/DataProvider.svelte
@@ -1,22 +1,38 @@
-<script>
+<script lang="ts">
   import { getContext } from "svelte"
   import { Pagination, ProgressCircle } from "@budibase/bbui"
   import { fetchData, QueryUtils } from "@budibase/frontend-core"
-  import { LogicalOperator, EmptyFilterOption } from "@budibase/types"
+  import {
+    LogicalOperator,
+    EmptyFilterOption,
+    TableSchema,
+    SortOrder,
+    SearchFilters,
+    UISearchFilter,
+    DataFetchDatasource,
+    UserDatasource,
+    GroupUserDatasource,
+    DataFetchOptions,
+  } from "@budibase/types"
 
-  export let dataSource
-  export let filter
-  export let sortColumn
-  export let sortOrder
-  export let limit
-  export let paginate
-  export let autoRefresh
+  type ProviderDatasource = Exclude<
+    DataFetchDatasource,
+    UserDatasource | GroupUserDatasource
+  >
+
+  export let dataSource: ProviderDatasource
+  export let filter: UISearchFilter
+  export let sortColumn: string
+  export let sortOrder: SortOrder
+  export let limit: number
+  export let paginate: boolean
+  export let autoRefresh: number
 
   const { styleable, Provider, ActionTypes, API } = getContext("sdk")
   const component = getContext("component")
 
-  let interval
-  let queryExtensions = {}
+  let interval: ReturnType<typeof setInterval>
+  let queryExtensions: Record<string, any> = {}
 
   $: defaultQuery = QueryUtils.buildQuery(filter)
 
@@ -49,8 +65,14 @@
     },
     {
       type: ActionTypes.SetDataProviderSorting,
-      callback: ({ column, order }) => {
-        let newOptions = {}
+      callback: ({
+        column,
+        order,
+      }: {
+        column: string
+        order: SortOrder | undefined
+      }) => {
+        let newOptions: Partial<DataFetchOptions> = {}
         if (column) {
           newOptions.sortColumn = column
         }
@@ -63,6 +85,7 @@
       },
     },
   ]
+
   $: dataContext = {
     rows: $fetch.rows,
     info: $fetch.info,
@@ -75,14 +98,12 @@
     id: $component?.id,
     state: {
       query: $fetch.query,
-      sortColumn: $fetch.sortColumn,
-      sortOrder: $fetch.sortOrder,
     },
     limit,
-    primaryDisplay: $fetch.definition?.primaryDisplay,
+    primaryDisplay: ($fetch.definition as any)?.primaryDisplay,
   }
 
-  const createFetch = datasource => {
+  const createFetch = (datasource: ProviderDatasource) => {
     return fetchData({
       API,
       datasource,
@@ -96,7 +117,7 @@
     })
   }
 
-  const sanitizeSchema = schema => {
+  const sanitizeSchema = (schema: TableSchema | null) => {
     if (!schema) {
       return schema
     }
@@ -109,14 +130,14 @@
     return cloned
   }
 
-  const addQueryExtension = (key, extension) => {
+  const addQueryExtension = (key: string, extension: any) => {
     if (!key || !extension) {
       return
     }
     queryExtensions = { ...queryExtensions, [key]: extension }
   }
 
-  const removeQueryExtension = key => {
+  const removeQueryExtension = (key: string) => {
     if (!key) {
       return
     }
@@ -125,11 +146,14 @@
     queryExtensions = newQueryExtensions
   }
 
-  const extendQuery = (defaultQuery, extensions) => {
+  const extendQuery = (
+    defaultQuery: SearchFilters,
+    extensions: Record<string, any>
+  ): SearchFilters => {
     if (!Object.keys(extensions).length) {
       return defaultQuery
     }
-    const extended = {
+    const extended: SearchFilters = {
       [LogicalOperator.AND]: {
         conditions: [
           ...(defaultQuery ? [defaultQuery] : []),
@@ -140,12 +164,12 @@
     }
 
     // If there are no conditions applied at all, clear the request.
-    return extended[LogicalOperator.AND]?.conditions?.length > 0
+    return (extended[LogicalOperator.AND]?.conditions?.length ?? 0) > 0
       ? extended
-      : null
+      : {}
   }
 
-  const setUpAutoRefresh = autoRefresh => {
+  const setUpAutoRefresh = (autoRefresh: number) => {
     clearInterval(interval)
     if (autoRefresh) {
       interval = setInterval(fetch.refresh, Math.max(10000, autoRefresh * 1000))
diff --git a/packages/client/src/components/app/blocks/CardsBlock.svelte b/packages/client/src/components/app/blocks/CardsBlock.svelte
index 0368a27e93..34707c394d 100644
--- a/packages/client/src/components/app/blocks/CardsBlock.svelte
+++ b/packages/client/src/components/app/blocks/CardsBlock.svelte
@@ -3,7 +3,7 @@
   import Block from "components/Block.svelte"
   import BlockComponent from "components/BlockComponent.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
-  import { enrichSearchColumns, enrichFilter } from "utils/blocks.js"
+  import { enrichSearchColumns, enrichFilter } from "utils/blocks"
   import { get } from "svelte/store"
 
   export let title
diff --git a/packages/client/src/components/app/blocks/form/FormBlock.svelte b/packages/client/src/components/app/blocks/form/FormBlock.svelte
index 656aa5933b..3f44aee1d7 100644
--- a/packages/client/src/components/app/blocks/form/FormBlock.svelte
+++ b/packages/client/src/components/app/blocks/form/FormBlock.svelte
@@ -1,37 +1,43 @@
-<script>
+<script lang="ts">
   import { getContext } from "svelte"
   import InnerFormBlock from "./InnerFormBlock.svelte"
   import { Utils } from "@budibase/frontend-core"
   import FormBlockWrapper from "./FormBlockWrapper.svelte"
   import { get } from "svelte/store"
+  import { TableSchema, UIDatasource } from "@budibase/types"
 
-  export let actionType
-  export let dataSource
-  export let size
-  export let disabled
-  export let fields
-  export let buttons
-  export let buttonPosition
-  export let title
-  export let description
-  export let rowId
-  export let actionUrl
-  export let noRowsMessage
-  export let notificationOverride
-  export let buttonsCollapsed
-  export let buttonsCollapsedText
+  type Field = { name: string; active: boolean }
+
+  export let actionType: string
+  export let dataSource: UIDatasource
+  export let size: string
+  export let disabled: boolean
+  export let fields: (Field | string)[]
+  export let buttons: {
+    "##eventHandlerType": string
+    parameters: Record<string, string>
+  }[]
+  export let buttonPosition: "top" | "bottom"
+  export let title: string
+  export let description: string
+  export let rowId: string
+  export let actionUrl: string
+  export let noRowsMessage: string
+  export let notificationOverride: boolean
+  export let buttonsCollapsed: boolean
+  export let buttonsCollapsedText: string
 
   // Legacy
-  export let showDeleteButton
-  export let showSaveButton
-  export let saveButtonLabel
-  export let deleteButtonLabel
+  export let showDeleteButton: boolean
+  export let showSaveButton: boolean
+  export let saveButtonLabel: boolean
+  export let deleteButtonLabel: boolean
 
   const { fetchDatasourceSchema, generateGoldenSample } = getContext("sdk")
   const component = getContext("component")
   const context = getContext("context")
 
-  let schema
+  let schema: TableSchema
 
   $: fetchSchema(dataSource)
   $: id = $component.id
@@ -61,7 +67,7 @@
     }
   }
 
-  const convertOldFieldFormat = fields => {
+  const convertOldFieldFormat = (fields: (Field | string)[]): Field[] => {
     if (!fields) {
       return []
     }
@@ -82,11 +88,11 @@
     })
   }
 
-  const getDefaultFields = (fields, schema) => {
+  const getDefaultFields = (fields: Field[], schema: TableSchema) => {
     if (!schema) {
       return []
     }
-    let defaultFields = []
+    let defaultFields: Field[] = []
 
     if (!fields || fields.length === 0) {
       Object.values(schema)
@@ -101,15 +107,14 @@
     return [...fields, ...defaultFields].filter(field => field.active)
   }
 
-  const fetchSchema = async () => {
-    schema = (await fetchDatasourceSchema(dataSource)) || {}
+  const fetchSchema = async (datasource: UIDatasource) => {
+    schema = (await fetchDatasourceSchema(datasource)) || {}
   }
 </script>
 
 <FormBlockWrapper {actionType} {dataSource} {rowId} {noRowsMessage}>
   <InnerFormBlock
     {dataSource}
-    {actionUrl}
     {actionType}
     {size}
     {disabled}
@@ -117,7 +122,6 @@
     {title}
     {description}
     {schema}
-    {notificationOverride}
     buttons={buttonsOrDefault}
     buttonPosition={buttons ? buttonPosition : "top"}
     {buttonsCollapsed}
diff --git a/packages/client/src/components/app/charts/AreaChart.svelte b/packages/client/src/components/app/charts/AreaChart.svelte
index 051601b245..556e0a61d4 100644
--- a/packages/client/src/components/app/charts/AreaChart.svelte
+++ b/packages/client/src/components/app/charts/AreaChart.svelte
@@ -18,8 +18,6 @@
   export let palette
   export let c1, c2, c3, c4, c5
 
-  // Area specific props
-  export let area
   export let stacked
   export let gradient
 
diff --git a/packages/client/src/components/app/deprecated/TableBlock.svelte b/packages/client/src/components/app/deprecated/TableBlock.svelte
index e67dc5b061..cdb45cfed7 100644
--- a/packages/client/src/components/app/deprecated/TableBlock.svelte
+++ b/packages/client/src/components/app/deprecated/TableBlock.svelte
@@ -5,7 +5,7 @@
   import Block from "components/Block.svelte"
   import BlockComponent from "components/BlockComponent.svelte"
   import { makePropSafe as safe } from "@budibase/string-templates"
-  import { enrichSearchColumns, enrichFilter } from "utils/blocks.js"
+  import { enrichSearchColumns, enrichFilter } from "utils/blocks"
   import { Utils } from "@budibase/frontend-core"
 
   export let title
diff --git a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
index 4ab01de17d..28858f3112 100644
--- a/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
+++ b/packages/client/src/components/app/dynamic-filter/DynamicFilter.svelte
@@ -6,6 +6,7 @@
     QueryUtils,
     Constants,
     CoreFilterBuilder,
+    Utils,
   } from "@budibase/frontend-core"
   import Button from "../Button.svelte"
 
@@ -95,7 +96,7 @@
   }
 
   const updateQuery = () => {
-    filters = editableFilters
+    filters = Utils.parseFilter(editableFilters)
   }
 
   onDestroy(() => {
diff --git a/packages/client/src/components/app/embedded-map/EmbeddedMapControls.js b/packages/client/src/components/app/embedded-map/EmbeddedMapControls.js
index de14190b64..190bc810bf 100644
--- a/packages/client/src/components/app/embedded-map/EmbeddedMapControls.js
+++ b/packages/client/src/components/app/embedded-map/EmbeddedMapControls.js
@@ -30,7 +30,7 @@ const FullScreenControl = L.Control.extend({
     fullScreenTitle: "Enter Fullscreen",
   },
   onAdd: function () {
-    var fullScreenClassName = "leaflet-control-fullscreen",
+    let fullScreenClassName = "leaflet-control-fullscreen",
       container = L.DomUtil.create("div", fullScreenClassName + " leaflet-bar"),
       options = this.options
 
@@ -45,7 +45,7 @@ const FullScreenControl = L.Control.extend({
     return container
   },
   _fullScreen: function () {
-    var map = this._map
+    let map = this._map
     if (screenfull.isEnabled) {
       screenfull.toggle(map.getContainer())
     }
@@ -80,7 +80,7 @@ const LocationControl = L.Control.extend({
     locationTitle: "Show Your Location",
   },
   onAdd: function () {
-    var locationClassName = "leaflet-control-location",
+    let locationClassName = "leaflet-control-location",
       container = L.DomUtil.create("div", locationClassName + " leaflet-bar"),
       options = this.options
 
@@ -136,7 +136,7 @@ const LocationControl = L.Control.extend({
       })
   },
   _getPosition: function () {
-    var options = {
+    let options = {
       enableHighAccuracy: false,
       timeout: 5000,
       maximumAge: 30000,
diff --git a/packages/client/src/components/app/forms/AttachmentField.svelte b/packages/client/src/components/app/forms/AttachmentField.svelte
index 27286a8666..d9a91016cb 100644
--- a/packages/client/src/components/app/forms/AttachmentField.svelte
+++ b/packages/client/src/components/app/forms/AttachmentField.svelte
@@ -49,10 +49,7 @@
       data.append("file", fileList[i])
     }
     try {
-      return await API.uploadAttachment({
-        data,
-        tableId: formContext?.dataSource?.tableId,
-      })
+      return await API.uploadAttachment(formContext?.dataSource?.tableId, data)
     } catch (error) {
       return []
     }
diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index 9210b6ea8f..5fccb5d881 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -1,7 +1,10 @@
 <script>
-  import Placeholder from "../Placeholder.svelte"
   import { getContext, onDestroy } from "svelte"
+  import { writable } from "svelte/store"
   import { Icon } from "@budibase/bbui"
+  import { memo } from "@budibase/frontend-core"
+  import Placeholder from "../Placeholder.svelte"
+  import InnerForm from "./InnerForm.svelte"
 
   export let label
   export let field
@@ -20,26 +23,39 @@
   const formContext = getContext("form")
   const formStepContext = getContext("form-step")
   const fieldGroupContext = getContext("field-group")
-  const { styleable, builderStore } = getContext("sdk")
+  const { styleable, builderStore, Provider } = getContext("sdk")
   const component = getContext("component")
 
   // Register field with form
   const formApi = formContext?.formApi
   const labelPos = fieldGroupContext?.labelPosition || "above"
 
+  let formField
   let touched = false
   let labelNode
 
-  $: formStep = formStepContext ? $formStepContext || 1 : 1
-  $: formField = formApi?.registerField(
-    field,
+  // Memoize values required to register the field to avoid loops
+  const formStep = formStepContext || writable(1)
+  const fieldInfo = memo({
+    field: field || $component.name,
     type,
     defaultValue,
     disabled,
     readonly,
     validation,
-    formStep
-  )
+    formStep: $formStep || 1,
+  })
+  $: fieldInfo.set({
+    field: field || $component.name,
+    type,
+    defaultValue,
+    disabled,
+    readonly,
+    validation,
+    formStep: $formStep || 1,
+  })
+  $: registerField($fieldInfo)
+
   $: schemaType =
     fieldSchema?.type !== "formula" && fieldSchema?.type !== "bigint"
       ? fieldSchema?.type
@@ -58,6 +74,18 @@
   // Determine label class from position
   $: labelClass = labelPos === "above" ? "" : `spectrum-FieldLabel--${labelPos}`
 
+  const registerField = info => {
+    formField = formApi?.registerField(
+      info.field,
+      info.type,
+      info.defaultValue,
+      info.disabled,
+      info.readonly,
+      info.validation,
+      info.formStep
+    )
+  }
+
   const updateLabel = e => {
     if (touched) {
       builderStore.actions.updateProp("label", e.target.textContent)
@@ -71,52 +99,65 @@
   })
 </script>
 
-<div
-  class="spectrum-Form-item"
-  class:span-2={span === 2}
-  class:span-3={span === 3}
-  class:span-6={span === 6 || !span}
-  use:styleable={$component.styles}
-  class:above={labelPos === "above"}
->
-  {#key $component.editing}
-    <label
-      bind:this={labelNode}
-      contenteditable={$component.editing}
-      on:blur={$component.editing ? updateLabel : null}
-      on:input={() => (touched = true)}
-      class:hidden={!label}
-      class:readonly
-      for={fieldState?.fieldId}
-      class={`spectrum-FieldLabel spectrum-FieldLabel--sizeM spectrum-Form-itemLabel ${labelClass}`}
+<Provider data={{ value: fieldState?.value }}>
+  {#if !formContext}
+    <InnerForm
+      {disabled}
+      {readonly}
+      currentStep={writable(1)}
+      provideContext={false}
     >
-      {label || " "}
-    </label>
-  {/key}
-  <div class="spectrum-Form-itemField">
-    {#if !formContext}
-      <Placeholder text="Form components need to be wrapped in a form" />
-    {:else if !fieldState}
-      <Placeholder />
-    {:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)}
-      <Placeholder
-        text="This Field setting is the wrong data type for this component"
-      />
-    {:else}
-      <slot />
-      {#if fieldState.error}
-        <div class="error">
-          <Icon name="Alert" />
-          <span>{fieldState.error}</span>
-        </div>
-      {:else if helpText}
-        <div class="helpText">
-          <Icon name="HelpOutline" /> <span>{helpText}</span>
-        </div>
-      {/if}
-    {/if}
-  </div>
-</div>
+      <svelte:self {...$$props} bind:fieldState bind:fieldApi bind:fieldSchema>
+        <slot />
+      </svelte:self>
+    </InnerForm>
+  {:else}
+    <div
+      class="spectrum-Form-item"
+      class:span-2={span === 2}
+      class:span-3={span === 3}
+      class:span-6={span === 6 || !span}
+      use:styleable={$component.styles}
+      class:above={labelPos === "above"}
+    >
+      {#key $component.editing}
+        <label
+          bind:this={labelNode}
+          contenteditable={$component.editing}
+          on:blur={$component.editing ? updateLabel : null}
+          on:input={() => (touched = true)}
+          class:hidden={!label}
+          class:readonly
+          for={fieldState?.fieldId}
+          class={`spectrum-FieldLabel spectrum-FieldLabel--sizeM spectrum-Form-itemLabel ${labelClass}`}
+        >
+          {label || " "}
+        </label>
+      {/key}
+      <div class="spectrum-Form-itemField">
+        {#if !fieldState}
+          <Placeholder />
+        {:else if schemaType && schemaType !== type && !["options", "longform"].includes(type)}
+          <Placeholder
+            text="This Field setting is the wrong data type for this component"
+          />
+        {:else}
+          <slot />
+          {#if fieldState.error}
+            <div class="error">
+              <Icon name="Alert" />
+              <span>{fieldState.error}</span>
+            </div>
+          {:else if helpText}
+            <div class="helpText">
+              <Icon name="HelpOutline" /> <span>{helpText}</span>
+            </div>
+          {/if}
+        {/if}
+      </div>
+    </div>
+  {/if}
+</Provider>
 
 <style>
   :global(.form-block .spectrum-Form-item.span-2) {
diff --git a/packages/client/src/components/app/forms/Form.svelte b/packages/client/src/components/app/forms/Form.svelte
index f470297d78..dec779503f 100644
--- a/packages/client/src/components/app/forms/Form.svelte
+++ b/packages/client/src/components/app/forms/Form.svelte
@@ -5,7 +5,6 @@
   import { writable } from "svelte/store"
 
   export let dataSource
-  export let theme
   export let size
   export let disabled = false
   export let readonly = false
@@ -113,11 +112,9 @@
   {#key resetKey}
     <InnerForm
       {dataSource}
-      {theme}
       {size}
       {disabled}
       {readonly}
-      {actionType}
       {schema}
       {definition}
       {initialValues}
diff --git a/packages/client/src/components/app/forms/InnerForm.svelte b/packages/client/src/components/app/forms/InnerForm.svelte
index 91a444aa6a..fcf5379713 100644
--- a/packages/client/src/components/app/forms/InnerForm.svelte
+++ b/packages/client/src/components/app/forms/InnerForm.svelte
@@ -14,6 +14,10 @@
   export let disableSchemaValidation = false
   export let editAutoColumns = false
 
+  // For internal use only, to disable context when being used with standalone
+  // fields
+  export let provideContext = true
+
   // We export this store so that when we remount the inner form we can still
   // persist what step we're on
   export let currentStep
@@ -442,8 +446,14 @@
   ]
 </script>
 
-<Provider {actions} data={dataContext}>
+{#if provideContext}
+  <Provider {actions} data={dataContext}>
+    <div use:styleable={$component.styles} class={size}>
+      <slot />
+    </div>
+  </Provider>
+{:else}
   <div use:styleable={$component.styles} class={size}>
     <slot />
   </div>
-</Provider>
+{/if}
diff --git a/packages/client/src/components/app/forms/S3Upload.svelte b/packages/client/src/components/app/forms/S3Upload.svelte
index 0147cbca6e..7ac0532dca 100644
--- a/packages/client/src/components/app/forms/S3Upload.svelte
+++ b/packages/client/src/components/app/forms/S3Upload.svelte
@@ -2,6 +2,8 @@
   import Field from "./Field.svelte"
   import { CoreDropzone, ProgressCircle, Helpers } from "@budibase/bbui"
   import { getContext, onMount, onDestroy } from "svelte"
+  import { builderStore } from "stores/builder.js"
+  import { processStringSync } from "@budibase/string-templates"
 
   export let datasourceId
   export let bucket
@@ -12,6 +14,8 @@
   export let validation
   export let onChange
 
+  const context = getContext("context")
+
   let fieldState
   let fieldApi
   let localFiles = []
@@ -42,6 +46,9 @@
   // Process the file input and return a serializable structure expected by
   // the dropzone component to display the file
   const processFiles = async fileList => {
+    if ($builderStore.inBuilder) {
+      return []
+    }
     return await new Promise(resolve => {
       if (!fileList?.length) {
         return []
@@ -78,14 +85,15 @@
   }
 
   const upload = async () => {
+    const processedFileKey = processStringSync(key, $context)
     loading = true
     try {
-      const res = await API.externalUpload({
+      const res = await API.externalUpload(
         datasourceId,
         bucket,
-        key,
-        data,
-      })
+        processedFileKey,
+        data
+      )
       notificationStore.actions.success("File uploaded successfully")
       loading = false
       return res
@@ -131,7 +139,7 @@
   bind:fieldApi
   defaultValue={[]}
 >
-  <div class="content">
+  <div class="content" class:builder={$builderStore.inBuilder}>
     {#if fieldState}
       <CoreDropzone
         value={localFiles}
@@ -154,6 +162,9 @@
 </Field>
 
 <style>
+  .content.builder :global(.spectrum-Dropzone) {
+    pointer-events: none;
+  }
   .content {
     position: relative;
   }
diff --git a/packages/client/src/components/app/forms/SignatureField.svelte b/packages/client/src/components/app/forms/SignatureField.svelte
index bdae148368..a7a7dc3206 100644
--- a/packages/client/src/components/app/forms/SignatureField.svelte
+++ b/packages/client/src/components/app/forms/SignatureField.svelte
@@ -31,10 +31,10 @@
         let attachRequest = new FormData()
         attachRequest.append("file", signatureFile)
 
-        const resp = await API.uploadAttachment({
-          data: attachRequest,
-          tableId: formContext?.dataSource?.tableId,
-        })
+        const resp = await API.uploadAttachment(
+          formContext?.dataSource?.tableId,
+          attachRequest
+        )
         const [signatureAttachment] = resp
         updateValue = signatureAttachment
       } else {
diff --git a/packages/client/src/components/error-states/ComponentErrorState.svelte b/packages/client/src/components/error-states/ComponentErrorState.svelte
index ec7c5169b0..7069b7a431 100644
--- a/packages/client/src/components/error-states/ComponentErrorState.svelte
+++ b/packages/client/src/components/error-states/ComponentErrorState.svelte
@@ -1,11 +1,14 @@
-<script>
+<script lang="ts">
   import { getContext } from "svelte"
   import { Icon } from "@budibase/bbui"
   import MissingRequiredSetting from "./MissingRequiredSetting.svelte"
   import MissingRequiredAncestor from "./MissingRequiredAncestor.svelte"
 
-  export let missingRequiredSettings
-  export let missingRequiredAncestors
+  export let missingRequiredSettings:
+    | { key: string; label: string }[]
+    | undefined
+  export let missingRequiredAncestors: string[] | undefined
+  export let componentErrors: string[] | undefined
 
   const component = getContext("component")
   const { styleable, builderStore } = getContext("sdk")
@@ -13,6 +16,7 @@
   $: styles = { ...$component.styles, normal: {}, custom: null, empty: true }
   $: requiredSetting = missingRequiredSettings?.[0]
   $: requiredAncestor = missingRequiredAncestors?.[0]
+  $: errorMessage = componentErrors?.[0]
 </script>
 
 {#if $builderStore.inBuilder}
@@ -21,6 +25,8 @@
       <Icon name="Alert" color="var(--spectrum-global-color-static-red-600)" />
       {#if requiredAncestor}
         <MissingRequiredAncestor {requiredAncestor} />
+      {:else if errorMessage}
+        {errorMessage}
       {:else if requiredSetting}
         <MissingRequiredSetting {requiredSetting} />
       {/if}
@@ -32,7 +38,7 @@
   .component-placeholder {
     display: flex;
     flex-direction: row;
-    justify-content: flex-start;
+    justify-content: center;
     align-items: center;
     color: var(--spectrum-global-color-gray-600);
     font-size: var(--font-size-s);
diff --git a/packages/client/src/components/preview/SettingsBar.svelte b/packages/client/src/components/preview/SettingsBar.svelte
index ec861ab5b4..9dae1dcb22 100644
--- a/packages/client/src/components/preview/SettingsBar.svelte
+++ b/packages/client/src/components/preview/SettingsBar.svelte
@@ -273,6 +273,7 @@
               value={option.value}
               icon={option.barIcon}
               title={option.barTitle || option.label}
+              disabled={!!setting.license}
               {component}
             />
           {/each}
@@ -281,6 +282,7 @@
             prop={setting.key}
             options={setting.options}
             label={setting.label}
+            disabled={!!setting.license}
             {component}
           />
         {/if}
@@ -289,11 +291,16 @@
           prop={setting.key}
           icon={setting.barIcon}
           title={setting.barTitle || setting.label}
+          disabled={!!setting.license}
           bool
           {component}
         />
       {:else if setting.type === "color"}
-        <SettingsColorPicker prop={setting.key} {component} />
+        <SettingsColorPicker
+          prop={setting.key}
+          {component}
+          disabled={!!setting.license}
+        />
       {/if}
       {#if setting.barSeparator !== false && (settings.length != idx + 1 || !isRoot)}
         <div class="divider" />
diff --git a/packages/client/src/components/preview/SettingsButton.svelte b/packages/client/src/components/preview/SettingsButton.svelte
index a93ffb77af..16a4fe23d0 100644
--- a/packages/client/src/components/preview/SettingsButton.svelte
+++ b/packages/client/src/components/preview/SettingsButton.svelte
@@ -10,6 +10,7 @@
   export let bool = false
   export let active = false
   export let component
+  export let disabled = false
 
   const dispatch = createEventDispatcher()
 
@@ -22,6 +23,7 @@
 <div
   {title}
   class:active
+  class:disabled
   on:click={() => {
     if (prop) {
       const newValue = bool ? !currentValue : value
@@ -50,4 +52,8 @@
     background-color: rgba(13, 102, 208, 0.1);
     color: var(--spectrum-global-color-blue-600);
   }
+  .disabled {
+    pointer-events: none;
+    color: var(--spectrum-global-color-gray-400);
+  }
 </style>
diff --git a/packages/client/src/components/preview/SettingsColorPicker.svelte b/packages/client/src/components/preview/SettingsColorPicker.svelte
index a292d7d838..aa4b3cb1d1 100644
--- a/packages/client/src/components/preview/SettingsColorPicker.svelte
+++ b/packages/client/src/components/preview/SettingsColorPicker.svelte
@@ -4,14 +4,15 @@
 
   export let prop
   export let component
+  export let disabled = false
 
   $: currentValue = component?.[prop]
 </script>
 
-<div>
+<div class:disabled>
   <ColorPicker
     size="S"
-    value={currentValue}
+    value={disabled ? null : currentValue}
     on:change={e => {
       if (prop) {
         builderStore.actions.updateProp(prop, e.detail)
@@ -24,4 +25,7 @@
   div {
     padding: 0 4px;
   }
+  div.disabled {
+    pointer-events: none;
+  }
 </style>
diff --git a/packages/client/src/components/preview/SettingsPicker.svelte b/packages/client/src/components/preview/SettingsPicker.svelte
index 3900d065e8..6b354f8d65 100644
--- a/packages/client/src/components/preview/SettingsPicker.svelte
+++ b/packages/client/src/components/preview/SettingsPicker.svelte
@@ -6,6 +6,7 @@
   export let options
   export let label
   export let component
+  export let disabled = false
 
   $: currentValue = component?.[prop]
 </script>
@@ -16,6 +17,7 @@
     autoWidth
     placeholder={label}
     {options}
+    {disabled}
     value={currentValue}
     on:change={e => {
       if (prop) {
diff --git a/packages/client/src/constants.js b/packages/client/src/constants.ts
similarity index 100%
rename from packages/client/src/constants.js
rename to packages/client/src/constants.ts
diff --git a/packages/client/src/context.d.ts b/packages/client/src/context.d.ts
new file mode 100644
index 0000000000..994f9ef172
--- /dev/null
+++ b/packages/client/src/context.d.ts
@@ -0,0 +1,7 @@
+import { Component, Context, SDK } from "."
+
+declare module "svelte" {
+  export function getContext(key: "sdk"): SDK
+  export function getContext(key: "component"): Component
+  export function getContext(key: "context"): Context
+}
diff --git a/packages/client/src/index.d.ts b/packages/client/src/index.d.ts
new file mode 100644
index 0000000000..7e13670b33
--- /dev/null
+++ b/packages/client/src/index.d.ts
@@ -0,0 +1,5 @@
+interface Window {
+  "##BUDIBASE_APP_ID##": string
+  "##BUDIBASE_IN_BUILDER##": string
+  MIGRATING_APP: boolean
+}
diff --git a/packages/client/src/index.js b/packages/client/src/index.js
index de6d1bdc12..7cb9ed4430 100644
--- a/packages/client/src/index.js
+++ b/packages/client/src/index.js
@@ -10,7 +10,7 @@ import {
   eventStore,
   hoverStore,
 } from "./stores"
-import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-rollup.js"
+import loadSpectrumIcons from "@budibase/bbui/spectrum-icons-vite.js"
 import { get } from "svelte/store"
 import { initWebsocket } from "./websocket.js"
 
@@ -43,6 +43,7 @@ const loadBudibase = async () => {
     usedPlugins: window["##BUDIBASE_USED_PLUGINS##"],
     location: window["##BUDIBASE_LOCATION##"],
     snippets: window["##BUDIBASE_SNIPPETS##"],
+    componentErrors: window["##BUDIBASE_COMPONENT_ERRORS##"],
   })
 
   // Set app ID - this window flag is set by both the preview and the real
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
new file mode 100644
index 0000000000..2a435c2f8c
--- /dev/null
+++ b/packages/client/src/index.ts
@@ -0,0 +1,23 @@
+import { APIClient } from "@budibase/frontend-core"
+import type { ActionTypes } from "./constants"
+import { Readable } from "svelte/store"
+
+export interface SDK {
+  API: APIClient
+  styleable: any
+  Provider: any
+  ActionTypes: typeof ActionTypes
+  fetchDatasourceSchema: any
+  generateGoldenSample: any
+  builderStore: Readable<{
+    inBuilder: boolean
+  }>
+}
+
+export type Component = Readable<{
+  id: string
+  styles: any
+  errorState: boolean
+}>
+
+export type Context = Readable<{}>
diff --git a/packages/client/src/sdk.js b/packages/client/src/sdk.js
index bd51924bf4..c641d339d5 100644
--- a/packages/client/src/sdk.js
+++ b/packages/client/src/sdk.js
@@ -29,7 +29,7 @@ import { ActionTypes } from "./constants"
 import {
   fetchDatasourceSchema,
   fetchDatasourceDefinition,
-} from "./utils/schema.js"
+} from "./utils/schema"
 import { getAPIKey } from "./utils/api.js"
 import { enrichButtonActions } from "./utils/buttonActions.js"
 import { processStringSync, makePropSafe } from "@budibase/string-templates"
@@ -41,6 +41,7 @@ import {
   memo,
   derivedMemo,
 } from "@budibase/frontend-core"
+import { createValidatorFromConstraints } from "components/app/forms/validation"
 
 export default {
   API,
@@ -73,6 +74,7 @@ export default {
   fetchData,
   QueryUtils,
   ContextScopes: Constants.ContextScopes,
+  // This is not used internally but exposed to users to be used in plugins
   getAPIKey,
   enrichButtonActions,
   processStringSync,
@@ -81,6 +83,7 @@ export default {
   generateGoldenSample: RowUtils.generateGoldenSample,
   memo,
   derivedMemo,
+  createValidatorFromConstraints,
 
   // Components
   Provider,
diff --git a/packages/client/src/stores/auth.js b/packages/client/src/stores/auth.ts
similarity index 94%
rename from packages/client/src/stores/auth.js
rename to packages/client/src/stores/auth.ts
index 214cc7bce2..15f44e7c32 100644
--- a/packages/client/src/stores/auth.js
+++ b/packages/client/src/stores/auth.ts
@@ -2,7 +2,9 @@ import { API } from "api"
 import { writable } from "svelte/store"
 
 const createAuthStore = () => {
-  const store = writable(null)
+  const store = writable<{
+    csrfToken?: string
+  } | null>(null)
 
   // Fetches the user object if someone is logged in and has reloaded the page
   const fetchUser = async () => {
diff --git a/packages/client/src/stores/builder.js b/packages/client/src/stores/builder.js
index faa37eddca..1ae7d3a670 100644
--- a/packages/client/src/stores/builder.js
+++ b/packages/client/src/stores/builder.js
@@ -19,6 +19,7 @@ const createBuilderStore = () => {
     eventResolvers: {},
     metadata: null,
     snippets: null,
+    componentErrors: {},
 
     // Legacy - allow the builder to specify a layout
     layout: null,
diff --git a/packages/client/src/stores/components.js b/packages/client/src/stores/components.js
index d4afa6c7f1..48ade99321 100644
--- a/packages/client/src/stores/components.js
+++ b/packages/client/src/stores/components.js
@@ -6,7 +6,7 @@ import { screenStore } from "./screens"
 import { builderStore } from "./builder"
 import Router from "../components/Router.svelte"
 import * as AppComponents from "../components/app/index.js"
-import { ScreenslotType } from "../constants.js"
+import { ScreenslotType } from "../constants"
 
 export const BudibasePrefix = "@budibase/standard-components/"
 
diff --git a/packages/client/src/stores/derived/currentRole.js b/packages/client/src/stores/derived/currentRole.js
index 8bb4c5a25d..056a05f8ab 100644
--- a/packages/client/src/stores/derived/currentRole.js
+++ b/packages/client/src/stores/derived/currentRole.js
@@ -1,7 +1,7 @@
 import { derived } from "svelte/store"
 import { Constants } from "@budibase/frontend-core"
 import { devToolsStore } from "../devTools.js"
-import { authStore } from "../auth.js"
+import { authStore } from "../auth"
 import { devToolsEnabled } from "./devToolsEnabled.js"
 
 // Derive the current role of the logged-in user
diff --git a/packages/client/src/stores/notification.js b/packages/client/src/stores/notification.ts
similarity index 80%
rename from packages/client/src/stores/notification.js
rename to packages/client/src/stores/notification.ts
index 054117aaba..fa28b9f40a 100644
--- a/packages/client/src/stores/notification.js
+++ b/packages/client/src/stores/notification.ts
@@ -6,7 +6,7 @@ const DEFAULT_NOTIFICATION_TIMEOUT = 3000
 const createNotificationStore = () => {
   let block = false
 
-  const store = writable([])
+  const store = writable<{ id: string; message: string; count: number }[]>([])
 
   const blockNotifications = (timeout = 1000) => {
     block = true
@@ -14,11 +14,11 @@ const createNotificationStore = () => {
   }
 
   const send = (
-    message,
+    message: string,
     type = "info",
-    icon,
+    icon: string,
     autoDismiss = true,
-    duration,
+    duration?: number,
     count = 1
   ) => {
     if (block) {
@@ -66,7 +66,7 @@ const createNotificationStore = () => {
     }
   }
 
-  const dismiss = id => {
+  const dismiss = (id: string) => {
     store.update(state => {
       return state.filter(n => n.id !== id)
     })
@@ -76,13 +76,13 @@ const createNotificationStore = () => {
     subscribe: store.subscribe,
     actions: {
       send,
-      info: (msg, autoDismiss, duration) =>
+      info: (msg: string, autoDismiss?: boolean, duration?: number) =>
         send(msg, "info", "Info", autoDismiss ?? true, duration),
-      success: (msg, autoDismiss, duration) =>
+      success: (msg: string, autoDismiss?: boolean, duration?: number) =>
         send(msg, "success", "CheckmarkCircle", autoDismiss ?? true, duration),
-      warning: (msg, autoDismiss, duration) =>
+      warning: (msg: string, autoDismiss?: boolean, duration?: number) =>
         send(msg, "warning", "Alert", autoDismiss ?? true, duration),
-      error: (msg, autoDismiss, duration) =>
+      error: (msg: string, autoDismiss?: boolean, duration?: number) =>
         send(msg, "error", "Alert", autoDismiss ?? false, duration),
       blockNotifications,
       dismiss,
diff --git a/packages/client/src/stores/routes.js b/packages/client/src/stores/routes.ts
similarity index 82%
rename from packages/client/src/stores/routes.js
rename to packages/client/src/stores/routes.ts
index 8e318af2e3..3f200a9c88 100644
--- a/packages/client/src/stores/routes.js
+++ b/packages/client/src/stores/routes.ts
@@ -4,8 +4,24 @@ import { API } from "api"
 import { peekStore } from "./peek"
 import { builderStore } from "./builder"
 
+interface Route {
+  path: string
+  screenId: string
+}
+
+interface StoreType {
+  routes: Route[]
+  routeParams: {}
+  activeRoute?: Route | null
+  routeSessionId: number
+  routerLoaded: boolean
+  queryParams?: {
+    peek?: boolean
+  }
+}
+
 const createRouteStore = () => {
-  const initialState = {
+  const initialState: StoreType = {
     routes: [],
     routeParams: {},
     activeRoute: null,
@@ -22,7 +38,7 @@ const createRouteStore = () => {
     } catch (error) {
       routeConfig = null
     }
-    let routes = []
+    const routes: Route[] = []
     Object.values(routeConfig?.routes || {}).forEach(route => {
       Object.entries(route.subpaths || {}).forEach(([path, config]) => {
         routes.push({
@@ -43,13 +59,13 @@ const createRouteStore = () => {
       return state
     })
   }
-  const setRouteParams = routeParams => {
+  const setRouteParams = (routeParams: StoreType["routeParams"]) => {
     store.update(state => {
       state.routeParams = routeParams
       return state
     })
   }
-  const setQueryParams = queryParams => {
+  const setQueryParams = (queryParams: { peek?: boolean }) => {
     store.update(state => {
       state.queryParams = {
         ...queryParams,
@@ -60,13 +76,13 @@ const createRouteStore = () => {
       return state
     })
   }
-  const setActiveRoute = route => {
+  const setActiveRoute = (route: string) => {
     store.update(state => {
       state.activeRoute = state.routes.find(x => x.path === route)
       return state
     })
   }
-  const navigate = (url, peek, externalNewTab) => {
+  const navigate = (url: string, peek: boolean, externalNewTab: boolean) => {
     if (get(builderStore).inBuilder) {
       return
     }
@@ -93,7 +109,7 @@ const createRouteStore = () => {
   const setRouterLoaded = () => {
     store.update(state => ({ ...state, routerLoaded: true }))
   }
-  const createFullURL = relativeURL => {
+  const createFullURL = (relativeURL: string) => {
     if (!relativeURL?.startsWith("/")) {
       return relativeURL
     }
diff --git a/packages/client/src/stores/screens.js b/packages/client/src/stores/screens.js
index bc87216660..491d8d4236 100644
--- a/packages/client/src/stores/screens.js
+++ b/packages/client/src/stores/screens.js
@@ -42,6 +42,14 @@ const createScreenStore = () => {
         if ($builderStore.layout) {
           activeLayout = $builderStore.layout
         }
+
+        // Attach meta
+        const errors = $builderStore.componentErrors || {}
+        const attachComponentMeta = component => {
+          component._meta = { errors: errors[component._id] || [] }
+          component._children?.forEach(attachComponentMeta)
+        }
+        attachComponentMeta(activeScreen.props)
       } else {
         // Find the correct screen by matching the current route
         screens = $appStore.screens || []
diff --git a/packages/client/src/stores/theme.js b/packages/client/src/stores/theme.js
index 523d34cdc5..5171449a91 100644
--- a/packages/client/src/stores/theme.js
+++ b/packages/client/src/stores/theme.js
@@ -1,3 +1,4 @@
+/* eslint-disable no-useless-concat */
 import { derived } from "svelte/store"
 import { appStore } from "./app"
 import { builderStore } from "./builder"
diff --git a/packages/client/src/utils/blocks.js b/packages/client/src/utils/blocks.ts
similarity index 82%
rename from packages/client/src/utils/blocks.js
rename to packages/client/src/utils/blocks.ts
index f9452e47a9..ddde6bdd77 100644
--- a/packages/client/src/utils/blocks.js
+++ b/packages/client/src/utils/blocks.ts
@@ -1,10 +1,16 @@
 import { makePropSafe as safe } from "@budibase/string-templates"
-import { API } from "../api/index.js"
-import { UILogicalOperator } from "@budibase/types"
-import { OnEmptyFilter } from "@budibase/frontend-core/src/constants.js"
+import { API } from "../api"
+import {
+  BasicOperator,
+  LegacyFilter,
+  UIColumn,
+  UILogicalOperator,
+  UISearchFilter,
+} from "@budibase/types"
+import { Constants } from "@budibase/frontend-core"
 
 // Map of data types to component types for search fields inside blocks
-const schemaComponentMap = {
+const schemaComponentMap: Record<string, string> = {
   string: "stringfield",
   options: "optionsfield",
   number: "numberfield",
@@ -19,7 +25,16 @@ const schemaComponentMap = {
  * @param searchColumns the search columns to use
  * @param schema the datasource schema
  */
-export const enrichSearchColumns = async (searchColumns, schema) => {
+export const enrichSearchColumns = async (
+  searchColumns: string[],
+  schema: Record<
+    string,
+    {
+      tableId: string
+      type: string
+    }
+  >
+) => {
   if (!searchColumns?.length || !schema) {
     return []
   }
@@ -61,12 +76,16 @@ export const enrichSearchColumns = async (searchColumns, schema) => {
  * @param columns the enriched search column structure
  * @param formId the ID of the form containing the search fields
  */
-export const enrichFilter = (filter, columns, formId) => {
+export const enrichFilter = (
+  filter: UISearchFilter,
+  columns: UIColumn[],
+  formId: string
+) => {
   if (!columns?.length) {
     return filter
   }
 
-  let newFilters = []
+  const newFilters: LegacyFilter[] = []
   columns?.forEach(column => {
     const safePath = column.name.split(".").map(safe).join(".")
     const stringType = column.type === "string" || column.type === "formula"
@@ -99,7 +118,7 @@ export const enrichFilter = (filter, columns, formId) => {
       newFilters.push({
         field: column.name,
         type: column.type,
-        operator: stringType ? "string" : "equal",
+        operator: stringType ? BasicOperator.STRING : BasicOperator.EQUAL,
         valueType: "Binding",
         value: `{{ ${binding} }}`,
       })
@@ -108,7 +127,7 @@ export const enrichFilter = (filter, columns, formId) => {
 
   return {
     logicalOperator: UILogicalOperator.ALL,
-    onEmptyFilter: OnEmptyFilter.RETURN_ALL,
+    onEmptyFilter: Constants.OnEmptyFilter.RETURN_ALL,
     groups: [
       ...(filter?.groups || []),
       {
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index e2b0071042..16dc3c97e7 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -147,7 +147,7 @@ const fetchRowHandler = async action => {
 
   if (tableId && rowId) {
     try {
-      const row = await API.fetchRow({ tableId, rowId })
+      const row = await API.fetchRow(tableId, rowId)
 
       return { row }
     } catch (error) {
@@ -192,7 +192,7 @@ const deleteRowHandler = async action => {
         return false
       }
 
-      const resp = await API.deleteRows({ tableId, rows: requestConfig })
+      const resp = await API.deleteRows(tableId, requestConfig)
 
       if (!notificationOverride) {
         notificationStore.actions.success(
@@ -216,11 +216,11 @@ const deleteRowHandler = async action => {
 const triggerAutomationHandler = async action => {
   const { fields, notificationOverride, timeout } = action.parameters
   try {
-    const result = await API.triggerAutomation({
-      automationId: action.parameters.automationId,
+    const result = await API.triggerAutomation(
+      action.parameters.automationId,
       fields,
-      timeout,
-    })
+      timeout
+    )
 
     // Value will exist if automation is synchronous, so return it.
     if (result.value) {
@@ -251,17 +251,14 @@ const navigationHandler = action => {
 }
 
 const queryExecutionHandler = async action => {
-  const { datasourceId, queryId, queryParams, notificationOverride } =
-    action.parameters
+  const { queryId, queryParams, notificationOverride } = action.parameters
   try {
     const query = await API.fetchQueryDefinition(queryId)
     if (query?.datasourceId == null) {
       notificationStore.actions.error("That query couldn't be found")
       return false
     }
-    const result = await API.executeQuery({
-      datasourceId,
-      queryId,
+    const result = await API.executeQuery(queryId, {
       parameters: queryParams,
     })
 
@@ -381,10 +378,8 @@ const exportDataHandler = async action => {
       if (typeof rows[0] !== "string") {
         rows = rows.map(row => row._id)
       }
-      const data = await API.exportRows({
-        tableId,
+      const data = await API.exportRows(tableId, type, {
         rows,
-        format: type,
         columns: columns?.map(column => column.name || column),
         delimiter,
         customHeaders,
@@ -454,12 +449,7 @@ const downloadFileHandler = async action => {
     const { type } = action.parameters
     if (type === "attachment") {
       const { tableId, rowId, attachmentColumn } = action.parameters
-      const res = await API.downloadAttachment(
-        tableId,
-        rowId,
-        attachmentColumn,
-        { suppressErrors: true }
-      )
+      const res = await API.downloadAttachment(tableId, rowId, attachmentColumn)
       await downloadStream(res)
       return
     }
@@ -495,11 +485,7 @@ const downloadFileHandler = async action => {
 
 const rowActionHandler = async action => {
   const { resourceId, rowId, rowActionId } = action.parameters
-  await API.rowActions.trigger({
-    rowActionId,
-    sourceId: resourceId,
-    rowId,
-  })
+  await API.rowActions.trigger(resourceId, rowActionId, rowId)
   // Refresh related datasources
   await dataSourceStore.actions.invalidateDataSource(resourceId, {
     invalidateRelationships: true,
diff --git a/packages/client/src/utils/grid.js b/packages/client/src/utils/grid.ts
similarity index 81%
rename from packages/client/src/utils/grid.js
rename to packages/client/src/utils/grid.ts
index 142a7ed55a..69797e9120 100644
--- a/packages/client/src/utils/grid.js
+++ b/packages/client/src/utils/grid.ts
@@ -1,7 +1,27 @@
-import { GridSpacing, GridRowHeight } from "constants"
+import { GridSpacing, GridRowHeight } from "@/constants"
 import { builderStore } from "stores"
 import { buildStyleString } from "utils/styleable.js"
 
+interface GridMetadata {
+  id: string
+  styles: Record<string, string | number> & {
+    "--default-width"?: number
+    "--default-height"?: number
+  }
+  interactive: boolean
+  errored: boolean
+  definition?: {
+    size?: {
+      width: number
+      height: number
+    }
+    grid?: { hAlign: string; vAlign: string }
+  }
+  draggable: boolean
+  insideGrid: boolean
+  ignoresLayout: boolean
+}
+
 /**
  * We use CSS variables on components to control positioning and layout of
  * components inside grids.
@@ -44,14 +64,17 @@ export const GridDragModes = {
 }
 
 // Builds a CSS variable name for a certain piece of grid metadata
-export const getGridVar = (device, param) => `--grid-${device}-${param}`
+export const getGridVar = (device: string, param: string) =>
+  `--grid-${device}-${param}`
 
 // Determines whether a JS event originated from immediately within a grid
-export const isGridEvent = e => {
+export const isGridEvent = (e: Event & { target: HTMLElement }): boolean => {
   return (
     e.target.dataset?.indicator === "true" ||
+    // @ts-expect-error: api is not properly typed
     e.target
       .closest?.(".component")
+      // @ts-expect-error
       ?.parentNode.closest(".component")
       ?.childNodes[0]?.classList?.contains("grid")
   )
@@ -59,11 +82,11 @@ export const isGridEvent = e => {
 
 // Svelte action to apply required class names and styles to our component
 // wrappers
-export const gridLayout = (node, metadata) => {
-  let selectComponent
+export const gridLayout = (node: HTMLDivElement, metadata: GridMetadata) => {
+  let selectComponent: ((e: Event) => void) | null
 
   // Applies the required listeners, CSS and classes to a component DOM node
-  const applyMetadata = metadata => {
+  const applyMetadata = (metadata: GridMetadata) => {
     const {
       id,
       styles,
@@ -86,7 +109,7 @@ export const gridLayout = (node, metadata) => {
     }
 
     // Callback to select the component when clicking on the wrapper
-    selectComponent = e => {
+    selectComponent = (e: Event) => {
       e.stopPropagation()
       builderStore.actions.selectComponent(id)
     }
@@ -100,7 +123,7 @@ export const gridLayout = (node, metadata) => {
     }
     width += 2 * GridSpacing
     height += 2 * GridSpacing
-    let vars = {
+    const vars: Record<string, string | number> = {
       "--default-width": width,
       "--default-height": height,
     }
@@ -135,7 +158,7 @@ export const gridLayout = (node, metadata) => {
     }
 
     // Apply some metadata to data attributes to speed up lookups
-    const addDataTag = (tagName, device, param) => {
+    const addDataTag = (tagName: string, device: string, param: string) => {
       const val = `${vars[getGridVar(device, param)]}`
       if (node.dataset[tagName] !== val) {
         node.dataset[tagName] = val
@@ -147,11 +170,12 @@ export const gridLayout = (node, metadata) => {
     addDataTag("gridMobileHAlign", Devices.Mobile, GridParams.HAlign)
     addDataTag("gridDesktopVAlign", Devices.Desktop, GridParams.VAlign)
     addDataTag("gridMobileVAlign", Devices.Mobile, GridParams.VAlign)
-    if (node.dataset.insideGrid !== true) {
-      node.dataset.insideGrid = true
+    if (node.dataset.insideGrid !== "true") {
+      node.dataset.insideGrid = "true"
     }
 
     // Apply all CSS variables to the wrapper
+    // @ts-expect-error TODO
     node.style = buildStyleString(vars)
 
     // Add a listener to select this node on click
@@ -160,7 +184,7 @@ export const gridLayout = (node, metadata) => {
     }
 
     // Add draggable attribute
-    node.setAttribute("draggable", !!draggable)
+    node.setAttribute("draggable", (!!draggable).toString())
   }
 
   // Removes the previously set up listeners
@@ -176,7 +200,7 @@ export const gridLayout = (node, metadata) => {
   applyMetadata(metadata)
 
   return {
-    update(newMetadata) {
+    update(newMetadata: GridMetadata) {
       removeListeners()
       applyMetadata(newMetadata)
     },
diff --git a/packages/client/src/utils/linkable.js b/packages/client/src/utils/linkable.ts
similarity index 61%
rename from packages/client/src/utils/linkable.js
rename to packages/client/src/utils/linkable.ts
index d82a53474b..2b6cd0ebfd 100644
--- a/packages/client/src/utils/linkable.js
+++ b/packages/client/src/utils/linkable.ts
@@ -1,8 +1,8 @@
 import { get } from "svelte/store"
-import { link } from "svelte-spa-router"
+import { link, LinkActionOpts } from "svelte-spa-router"
 import { builderStore } from "stores"
 
-export const linkable = (node, href) => {
+export const linkable = (node: HTMLElement, href?: LinkActionOpts) => {
   if (get(builderStore).inBuilder) {
     node.onclick = e => {
       e.preventDefault()
diff --git a/packages/client/src/utils/schema.js b/packages/client/src/utils/schema.ts
similarity index 53%
rename from packages/client/src/utils/schema.js
rename to packages/client/src/utils/schema.ts
index ec1cef53ce..9ea868751d 100644
--- a/packages/client/src/utils/schema.js
+++ b/packages/client/src/utils/schema.ts
@@ -1,13 +1,6 @@
 import { API } from "api"
-import TableFetch from "@budibase/frontend-core/src/fetch/TableFetch.js"
-import ViewFetch from "@budibase/frontend-core/src/fetch/ViewFetch.js"
-import QueryFetch from "@budibase/frontend-core/src/fetch/QueryFetch.js"
-import RelationshipFetch from "@budibase/frontend-core/src/fetch/RelationshipFetch.js"
-import NestedProviderFetch from "@budibase/frontend-core/src/fetch/NestedProviderFetch.js"
-import FieldFetch from "@budibase/frontend-core/src/fetch/FieldFetch.js"
-import JSONArrayFetch from "@budibase/frontend-core/src/fetch/JSONArrayFetch.js"
-import ViewV2Fetch from "@budibase/frontend-core/src/fetch/ViewV2Fetch.js"
-import QueryArrayFetch from "@budibase/frontend-core/src/fetch/QueryArrayFetch"
+import { DataFetchMap, DataFetchType } from "@budibase/frontend-core"
+import { FieldType, TableSchema } from "@budibase/types"
 
 /**
  * Constructs a fetch instance for a given datasource.
@@ -16,22 +9,20 @@ import QueryArrayFetch from "@budibase/frontend-core/src/fetch/QueryArrayFetch"
  * @param datasource the datasource
  * @returns
  */
-const getDatasourceFetchInstance = datasource => {
-  const handler = {
-    table: TableFetch,
-    view: ViewFetch,
-    viewV2: ViewV2Fetch,
-    query: QueryFetch,
-    link: RelationshipFetch,
-    provider: NestedProviderFetch,
-    field: FieldFetch,
-    jsonarray: JSONArrayFetch,
-    queryarray: QueryArrayFetch,
-  }[datasource?.type]
+const getDatasourceFetchInstance = <
+  TDatasource extends { type: DataFetchType }
+>(
+  datasource: TDatasource
+) => {
+  const handler = DataFetchMap[datasource?.type]
   if (!handler) {
     return null
   }
-  return new handler({ API })
+  return new handler({
+    API,
+    datasource: datasource as never,
+    query: null as any,
+  })
 }
 
 /**
@@ -39,25 +30,27 @@ const getDatasourceFetchInstance = datasource => {
  * @param datasource the datasource to fetch the schema for
  * @param options options for enriching the schema
  */
-export const fetchDatasourceSchema = async (
-  datasource,
+export const fetchDatasourceSchema = async <
+  TDatasource extends { type: DataFetchType }
+>(
+  datasource: TDatasource,
   options = { enrichRelationships: false, formSchema: false }
 ) => {
   const instance = getDatasourceFetchInstance(datasource)
-  const definition = await instance?.getDefinition(datasource)
-  if (!definition) {
+  const definition = await instance?.getDefinition()
+  if (!instance || !definition) {
     return null
   }
 
   // Get the normal schema as long as we aren't wanting a form schema
-  let schema
+  let schema: TableSchema | undefined
   if (datasource?.type !== "query" || !options?.formSchema) {
-    schema = instance.getSchema(datasource, definition)
-  } else if (definition.parameters?.length) {
+    schema = instance.getSchema(definition as any) as TableSchema
+  } else if ("parameters" in definition && definition.parameters?.length) {
     schema = {}
-    definition.parameters.forEach(param => {
-      schema[param.name] = { ...param, type: "string" }
-    })
+    for (const param of definition.parameters) {
+      schema[param.name] = { ...param, type: FieldType.STRING }
+    }
   }
   if (!schema) {
     return null
@@ -65,15 +58,20 @@ export const fetchDatasourceSchema = async (
 
   // Strip hidden fields from views
   if (datasource.type === "viewV2") {
-    Object.keys(schema).forEach(field => {
+    for (const field of Object.keys(schema)) {
       if (!schema[field].visible) {
         delete schema[field]
       }
-    })
+    }
   }
 
   // Enrich schema with relationships if required
-  if (definition?.sql && options?.enrichRelationships) {
+  if (
+    definition &&
+    "sql" in definition &&
+    definition.sql &&
+    options?.enrichRelationships
+  ) {
     const relationshipAdditions = await getRelationshipSchemaAdditions(schema)
     schema = {
       ...schema,
@@ -89,20 +87,26 @@ export const fetchDatasourceSchema = async (
  * Fetches the definition of any kind of datasource.
  * @param datasource the datasource to fetch the schema for
  */
-export const fetchDatasourceDefinition = async datasource => {
+export const fetchDatasourceDefinition = async <
+  TDatasource extends { type: DataFetchType }
+>(
+  datasource: TDatasource
+) => {
   const instance = getDatasourceFetchInstance(datasource)
-  return await instance?.getDefinition(datasource)
+  return await instance?.getDefinition()
 }
 
 /**
  * Fetches the schema of relationship fields for a SQL table schema
  * @param schema the schema to enrich
  */
-export const getRelationshipSchemaAdditions = async schema => {
+export const getRelationshipSchemaAdditions = async (
+  schema: Record<string, any>
+) => {
   if (!schema) {
     return null
   }
-  let relationshipAdditions = {}
+  let relationshipAdditions: Record<string, any> = {}
   for (let fieldKey of Object.keys(schema)) {
     const fieldSchema = schema[fieldKey]
     if (fieldSchema?.type === "link") {
@@ -110,7 +114,10 @@ export const getRelationshipSchemaAdditions = async schema => {
         type: "table",
         tableId: fieldSchema?.tableId,
       })
-      Object.keys(linkSchema || {}).forEach(linkKey => {
+      if (!linkSchema) {
+        continue
+      }
+      Object.keys(linkSchema).forEach(linkKey => {
         relationshipAdditions[`${fieldKey}.${linkKey}`] = {
           type: linkSchema[linkKey].type,
           externalType: linkSchema[linkKey].externalType,
diff --git a/packages/client/svelte.config.mjs b/packages/client/svelte.config.mjs
new file mode 100644
index 0000000000..af7d74ea4b
--- /dev/null
+++ b/packages/client/svelte.config.mjs
@@ -0,0 +1,7 @@
+import { vitePreprocess } from "@sveltejs/vite-plugin-svelte"
+
+const config = {
+  preprocess: vitePreprocess(),
+}
+
+export default config
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
index 81f1657f48..ab07343525 100644
--- a/packages/client/tsconfig.json
+++ b/packages/client/tsconfig.json
@@ -3,6 +3,10 @@
     "allowJs": true,
     "strict": true,
     "outDir": "dist",
+    "allowSyntheticDefaultImports": true,
+    "target": "ESNext",
+    "moduleResolution": "bundler",
+    "resolveJsonModule": true,
     "paths": {
       "@budibase/*": [
         "../*/src/index.ts",
@@ -10,8 +14,8 @@
         "../*",
         "../../node_modules/@budibase/*"
       ],
+      "@/*": ["./src/*"],
       "*": ["./src/*"]
     }
-  },
-  "include": ["src/**/*"]
+  }
 }
diff --git a/packages/client/vite.config.mjs b/packages/client/vite.config.mjs
new file mode 100644
index 0000000000..7c163181ae
--- /dev/null
+++ b/packages/client/vite.config.mjs
@@ -0,0 +1,93 @@
+import { svelte } from "@sveltejs/vite-plugin-svelte"
+import { defineConfig } from "vite"
+import path from "path"
+import cssInjectedByJsPlugin from "vite-plugin-css-injected-by-js"
+
+const ignoredWarnings = [
+  "unused-export-let",
+  "css-unused-selector",
+  "module-script-reactive-declaration",
+  "a11y-no-onchange",
+  "a11y-click-events-have-key-events",
+]
+
+export default defineConfig(({ mode }) => {
+  const isProduction = mode === "production"
+
+  return {
+    server: {
+      open: false,
+    },
+    build: {
+      lib: {
+        entry: "src/index.js",
+        formats: ["iife"],
+        outDir: "dist",
+        name: "budibase_client",
+        fileName: () => "budibase-client.js",
+      },
+      minify: isProduction,
+    },
+    plugins: [
+      svelte({
+        emitCss: true,
+        onwarn: (warning, handler) => {
+          // Ignore some warnings
+          if (!ignoredWarnings.includes(warning.code)) {
+            handler(warning)
+          }
+        },
+      }),
+      cssInjectedByJsPlugin(),
+    ],
+    resolve: {
+      dedupe: ["svelte", "svelte/internal"],
+      alias: [
+        {
+          find: "manifest.json",
+          replacement: path.resolve("./manifest.json"),
+        },
+        {
+          find: "api",
+          replacement: path.resolve("./src/api"),
+        },
+        {
+          find: "components",
+          replacement: path.resolve("./src/components"),
+        },
+        {
+          find: "stores",
+          replacement: path.resolve("./src/stores"),
+        },
+        {
+          find: "utils",
+          replacement: path.resolve("./src/utils"),
+        },
+        {
+          find: "constants",
+          replacement: path.resolve("./src/constants"),
+        },
+        {
+          find: "@/constants",
+          replacement: path.resolve("./src/constants"),
+        },
+        {
+          find: "sdk",
+          replacement: path.resolve("./src/sdk"),
+        },
+        {
+          find: "@budibase/types",
+          replacement: path.resolve("../types/src"),
+        },
+        {
+          find: "@budibase/shared-core",
+          replacement: path.resolve("../shared-core/src"),
+        },
+        {
+          find: "@budibase/bbui",
+          replacement: path.resolve("../bbui/src"),
+        },
+      ],
+    },
+  }
+})
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 2eed29f77c..b1f311183a 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -4,14 +4,20 @@
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
-  "svelte": "src/index.js",
+  "svelte": "./src/index.ts",
+  "scripts": {
+    "check:types": "yarn svelte-check"
+  },
   "dependencies": {
-    "@budibase/bbui": "0.0.0",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@budibase/bbui": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/types": "*",
     "dayjs": "^1.10.8",
     "lodash": "4.17.21",
     "shortid": "2.2.15",
     "socket.io-client": "^4.7.5"
+  },
+  "devDependencies": {
+    "svelte-check": "^4.1.0"
   }
 }
diff --git a/packages/frontend-core/src/api/ai.js b/packages/frontend-core/src/api/ai.js
deleted file mode 100644
index 7fa756a19e..0000000000
--- a/packages/frontend-core/src/api/ai.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export const buildAIEndpoints = API => ({
-  /**
-   * Generates a cron expression from a prompt
-   */
-  generateCronExpression: async ({ prompt }) => {
-    return await API.post({
-      url: "/api/ai/cron",
-      body: { prompt },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/ai.ts b/packages/frontend-core/src/api/ai.ts
new file mode 100644
index 0000000000..3160273301
--- /dev/null
+++ b/packages/frontend-core/src/api/ai.ts
@@ -0,0 +1,17 @@
+import { BaseAPIClient } from "./types"
+
+export interface AIEndpoints {
+  generateCronExpression: (prompt: string) => Promise<{ message: string }>
+}
+
+export const buildAIEndpoints = (API: BaseAPIClient): AIEndpoints => ({
+  /**
+   * Generates a cron expression from a prompt
+   */
+  generateCronExpression: async prompt => {
+    return await API.post({
+      url: "/api/ai/cron",
+      body: { prompt },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/analytics.js b/packages/frontend-core/src/api/analytics.js
deleted file mode 100644
index df56bc938e..0000000000
--- a/packages/frontend-core/src/api/analytics.js
+++ /dev/null
@@ -1,17 +0,0 @@
-export const buildAnalyticsEndpoints = API => ({
-  /**
-   * Gets the current status of analytics for this environment
-   */
-  getAnalyticsStatus: async () => {
-    return await API.get({
-      url: "/api/bbtel",
-    })
-  },
-  analyticsPing: async ({ source, embedded }) => {
-    const timezone = Intl.DateTimeFormat().resolvedOptions().timeZone
-    return await API.post({
-      url: "/api/bbtel/ping",
-      body: { source, timezone, embedded },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/analytics.ts b/packages/frontend-core/src/api/analytics.ts
new file mode 100644
index 0000000000..b57a8e5925
--- /dev/null
+++ b/packages/frontend-core/src/api/analytics.ts
@@ -0,0 +1,39 @@
+import { BaseAPIClient } from "./types"
+import {
+  AnalyticsEnabledResponse,
+  AnalyticsPingRequest,
+  AnalyticsPingResponse,
+} from "@budibase/types"
+
+export interface AnalyticsEndpoints {
+  getAnalyticsStatus: () => Promise<AnalyticsEnabledResponse>
+  analyticsPing: (
+    payload: Omit<AnalyticsPingRequest, "timezone">
+  ) => Promise<AnalyticsPingResponse>
+}
+
+export const buildAnalyticsEndpoints = (
+  API: BaseAPIClient
+): AnalyticsEndpoints => ({
+  /**
+   * Gets the current status of analytics for this environment
+   */
+  getAnalyticsStatus: async () => {
+    return await API.get({
+      url: "/api/bbtel",
+    })
+  },
+
+  /**
+   * Notifies analytics of a certain environment
+   */
+  analyticsPing: async request => {
+    return await API.post<AnalyticsPingRequest, AnalyticsPingResponse>({
+      url: "/api/bbtel/ping",
+      body: {
+        ...request,
+        timezone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+      },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/app.js b/packages/frontend-core/src/api/app.ts
similarity index 61%
rename from packages/frontend-core/src/api/app.js
rename to packages/frontend-core/src/api/app.ts
index de1703373b..eab5d33567 100644
--- a/packages/frontend-core/src/api/app.js
+++ b/packages/frontend-core/src/api/app.ts
@@ -1,6 +1,72 @@
 import { sdk } from "@budibase/shared-core"
+import { BaseAPIClient } from "./types"
+import {
+  AddAppSampleDataResponse,
+  ClearDevLockResponse,
+  CreateAppRequest,
+  CreateAppResponse,
+  DeleteAppResponse,
+  DuplicateAppRequest,
+  DuplicateAppResponse,
+  FetchAppDefinitionResponse,
+  FetchAppPackageResponse,
+  FetchAppsResponse,
+  FetchDeploymentResponse,
+  GetDiagnosticsResponse,
+  ImportToUpdateAppRequest,
+  ImportToUpdateAppResponse,
+  PublishAppResponse,
+  RevertAppClientResponse,
+  RevertAppResponse,
+  SetRevertableAppVersionRequest,
+  SetRevertableAppVersionResponse,
+  SyncAppResponse,
+  UnpublishAppResponse,
+  UpdateAppClientResponse,
+  UpdateAppRequest,
+  UpdateAppResponse,
+} from "@budibase/types"
 
-export const buildAppEndpoints = API => ({
+export interface AppEndpoints {
+  fetchAppPackage: (appId: string) => Promise<FetchAppPackageResponse>
+  saveAppMetadata: (
+    appId: string,
+    metadata: UpdateAppRequest
+  ) => Promise<UpdateAppResponse>
+  unpublishApp: (appId: string) => Promise<UnpublishAppResponse>
+  publishAppChanges: (appId: string) => Promise<PublishAppResponse>
+  revertAppChanges: (appId: string) => Promise<RevertAppResponse>
+  updateAppClientVersion: (appId: string) => Promise<UpdateAppClientResponse>
+  revertAppClientVersion: (appId: string) => Promise<RevertAppClientResponse>
+  releaseAppLock: (appId: string) => Promise<ClearDevLockResponse>
+  getAppDeployments: () => Promise<FetchDeploymentResponse>
+  createApp: (app: CreateAppRequest) => Promise<CreateAppResponse>
+  deleteApp: (appId: string) => Promise<DeleteAppResponse>
+  duplicateApp: (
+    appId: string,
+    app: DuplicateAppRequest
+  ) => Promise<DuplicateAppResponse>
+  updateAppFromExport: (
+    appId: string,
+    body: ImportToUpdateAppRequest
+  ) => Promise<ImportToUpdateAppResponse>
+  fetchSystemDebugInfo: () => Promise<GetDiagnosticsResponse>
+  syncApp: (appId: string) => Promise<SyncAppResponse>
+  getApps: () => Promise<FetchAppsResponse>
+  fetchComponentLibDefinitions: (
+    appId: string
+  ) => Promise<FetchAppDefinitionResponse>
+  setRevertableVersion: (
+    appId: string,
+    revertableVersion: string
+  ) => Promise<SetRevertableAppVersionResponse>
+  addSampleData: (appId: string) => Promise<AddAppSampleDataResponse>
+
+  // Missing request or response types
+  importApps: (apps: any) => Promise<any>
+}
+
+export const buildAppEndpoints = (API: BaseAPIClient): AppEndpoints => ({
   /**
    * Fetches screen definition for an app.
    * @param appId the ID of the app to fetch from
@@ -16,7 +82,7 @@ export const buildAppEndpoints = API => ({
    * @param appId the ID of the app to update
    * @param metadata the app metadata to save
    */
-  saveAppMetadata: async ({ appId, metadata }) => {
+  saveAppMetadata: async (appId, metadata) => {
     return await API.put({
       url: `/api/applications/${appId}`,
       body: metadata,
@@ -87,7 +153,7 @@ export const buildAppEndpoints = API => ({
    * Duplicate an existing app
    * @param app the app to dupe
    */
-  duplicateApp: async (app, appId) => {
+  duplicateApp: async (appId, app) => {
     return await API.post({
       url: `/api/applications/${appId}/duplicate`,
       body: app,
@@ -184,7 +250,7 @@ export const buildAppEndpoints = API => ({
   /**
    * Fetches the definitions for component library components. This includes
    * their props and other metadata from components.json.
-   * @param {string} appId - ID of the currently running app
+   * @param appId ID of the currently running app
    */
   fetchComponentLibDefinitions: async appId => {
     return await API.get({
@@ -192,14 +258,27 @@ export const buildAppEndpoints = API => ({
     })
   },
 
+  /**
+   * Adds sample data to an app
+   * @param appId the app ID
+   */
   addSampleData: async appId => {
     return await API.post({
       url: `/api/applications/${appId}/sample`,
     })
   },
 
+  /**
+   * Sets the revertable version of an app.
+   * Used when manually reverting to older client versions.
+   * @param appId the app ID
+   * @param revertableVersion the version number
+   */
   setRevertableVersion: async (appId, revertableVersion) => {
-    return await API.post({
+    return await API.post<
+      SetRevertableAppVersionRequest,
+      SetRevertableAppVersionResponse
+    >({
       url: `/api/applications/${appId}/setRevertableVersion`,
       body: {
         revertableVersion,
diff --git a/packages/frontend-core/src/api/attachments.js b/packages/frontend-core/src/api/attachments.js
deleted file mode 100644
index 72f280d99d..0000000000
--- a/packages/frontend-core/src/api/attachments.js
+++ /dev/null
@@ -1,78 +0,0 @@
-export const buildAttachmentEndpoints = API => {
-  /**
-   * Generates a signed URL to upload a file to an external datasource.
-   * @param datasourceId the ID of the datasource to upload to
-   * @param bucket the name of the bucket to upload to
-   * @param key the name of the file to upload to
-   */
-  const getSignedDatasourceURL = async ({ datasourceId, bucket, key }) => {
-    return await API.post({
-      url: `/api/attachments/${datasourceId}/url`,
-      body: { bucket, key },
-    })
-  }
-
-  return {
-    getSignedDatasourceURL,
-
-    /**
-     * Uploads an attachment to the server.
-     * @param data the attachment to upload
-     * @param tableId the table ID to upload to
-     */
-    uploadAttachment: async ({ data, tableId }) => {
-      return await API.post({
-        url: `/api/attachments/${tableId}/upload`,
-        body: data,
-        json: false,
-      })
-    },
-
-    /**
-     * Uploads an attachment to the server as a builder user from the builder.
-     * @param data the data to upload
-     */
-    uploadBuilderAttachment: async data => {
-      return await API.post({
-        url: "/api/attachments/process",
-        body: data,
-        json: false,
-      })
-    },
-
-    /**
-     * Uploads a file to an external datasource.
-     * @param datasourceId the ID of the datasource to upload to
-     * @param bucket the name of the bucket to upload to
-     * @param key the name of the file to upload to
-     * @param data the file to upload
-     */
-    externalUpload: async ({ datasourceId, bucket, key, data }) => {
-      const { signedUrl, publicUrl } = await getSignedDatasourceURL({
-        datasourceId,
-        bucket,
-        key,
-      })
-      await API.put({
-        url: signedUrl,
-        body: data,
-        json: false,
-        external: true,
-      })
-      return { publicUrl }
-    },
-    /**
-     * Download an attachment from a row given its column name.
-     * @param datasourceId the ID of the datasource to download from
-     * @param rowId the ID of the row to download from
-     * @param columnName the column name to download
-     */
-    downloadAttachment: async (datasourceId, rowId, columnName, options) => {
-      return await API.get({
-        url: `/api/${datasourceId}/rows/${rowId}/attachment/${columnName}`,
-        parseResponse: response => response,
-        suppressErrors: options?.suppressErrors,
-      })
-    },
-  }
-}
diff --git a/packages/frontend-core/src/api/attachments.ts b/packages/frontend-core/src/api/attachments.ts
new file mode 100644
index 0000000000..e680218c8f
--- /dev/null
+++ b/packages/frontend-core/src/api/attachments.ts
@@ -0,0 +1,122 @@
+import {
+  DownloadAttachmentResponse,
+  GetSignedUploadUrlRequest,
+  GetSignedUploadUrlResponse,
+  ProcessAttachmentResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface AttachmentEndpoints {
+  downloadAttachment: (
+    datasourceId: string,
+    rowId: string,
+    columnName: string
+  ) => Promise<DownloadAttachmentResponse>
+  getSignedDatasourceURL: (
+    datasourceId: string,
+    bucket: string,
+    key: string
+  ) => Promise<GetSignedUploadUrlResponse>
+  uploadAttachment: (
+    tableId: string,
+    data: any
+  ) => Promise<ProcessAttachmentResponse>
+  uploadBuilderAttachment: (data: any) => Promise<ProcessAttachmentResponse>
+  externalUpload: (
+    datasourceId: string,
+    bucket: string,
+    key: string,
+    data: any
+  ) => Promise<{ publicUrl: string | undefined }>
+}
+
+export const buildAttachmentEndpoints = (
+  API: BaseAPIClient
+): AttachmentEndpoints => {
+  const endpoints: Pick<AttachmentEndpoints, "getSignedDatasourceURL"> = {
+    /**
+     * Generates a signed URL to upload a file to an external datasource.
+     * @param datasourceId the ID of the datasource to upload to
+     * @param bucket the name of the bucket to upload to
+     * @param key the name of the file to upload to
+     */
+    getSignedDatasourceURL: async (datasourceId, bucket, key) => {
+      return await API.post<
+        GetSignedUploadUrlRequest,
+        GetSignedUploadUrlResponse
+      >({
+        url: `/api/attachments/${datasourceId}/url`,
+        body: { bucket, key },
+      })
+    },
+  }
+
+  return {
+    ...endpoints,
+
+    /**
+     * Uploads an attachment to the server.
+     * @param data the attachment to upload
+     * @param tableId the table ID to upload to
+     */
+    uploadAttachment: async (tableId, data) => {
+      return await API.post({
+        url: `/api/attachments/${tableId}/upload`,
+        body: data,
+        json: false,
+      })
+    },
+
+    /**
+     * Uploads an attachment to the server as a builder user from the builder.
+     * @param data the data to upload
+     */
+    uploadBuilderAttachment: async data => {
+      return await API.post({
+        url: "/api/attachments/process",
+        body: data,
+        json: false,
+      })
+    },
+
+    /**
+     * Uploads a file to an external datasource.
+     * @param datasourceId the ID of the datasource to upload to
+     * @param bucket the name of the bucket to upload to
+     * @param key the name of the file to upload to
+     * @param data the file to upload
+     */
+    externalUpload: async (datasourceId, bucket, key, data) => {
+      const { signedUrl, publicUrl } = await endpoints.getSignedDatasourceURL(
+        datasourceId,
+        bucket,
+        key
+      )
+      if (!signedUrl) {
+        return { publicUrl: undefined }
+      }
+      await API.put({
+        url: signedUrl,
+        body: data,
+        json: false,
+        external: true,
+        parseResponse: response => response as any,
+      })
+      return { publicUrl }
+    },
+
+    /**
+     * Download an attachment from a row given its column name.
+     * @param datasourceId the ID of the datasource to download from
+     * @param rowId the ID of the row to download from
+     * @param columnName the column name to download
+     */
+    downloadAttachment: async (datasourceId, rowId, columnName) => {
+      return await API.get({
+        url: `/api/${datasourceId}/rows/${rowId}/attachment/${columnName}`,
+        parseResponse: response => response as any,
+        suppressErrors: true,
+      })
+    },
+  }
+}
diff --git a/packages/frontend-core/src/api/auditLogs.js b/packages/frontend-core/src/api/auditLogs.js
deleted file mode 100644
index c4230df6d9..0000000000
--- a/packages/frontend-core/src/api/auditLogs.js
+++ /dev/null
@@ -1,63 +0,0 @@
-const buildOpts = ({
-  bookmark,
-  userIds,
-  appIds,
-  startDate,
-  endDate,
-  fullSearch,
-  events,
-}) => {
-  const opts = {}
-
-  if (bookmark) {
-    opts.bookmark = bookmark
-  }
-
-  if (startDate && endDate) {
-    opts.startDate = startDate
-    opts.endDate = endDate
-  } else if (startDate && !endDate) {
-    opts.startDate = startDate
-  }
-
-  if (fullSearch) {
-    opts.fullSearch = fullSearch
-  }
-
-  if (events.length) {
-    opts.events = events
-  }
-
-  if (userIds.length) {
-    opts.userIds = userIds
-  }
-
-  if (appIds.length) {
-    opts.appIds = appIds
-  }
-
-  return opts
-}
-
-export const buildAuditLogsEndpoints = API => ({
-  /**
-   * Gets a list of users in the current tenant.
-   */
-  searchAuditLogs: async opts => {
-    return await API.post({
-      url: `/api/global/auditlogs/search`,
-      body: buildOpts(opts),
-    })
-  },
-
-  getEventDefinitions: async () => {
-    return await API.get({
-      url: `/api/global/auditlogs/definitions`,
-    })
-  },
-
-  getDownloadUrl: opts => {
-    const query = encodeURIComponent(JSON.stringify(opts))
-    return `/api/global/auditlogs/download?query=${query}`
-  },
-})
diff --git a/packages/frontend-core/src/api/auditLogs.ts b/packages/frontend-core/src/api/auditLogs.ts
new file mode 100644
index 0000000000..e0407f0412
--- /dev/null
+++ b/packages/frontend-core/src/api/auditLogs.ts
@@ -0,0 +1,35 @@
+import {
+  SearchAuditLogsRequest,
+  SearchAuditLogsResponse,
+  DefinitionsAuditLogsResponse,
+  DownloadAuditLogsRequest,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface AuditLogEndpoints {
+  searchAuditLogs: (
+    opts: SearchAuditLogsRequest
+  ) => Promise<SearchAuditLogsResponse>
+  getEventDefinitions: () => Promise<DefinitionsAuditLogsResponse>
+  getDownloadUrl: (opts: DownloadAuditLogsRequest) => string
+}
+
+export const buildAuditLogEndpoints = (
+  API: BaseAPIClient
+): AuditLogEndpoints => ({
+  searchAuditLogs: async opts => {
+    return await API.post({
+      url: `/api/global/auditlogs/search`,
+      body: opts,
+    })
+  },
+  getEventDefinitions: async () => {
+    return await API.get({
+      url: `/api/global/auditlogs/definitions`,
+    })
+  },
+  getDownloadUrl: opts => {
+    const query = encodeURIComponent(JSON.stringify(opts))
+    return `/api/global/auditlogs/download?query=${query}`
+  },
+})
diff --git a/packages/frontend-core/src/api/auth.js b/packages/frontend-core/src/api/auth.ts
similarity index 51%
rename from packages/frontend-core/src/api/auth.js
rename to packages/frontend-core/src/api/auth.ts
index 9289d71239..7d429c0c82 100644
--- a/packages/frontend-core/src/api/auth.js
+++ b/packages/frontend-core/src/api/auth.ts
@@ -1,12 +1,46 @@
-export const buildAuthEndpoints = API => ({
+import {
+  GetInitInfoResponse,
+  LoginRequest,
+  LoginResponse,
+  LogoutResponse,
+  PasswordResetRequest,
+  PasswordResetResponse,
+  PasswordResetUpdateRequest,
+  PasswordResetUpdateResponse,
+  SetInitInfoRequest,
+  SetInitInfoResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface AuthEndpoints {
+  logIn: (
+    tenantId: string,
+    username: string,
+    password: string
+  ) => Promise<LoginResponse>
+  logOut: () => Promise<LogoutResponse>
+  requestForgotPassword: (
+    tenantId: string,
+    email: string
+  ) => Promise<PasswordResetResponse>
+  resetPassword: (
+    tenantId: string,
+    password: string,
+    resetCode: string
+  ) => Promise<PasswordResetUpdateResponse>
+  setInitInfo: (info: SetInitInfoRequest) => Promise<SetInitInfoResponse>
+  getInitInfo: () => Promise<GetInitInfoResponse>
+}
+
+export const buildAuthEndpoints = (API: BaseAPIClient): AuthEndpoints => ({
   /**
    * Performs a login request.
    * @param tenantId the ID of the tenant to log in to
    * @param username the username (email)
    * @param password the password
    */
-  logIn: async ({ tenantId, username, password }) => {
-    return await API.post({
+  logIn: async (tenantId, username, password) => {
+    return await API.post<LoginRequest, LoginResponse>({
       url: `/api/global/auth/${tenantId}/login`,
       body: {
         username,
@@ -49,8 +83,8 @@ export const buildAuthEndpoints = API => ({
    * @param tenantId the ID of the tenant the user is in
    * @param email the email address of the user
    */
-  requestForgotPassword: async ({ tenantId, email }) => {
-    return await API.post({
+  requestForgotPassword: async (tenantId, email) => {
+    return await API.post<PasswordResetRequest, PasswordResetResponse>({
       url: `/api/global/auth/${tenantId}/reset`,
       body: {
         email,
@@ -64,8 +98,11 @@ export const buildAuthEndpoints = API => ({
    * @param password the new password to set
    * @param resetCode the reset code to authenticate the request
    */
-  resetPassword: async ({ tenantId, password, resetCode }) => {
-    return await API.post({
+  resetPassword: async (tenantId, password, resetCode) => {
+    return await API.post<
+      PasswordResetUpdateRequest,
+      PasswordResetUpdateResponse
+    >({
       url: `/api/global/auth/${tenantId}/reset/update`,
       body: {
         password,
diff --git a/packages/frontend-core/src/api/automations.js b/packages/frontend-core/src/api/automations.js
deleted file mode 100644
index 37a834cf04..0000000000
--- a/packages/frontend-core/src/api/automations.js
+++ /dev/null
@@ -1,111 +0,0 @@
-export const buildAutomationEndpoints = API => ({
-  /**
-   * Executes an automation. Must have "App Action" trigger.
-   * @param automationId the ID of the automation to trigger
-   * @param fields the fields to trigger the automation with
-   */
-  triggerAutomation: async ({ automationId, fields, timeout }) => {
-    return await API.post({
-      url: `/api/automations/${automationId}/trigger`,
-      body: { fields, timeout },
-    })
-  },
-
-  /**
-   * Tests an automation with data.
-   * @param automationId the ID of the automation to test
-   * @param testData the test data to run against the automation
-   */
-  testAutomation: async ({ automationId, testData }) => {
-    return await API.post({
-      url: `/api/automations/${automationId}/test`,
-      body: testData,
-    })
-  },
-
-  /**
-   * Gets a list of all automations.
-   */
-  getAutomations: async () => {
-    return await API.get({
-      url: "/api/automations",
-    })
-  },
-
-  /**
-   * Gets a list of all the definitions for blocks in automations.
-   */
-  getAutomationDefinitions: async () => {
-    return await API.get({
-      url: "/api/automations/definitions/list",
-    })
-  },
-
-  /**
-   * Creates an automation.
-   * @param automation the automation to create
-   */
-  createAutomation: async automation => {
-    return await API.post({
-      url: "/api/automations",
-      body: automation,
-    })
-  },
-
-  /**
-   * Updates an automation.
-   * @param automation the automation to update
-   */
-  updateAutomation: async automation => {
-    return await API.put({
-      url: "/api/automations",
-      body: automation,
-    })
-  },
-
-  /**
-   * Deletes an automation
-   * @param automationId the ID of the automation to delete
-   * @param automationRev the rev of the automation to delete
-   */
-  deleteAutomation: async ({ automationId, automationRev }) => {
-    return await API.delete({
-      url: `/api/automations/${automationId}/${automationRev}`,
-    })
-  },
-
-  /**
-   * Get the logs for the app, or by automation ID.
-   * @param automationId The ID of the automation to get logs for.
-   * @param startDate An ISO date string to state the start of the date range.
-   * @param status The status, error or success.
-   * @param page The page to retrieve.
-   */
-  getAutomationLogs: async ({ automationId, startDate, status, page }) => {
-    return await API.post({
-      url: "/api/automations/logs/search",
-      body: {
-        automationId,
-        startDate,
-        status,
-        page,
-      },
-    })
-  },
-
-  /**
-   * Clears automation log errors (which are creating notification) for
-   * automation or the app.
-   * @param automationId optional - the ID of the automation to clear errors for.
-   * @param appId The app ID to clear errors for.
-   */
-  clearAutomationLogErrors: async ({ automationId, appId }) => {
-    return await API.delete({
-      url: "/api/automations/logs",
-      body: {
-        appId,
-        automationId,
-      },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/automations.ts b/packages/frontend-core/src/api/automations.ts
new file mode 100644
index 0000000000..e87999e55b
--- /dev/null
+++ b/packages/frontend-core/src/api/automations.ts
@@ -0,0 +1,158 @@
+import {
+  ClearAutomationLogRequest,
+  ClearAutomationLogResponse,
+  CreateAutomationRequest,
+  CreateAutomationResponse,
+  DeleteAutomationResponse,
+  FetchAutomationResponse,
+  GetAutomationStepDefinitionsResponse,
+  SearchAutomationLogsRequest,
+  SearchAutomationLogsResponse,
+  TestAutomationRequest,
+  TestAutomationResponse,
+  TriggerAutomationRequest,
+  TriggerAutomationResponse,
+  UpdateAutomationRequest,
+  UpdateAutomationResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface AutomationEndpoints {
+  getAutomations: () => Promise<FetchAutomationResponse>
+  createAutomation: (
+    automation: CreateAutomationRequest
+  ) => Promise<CreateAutomationResponse>
+  updateAutomation: (
+    automation: UpdateAutomationRequest
+  ) => Promise<UpdateAutomationResponse>
+  deleteAutomation: (
+    automationId: string,
+    automationRev: string
+  ) => Promise<DeleteAutomationResponse>
+  clearAutomationLogErrors: (
+    automationId: string,
+    appId: string
+  ) => Promise<ClearAutomationLogResponse>
+  triggerAutomation: (
+    automationId: string,
+    fields: Record<string, any>,
+    timeout: number
+  ) => Promise<TriggerAutomationResponse>
+  testAutomation: (
+    automationdId: string,
+    data: TestAutomationRequest
+  ) => Promise<TestAutomationResponse>
+  getAutomationDefinitions: () => Promise<GetAutomationStepDefinitionsResponse>
+  getAutomationLogs: (
+    options: SearchAutomationLogsRequest
+  ) => Promise<SearchAutomationLogsResponse>
+}
+
+export const buildAutomationEndpoints = (
+  API: BaseAPIClient
+): AutomationEndpoints => ({
+  /**
+   * Executes an automation. Must have "App Action" trigger.
+   * @param automationId the ID of the automation to trigger
+   * @param fields the fields to trigger the automation with
+   * @param timeout a timeout override
+   */
+  triggerAutomation: async (automationId, fields, timeout) => {
+    return await API.post<TriggerAutomationRequest, TriggerAutomationResponse>({
+      url: `/api/automations/${automationId}/trigger`,
+      body: { fields, timeout },
+    })
+  },
+
+  /**
+   * Tests an automation with data.
+   * @param automationId the ID of the automation to test
+   * @param data the test data to run against the automation
+   */
+  testAutomation: async (automationId, data) => {
+    return await API.post({
+      url: `/api/automations/${automationId}/test`,
+      body: data,
+    })
+  },
+
+  /**
+   * Gets a list of all automations.
+   */
+  getAutomations: async () => {
+    return await API.get({
+      url: "/api/automations",
+    })
+  },
+
+  /**
+   * Gets a list of all the definitions for blocks in automations.
+   */
+  getAutomationDefinitions: async () => {
+    return await API.get({
+      url: "/api/automations/definitions/list",
+    })
+  },
+
+  /**
+   * Creates an automation.
+   * @param automation the automation to create
+   */
+  createAutomation: async automation => {
+    return await API.post({
+      url: "/api/automations",
+      body: automation,
+    })
+  },
+
+  /**
+   * Updates an automation.
+   * @param automation the automation to update
+   */
+  updateAutomation: async automation => {
+    return await API.put({
+      url: "/api/automations",
+      body: automation,
+    })
+  },
+
+  /**
+   * Deletes an automation
+   * @param automationId the ID of the automation to delete
+   * @param automationRev the rev of the automation to delete
+   */
+  deleteAutomation: async (automationId, automationRev) => {
+    return await API.delete({
+      url: `/api/automations/${automationId}/${automationRev}`,
+    })
+  },
+
+  /**
+   * Get the logs for the app, or by automation ID.
+   */
+  getAutomationLogs: async data => {
+    return await API.post({
+      url: "/api/automations/logs/search",
+      body: data,
+    })
+  },
+
+  /**
+   * Clears automation log errors (which are creating notification) for
+   * automation or the app.
+   * @param automationId optional - the ID of the automation to clear errors for.
+   * @param appId The app ID to clear errors for.
+   */
+  clearAutomationLogErrors: async (automationId, appId) => {
+    return await API.delete<
+      ClearAutomationLogRequest,
+      ClearAutomationLogResponse
+    >({
+      url: "/api/automations/logs",
+      body: {
+        appId,
+        automationId,
+      },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/backups.js b/packages/frontend-core/src/api/backups.js
deleted file mode 100644
index 40546b6f66..0000000000
--- a/packages/frontend-core/src/api/backups.js
+++ /dev/null
@@ -1,46 +0,0 @@
-export const buildBackupsEndpoints = API => ({
-  searchBackups: async ({ appId, trigger, type, page, startDate, endDate }) => {
-    const opts = {}
-    if (page) {
-      opts.page = page
-    }
-    if (trigger && type) {
-      opts.trigger = trigger.toLowerCase()
-      opts.type = type.toLowerCase()
-    }
-    if (startDate && endDate) {
-      opts.startDate = startDate
-      opts.endDate = endDate
-    }
-    return await API.post({
-      url: `/api/apps/${appId}/backups/search`,
-      body: opts,
-    })
-  },
-
-  createManualBackup: async ({ appId }) => {
-    return await API.post({
-      url: `/api/apps/${appId}/backups`,
-    })
-  },
-
-  deleteBackup: async ({ appId, backupId }) => {
-    return await API.delete({
-      url: `/api/apps/${appId}/backups/${backupId}`,
-    })
-  },
-
-  updateBackup: async ({ appId, backupId, name }) => {
-    return await API.patch({
-      url: `/api/apps/${appId}/backups/${backupId}`,
-      body: { name },
-    })
-  },
-
-  restoreBackup: async ({ appId, backupId, name }) => {
-    return await API.post({
-      url: `/api/apps/${appId}/backups/${backupId}/import`,
-      body: { name },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/backups.ts b/packages/frontend-core/src/api/backups.ts
new file mode 100644
index 0000000000..090ff97fc6
--- /dev/null
+++ b/packages/frontend-core/src/api/backups.ts
@@ -0,0 +1,50 @@
+import {
+  CreateAppBackupResponse,
+  ImportAppBackupResponse,
+  SearchAppBackupsRequest,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface BackupEndpoints {
+  createManualBackup: (appId: string) => Promise<CreateAppBackupResponse>
+  restoreBackup: (
+    appId: string,
+    backupId: string,
+    name?: string
+  ) => Promise<ImportAppBackupResponse>
+
+  // Missing request or response types
+  searchBackups: (appId: string, opts: SearchAppBackupsRequest) => Promise<any>
+  deleteBackup: (
+    appId: string,
+    backupId: string
+  ) => Promise<{ message: string }>
+}
+
+export const buildBackupEndpoints = (API: BaseAPIClient): BackupEndpoints => ({
+  createManualBackup: async appId => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups`,
+    })
+  },
+  searchBackups: async (appId, opts) => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups/search`,
+      body: opts,
+    })
+  },
+  deleteBackup: async (appId, backupId) => {
+    return await API.delete({
+      url: `/api/apps/${appId}/backups/${backupId}`,
+    })
+  },
+  restoreBackup: async (appId, backupId, name) => {
+    return await API.post({
+      url: `/api/apps/${appId}/backups/${backupId}/import`,
+      // Name is a legacy thing, but unsure if it is needed for restoring.
+      // Leaving this in just in case, but not type casting the body here
+      // as we won't normally have it, but it's required in the type.
+      body: { name },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/configs.js b/packages/frontend-core/src/api/configs.ts
similarity index 65%
rename from packages/frontend-core/src/api/configs.js
rename to packages/frontend-core/src/api/configs.ts
index 8d0d176a55..408180a859 100644
--- a/packages/frontend-core/src/api/configs.js
+++ b/packages/frontend-core/src/api/configs.ts
@@ -1,4 +1,32 @@
-export const buildConfigEndpoints = API => ({
+import {
+  Config,
+  ConfigChecklistResponse,
+  ConfigType,
+  DeleteConfigResponse,
+  FindConfigResponse,
+  GetPublicOIDCConfigResponse,
+  GetPublicSettingsResponse,
+  OIDCLogosConfig,
+  SaveConfigRequest,
+  SaveConfigResponse,
+  UploadConfigFileResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface ConfigEndpoints {
+  getConfig: (type: ConfigType) => Promise<FindConfigResponse>
+  getTenantConfig: (tentantId: string) => Promise<GetPublicSettingsResponse>
+  getOIDCConfigs: (tenantId: string) => Promise<GetPublicOIDCConfigResponse>
+  getOIDCLogos: () => Promise<Config<OIDCLogosConfig>>
+  saveConfig: (config: SaveConfigRequest) => Promise<SaveConfigResponse>
+  deleteConfig: (id: string, rev: string) => Promise<DeleteConfigResponse>
+  getChecklist: (tenantId: string) => Promise<ConfigChecklistResponse>
+  uploadLogo: (data: any) => Promise<UploadConfigFileResponse>
+  uploadFavicon: (data: any) => Promise<UploadConfigFileResponse>
+  uploadOIDCLogo: (name: string, data: any) => Promise<UploadConfigFileResponse>
+}
+
+export const buildConfigEndpoints = (API: BaseAPIClient): ConfigEndpoints => ({
   /**
    * Saves a global config.
    * @param config the config to save
@@ -25,7 +53,7 @@ export const buildConfigEndpoints = API => ({
    * @param id the id of the config to delete
    * @param rev the revision of the config to delete
    */
-  deleteConfig: async ({ id, rev }) => {
+  deleteConfig: async (id, rev) => {
     return await API.delete({
       url: `/api/global/configs/${id}/${rev}`,
     })
@@ -45,7 +73,7 @@ export const buildConfigEndpoints = API => ({
    * Gets the OIDC config for a certain tenant.
    * @param tenantId the tenant ID to get the config for
    */
-  getOIDCConfig: async tenantId => {
+  getOIDCConfigs: async tenantId => {
     return await API.get({
       url: `/api/global/configs/public/oidc?tenantId=${tenantId}`,
     })
@@ -90,7 +118,7 @@ export const buildConfigEndpoints = API => ({
    * @param name the name of the OIDC provider
    * @param data the logo form data to upload
    */
-  uploadOIDCLogo: async ({ name, data }) => {
+  uploadOIDCLogo: async (name, data) => {
     return await API.post({
       url: `/api/global/configs/upload/logos_oidc/${name}`,
       body: data,
diff --git a/packages/frontend-core/src/api/datasources.js b/packages/frontend-core/src/api/datasources.js
deleted file mode 100644
index 7cc05960d7..0000000000
--- a/packages/frontend-core/src/api/datasources.js
+++ /dev/null
@@ -1,92 +0,0 @@
-export const buildDatasourceEndpoints = API => ({
-  /**
-   * Gets a list of datasources.
-   */
-  getDatasources: async () => {
-    return await API.get({
-      url: "/api/datasources",
-    })
-  },
-
-  /**
-   * Prompts the server to build the schema for a datasource.
-   * @param datasourceId the datasource ID to build the schema for
-   * @param tablesFilter list of specific table names to be build the schema
-   */
-  buildDatasourceSchema: async ({ datasourceId, tablesFilter }) => {
-    return await API.post({
-      url: `/api/datasources/${datasourceId}/schema`,
-      body: {
-        tablesFilter,
-      },
-    })
-  },
-
-  /**
-   * Creates a datasource
-   * @param datasource the datasource to create
-   * @param fetchSchema whether to fetch the schema or not
-   * @param tablesFilter a list of tables to actually fetch rather than simply
-   * all that are accessible.
-   */
-  createDatasource: async ({ datasource, fetchSchema, tablesFilter }) => {
-    return await API.post({
-      url: "/api/datasources",
-      body: {
-        datasource,
-        fetchSchema,
-        tablesFilter,
-      },
-    })
-  },
-
-  /**
-   * Updates a datasource
-   * @param datasource the datasource to update
-   */
-  updateDatasource: async datasource => {
-    return await API.put({
-      url: `/api/datasources/${datasource._id}`,
-      body: datasource,
-    })
-  },
-
-  /**
-   * Deletes a datasource.
-   * @param datasourceId the ID of the ddtasource to delete
-   * @param datasourceRev the rev of the datasource to delete
-   */
-  deleteDatasource: async ({ datasourceId, datasourceRev }) => {
-    return await API.delete({
-      url: `/api/datasources/${datasourceId}/${datasourceRev}`,
-    })
-  },
-
-  /**
-   * Validate a datasource configuration
-   * @param datasource the datasource configuration to validate
-   */
-  validateDatasource: async datasource => {
-    return await API.post({
-      url: `/api/datasources/verify`,
-      body: { datasource },
-    })
-  },
-
-  /**
-   * Fetch table names available within the datasource, for filtering out undesired tables
-   * @param datasource the datasource configuration to use for fetching tables
-   */
-  fetchInfoForDatasource: async datasource => {
-    return await API.post({
-      url: `/api/datasources/info`,
-      body: { datasource },
-    })
-  },
-
-  fetchExternalSchema: async datasourceId => {
-    return await API.get({
-      url: `/api/datasources/${datasourceId}/schema/external`,
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/datasources.ts b/packages/frontend-core/src/api/datasources.ts
new file mode 100644
index 0000000000..1d35a6c347
--- /dev/null
+++ b/packages/frontend-core/src/api/datasources.ts
@@ -0,0 +1,132 @@
+import {
+  BuildSchemaFromSourceRequest,
+  BuildSchemaFromSourceResponse,
+  CreateDatasourceRequest,
+  CreateDatasourceResponse,
+  Datasource,
+  DeleteDatasourceResponse,
+  FetchDatasourceInfoRequest,
+  FetchDatasourceInfoResponse,
+  FetchExternalSchemaResponse,
+  UpdateDatasourceRequest,
+  UpdateDatasourceResponse,
+  VerifyDatasourceRequest,
+  VerifyDatasourceResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface DatasourceEndpoints {
+  getDatasources: () => Promise<Datasource[]>
+  buildDatasourceSchema: (
+    datasourceId: string,
+    tablesFilter?: string[]
+  ) => Promise<BuildSchemaFromSourceResponse>
+  createDatasource: (
+    data: CreateDatasourceRequest
+  ) => Promise<CreateDatasourceResponse>
+  updateDatasource: (
+    datasource: Datasource
+  ) => Promise<UpdateDatasourceResponse>
+  deleteDatasource: (
+    id: string,
+    rev: string
+  ) => Promise<DeleteDatasourceResponse>
+  validateDatasource: (
+    datasource: Datasource
+  ) => Promise<VerifyDatasourceResponse>
+  fetchInfoForDatasource: (
+    datasource: Datasource
+  ) => Promise<FetchDatasourceInfoResponse>
+  fetchExternalSchema: (
+    datasourceId: string
+  ) => Promise<FetchExternalSchemaResponse>
+}
+
+export const buildDatasourceEndpoints = (
+  API: BaseAPIClient
+): DatasourceEndpoints => ({
+  /**
+   * Gets a list of datasources.
+   */
+  getDatasources: async () => {
+    return await API.get({
+      url: "/api/datasources",
+    })
+  },
+
+  /**
+   * Prompts the server to build the schema for a datasource.
+   */
+  buildDatasourceSchema: async (datasourceId, tablesFilter?) => {
+    return await API.post<
+      BuildSchemaFromSourceRequest,
+      BuildSchemaFromSourceResponse
+    >({
+      url: `/api/datasources/${datasourceId}/schema`,
+      body: {
+        tablesFilter,
+      },
+    })
+  },
+
+  /**
+   * Creates a datasource
+   */
+  createDatasource: async data => {
+    return await API.post({
+      url: "/api/datasources",
+      body: data,
+    })
+  },
+
+  /**
+   * Updates a datasource
+   */
+  updateDatasource: async datasource => {
+    return await API.put<UpdateDatasourceRequest, UpdateDatasourceResponse>({
+      url: `/api/datasources/${datasource._id}`,
+      body: datasource,
+    })
+  },
+
+  /**
+   * Deletes a datasource.
+   */
+  deleteDatasource: async (id: string, rev: string) => {
+    return await API.delete({
+      url: `/api/datasources/${id}/${rev}`,
+    })
+  },
+
+  /**
+   * Validate a datasource configuration
+   */
+  validateDatasource: async (datasource: Datasource) => {
+    return await API.post<VerifyDatasourceRequest, VerifyDatasourceResponse>({
+      url: `/api/datasources/verify`,
+      body: { datasource },
+    })
+  },
+
+  /**
+   * Fetch table names available within the datasource, for filtering out undesired tables
+   */
+  fetchInfoForDatasource: async (datasource: Datasource) => {
+    return await API.post<
+      FetchDatasourceInfoRequest,
+      FetchDatasourceInfoResponse
+    >({
+      url: `/api/datasources/info`,
+      body: { datasource },
+    })
+  },
+
+  /**
+   * Fetches the external schema of a datasource
+   */
+  fetchExternalSchema: async (datasourceId: string) => {
+    return await API.get({
+      url: `/api/datasources/${datasourceId}/schema/external`,
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/environmentVariables.js b/packages/frontend-core/src/api/environmentVariables.js
deleted file mode 100644
index badd93ad69..0000000000
--- a/packages/frontend-core/src/api/environmentVariables.js
+++ /dev/null
@@ -1,36 +0,0 @@
-export const buildEnvironmentVariableEndpoints = API => ({
-  checkEnvironmentVariableStatus: async () => {
-    return await API.get({
-      url: `/api/env/variables/status`,
-    })
-  },
-
-  /**
-   * Fetches a list of environment variables
-   */
-  fetchEnvironmentVariables: async () => {
-    return await API.get({
-      url: `/api/env/variables`,
-      json: false,
-    })
-  },
-
-  createEnvironmentVariable: async data => {
-    return await API.post({
-      url: `/api/env/variables`,
-      body: data,
-    })
-  },
-  deleteEnvironmentVariable: async varName => {
-    return await API.delete({
-      url: `/api/env/variables/${varName}`,
-    })
-  },
-
-  updateEnvironmentVariable: async data => {
-    return await API.patch({
-      url: `/api/env/variables/${data.name}`,
-      body: data,
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/environmentVariables.ts b/packages/frontend-core/src/api/environmentVariables.ts
new file mode 100644
index 0000000000..8dd2988c5f
--- /dev/null
+++ b/packages/frontend-core/src/api/environmentVariables.ts
@@ -0,0 +1,58 @@
+import {
+  CreateEnvironmentVariableRequest,
+  CreateEnvironmentVariableResponse,
+  DeleteEnvironmentVariablesResponse,
+  GetEnvironmentVariablesResponse,
+  StatusEnvironmentVariableResponse,
+  UpdateEnvironmentVariableRequest,
+  UpdateEnvironmentVariableResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface EnvironmentVariableEndpoints {
+  checkEnvironmentVariableStatus: () => Promise<StatusEnvironmentVariableResponse>
+  fetchEnvironmentVariables: () => Promise<GetEnvironmentVariablesResponse>
+  createEnvironmentVariable: (
+    data: CreateEnvironmentVariableRequest
+  ) => Promise<CreateEnvironmentVariableResponse>
+  deleteEnvironmentVariable: (
+    name: string
+  ) => Promise<DeleteEnvironmentVariablesResponse>
+  updateEnvironmentVariable: (
+    name: string,
+    data: UpdateEnvironmentVariableRequest
+  ) => Promise<UpdateEnvironmentVariableResponse>
+}
+
+export const buildEnvironmentVariableEndpoints = (
+  API: BaseAPIClient
+): EnvironmentVariableEndpoints => ({
+  checkEnvironmentVariableStatus: async () => {
+    return await API.get({
+      url: `/api/env/variables/status`,
+    })
+  },
+  fetchEnvironmentVariables: async () => {
+    return await API.get({
+      url: `/api/env/variables`,
+      json: false,
+    })
+  },
+  createEnvironmentVariable: async data => {
+    return await API.post({
+      url: `/api/env/variables`,
+      body: data,
+    })
+  },
+  deleteEnvironmentVariable: async name => {
+    return await API.delete({
+      url: `/api/env/variables/${name}`,
+    })
+  },
+  updateEnvironmentVariable: async (name, data) => {
+    return await API.patch({
+      url: `/api/env/variables/${name}`,
+      body: data,
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/events.js b/packages/frontend-core/src/api/events.js
deleted file mode 100644
index 3f17722d3e..0000000000
--- a/packages/frontend-core/src/api/events.js
+++ /dev/null
@@ -1,13 +0,0 @@
-export const buildEventEndpoints = API => ({
-  /**
-   * Publish a specific event to the backend.
-   */
-  publishEvent: async eventType => {
-    return await API.post({
-      url: `/api/global/event/publish`,
-      body: {
-        type: eventType,
-      },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/events.ts b/packages/frontend-core/src/api/events.ts
new file mode 100644
index 0000000000..2bec0ea680
--- /dev/null
+++ b/packages/frontend-core/src/api/events.ts
@@ -0,0 +1,21 @@
+import {
+  EventPublishType,
+  PostEventPublishRequest,
+  PostEventPublishResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface EventEndpoints {
+  publishEvent: (type: EventPublishType) => Promise<PostEventPublishResponse>
+}
+
+export const buildEventEndpoints = (API: BaseAPIClient): EventEndpoints => ({
+  publishEvent: async type => {
+    return await API.post<PostEventPublishRequest, PostEventPublishResponse>({
+      url: `/api/global/event/publish`,
+      body: {
+        type,
+      },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/flags.js b/packages/frontend-core/src/api/flags.js
deleted file mode 100644
index 16adeb7b5d..0000000000
--- a/packages/frontend-core/src/api/flags.js
+++ /dev/null
@@ -1,34 +0,0 @@
-export const buildFlagEndpoints = API => ({
-  /**
-   * Gets the current user flags object.
-   */
-  getFlags: async () => {
-    return await API.get({
-      url: "/api/users/flags",
-    })
-  },
-
-  /**
-   * Updates a flag for the current user.
-   * @param flag the flag to update
-   * @param value the value to set the flag to
-   */
-  updateFlag: async ({ flag, value }) => {
-    return await API.post({
-      url: "/api/users/flags",
-      body: {
-        flag,
-        value,
-      },
-    })
-  },
-  /**
-   * Allows us to experimentally toggle a beta UI feature through a cookie.
-   * @param value the feature to toggle
-   */
-  toggleUiFeature: async ({ value }) => {
-    return await API.post({
-      url: `/api/beta/${value}`,
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/flags.ts b/packages/frontend-core/src/api/flags.ts
new file mode 100644
index 0000000000..baaa2309bc
--- /dev/null
+++ b/packages/frontend-core/src/api/flags.ts
@@ -0,0 +1,48 @@
+import {
+  GetUserFlagsResponse,
+  SetUserFlagRequest,
+  SetUserFlagResponse,
+  ToggleBetaFeatureResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface FlagEndpoints {
+  getFlags: () => Promise<GetUserFlagsResponse>
+  updateFlag: (flag: string, value: any) => Promise<SetUserFlagResponse>
+  toggleUiFeature: (value: string) => Promise<ToggleBetaFeatureResponse>
+}
+
+export const buildFlagEndpoints = (API: BaseAPIClient): FlagEndpoints => ({
+  /**
+   * Gets the current user flags object.
+   */
+  getFlags: async () => {
+    return await API.get({
+      url: "/api/users/flags",
+    })
+  },
+
+  /**
+   * Updates a flag for the current user.
+   * @param flag the flag to update
+   * @param value the value to set the flag to
+   */
+  updateFlag: async (flag, value) => {
+    return await API.post<SetUserFlagRequest, SetUserFlagResponse>({
+      url: "/api/users/flags",
+      body: {
+        flag,
+        value,
+      },
+    })
+  },
+  /**
+   * Allows us to experimentally toggle a beta UI feature through a cookie.
+   * @param value the feature to toggle
+   */
+  toggleUiFeature: async value => {
+    return await API.post({
+      url: `/api/beta/${value}`,
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/groups.js b/packages/frontend-core/src/api/groups.ts
similarity index 52%
rename from packages/frontend-core/src/api/groups.js
rename to packages/frontend-core/src/api/groups.ts
index b1be230ac6..e6374f257c 100644
--- a/packages/frontend-core/src/api/groups.js
+++ b/packages/frontend-core/src/api/groups.ts
@@ -1,13 +1,54 @@
-export const buildGroupsEndpoints = API => {
-  // underlying functionality of adding/removing users/apps to groups
-  async function updateGroupResource(groupId, resource, operation, ids) {
-    if (!Array.isArray(ids)) {
-      ids = [ids]
-    }
-    return await API.post({
+import {
+  SearchGroupResponse,
+  SearchUserGroupResponse,
+  UserGroup,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface GroupEndpoints {
+  saveGroup: (group: UserGroup) => Promise<{ _id: string; _rev: string }>
+  getGroups: () => Promise<UserGroup[]>
+  getGroup: (id: string) => Promise<UserGroup>
+  deleteGroup: (id: string, rev: string) => Promise<{ message: string }>
+  getGroupUsers: (
+    data: GetGroupUsersRequest
+  ) => Promise<SearchUserGroupResponse>
+  addUsersToGroup: (groupId: string, userIds: string[]) => Promise<void>
+  removeUsersFromGroup: (groupId: string, userIds: string[]) => Promise<void>
+  addAppsToGroup: (groupId: string, appArray: object[]) => Promise<void>
+  removeAppsFromGroup: (groupId: string, appArray: object[]) => Promise<void>
+  addGroupAppBuilder: (groupId: string, appId: string) => Promise<void>
+  removeGroupAppBuilder: (groupId: string, appId: string) => Promise<void>
+}
+
+enum GroupResource {
+  USERS = "users",
+  APPS = "apps",
+}
+
+enum GroupOperation {
+  ADD = "add",
+  REMOVE = "remove",
+}
+
+type GetGroupUsersRequest = {
+  id: string
+  bookmark?: string
+  emailSearch?: string
+}
+
+export const buildGroupsEndpoints = (API: BaseAPIClient): GroupEndpoints => {
+  // Underlying functionality of adding/removing users/apps to groups
+  async function updateGroupResource(
+    groupId: string,
+    resource: GroupResource,
+    operation: GroupOperation,
+    resources: string[] | object[]
+  ) {
+    return await API.post<{ [key in GroupOperation]?: string[] | object[] }>({
       url: `/api/global/groups/${groupId}/${resource}`,
       body: {
-        [operation]: ids,
+        [operation]: resources,
       },
     })
   }
@@ -27,9 +68,10 @@ export const buildGroupsEndpoints = API => {
      * Gets all the user groups
      */
     getGroups: async () => {
-      return await API.get({
+      const res = await API.get<SearchGroupResponse>({
         url: "/api/global/groups",
       })
+      return res.data
     },
 
     /**
@@ -46,7 +88,7 @@ export const buildGroupsEndpoints = API => {
      * @param id the id of the config to delete
      * @param rev the revision of the config to delete
      */
-    deleteGroup: async ({ id, rev }) => {
+    deleteGroup: async (id, rev) => {
       return await API.delete({
         url: `/api/global/groups/${id}/${rev}`,
       })
@@ -61,9 +103,8 @@ export const buildGroupsEndpoints = API => {
         url += `bookmark=${bookmark}&`
       }
       if (emailSearch) {
-        url += `emailSearch=${emailSearch}&`
+        url += `emailSearch=${emailSearch}`
       }
-
       return await API.get({
         url,
       })
@@ -75,7 +116,12 @@ export const buildGroupsEndpoints = API => {
      * @param userIds The user IDs to be added
      */
     addUsersToGroup: async (groupId, userIds) => {
-      return updateGroupResource(groupId, "users", "add", userIds)
+      return updateGroupResource(
+        groupId,
+        GroupResource.USERS,
+        GroupOperation.ADD,
+        userIds
+      )
     },
 
     /**
@@ -84,7 +130,12 @@ export const buildGroupsEndpoints = API => {
      * @param userIds The user IDs to be removed
      */
     removeUsersFromGroup: async (groupId, userIds) => {
-      return updateGroupResource(groupId, "users", "remove", userIds)
+      return updateGroupResource(
+        groupId,
+        GroupResource.USERS,
+        GroupOperation.REMOVE,
+        userIds
+      )
     },
 
     /**
@@ -93,7 +144,12 @@ export const buildGroupsEndpoints = API => {
      * @param appArray Array of objects, containing the appId and roleId to be added
      */
     addAppsToGroup: async (groupId, appArray) => {
-      return updateGroupResource(groupId, "apps", "add", appArray)
+      return updateGroupResource(
+        groupId,
+        GroupResource.APPS,
+        GroupOperation.ADD,
+        appArray
+      )
     },
 
     /**
@@ -102,7 +158,12 @@ export const buildGroupsEndpoints = API => {
      * @param appArray Array of objects, containing the appId to be removed
      */
     removeAppsFromGroup: async (groupId, appArray) => {
-      return updateGroupResource(groupId, "apps", "remove", appArray)
+      return updateGroupResource(
+        groupId,
+        GroupResource.APPS,
+        GroupOperation.REMOVE,
+        appArray
+      )
     },
 
     /**
@@ -110,7 +171,7 @@ export const buildGroupsEndpoints = API => {
      * @param groupId The group to update
      * @param appId The app id where the builder will be added
      */
-    addGroupAppBuilder: async ({ groupId, appId }) => {
+    addGroupAppBuilder: async (groupId, appId) => {
       return await API.post({
         url: `/api/global/groups/${groupId}/app/${appId}/builder`,
       })
@@ -121,7 +182,7 @@ export const buildGroupsEndpoints = API => {
      * @param groupId The group to update
      * @param appId The app id where the builder will be removed
      */
-    removeGroupAppBuilder: async ({ groupId, appId }) => {
+    removeGroupAppBuilder: async (groupId, appId) => {
       return await API.delete({
         url: `/api/global/groups/${groupId}/app/${appId}/builder`,
       })
diff --git a/packages/frontend-core/src/api/hosting.js b/packages/frontend-core/src/api/hosting.js
deleted file mode 100644
index 8c398f9ae7..0000000000
--- a/packages/frontend-core/src/api/hosting.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const buildHostingEndpoints = API => ({
-  /**
-   * Gets the hosting URLs of the environment.
-   */
-  getHostingURLs: async () => {
-    return await API.get({
-      url: "/api/hosting/urls",
-    })
-  },
-
-  /**
-   * Gets the list of deployed apps.
-   */
-  getDeployedApps: async () => {
-    return await API.get({
-      url: "/api/hosting/apps",
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/index.js b/packages/frontend-core/src/api/index.ts
similarity index 64%
rename from packages/frontend-core/src/api/index.js
rename to packages/frontend-core/src/api/index.ts
index 1ca8b7c3f4..485e4d8b5a 100644
--- a/packages/frontend-core/src/api/index.js
+++ b/packages/frontend-core/src/api/index.ts
@@ -1,3 +1,13 @@
+import {
+  HTTPMethod,
+  APICallParams,
+  APIClientConfig,
+  APIClient,
+  APICallConfig,
+  BaseAPIClient,
+  Headers,
+  APIError,
+} from "./types"
 import { Helpers } from "@budibase/bbui"
 import { Header } from "@budibase/shared-core"
 import { ApiVersion } from "../constants"
@@ -10,7 +20,6 @@ import { buildAutomationEndpoints } from "./automations"
 import { buildConfigEndpoints } from "./configs"
 import { buildDatasourceEndpoints } from "./datasources"
 import { buildFlagEndpoints } from "./flags"
-import { buildHostingEndpoints } from "./hosting"
 import { buildLayoutEndpoints } from "./layouts"
 import { buildOtherEndpoints } from "./other"
 import { buildPermissionsEndpoints } from "./permissions"
@@ -29,14 +38,16 @@ import { buildViewV2Endpoints } from "./viewsV2"
 import { buildLicensingEndpoints } from "./licensing"
 import { buildGroupsEndpoints } from "./groups"
 import { buildPluginEndpoints } from "./plugins"
-import { buildBackupsEndpoints } from "./backups"
+import { buildBackupEndpoints } from "./backups"
 import { buildEnvironmentVariableEndpoints } from "./environmentVariables"
 import { buildEventEndpoints } from "./events"
-import { buildAuditLogsEndpoints } from "./auditLogs"
+import { buildAuditLogEndpoints } from "./auditLogs"
 import { buildLogsEndpoints } from "./logs"
 import { buildMigrationEndpoints } from "./migrations"
 import { buildRowActionEndpoints } from "./rowActions"
 
+export type { APIClient } from "./types"
+
 /**
  * Random identifier to uniquely identify a session in a tab. This is
  * used to determine the originator of calls to the API, which is in
@@ -45,52 +56,18 @@ import { buildRowActionEndpoints } from "./rowActions"
  */
 export const APISessionID = Helpers.uuid()
 
-const defaultAPIClientConfig = {
-  /**
-   * Certain definitions can't change at runtime for client apps, such as the
-   * schema of tables. The endpoints that are cacheable can be cached by passing
-   * in this flag. It's disabled by default to avoid bugs with stale data.
-   */
-  enableCaching: false,
-
-  /**
-   * A function can be passed in to attach headers to all outgoing requests.
-   * This function is passed in the headers object, which should be directly
-   * mutated. No return value is required.
-   */
-  attachHeaders: null,
-
-  /**
-   * A function can be passed in which will be invoked any time an API error
-   * occurs. An error is defined as a status code >= 400. This function is
-   * invoked before the actual JS error is thrown up the stack.
-   */
-  onError: null,
-
-  /**
-   * A function can be passed to be called when an API call returns info about a migration running for a specific app
-   */
-  onMigrationDetected: null,
-}
-
 /**
  * Constructs an API client with the provided configuration.
- * @param config the API client configuration
- * @return {object} the API client
  */
-export const createAPIClient = config => {
-  config = {
-    ...defaultAPIClientConfig,
-    ...config,
-  }
-  let cache = {}
+export const createAPIClient = (config: APIClientConfig = {}): APIClient => {
+  let cache: Record<string, any> = {}
 
   // Generates an error object from an API response
   const makeErrorFromResponse = async (
-    response,
-    method,
+    response: Response,
+    method: HTTPMethod,
     suppressErrors = false
-  ) => {
+  ): Promise<APIError> => {
     // Try to read a message from the error
     let message = response.statusText
     let json = null
@@ -99,7 +76,7 @@ export const createAPIClient = config => {
       if (json?.message) {
         message = json.message
       } else if (json?.error) {
-        message = json.error
+        message = JSON.stringify(json.error)
       }
     } catch (error) {
       // Do nothing
@@ -116,32 +93,34 @@ export const createAPIClient = config => {
   }
 
   // Generates an error object from a string
-  const makeError = (message, request) => {
+  const makeError = (
+    message: string,
+    url: string,
+    method?: HTTPMethod
+  ): APIError => {
     return {
       message,
       json: null,
       status: 400,
-      url: request?.url,
-      method: request?.method,
+      url: url,
+      method: method,
       handled: true,
+      suppressErrors: false,
     }
   }
 
   // Performs an API call to the server.
-  const makeApiCall = async ({
-    method,
-    url,
-    body,
-    json = true,
-    external = false,
-    parseResponse,
-    suppressErrors = false,
-  }) => {
+  const makeApiCall = async <RequestT = null, ResponseT = void>(
+    callConfig: APICallConfig<RequestT, ResponseT>
+  ): Promise<ResponseT> => {
+    let { json, method, external, body, url, parseResponse, suppressErrors } =
+      callConfig
+
     // Ensure we don't do JSON processing if sending a GET request
-    json = json && method !== "GET"
+    json = json && method !== HTTPMethod.GET
 
     // Build headers
-    let headers = { Accept: "application/json" }
+    let headers: Headers = { Accept: "application/json" }
     headers[Header.SESSION_ID] = APISessionID
     if (!external) {
       headers[Header.API_VER] = ApiVersion
@@ -154,17 +133,17 @@ export const createAPIClient = config => {
     }
 
     // Build request body
-    let requestBody = body
+    let requestBody: any = body
     if (json) {
       try {
         requestBody = JSON.stringify(body)
       } catch (error) {
-        throw makeError("Invalid JSON body", { url, method })
+        throw makeError("Invalid JSON body", url, method)
       }
     }
 
     // Make request
-    let response
+    let response: Response
     try {
       response = await fetch(url, {
         method,
@@ -174,21 +153,23 @@ export const createAPIClient = config => {
       })
     } catch (error) {
       delete cache[url]
-      throw makeError("Failed to send request", { url, method })
+      throw makeError("Failed to send request", url, method)
     }
 
     // Handle response
     if (response.status >= 200 && response.status < 400) {
       handleMigrations(response)
       try {
-        if (parseResponse) {
+        if (response.status === 204) {
+          return undefined as ResponseT
+        } else if (parseResponse) {
           return await parseResponse(response)
         } else {
-          return await response.json()
+          return (await response.json()) as ResponseT
         }
       } catch (error) {
         delete cache[url]
-        return null
+        throw `Failed to parse response: ${error}`
       }
     } else {
       delete cache[url]
@@ -196,7 +177,7 @@ export const createAPIClient = config => {
     }
   }
 
-  const handleMigrations = response => {
+  const handleMigrations = (response: Response) => {
     if (!config.onMigrationDetected) {
       return
     }
@@ -210,59 +191,64 @@ export const createAPIClient = config => {
   // Performs an API call to the server  and caches the response.
   // Future invocation for this URL will return the cached result instead of
   // hitting the server again.
-  const makeCachedApiCall = async params => {
-    const identifier = params.url
-    if (!identifier) {
-      return null
-    }
+  const makeCachedApiCall = async <RequestT = null, ResponseT = void>(
+    callConfig: APICallConfig<RequestT, ResponseT>
+  ): Promise<ResponseT> => {
+    const identifier = callConfig.url
     if (!cache[identifier]) {
-      cache[identifier] = makeApiCall(params)
+      cache[identifier] = makeApiCall(callConfig)
       cache[identifier] = await cache[identifier]
     }
-    return await cache[identifier]
+    return (await cache[identifier]) as ResponseT
   }
 
   // Constructs an API call function for a particular HTTP method
-  const requestApiCall = method => async params => {
-    try {
-      let { url, cache = false, external = false } = params
-      if (!external) {
-        url = `/${url}`.replace("//", "/")
-      }
+  const requestApiCall =
+    (method: HTTPMethod) =>
+    async <RequestT = null, ResponseT = void>(
+      params: APICallParams<RequestT, ResponseT>
+    ): Promise<ResponseT> => {
+      try {
+        let callConfig: APICallConfig<RequestT, ResponseT> = {
+          json: true,
+          external: false,
+          suppressErrors: false,
+          cache: false,
+          method,
+          ...params,
+        }
+        let { url, cache, external } = callConfig
+        if (!external) {
+          callConfig.url = `/${url}`.replace("//", "/")
+        }
 
-      // Cache the request if possible and desired
-      const cacheRequest = cache && config?.enableCaching
-      const handler = cacheRequest ? makeCachedApiCall : makeApiCall
-
-      const enrichedParams = { ...params, method, url }
-      return await handler(enrichedParams)
-    } catch (error) {
-      if (config?.onError) {
-        config.onError(error)
+        // Cache the request if possible and desired
+        const cacheRequest = cache && config?.enableCaching
+        const handler = cacheRequest ? makeCachedApiCall : makeApiCall
+        return await handler(callConfig)
+      } catch (error) {
+        if (config?.onError) {
+          config.onError(error as APIError)
+        }
+        throw error
       }
-      throw error
     }
-  }
 
   // Build the underlying core API methods
-  let API = {
-    post: requestApiCall("POST"),
-    get: requestApiCall("GET"),
-    patch: requestApiCall("PATCH"),
-    delete: requestApiCall("DELETE"),
-    put: requestApiCall("PUT"),
-    error: message => {
-      throw makeError(message)
-    },
+  let API: BaseAPIClient = {
+    post: requestApiCall(HTTPMethod.POST),
+    get: requestApiCall(HTTPMethod.GET),
+    patch: requestApiCall(HTTPMethod.PATCH),
+    delete: requestApiCall(HTTPMethod.DELETE),
+    put: requestApiCall(HTTPMethod.PUT),
     invalidateCache: () => {
       cache = {}
     },
-
     // Generic utility to extract the current app ID. Assumes that any client
     // that exists in an app context will be attaching our app ID header.
-    getAppID: () => {
-      let headers = {}
-      config?.attachHeaders(headers)
+    getAppID: (): string => {
+      let headers: Headers = {}
+      config?.attachHeaders?.(headers)
       return headers?.[Header.APP_ID]
     },
   }
@@ -279,7 +265,6 @@ export const createAPIClient = config => {
     ...buildConfigEndpoints(API),
     ...buildDatasourceEndpoints(API),
     ...buildFlagEndpoints(API),
-    ...buildHostingEndpoints(API),
     ...buildLayoutEndpoints(API),
     ...buildOtherEndpoints(API),
     ...buildPermissionsEndpoints(API),
@@ -297,10 +282,10 @@ export const createAPIClient = config => {
     ...buildLicensingEndpoints(API),
     ...buildGroupsEndpoints(API),
     ...buildPluginEndpoints(API),
-    ...buildBackupsEndpoints(API),
+    ...buildBackupEndpoints(API),
     ...buildEnvironmentVariableEndpoints(API),
     ...buildEventEndpoints(API),
-    ...buildAuditLogsEndpoints(API),
+    ...buildAuditLogEndpoints(API),
     ...buildLogsEndpoints(API),
     ...buildMigrationEndpoints(API),
     viewV2: buildViewV2Endpoints(API),
diff --git a/packages/frontend-core/src/api/layouts.js b/packages/frontend-core/src/api/layouts.js
deleted file mode 100644
index 51bce1f533..0000000000
--- a/packages/frontend-core/src/api/layouts.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export const buildLayoutEndpoints = API => ({
-  /**
-   * Saves a layout.
-   * @param layout the layout to save
-   */
-  saveLayout: async layout => {
-    return await API.post({
-      url: "/api/layouts",
-      body: layout,
-    })
-  },
-
-  /**
-   * Deletes a layout.
-   * @param layoutId the ID of the layout to delete
-   * @param layoutRev the rev of the layout to delete
-   */
-  deleteLayout: async ({ layoutId, layoutRev }) => {
-    return await API.delete({
-      url: `/api/layouts/${layoutId}/${layoutRev}`,
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/layouts.ts b/packages/frontend-core/src/api/layouts.ts
new file mode 100644
index 0000000000..233f60e6c2
--- /dev/null
+++ b/packages/frontend-core/src/api/layouts.ts
@@ -0,0 +1,35 @@
+import {
+  DeleteLayoutResponse,
+  SaveLayoutRequest,
+  SaveLayoutResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface LayoutEndpoints {
+  saveLayout: (layout: SaveLayoutRequest) => Promise<SaveLayoutResponse>
+  deleteLayout: (id: string, rev: string) => Promise<DeleteLayoutResponse>
+}
+
+export const buildLayoutEndpoints = (API: BaseAPIClient): LayoutEndpoints => ({
+  /**
+   * Saves a layout.
+   * @param layout the layout to save
+   */
+  saveLayout: async layout => {
+    return await API.post({
+      url: "/api/layouts",
+      body: layout,
+    })
+  },
+
+  /**
+   * Deletes a layout.
+   * @param layoutId the ID of the layout to delete
+   * @param layoutRev the rev of the layout to delete
+   */
+  deleteLayout: async (id: string, rev: string) => {
+    return await API.delete({
+      url: `/api/layouts/${id}/${rev}`,
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/licensing.js b/packages/frontend-core/src/api/licensing.js
deleted file mode 100644
index 987fc34cf5..0000000000
--- a/packages/frontend-core/src/api/licensing.js
+++ /dev/null
@@ -1,75 +0,0 @@
-export const buildLicensingEndpoints = API => ({
-  // LICENSE KEY
-
-  activateLicenseKey: async data => {
-    return API.post({
-      url: `/api/global/license/key`,
-      body: data,
-    })
-  },
-  deleteLicenseKey: async () => {
-    return API.delete({
-      url: `/api/global/license/key`,
-    })
-  },
-  getLicenseKey: async () => {
-    try {
-      return await API.get({
-        url: "/api/global/license/key",
-      })
-    } catch (e) {
-      if (e.status !== 404) {
-        throw e
-      }
-    }
-  },
-
-  // OFFLINE LICENSE
-
-  activateOfflineLicense: async ({ offlineLicenseToken }) => {
-    return API.post({
-      url: "/api/global/license/offline",
-      body: {
-        offlineLicenseToken,
-      },
-    })
-  },
-  deleteOfflineLicense: async () => {
-    return API.delete({
-      url: "/api/global/license/offline",
-    })
-  },
-  getOfflineLicense: async () => {
-    try {
-      return await API.get({
-        url: "/api/global/license/offline",
-      })
-    } catch (e) {
-      if (e.status !== 404) {
-        throw e
-      }
-    }
-  },
-  getOfflineLicenseIdentifier: async () => {
-    return await API.get({
-      url: "/api/global/license/offline/identifier",
-    })
-  },
-
-  /**
-   * Refreshes the license cache
-   */
-  refreshLicense: async () => {
-    return API.post({
-      url: "/api/global/license/refresh",
-    })
-  },
-  /**
-   * Retrieve the usage information for the tenant
-   */
-  getQuotaUsage: async () => {
-    return API.get({
-      url: "/api/global/license/usage",
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/licensing.ts b/packages/frontend-core/src/api/licensing.ts
new file mode 100644
index 0000000000..bc499b92d4
--- /dev/null
+++ b/packages/frontend-core/src/api/licensing.ts
@@ -0,0 +1,107 @@
+import {
+  ActivateLicenseKeyRequest,
+  ActivateLicenseKeyResponse,
+  ActivateOfflineLicenseTokenRequest,
+  ActivateOfflineLicenseTokenResponse,
+  GetLicenseKeyResponse,
+  GetOfflineIdentifierResponse,
+  GetOfflineLicenseTokenResponse,
+  QuotaUsage,
+  RefreshOfflineLicenseResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface LicensingEndpoints {
+  activateLicenseKey: (
+    licenseKey: string
+  ) => Promise<ActivateLicenseKeyResponse>
+  deleteLicenseKey: () => Promise<void>
+  getLicenseKey: () => Promise<GetLicenseKeyResponse | void>
+  activateOfflineLicense: (
+    offlineLicenseToken: string
+  ) => Promise<ActivateOfflineLicenseTokenResponse>
+  deleteOfflineLicense: () => Promise<void>
+  getOfflineLicense: () => Promise<GetOfflineLicenseTokenResponse | void>
+  getOfflineLicenseIdentifier: () => Promise<GetOfflineIdentifierResponse>
+  refreshLicense: () => Promise<RefreshOfflineLicenseResponse>
+  getQuotaUsage: () => Promise<QuotaUsage>
+}
+
+export const buildLicensingEndpoints = (
+  API: BaseAPIClient
+): LicensingEndpoints => ({
+  // LICENSE KEY
+  activateLicenseKey: async licenseKey => {
+    return API.post<ActivateLicenseKeyRequest, ActivateLicenseKeyResponse>({
+      url: `/api/global/license/key`,
+      body: { licenseKey },
+    })
+  },
+  deleteLicenseKey: async () => {
+    return API.delete({
+      url: `/api/global/license/key`,
+    })
+  },
+  getLicenseKey: async () => {
+    try {
+      return await API.get({
+        url: "/api/global/license/key",
+      })
+    } catch (e: any) {
+      if (e.status !== 404) {
+        throw e
+      }
+    }
+  },
+
+  // OFFLINE LICENSE
+  activateOfflineLicense: async offlineLicenseToken => {
+    return API.post<
+      ActivateOfflineLicenseTokenRequest,
+      ActivateOfflineLicenseTokenResponse
+    >({
+      url: "/api/global/license/offline",
+      body: {
+        offlineLicenseToken,
+      },
+    })
+  },
+  deleteOfflineLicense: async () => {
+    return API.delete({
+      url: "/api/global/license/offline",
+    })
+  },
+  getOfflineLicense: async () => {
+    try {
+      return await API.get({
+        url: "/api/global/license/offline",
+      })
+    } catch (e: any) {
+      if (e.status !== 404) {
+        throw e
+      }
+    }
+  },
+  getOfflineLicenseIdentifier: async () => {
+    return await API.get({
+      url: "/api/global/license/offline/identifier",
+    })
+  },
+
+  /**
+   * Refreshes the license cache
+   */
+  refreshLicense: async () => {
+    return API.post({
+      url: "/api/global/license/refresh",
+    })
+  },
+  /**
+   * Retrieve the usage information for the tenant
+   */
+  getQuotaUsage: async () => {
+    return API.get({
+      url: "/api/global/license/usage",
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/logs.js b/packages/frontend-core/src/api/logs.ts
similarity index 57%
rename from packages/frontend-core/src/api/logs.js
rename to packages/frontend-core/src/api/logs.ts
index b6cb98627c..4c883233f6 100644
--- a/packages/frontend-core/src/api/logs.js
+++ b/packages/frontend-core/src/api/logs.ts
@@ -1,4 +1,10 @@
-export const buildLogsEndpoints = API => ({
+import { BaseAPIClient } from "./types"
+
+export interface LogEndpoints {
+  getSystemLogs: () => Promise<any>
+}
+
+export const buildLogsEndpoints = (API: BaseAPIClient): LogEndpoints => ({
   /**
    * Gets a stream for the system logs.
    */
diff --git a/packages/frontend-core/src/api/migrations.js b/packages/frontend-core/src/api/migrations.js
deleted file mode 100644
index 2da70d6fcb..0000000000
--- a/packages/frontend-core/src/api/migrations.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export const buildMigrationEndpoints = API => ({
-  /**
-   * Gets the info about the current app migration
-   */
-  getMigrationStatus: async () => {
-    return await API.get({
-      url: "/api/migrations/status",
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/migrations.ts b/packages/frontend-core/src/api/migrations.ts
new file mode 100644
index 0000000000..35d2f95dbc
--- /dev/null
+++ b/packages/frontend-core/src/api/migrations.ts
@@ -0,0 +1,19 @@
+import { GetMigrationStatus } from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface MigrationEndpoints {
+  getMigrationStatus: () => Promise<GetMigrationStatus>
+}
+
+export const buildMigrationEndpoints = (
+  API: BaseAPIClient
+): MigrationEndpoints => ({
+  /**
+   * Gets the info about the current app migration
+   */
+  getMigrationStatus: async () => {
+    return await API.get({
+      url: "/api/migrations/status",
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/other.js b/packages/frontend-core/src/api/other.ts
similarity index 56%
rename from packages/frontend-core/src/api/other.js
rename to packages/frontend-core/src/api/other.ts
index 3d171eaab4..c39538fd7b 100644
--- a/packages/frontend-core/src/api/other.js
+++ b/packages/frontend-core/src/api/other.ts
@@ -1,4 +1,21 @@
-export const buildOtherEndpoints = API => ({
+import {
+  FetchBuiltinPermissionsResponse,
+  FetchIntegrationsResponse,
+  GetEnvironmentResponse,
+  GetVersionResponse,
+  SystemStatusResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface OtherEndpoints {
+  getSystemStatus: () => Promise<SystemStatusResponse>
+  getBudibaseVersion: () => Promise<string>
+  getIntegrations: () => Promise<FetchIntegrationsResponse>
+  getBasePermissions: () => Promise<FetchBuiltinPermissionsResponse>
+  getEnvironment: () => Promise<GetEnvironmentResponse>
+}
+
+export const buildOtherEndpoints = (API: BaseAPIClient): OtherEndpoints => ({
   /**
    * Gets the current environment details.
    */
@@ -31,7 +48,7 @@ export const buildOtherEndpoints = API => ({
    */
   getBudibaseVersion: async () => {
     return (
-      await API.get({
+      await API.get<GetVersionResponse>({
         url: "/api/dev/version",
       })
     ).version
@@ -45,14 +62,4 @@ export const buildOtherEndpoints = API => ({
       url: "/api/permission/builtin",
     })
   },
-
-  /**
-   * Check if they are part of the budibase beta program.
-   */
-  checkBetaAccess: async email => {
-    return await API.get({
-      url: `/api/beta/access?email=${email}`,
-      external: true,
-    })
-  },
 })
diff --git a/packages/frontend-core/src/api/permissions.js b/packages/frontend-core/src/api/permissions.ts
similarity index 56%
rename from packages/frontend-core/src/api/permissions.js
rename to packages/frontend-core/src/api/permissions.ts
index dd0005aaf2..8a4a99b642 100644
--- a/packages/frontend-core/src/api/permissions.js
+++ b/packages/frontend-core/src/api/permissions.ts
@@ -1,4 +1,32 @@
-export const buildPermissionsEndpoints = API => ({
+import {
+  AddPermissionResponse,
+  GetDependantResourcesResponse,
+  GetResourcePermsResponse,
+  PermissionLevel,
+  RemovePermissionResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface PermissionEndpoints {
+  getPermissionForResource: (
+    resourceId: string
+  ) => Promise<GetResourcePermsResponse>
+  updatePermissionForResource: (
+    resourceId: string,
+    roleId: string,
+    level: PermissionLevel
+  ) => Promise<AddPermissionResponse>
+  removePermissionFromResource: (
+    resourceId: string,
+    roleId: string,
+    level: PermissionLevel
+  ) => Promise<RemovePermissionResponse>
+  getDependants: (resourceId: string) => Promise<GetDependantResourcesResponse>
+}
+
+export const buildPermissionsEndpoints = (
+  API: BaseAPIClient
+): PermissionEndpoints => ({
   /**
    * Gets the permission required to access a specific resource
    * @param resourceId the resource ID to check
@@ -14,9 +42,8 @@ export const buildPermissionsEndpoints = API => ({
    * @param resourceId the ID of the resource to update
    * @param roleId the ID of the role to update the permissions of
    * @param level the level to assign the role for this resource
-   * @return {Promise<*>}
    */
-  updatePermissionForResource: async ({ resourceId, roleId, level }) => {
+  updatePermissionForResource: async (resourceId, roleId, level) => {
     return await API.post({
       url: `/api/permission/${roleId}/${resourceId}/${level}`,
     })
@@ -27,9 +54,8 @@ export const buildPermissionsEndpoints = API => ({
    * @param resourceId the ID of the resource to update
    * @param roleId the ID of the role to update the permissions of
    * @param level the level to remove the role for this resource
-   * @return {Promise<*>}
    */
-  removePermissionFromResource: async ({ resourceId, roleId, level }) => {
+  removePermissionFromResource: async (resourceId, roleId, level) => {
     return await API.delete({
       url: `/api/permission/${roleId}/${resourceId}/${level}`,
     })
diff --git a/packages/frontend-core/src/api/plugins.js b/packages/frontend-core/src/api/plugins.ts
similarity index 57%
rename from packages/frontend-core/src/api/plugins.js
rename to packages/frontend-core/src/api/plugins.ts
index 8735b04caa..5a3a3a3e6a 100644
--- a/packages/frontend-core/src/api/plugins.js
+++ b/packages/frontend-core/src/api/plugins.ts
@@ -1,4 +1,21 @@
-export const buildPluginEndpoints = API => ({
+import {
+  CreatePluginRequest,
+  CreatePluginResponse,
+  DeletePluginResponse,
+  FetchPluginResponse,
+  UploadPluginRequest,
+  UploadPluginResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface PluginEndpoins {
+  uploadPlugin: (data: UploadPluginRequest) => Promise<UploadPluginResponse>
+  createPlugin: (data: CreatePluginRequest) => Promise<CreatePluginResponse>
+  getPlugins: () => Promise<FetchPluginResponse>
+  deletePlugin: (pluginId: string) => Promise<DeletePluginResponse>
+}
+
+export const buildPluginEndpoints = (API: BaseAPIClient): PluginEndpoins => ({
   /**
    * Uploads a plugin tarball bundle
    * @param data the plugin tarball bundle to upload
diff --git a/packages/frontend-core/src/api/queries.js b/packages/frontend-core/src/api/queries.ts
similarity index 50%
rename from packages/frontend-core/src/api/queries.js
rename to packages/frontend-core/src/api/queries.ts
index f18ec7c4ec..b088e4487c 100644
--- a/packages/frontend-core/src/api/queries.js
+++ b/packages/frontend-core/src/api/queries.ts
@@ -1,12 +1,42 @@
-export const buildQueryEndpoints = API => ({
+import {
+  DeleteQueryResponse,
+  ExecuteQueryRequest,
+  ExecuteV2QueryResponse,
+  FetchQueriesResponse,
+  FindQueryResponse,
+  ImportRestQueryRequest,
+  ImportRestQueryResponse,
+  PreviewQueryRequest,
+  PreviewQueryResponse,
+  SaveQueryRequest,
+  SaveQueryResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface QueryEndpoints {
+  executeQuery: (
+    queryId: string,
+    opts?: ExecuteQueryRequest
+  ) => Promise<ExecuteV2QueryResponse>
+  fetchQueryDefinition: (queryId: string) => Promise<FindQueryResponse>
+  getQueries: () => Promise<FetchQueriesResponse>
+  saveQuery: (query: SaveQueryRequest) => Promise<SaveQueryResponse>
+  deleteQuery: (id: string, rev: string) => Promise<DeleteQueryResponse>
+  previewQuery: (query: PreviewQueryRequest) => Promise<PreviewQueryResponse>
+  importQueries: (
+    data: ImportRestQueryRequest
+  ) => Promise<ImportRestQueryResponse>
+}
+
+export const buildQueryEndpoints = (API: BaseAPIClient): QueryEndpoints => ({
   /**
    * Executes a query against an external data connector.
    * @param queryId the ID of the query to execute
    * @param pagination pagination info for the query
    * @param parameters parameters for the query
    */
-  executeQuery: async ({ queryId, pagination, parameters }) => {
-    return await API.post({
+  executeQuery: async (queryId, { pagination, parameters } = {}) => {
+    return await API.post<ExecuteQueryRequest, ExecuteV2QueryResponse>({
       url: `/api/v2/queries/${queryId}`,
       body: {
         parameters,
@@ -48,27 +78,22 @@ export const buildQueryEndpoints = API => ({
 
   /**
    * Deletes a query
-   * @param queryId the ID of the query to delete
-   * @param queryRev the rev of the query to delete
+   * @param id the ID of the query to delete
+   * @param rev the rev of the query to delete
    */
-  deleteQuery: async ({ queryId, queryRev }) => {
+  deleteQuery: async (id, rev) => {
     return await API.delete({
-      url: `/api/queries/${queryId}/${queryRev}`,
+      url: `/api/queries/${id}/${rev}`,
     })
   },
 
   /**
    * Imports a set of queries into a certain datasource
-   * @param datasourceId the datasource ID to import queries into
-   * @param data the data string of the content to import
    */
-  importQueries: async ({ datasourceId, data }) => {
+  importQueries: async data => {
     return await API.post({
       url: "/api/queries/import",
-      body: {
-        datasourceId,
-        data,
-      },
+      body: data,
     })
   },
 
diff --git a/packages/frontend-core/src/api/relationships.js b/packages/frontend-core/src/api/relationships.js
deleted file mode 100644
index 45595750a8..0000000000
--- a/packages/frontend-core/src/api/relationships.js
+++ /dev/null
@@ -1,21 +0,0 @@
-export const buildRelationshipEndpoints = API => ({
-  /**
-   * Fetches related rows for a certain field of a certain row.
-   * @param tableId the ID of the table to fetch from
-   * @param rowId the ID of the row to fetch related rows for
-   * @param fieldName the name of the relationship field
-   */
-  fetchRelationshipData: async ({ tableId, rowId, fieldName }) => {
-    if (!tableId || !rowId) {
-      return []
-    }
-    const response = await API.get({
-      url: `/api/${tableId}/${rowId}/enrich?field=${fieldName}`,
-    })
-    if (!fieldName) {
-      return response || []
-    } else {
-      return response[fieldName] || []
-    }
-  },
-})
diff --git a/packages/frontend-core/src/api/relationships.ts b/packages/frontend-core/src/api/relationships.ts
new file mode 100644
index 0000000000..3d5f1a006d
--- /dev/null
+++ b/packages/frontend-core/src/api/relationships.ts
@@ -0,0 +1,31 @@
+import { FetchEnrichedRowResponse, Row } from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface RelationshipEndpoints {
+  fetchRelationshipData: (
+    sourceId: string,
+    rowId: string,
+    fieldName?: string
+  ) => Promise<Row[]>
+}
+
+export const buildRelationshipEndpoints = (
+  API: BaseAPIClient
+): RelationshipEndpoints => ({
+  /**
+   * Fetches related rows for a certain field of a certain row.
+   * @param sourceId the ID of the table to fetch from
+   * @param rowId the ID of the row to fetch related rows for
+   * @param fieldName the name of the relationship field
+   */
+  fetchRelationshipData: async (sourceId, rowId, fieldName) => {
+    const response = await API.get<FetchEnrichedRowResponse>({
+      url: `/api/${sourceId}/${rowId}/enrich?field=${fieldName}`,
+    })
+    if (!fieldName) {
+      return [response]
+    } else {
+      return response[fieldName] || []
+    }
+  },
+})
diff --git a/packages/frontend-core/src/api/roles.js b/packages/frontend-core/src/api/roles.ts
similarity index 50%
rename from packages/frontend-core/src/api/roles.js
rename to packages/frontend-core/src/api/roles.ts
index 80b8028c12..780bc511ed 100644
--- a/packages/frontend-core/src/api/roles.js
+++ b/packages/frontend-core/src/api/roles.ts
@@ -1,12 +1,29 @@
-export const buildRoleEndpoints = API => ({
+import {
+  AccessibleRolesResponse,
+  DeleteRoleResponse,
+  FetchRolesResponse,
+  SaveRoleRequest,
+  SaveRoleResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface RoleEndpoints {
+  deleteRole: (id: string, rev: string) => Promise<DeleteRoleResponse>
+  saveRole: (role: SaveRoleRequest) => Promise<SaveRoleResponse>
+  getRoles: () => Promise<FetchRolesResponse>
+  getRolesForApp: (appId: string) => Promise<any>
+  getAccessibleRoles: () => Promise<AccessibleRolesResponse>
+}
+
+export const buildRoleEndpoints = (API: BaseAPIClient): RoleEndpoints => ({
   /**
    * Deletes a role.
-   * @param roleId the ID of the role to delete
-   * @param roleRev the rev of the role to delete
+   * @param id the ID of the role to delete
+   * @param rev the rev of the role to delete
    */
-  deleteRole: async ({ roleId, roleRev }) => {
+  deleteRole: async (id, rev) => {
     return await API.delete({
-      url: `/api/roles/${roleId}/${roleRev}`,
+      url: `/api/roles/${id}/${rev}`,
     })
   },
 
diff --git a/packages/frontend-core/src/api/routes.js b/packages/frontend-core/src/api/routes.js
deleted file mode 100644
index 28e206debc..0000000000
--- a/packages/frontend-core/src/api/routes.js
+++ /dev/null
@@ -1,19 +0,0 @@
-export const buildRouteEndpoints = API => ({
-  /**
-   * Fetches available routes for the client app.
-   */
-  fetchClientAppRoutes: async () => {
-    return await API.get({
-      url: `/api/routing/client`,
-    })
-  },
-
-  /**
-   * Fetches all routes for the current app.
-   */
-  fetchAppRoutes: async () => {
-    return await API.get({
-      url: "/api/routing",
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/routes.ts b/packages/frontend-core/src/api/routes.ts
new file mode 100644
index 0000000000..0adedf15e2
--- /dev/null
+++ b/packages/frontend-core/src/api/routes.ts
@@ -0,0 +1,30 @@
+import {
+  FetchClientScreenRoutingResponse,
+  FetchScreenRoutingResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface RouteEndpoints {
+  fetchClientAppRoutes: () => Promise<FetchClientScreenRoutingResponse>
+  fetchAppRoutes: () => Promise<FetchScreenRoutingResponse>
+}
+
+export const buildRouteEndpoints = (API: BaseAPIClient): RouteEndpoints => ({
+  /**
+   * Fetches available routes for the client app.
+   */
+  fetchClientAppRoutes: async () => {
+    return await API.get({
+      url: `/api/routing/client`,
+    })
+  },
+
+  /**
+   * Fetches all routes for the current app.
+   */
+  fetchAppRoutes: async () => {
+    return await API.get({
+      url: "/api/routing",
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/rowActions.js b/packages/frontend-core/src/api/rowActions.ts
similarity index 51%
rename from packages/frontend-core/src/api/rowActions.js
rename to packages/frontend-core/src/api/rowActions.ts
index 071af953ef..eef50ed940 100644
--- a/packages/frontend-core/src/api/rowActions.js
+++ b/packages/frontend-core/src/api/rowActions.ts
@@ -1,13 +1,46 @@
-export const buildRowActionEndpoints = API => ({
+import {
+  RowActionsResponse,
+  RowActionResponse,
+  CreateRowActionRequest,
+  RowActionPermissionsResponse,
+  RowActionTriggerRequest,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface RowActionEndpoints {
+  fetch: (tableId: string) => Promise<Record<string, RowActionResponse>>
+  create: (tableId: string, name: string) => Promise<RowActionResponse>
+  delete: (tableId: string, rowActionId: string) => Promise<void>
+  enableView: (
+    tableId: string,
+    rowActionId: string,
+    viewId: string
+  ) => Promise<RowActionPermissionsResponse>
+  disableView: (
+    tableId: string,
+    rowActionId: string,
+    viewId: string
+  ) => Promise<RowActionPermissionsResponse>
+  trigger: (
+    sourceId: string,
+    rowActionId: string,
+    rowId: string
+  ) => Promise<void>
+}
+
+export const buildRowActionEndpoints = (
+  API: BaseAPIClient
+): RowActionEndpoints => ({
   /**
    * Gets the available row actions for a table.
    * @param tableId the ID of the table
    */
   fetch: async tableId => {
-    const res = await API.get({
-      url: `/api/tables/${tableId}/actions`,
-    })
-    return res?.actions || {}
+    return (
+      await API.get<RowActionsResponse>({
+        url: `/api/tables/${tableId}/actions`,
+      })
+    ).actions
   },
 
   /**
@@ -15,8 +48,8 @@ export const buildRowActionEndpoints = API => ({
    * @param name the name of the row action
    * @param tableId the ID of the table
    */
-  create: async ({ name, tableId }) => {
-    return await API.post({
+  create: async (tableId, name) => {
+    return await API.post<CreateRowActionRequest, RowActionResponse>({
       url: `/api/tables/${tableId}/actions`,
       body: {
         name,
@@ -24,27 +57,12 @@ export const buildRowActionEndpoints = API => ({
     })
   },
 
-  /**
-   * Updates a row action.
-   * @param name the new name of the row action
-   * @param tableId the ID of the table
-   * @param rowActionId the ID of the row action to update
-   */
-  update: async ({ tableId, rowActionId, name }) => {
-    return await API.put({
-      url: `/api/tables/${tableId}/actions/${rowActionId}`,
-      body: {
-        name,
-      },
-    })
-  },
-
   /**
    * Deletes a row action.
    * @param tableId the ID of the table
    * @param rowActionId the ID of the row action to delete
    */
-  delete: async ({ tableId, rowActionId }) => {
+  delete: async (tableId, rowActionId) => {
     return await API.delete({
       url: `/api/tables/${tableId}/actions/${rowActionId}`,
     })
@@ -56,7 +74,7 @@ export const buildRowActionEndpoints = API => ({
    * @param rowActionId the ID of the row action
    * @param viewId the ID of the view
    */
-  enableView: async ({ tableId, rowActionId, viewId }) => {
+  enableView: async (tableId, rowActionId, viewId) => {
     return await API.post({
       url: `/api/tables/${tableId}/actions/${rowActionId}/permissions/${viewId}`,
     })
@@ -68,7 +86,7 @@ export const buildRowActionEndpoints = API => ({
    * @param rowActionId the ID of the row action
    * @param viewId the ID of the view
    */
-  disableView: async ({ tableId, rowActionId, viewId }) => {
+  disableView: async (tableId, rowActionId, viewId) => {
     return await API.delete({
       url: `/api/tables/${tableId}/actions/${rowActionId}/permissions/${viewId}`,
     })
@@ -79,8 +97,8 @@ export const buildRowActionEndpoints = API => ({
    * @param tableId the ID of the table
    * @param rowActionId the ID of the row action to trigger
    */
-  trigger: async ({ sourceId, rowActionId, rowId }) => {
-    return await API.post({
+  trigger: async (sourceId, rowActionId, rowId) => {
+    return await API.post<RowActionTriggerRequest>({
       url: `/api/tables/${sourceId}/actions/${rowActionId}/trigger`,
       body: {
         rowId,
diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js
deleted file mode 100644
index 0a0d48da43..0000000000
--- a/packages/frontend-core/src/api/rows.js
+++ /dev/null
@@ -1,117 +0,0 @@
-export const buildRowEndpoints = API => ({
-  /**
-   * Fetches data about a certain row in a table.
-   * @param tableId the ID of the table to fetch from
-   * @param rowId the ID of the row to fetch
-   */
-  fetchRow: async ({ tableId, rowId }) => {
-    if (!tableId || !rowId) {
-      return null
-    }
-    return await API.get({
-      url: `/api/${tableId}/rows/${rowId}`,
-    })
-  },
-
-  /**
-   * Creates or updates a row in a table.
-   * @param row the row to save
-   * @param suppressErrors whether or not to suppress error notifications
-   */
-  saveRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
-      return
-    }
-    return await API.post({
-      url: `/api/${resourceId}/rows`,
-      body: row,
-      suppressErrors,
-    })
-  },
-
-  /**
-   * Patches a row in a table.
-   * @param row the row to patch
-   * @param suppressErrors whether or not to suppress error notifications
-   */
-  patchRow: async (row, suppressErrors = false) => {
-    const resourceId = row?._viewId || row?.tableId
-    if (!resourceId) {
-      return
-    }
-    return await API.patch({
-      url: `/api/${resourceId}/rows`,
-      body: row,
-      suppressErrors,
-    })
-  },
-
-  /**
-   * Deletes a row from a table.
-   * @param tableId the ID of the table or view to delete from
-   * @param rowId the ID of the row to delete
-   * @param revId the rev of the row to delete
-   */
-  deleteRow: async ({ tableId, rowId, revId }) => {
-    if (!tableId || !rowId) {
-      return
-    }
-    return await API.delete({
-      url: `/api/${tableId}/rows`,
-      body: {
-        _id: rowId,
-        _rev: revId,
-      },
-    })
-  },
-
-  /**
-   * Deletes multiple rows from a table.
-   * @param tableId the table or view ID to delete the rows from
-   * @param rows the array of rows to delete
-   */
-  deleteRows: async ({ tableId, rows }) => {
-    rows?.forEach(row => {
-      delete row?._viewId
-    })
-    return await API.delete({
-      url: `/api/${tableId}/rows`,
-      body: {
-        rows,
-      },
-    })
-  },
-
-  /**
-   * Exports rows.
-   * @param tableId the table ID to export the rows from
-   * @param rows the array of rows to export
-   * @param format the format to export (csv or json)
-   * @param columns which columns to export (all if undefined)
-   * @param delimiter how values should be separated in a CSV (default is comma)
-   */
-  exportRows: async ({
-    tableId,
-    rows,
-    format,
-    columns,
-    search,
-    delimiter,
-    customHeaders,
-  }) => {
-    return await API.post({
-      url: `/api/${tableId}/rows/exportRows?format=${format}`,
-      body: {
-        rows,
-        columns,
-        delimiter,
-        customHeaders,
-        ...search,
-      },
-      parseResponse: async response => {
-        return await response.text()
-      },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/rows.ts b/packages/frontend-core/src/api/rows.ts
new file mode 100644
index 0000000000..cee434037e
--- /dev/null
+++ b/packages/frontend-core/src/api/rows.ts
@@ -0,0 +1,120 @@
+import {
+  DeleteRowRequest,
+  ExportRowsRequest,
+  FindRowResponse,
+  PatchRowRequest,
+  PatchRowResponse,
+  Row,
+  SaveRowRequest,
+  SaveRowResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface RowEndpoints {
+  fetchRow: (tableId: string, rowId: string) => Promise<FindRowResponse>
+  saveRow: (
+    row: SaveRowRequest,
+    suppressErrors?: boolean
+  ) => Promise<SaveRowResponse>
+  patchRow: (
+    row: PatchRowRequest,
+    suppressErrors?: boolean
+  ) => Promise<PatchRowResponse>
+  deleteRow: (sourceId: string, id: string) => Promise<void>
+  deleteRows: (sourceId: string, rows: (Row | string)[]) => Promise<void>
+  exportRows: (
+    tableId: string,
+    format: string,
+    data: ExportRowsRequest
+  ) => Promise<string>
+}
+
+export const buildRowEndpoints = (API: BaseAPIClient): RowEndpoints => ({
+  /**
+   * Fetches data about a certain row in a data source.
+   * @param sourceId the ID of the table or view to fetch from
+   * @param rowId the ID of the row to fetch
+   */
+  fetchRow: async (sourceId, rowId) => {
+    return await API.get({
+      url: `/api/${sourceId}/rows/${rowId}`,
+    })
+  },
+
+  /**
+   * Creates or updates a row in a table.
+   * @param row the row to save
+   * @param suppressErrors whether or not to suppress error notifications
+   */
+  saveRow: async (row, suppressErrors = false) => {
+    const sourceId = row._viewId || row.tableId
+    return await API.post({
+      url: `/api/${sourceId}/rows`,
+      body: row,
+      suppressErrors,
+    })
+  },
+
+  /**
+   * Patches a row in a table.
+   * @param row the row to patch
+   * @param suppressErrors whether or not to suppress error notifications
+   */
+  patchRow: async (row, suppressErrors = false) => {
+    const sourceId = row._viewId || row.tableId
+    return await API.patch({
+      url: `/api/${sourceId}/rows`,
+      body: row,
+      suppressErrors,
+    })
+  },
+
+  /**
+   * Deletes a row from a table.
+   * @param sourceId the ID of the table or view to delete from
+   * @param rowId the ID of the row to delete
+   */
+  deleteRow: async (sourceId, rowId) => {
+    return await API.delete<DeleteRowRequest>({
+      url: `/api/${sourceId}/rows`,
+      body: {
+        _id: rowId,
+      },
+    })
+  },
+
+  /**
+   * Deletes multiple rows from a table.
+   * @param sourceId the table or view ID to delete the rows from
+   * @param rows the array of rows to delete
+   */
+  deleteRows: async (sourceId, rows) => {
+    rows.forEach(row => {
+      if (typeof row === "object") {
+        delete row?._viewId
+      }
+    })
+    return await API.delete<DeleteRowRequest>({
+      url: `/api/${sourceId}/rows`,
+      body: {
+        rows,
+      },
+    })
+  },
+
+  /**
+   * Exports rows.
+   * @param tableId the table ID to export the rows from
+   * @param format the format to export (csv or json)
+   * @param data the export options
+   */
+  exportRows: async (tableId, format, data) => {
+    return await API.post({
+      url: `/api/${tableId}/rows/exportRows?format=${format}`,
+      body: data,
+      parseResponse: async response => {
+        return await response.text()
+      },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/screens.js b/packages/frontend-core/src/api/screens.js
deleted file mode 100644
index 1daa79153b..0000000000
--- a/packages/frontend-core/src/api/screens.js
+++ /dev/null
@@ -1,23 +0,0 @@
-export const buildScreenEndpoints = API => ({
-  /**
-   * Saves a screen definition
-   * @param screen the screen to save
-   */
-  saveScreen: async screen => {
-    return await API.post({
-      url: "/api/screens",
-      body: screen,
-    })
-  },
-
-  /**
-   * Deletes a screen.
-   * @param screenId the ID of the screen to delete
-   * @param screenRev the rev of the screen to delete
-   */
-  deleteScreen: async ({ screenId, screenRev }) => {
-    return await API.delete({
-      url: `/api/screens/${screenId}/${screenRev}`,
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/screens.ts b/packages/frontend-core/src/api/screens.ts
new file mode 100644
index 0000000000..bdb01e1427
--- /dev/null
+++ b/packages/frontend-core/src/api/screens.ts
@@ -0,0 +1,35 @@
+import {
+  DeleteScreenResponse,
+  SaveScreenRequest,
+  SaveScreenResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface ScreenEndpoints {
+  saveScreen: (screen: SaveScreenRequest) => Promise<SaveScreenResponse>
+  deleteScreen: (id: string, rev: string) => Promise<DeleteScreenResponse>
+}
+
+export const buildScreenEndpoints = (API: BaseAPIClient): ScreenEndpoints => ({
+  /**
+   * Saves a screen definition
+   * @param screen the screen to save
+   */
+  saveScreen: async screen => {
+    return await API.post({
+      url: "/api/screens",
+      body: screen,
+    })
+  },
+
+  /**
+   * Deletes a screen.
+   * @param id the ID of the screen to delete
+   * @param rev the rev of the screen to delete
+   */
+  deleteScreen: async (id, rev) => {
+    return await API.delete({
+      url: `/api/screens/${id}/${rev}`,
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/self.js b/packages/frontend-core/src/api/self.ts
similarity index 59%
rename from packages/frontend-core/src/api/self.js
rename to packages/frontend-core/src/api/self.ts
index cdd5eaba53..0f4ff1f985 100644
--- a/packages/frontend-core/src/api/self.js
+++ b/packages/frontend-core/src/api/self.ts
@@ -1,11 +1,28 @@
-export const buildSelfEndpoints = API => ({
+import {
+  AppSelfResponse,
+  FetchAPIKeyResponse,
+  GenerateAPIKeyResponse,
+  GetGlobalSelfResponse,
+  UpdateSelfRequest,
+  UpdateSelfResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface SelfEndpoints {
+  updateSelf: (user: UpdateSelfRequest) => Promise<UpdateSelfResponse>
+  generateAPIKey: () => Promise<string | undefined>
+  fetchDeveloperInfo: () => Promise<FetchAPIKeyResponse>
+  fetchBuilderSelf: () => Promise<GetGlobalSelfResponse>
+  fetchSelf: () => Promise<AppSelfResponse | null>
+}
+
+export const buildSelfEndpoints = (API: BaseAPIClient): SelfEndpoints => ({
   /**
    * Using the logged in user, this will generate a new API key,
    * assuming the user is a builder.
-   * @return {Promise<object>} returns the API response, including an API key.
    */
   generateAPIKey: async () => {
-    const response = await API.post({
+    const response = await API.post<null, GenerateAPIKeyResponse>({
       url: "/api/global/self/api_key",
     })
     return response?.apiKey
@@ -13,7 +30,6 @@ export const buildSelfEndpoints = API => ({
 
   /**
    * retrieves the API key for the logged in user.
-   * @return {Promise<object>} An object containing the user developer information.
    */
   fetchDeveloperInfo: async () => {
     return API.get({
diff --git a/packages/frontend-core/src/api/tables.js b/packages/frontend-core/src/api/tables.js
deleted file mode 100644
index dc9008e4eb..0000000000
--- a/packages/frontend-core/src/api/tables.js
+++ /dev/null
@@ -1,152 +0,0 @@
-export const buildTableEndpoints = API => ({
-  /**
-   * Fetches a table definition.
-   * Since definitions cannot change at runtime, the result is cached.
-   * @param tableId the ID of the table to fetch
-   */
-  fetchTableDefinition: async tableId => {
-    return await API.get({
-      url: `/api/tables/${tableId}`,
-      cache: true,
-    })
-  },
-
-  /**
-   * Fetches all rows from a table.
-   * @param tableId the ID of the table for fetch
-   */
-  fetchTableData: async tableId => {
-    return await API.get({ url: `/api/${tableId}/rows` })
-  },
-
-  /**
-   * Searches a table using Lucene.
-   * @param tableId the ID of the table to search
-   * @param query the lucene search query
-   * @param bookmark the current pagination bookmark
-   * @param limit the number of rows to retrieve
-   * @param sort the field to sort by
-   * @param sortOrder the order to sort by
-   * @param sortType the type to sort by, either numerically or alphabetically
-   * @param paginate whether to paginate the data
-   */
-  searchTable: async ({
-    tableId,
-    query,
-    bookmark,
-    limit,
-    sort,
-    sortOrder,
-    sortType,
-    paginate,
-  }) => {
-    if (!tableId) {
-      return {
-        rows: [],
-      }
-    }
-    return await API.post({
-      url: `/api/${tableId}/search`,
-      body: {
-        ...(query ? { query } : {}),
-        bookmark,
-        limit,
-        sort,
-        sortOrder,
-        sortType,
-        paginate,
-      },
-    })
-  },
-
-  /**
-   * Imports data into an existing table
-   * @param tableId the table ID to import to
-   * @param rows the data import object
-   * @param identifierFields column names to be used as keys for overwriting existing rows
-   */
-  importTableData: async ({ tableId, rows, identifierFields }) => {
-    return await API.post({
-      url: `/api/tables/${tableId}/import`,
-      body: {
-        rows,
-        identifierFields,
-      },
-    })
-  },
-  csvToJson: async csvString => {
-    return await API.post({
-      url: "/api/convert/csvToJson",
-      body: {
-        csvString,
-      },
-    })
-  },
-
-  /**
-   * Gets a list of tables.
-   */
-  getTables: async () => {
-    return await API.get({
-      url: "/api/tables",
-    })
-  },
-
-  /**
-   * Get a single table based on table ID.
-   */
-  getTable: async tableId => {
-    return await API.get({
-      url: `/api/tables/${tableId}`,
-    })
-  },
-
-  /**
-   * Saves a table.
-   * @param table the table to save
-   */
-  saveTable: async table => {
-    return await API.post({
-      url: "/api/tables",
-      body: table,
-    })
-  },
-
-  /**
-   * Deletes a table.
-   * @param tableId the ID of the table to delete
-   * @param tableRev the rev of the table to delete
-   */
-  deleteTable: async ({ tableId, tableRev }) => {
-    return await API.delete({
-      url: `/api/tables/${tableId}/${tableRev}`,
-    })
-  },
-  validateNewTableImport: async ({ rows, schema }) => {
-    return await API.post({
-      url: "/api/tables/validateNewTableImport",
-      body: {
-        rows,
-        schema,
-      },
-    })
-  },
-  validateExistingTableImport: async ({ rows, tableId }) => {
-    return await API.post({
-      url: "/api/tables/validateExistingTableImport",
-      body: {
-        rows,
-        tableId,
-      },
-    })
-  },
-  migrateColumn: async ({ tableId, oldColumn, newColumn }) => {
-    return await API.post({
-      url: `/api/tables/${tableId}/migrate`,
-      body: {
-        oldColumn,
-        newColumn,
-      },
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/tables.ts b/packages/frontend-core/src/api/tables.ts
new file mode 100644
index 0000000000..ebbd7c09bf
--- /dev/null
+++ b/packages/frontend-core/src/api/tables.ts
@@ -0,0 +1,192 @@
+import {
+  BulkImportRequest,
+  BulkImportResponse,
+  CsvToJsonRequest,
+  CsvToJsonResponse,
+  FetchTablesResponse,
+  Row,
+  SaveTableRequest,
+  SaveTableResponse,
+  SearchRowRequest,
+  PaginatedSearchRowResponse,
+  TableSchema,
+  ValidateNewTableImportRequest,
+  ValidateTableImportRequest,
+  ValidateTableImportResponse,
+  FindTableResponse,
+  FetchRowsResponse,
+  MigrateTableResponse,
+  MigrateTableRequest,
+  DeleteTableResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface TableEndpoints {
+  fetchTableDefinition: (tableId: string) => Promise<FindTableResponse>
+  fetchTableData: (tableId: string) => Promise<FetchRowsResponse>
+  searchTable: (
+    sourceId: string,
+    opts: SearchRowRequest
+  ) => Promise<PaginatedSearchRowResponse>
+  importTableData: (
+    tableId: string,
+    rows: Row[],
+    identifierFields?: string[]
+  ) => Promise<BulkImportResponse>
+  csvToJson: (csvString: string) => Promise<CsvToJsonResponse>
+  getTables: () => Promise<FetchTablesResponse>
+  getTable: (tableId: string) => Promise<FindTableResponse>
+  saveTable: (table: SaveTableRequest) => Promise<SaveTableResponse>
+  deleteTable: (id: string, rev: string) => Promise<DeleteTableResponse>
+  validateNewTableImport: (
+    rows: Row[],
+    schema: TableSchema
+  ) => Promise<ValidateTableImportResponse>
+  validateExistingTableImport: (
+    rows: Row[],
+    tableId?: string
+  ) => Promise<ValidateTableImportResponse>
+  migrateColumn: (
+    tableId: string,
+    oldColumn: string,
+    newColumn: string
+  ) => Promise<MigrateTableResponse>
+}
+
+export const buildTableEndpoints = (API: BaseAPIClient): TableEndpoints => ({
+  /**
+   * Fetches a table definition.
+   * Since definitions cannot change at runtime, the result is cached.
+   * @param tableId the ID of the table to fetch
+   */
+  fetchTableDefinition: async tableId => {
+    return await API.get({
+      url: `/api/tables/${tableId}`,
+      cache: true,
+    })
+  },
+
+  /**
+   * Fetches all rows from a table.
+   * @param sourceId the ID of the table to fetch
+   */
+  fetchTableData: async sourceId => {
+    return await API.get({ url: `/api/${sourceId}/rows` })
+  },
+
+  /**
+   * Searches a table using Lucene.
+   * @param sourceId the ID of the table to search
+   * @param opts the search opts
+   */
+  searchTable: async (sourceId, opts) => {
+    return await API.post({
+      url: `/api/${sourceId}/search`,
+      body: opts,
+    })
+  },
+
+  /**
+   * Imports data into an existing table
+   * @param tableId the table ID to import to
+   * @param rows the data import object
+   * @param identifierFields column names to be used as keys for overwriting existing rows
+   */
+  importTableData: async (tableId, rows, identifierFields) => {
+    return await API.post<BulkImportRequest, BulkImportResponse>({
+      url: `/api/tables/${tableId}/import`,
+      body: {
+        rows,
+        identifierFields,
+      },
+    })
+  },
+
+  /**
+   * Converts a CSV string to JSON
+   * @param csvString the CSV string
+   */
+  csvToJson: async csvString => {
+    return await API.post<CsvToJsonRequest, CsvToJsonResponse>({
+      url: "/api/convert/csvToJson",
+      body: {
+        csvString,
+      },
+    })
+  },
+
+  /**
+   * Gets a list of tables.
+   */
+  getTables: async () => {
+    return await API.get({
+      url: "/api/tables",
+    })
+  },
+
+  /**
+   * Get a single table based on table ID.
+   * Dupe of fetchTableDefinition but not cached?
+   */
+  getTable: async tableId => {
+    return await API.get({
+      url: `/api/tables/${tableId}`,
+    })
+  },
+
+  /**
+   * Saves a table.
+   * @param table the table to save
+   */
+  saveTable: async table => {
+    return await API.post({
+      url: "/api/tables",
+      body: table,
+    })
+  },
+
+  /**
+   * Deletes a table.
+   * @param id the ID of the table to delete
+   * @param rev the rev of the table to delete
+   */
+  deleteTable: async (id, rev) => {
+    return await API.delete({
+      url: `/api/tables/${id}/${rev}`,
+    })
+  },
+
+  validateNewTableImport: async (rows, schema) => {
+    return await API.post<
+      ValidateNewTableImportRequest,
+      ValidateTableImportResponse
+    >({
+      url: "/api/tables/validateNewTableImport",
+      body: {
+        rows,
+        schema,
+      },
+    })
+  },
+  validateExistingTableImport: async (rows, tableId) => {
+    return await API.post<
+      ValidateTableImportRequest,
+      ValidateTableImportResponse
+    >({
+      url: "/api/tables/validateExistingTableImport",
+      body: {
+        rows,
+        tableId,
+      },
+    })
+  },
+  migrateColumn: async (tableId, oldColumn, newColumn) => {
+    return await API.post<MigrateTableRequest, MigrateTableResponse>({
+      url: `/api/tables/${tableId}/migrate`,
+      body: {
+        oldColumn,
+        newColumn,
+      },
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/templates.js b/packages/frontend-core/src/api/templates.js
deleted file mode 100644
index 660a85d745..0000000000
--- a/packages/frontend-core/src/api/templates.js
+++ /dev/null
@@ -1,35 +0,0 @@
-export const buildTemplateEndpoints = API => ({
-  /**
-   * Gets the list of email template definitions.
-   */
-  getEmailTemplateDefinitions: async () => {
-    return await API.get({ url: "/api/global/template/definitions" })
-  },
-
-  /**
-   * Gets the list of email templates.
-   */
-  getEmailTemplates: async () => {
-    return await API.get({ url: "/api/global/template/email" })
-  },
-
-  /**
-   * Saves an email template.
-   * @param template the template to save
-   */
-  saveEmailTemplate: async template => {
-    return await API.post({
-      url: "/api/global/template",
-      body: template,
-    })
-  },
-
-  /**
-   * Gets a list of app templates.
-   */
-  getAppTemplates: async () => {
-    return await API.get({
-      url: "/api/templates",
-    })
-  },
-})
diff --git a/packages/frontend-core/src/api/templates.ts b/packages/frontend-core/src/api/templates.ts
new file mode 100644
index 0000000000..f712bb1d39
--- /dev/null
+++ b/packages/frontend-core/src/api/templates.ts
@@ -0,0 +1,57 @@
+import {
+  FetchGlobalTemplateByTypeResponse,
+  FetchGlobalTemplateDefinitionResponse,
+  FetchTemplateResponse,
+  SaveGlobalTemplateRequest,
+  SaveGlobalTemplateResponse,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface TemplateEndpoints {
+  getEmailTemplates: () => Promise<FetchGlobalTemplateByTypeResponse>
+  getAppTemplates: () => Promise<FetchTemplateResponse>
+  getEmailTemplateDefinitions: () => Promise<FetchGlobalTemplateDefinitionResponse>
+  saveEmailTemplate: (
+    template: SaveGlobalTemplateRequest
+  ) => Promise<SaveGlobalTemplateResponse>
+}
+
+export const buildTemplateEndpoints = (
+  API: BaseAPIClient
+): TemplateEndpoints => ({
+  /**
+   * Gets the list of email template definitions.
+   */
+  getEmailTemplateDefinitions: async () => {
+    return await API.get({ url: "/api/global/template/definitions" })
+  },
+
+  /**
+   * Gets the list of email templates.
+   */
+  getEmailTemplates: async () => {
+    return await API.get({
+      url: "/api/global/template/email",
+    })
+  },
+
+  /**
+   * Saves an email template.
+   * @param template the template to save
+   */
+  saveEmailTemplate: async template => {
+    return await API.post({
+      url: "/api/global/template",
+      body: template,
+    })
+  },
+
+  /**
+   * Gets a list of app templates.
+   */
+  getAppTemplates: async () => {
+    return await API.get({
+      url: "/api/templates",
+    })
+  },
+})
diff --git a/packages/frontend-core/src/api/types.ts b/packages/frontend-core/src/api/types.ts
new file mode 100644
index 0000000000..4819b4cd3b
--- /dev/null
+++ b/packages/frontend-core/src/api/types.ts
@@ -0,0 +1,135 @@
+import { AIEndpoints } from "./ai"
+import { AnalyticsEndpoints } from "./analytics"
+import { AppEndpoints } from "./app"
+import { AttachmentEndpoints } from "./attachments"
+import { AuditLogEndpoints } from "./auditLogs"
+import { AuthEndpoints } from "./auth"
+import { AutomationEndpoints } from "./automations"
+import { BackupEndpoints } from "./backups"
+import { ConfigEndpoints } from "./configs"
+import { DatasourceEndpoints } from "./datasources"
+import { EnvironmentVariableEndpoints } from "./environmentVariables"
+import { EventEndpoints } from "./events"
+import { FlagEndpoints } from "./flags"
+import { GroupEndpoints } from "./groups"
+import { LayoutEndpoints } from "./layouts"
+import { LicensingEndpoints } from "./licensing"
+import { LogEndpoints } from "./logs"
+import { MigrationEndpoints } from "./migrations"
+import { OtherEndpoints } from "./other"
+import { PermissionEndpoints } from "./permissions"
+import { PluginEndpoins } from "./plugins"
+import { QueryEndpoints } from "./queries"
+import { RelationshipEndpoints } from "./relationships"
+import { RoleEndpoints } from "./roles"
+import { RouteEndpoints } from "./routes"
+import { RowActionEndpoints } from "./rowActions"
+import { RowEndpoints } from "./rows"
+import { ScreenEndpoints } from "./screens"
+import { SelfEndpoints } from "./self"
+import { TableEndpoints } from "./tables"
+import { TemplateEndpoints } from "./templates"
+import { UserEndpoints } from "./user"
+import { ViewEndpoints } from "./views"
+import { ViewV2Endpoints } from "./viewsV2"
+
+export enum HTTPMethod {
+  POST = "POST",
+  PATCH = "PATCH",
+  GET = "GET",
+  PUT = "PUT",
+  DELETE = "DELETE",
+}
+
+export type Headers = Record<string, string>
+
+export type APIClientConfig = {
+  enableCaching?: boolean
+  attachHeaders?: (headers: Headers) => void
+  onError?: (error: APIError) => void
+  onMigrationDetected?: (migration: string) => void
+}
+
+export type APICallConfig<RequestT, ResponseT> = {
+  method: HTTPMethod
+  url: string
+  json: boolean
+  external: boolean
+  suppressErrors: boolean
+  cache: boolean
+  body?: RequestT
+  parseResponse?: (response: Response) => Promise<ResponseT> | ResponseT
+}
+
+export type APICallParams<
+  RequestT = null,
+  ResponseT = void
+> = RequestT extends null
+  ? Pick<APICallConfig<RequestT, ResponseT>, "url"> &
+      Partial<APICallConfig<RequestT, ResponseT>>
+  : Pick<APICallConfig<RequestT, ResponseT>, "url" | "body"> &
+      Partial<APICallConfig<RequestT, ResponseT>>
+
+export type BaseAPIClient = {
+  post: <RequestT = null, ResponseT = void>(
+    params: APICallParams<RequestT, ResponseT>
+  ) => Promise<ResponseT>
+  get: <ResponseT = void>(
+    params: APICallParams<undefined | null, ResponseT>
+  ) => Promise<ResponseT>
+  put: <RequestT = null, ResponseT = void>(
+    params: APICallParams<RequestT, ResponseT>
+  ) => Promise<ResponseT>
+  delete: <RequestT = null, ResponseT = void>(
+    params: APICallParams<RequestT, ResponseT>
+  ) => Promise<ResponseT>
+  patch: <RequestT = null, ResponseT = void>(
+    params: APICallParams<RequestT, ResponseT>
+  ) => Promise<ResponseT>
+  invalidateCache: () => void
+  getAppID: () => string
+}
+
+export type APIError = {
+  message?: string
+  url: string
+  method?: HTTPMethod
+  json: any
+  status: number
+  handled: boolean
+  suppressErrors: boolean
+}
+
+export type APIClient = BaseAPIClient &
+  AIEndpoints &
+  AnalyticsEndpoints &
+  AppEndpoints &
+  AttachmentEndpoints &
+  AuditLogEndpoints &
+  AuthEndpoints &
+  AutomationEndpoints &
+  BackupEndpoints &
+  ConfigEndpoints &
+  DatasourceEndpoints &
+  EnvironmentVariableEndpoints &
+  EventEndpoints &
+  FlagEndpoints &
+  GroupEndpoints &
+  LayoutEndpoints &
+  LicensingEndpoints &
+  LogEndpoints &
+  MigrationEndpoints &
+  OtherEndpoints &
+  PermissionEndpoints &
+  PluginEndpoins &
+  QueryEndpoints &
+  RelationshipEndpoints &
+  RoleEndpoints &
+  RouteEndpoints &
+  RowEndpoints &
+  ScreenEndpoints &
+  SelfEndpoints &
+  TableEndpoints &
+  TemplateEndpoints &
+  UserEndpoints &
+  ViewEndpoints & { rowActions: RowActionEndpoints; viewV2: ViewV2Endpoints }
diff --git a/packages/frontend-core/src/api/user.js b/packages/frontend-core/src/api/user.ts
similarity index 50%
rename from packages/frontend-core/src/api/user.js
rename to packages/frontend-core/src/api/user.ts
index 45d481183a..cf66751078 100644
--- a/packages/frontend-core/src/api/user.js
+++ b/packages/frontend-core/src/api/user.ts
@@ -1,4 +1,78 @@
-export const buildUserEndpoints = API => ({
+import {
+  AcceptUserInviteRequest,
+  AcceptUserInviteResponse,
+  BulkUserCreated,
+  BulkUserDeleted,
+  BulkUserRequest,
+  BulkUserResponse,
+  CheckInviteResponse,
+  CountUserResponse,
+  CreateAdminUserRequest,
+  CreateAdminUserResponse,
+  DeleteInviteUsersRequest,
+  DeleteInviteUsersResponse,
+  DeleteUserResponse,
+  FetchUsersResponse,
+  FindUserResponse,
+  GetUserInvitesResponse,
+  InviteUsersRequest,
+  InviteUsersResponse,
+  LookupAccountHolderResponse,
+  SaveUserResponse,
+  SearchUsersRequest,
+  SearchUsersResponse,
+  UnsavedUser,
+  UpdateInviteRequest,
+  UpdateInviteResponse,
+  UpdateSelfMetadataRequest,
+  UpdateSelfMetadataResponse,
+  UserIdentifier,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface UserEndpoints {
+  getUsers: () => Promise<FetchUsersResponse>
+  getUser: (userId: string) => Promise<FindUserResponse>
+  updateOwnMetadata: (
+    metadata: UpdateSelfMetadataRequest
+  ) => Promise<UpdateSelfMetadataResponse>
+  createAdminUser: (
+    user: CreateAdminUserRequest
+  ) => Promise<CreateAdminUserResponse>
+  saveUser: (user: UnsavedUser) => Promise<SaveUserResponse>
+  deleteUser: (userId: string) => Promise<DeleteUserResponse>
+  deleteUsers: (users: UserIdentifier[]) => Promise<BulkUserDeleted | undefined>
+  onboardUsers: (data: InviteUsersRequest) => Promise<InviteUsersResponse>
+  getUserInvite: (code: string) => Promise<CheckInviteResponse>
+  getUserInvites: () => Promise<GetUserInvitesResponse>
+  inviteUsers: (users: InviteUsersRequest) => Promise<InviteUsersResponse>
+  removeUserInvites: (
+    data: DeleteInviteUsersRequest
+  ) => Promise<DeleteInviteUsersResponse>
+  acceptInvite: (
+    data: AcceptUserInviteRequest
+  ) => Promise<AcceptUserInviteResponse>
+  getUserCountByApp: (appId: string) => Promise<number>
+  getAccountHolder: () => Promise<LookupAccountHolderResponse>
+  searchUsers: (data: SearchUsersRequest) => Promise<SearchUsersResponse>
+  createUsers: (
+    users: UnsavedUser[],
+    groups: any[]
+  ) => Promise<BulkUserCreated | undefined>
+  updateUserInvite: (
+    code: string,
+    data: UpdateInviteRequest
+  ) => Promise<UpdateInviteResponse>
+
+  // Missing request or response types
+  addAppBuilder: (userId: string, appId: string) => Promise<{ message: string }>
+  removeAppBuilder: (
+    userId: string,
+    appId: string
+  ) => Promise<{ message: string }>
+}
+
+export const buildUserEndpoints = (API: BaseAPIClient): UserEndpoints => ({
   /**
    * Gets a list of users in the current tenant.
    */
@@ -9,33 +83,12 @@ export const buildUserEndpoints = API => ({
   },
 
   /**
-   * Gets a list of users in the current tenant.
-   * @param {string} bookmark The page to retrieve
-   * @param {object} query search filters for lookup by user (all operators not supported).
-   * @param {string} appId Facilitate app/role based user searching
-   * @param {boolean} paginate Allow the disabling of pagination
-   * @param {number} limit How many users to retrieve in a single search
+   * Searches a list of users in the current tenant.
    */
-  searchUsers: async ({ paginate, bookmark, query, appId, limit } = {}) => {
-    const opts = {}
-    if (bookmark) {
-      opts.bookmark = bookmark
-    }
-    if (query) {
-      opts.query = query
-    }
-    if (appId) {
-      opts.appId = appId
-    }
-    if (typeof paginate === "boolean") {
-      opts.paginate = paginate
-    }
-    if (limit) {
-      opts.limit = limit
-    }
+  searchUsers: async data => {
     return await API.post({
       url: `/api/global/users/search`,
-      body: opts,
+      body: data,
     })
   },
 
@@ -48,17 +101,6 @@ export const buildUserEndpoints = API => ({
     })
   },
 
-  /**
-   * Creates a user for an app.
-   * @param user the user to create
-   */
-  createAppUser: async user => {
-    return await API.post({
-      url: "/api/users/metadata",
-      body: user,
-    })
-  },
-
   /**
    * Updates the current user metadata.
    * @param metadata the metadata to save
@@ -72,12 +114,12 @@ export const buildUserEndpoints = API => ({
 
   /**
    * Creates an admin user.
-   * @param adminUser the admin user to create
+   * @param user the admin user to create
    */
-  createAdminUser: async adminUser => {
+  createAdminUser: async user => {
     return await API.post({
       url: "/api/global/users/init",
-      body: adminUser,
+      body: user,
     })
   },
 
@@ -97,8 +139,8 @@ export const buildUserEndpoints = API => ({
    * @param users the array of user objects to create
    * @param groups the array of group ids to add all users to
    */
-  createUsers: async ({ users, groups }) => {
-    const res = await API.post({
+  createUsers: async (users, groups) => {
+    const res = await API.post<BulkUserRequest, BulkUserResponse>({
       url: "/api/global/users/bulk",
       body: {
         create: {
@@ -125,7 +167,7 @@ export const buildUserEndpoints = API => ({
    * @param users the ID/email pair of the user to delete
    */
   deleteUsers: async users => {
-    const res = await API.post({
+    const res = await API.post<BulkUserRequest, BulkUserResponse>({
       url: `/api/global/users/bulk`,
       body: {
         delete: {
@@ -137,54 +179,23 @@ export const buildUserEndpoints = API => ({
   },
 
   /**
-   * Invites a user to the current tenant.
-   * @param email the email address to send the invitation to
-   * @param builder whether the user should be a global builder
-   * @param admin whether the user should be a global admin
+   * Onboards multiple users
    */
-  inviteUser: async ({ email, builder, admin, apps }) => {
-    return await API.post({
-      url: "/api/global/users/invite",
-      body: {
-        email,
-        userInfo: {
-          admin: admin?.global ? { global: true } : undefined,
-          builder: builder?.global ? { global: true } : undefined,
-          apps: apps ? apps : undefined,
-        },
-      },
-    })
-  },
-
-  onboardUsers: async payload => {
+  onboardUsers: async data => {
     return await API.post({
       url: "/api/global/users/onboard",
-      body: payload.map(invite => {
-        const { email, admin, builder, apps } = invite
-        return {
-          email,
-          userInfo: {
-            admin,
-            builder,
-            apps: apps ? apps : undefined,
-          },
-        }
-      }),
+      body: data,
     })
   },
 
   /**
    * Accepts a user invite as a body and will update the associated app roles.
    * for an existing invite
-   * @param invite the invite code sent in the email
    */
-  updateUserInvite: async invite => {
-    await API.post({
-      url: `/api/global/users/invite/update/${invite.code}`,
-      body: {
-        apps: invite.apps,
-        builder: invite.builder,
-      },
+  updateUserInvite: async (code, data) => {
+    return await API.post<UpdateInviteRequest, UpdateInviteResponse>({
+      url: `/api/global/users/invite/update/${code}`,
+      body: data,
     })
   },
 
@@ -214,72 +225,46 @@ export const buildUserEndpoints = API => ({
   inviteUsers: async users => {
     return await API.post({
       url: "/api/global/users/multi/invite",
-      body: users.map(user => {
-        let builder = undefined
-        if (user.admin || user.builder) {
-          builder = { global: true }
-        } else if (user.creator) {
-          builder = { creator: true }
-        }
-        return {
-          email: user.email,
-          userInfo: {
-            admin: user.admin ? { global: true } : undefined,
-            builder,
-            userGroups: user.groups,
-            roles: user.apps ? user.apps : undefined,
-          },
-        }
-      }),
+      body: users,
     })
   },
 
   /**
    * Removes multiple user invites from Redis cache
    */
-  removeUserInvites: async inviteCodes => {
+  removeUserInvites: async data => {
     return await API.post({
       url: "/api/global/users/multi/invite/delete",
-      body: inviteCodes,
+      body: data,
     })
   },
 
   /**
    * Accepts an invite to join the platform and creates a user.
-   * @param inviteCode the invite code sent in the email
-   * @param password the password for the newly created user
-   * @param firstName the first name of the new user
-   * @param lastName the last name of the new user
    */
-  acceptInvite: async ({ inviteCode, password, firstName, lastName }) => {
+  acceptInvite: async data => {
     return await API.post({
       url: "/api/global/users/invite/accept",
-      body: {
-        inviteCode,
-        password,
-        firstName,
-        lastName,
-      },
+      body: data,
     })
   },
 
   /**
-   * Accepts an invite to join the platform and creates a user.
-   * @param inviteCode the invite code sent in the email
-   * @param password the password for the newly created user
+   * Counts the number of users in an app
    */
-  getUserCountByApp: async ({ appId }) => {
-    return await API.get({
+  getUserCountByApp: async appId => {
+    const res = await API.get<CountUserResponse>({
       url: `/api/global/users/count/${appId}`,
     })
+    return res.userCount
   },
 
   /**
    * Adds a per app builder to the selected app
-   * @param appId the applications id
    * @param userId The id of the user to add as a builder
+   * @param appId the applications id
    */
-  addAppBuilder: async ({ userId, appId }) => {
+  addAppBuilder: async (userId, appId) => {
     return await API.post({
       url: `/api/global/users/${userId}/app/${appId}/builder`,
     })
@@ -287,15 +272,18 @@ export const buildUserEndpoints = API => ({
 
   /**
    * Removes a per app builder to the selected app
-   * @param appId the applications id
    * @param userId The id of the user to remove as a builder
+   * @param appId the applications id
    */
-  removeAppBuilder: async ({ userId, appId }) => {
+  removeAppBuilder: async (userId, appId) => {
     return await API.delete({
       url: `/api/global/users/${userId}/app/${appId}/builder`,
     })
   },
 
+  /**
+   * Gets the account holder of the current tenant
+   */
   getAccountHolder: async () => {
     return await API.get({
       url: `/api/global/users/accountholder`,
diff --git a/packages/frontend-core/src/api/views.js b/packages/frontend-core/src/api/views.ts
similarity index 57%
rename from packages/frontend-core/src/api/views.js
rename to packages/frontend-core/src/api/views.ts
index 1d710c5171..aa0f797f58 100644
--- a/packages/frontend-core/src/api/views.js
+++ b/packages/frontend-core/src/api/views.ts
@@ -1,4 +1,23 @@
-export const buildViewEndpoints = API => ({
+import { Row } from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface ViewEndpoints {
+  // Missing request or response types
+  fetchViewData: (
+    name: string,
+    opts: {
+      calculation?: string
+      field?: string
+      groupBy?: string
+      tableId: string
+    }
+  ) => Promise<Row[]>
+  exportView: (name: string, format: string) => Promise<any>
+  saveView: (view: any) => Promise<any>
+  deleteView: (name: string) => Promise<any>
+}
+
+export const buildViewEndpoints = (API: BaseAPIClient): ViewEndpoints => ({
   /**
    * Fetches all rows in a view
    * @param name the name of the view
@@ -6,10 +25,12 @@ export const buildViewEndpoints = API => ({
    * @param groupBy the field to group by
    * @param calculation the calculation to perform
    */
-  fetchViewData: async ({ name, field, groupBy, calculation }) => {
+  fetchViewData: async (name, { field, groupBy, calculation }) => {
     const params = new URLSearchParams()
     if (calculation) {
-      params.set("field", field)
+      if (field) {
+        params.set("field", field)
+      }
       params.set("calculation", calculation)
     }
     if (groupBy) {
@@ -23,11 +44,11 @@ export const buildViewEndpoints = API => ({
 
   /**
    * Exports a view for download
-   * @param viewName the view to export
+   * @param name the view to export
    * @param format the format to download
    */
-  exportView: async ({ viewName, format }) => {
-    const safeViewName = encodeURIComponent(viewName)
+  exportView: async (name, format) => {
+    const safeViewName = encodeURIComponent(name)
     return await API.get({
       url: `/api/views/export?view=${safeViewName}&format=${format}`,
       parseResponse: async response => {
@@ -51,9 +72,9 @@ export const buildViewEndpoints = API => ({
    * Deletes a view.
    * @param viewName the name of the view to delete
    */
-  deleteView: async viewName => {
+  deleteView: async name => {
     return await API.delete({
-      url: `/api/views/${encodeURIComponent(viewName)}`,
+      url: `/api/views/${encodeURIComponent(name)}`,
     })
   },
 })
diff --git a/packages/frontend-core/src/api/viewsV2.js b/packages/frontend-core/src/api/viewsV2.ts
similarity index 52%
rename from packages/frontend-core/src/api/viewsV2.js
rename to packages/frontend-core/src/api/viewsV2.ts
index d1cb07c6b0..4a867e8f6a 100644
--- a/packages/frontend-core/src/api/viewsV2.js
+++ b/packages/frontend-core/src/api/viewsV2.ts
@@ -1,4 +1,31 @@
-export const buildViewV2Endpoints = API => ({
+import {
+  CreateViewRequest,
+  CreateViewResponse,
+  PaginatedSearchRowResponse,
+  SearchRowResponse,
+  SearchViewRowRequest,
+  UpdateViewRequest,
+  UpdateViewResponse,
+  ViewResponseEnriched,
+} from "@budibase/types"
+import { BaseAPIClient } from "./types"
+
+export interface ViewV2Endpoints {
+  fetchDefinition: (viewId: string) => Promise<ViewResponseEnriched>
+  create: (view: CreateViewRequest) => Promise<CreateViewResponse>
+  update: (view: UpdateViewRequest) => Promise<UpdateViewResponse>
+  fetch: <T extends SearchViewRowRequest>(
+    viewId: string,
+    opts: T
+  ) => Promise<
+    T extends { paginate: true }
+      ? PaginatedSearchRowResponse
+      : SearchRowResponse
+  >
+  delete: (viewId: string) => Promise<void>
+}
+
+export const buildViewV2Endpoints = (API: BaseAPIClient): ViewV2Endpoints => ({
   /**
    * Fetches the definition of a view
    * @param viewId the ID of the view to fetch
@@ -9,6 +36,7 @@ export const buildViewV2Endpoints = API => ({
       cache: true,
     })
   },
+
   /**
    * Create a new view
    * @param view the view object
@@ -19,6 +47,7 @@ export const buildViewV2Endpoints = API => ({
       body: view,
     })
   },
+
   /**
    * Updates a view
    * @param view the view object
@@ -29,40 +58,19 @@ export const buildViewV2Endpoints = API => ({
       body: view,
     })
   },
+
   /**
    * Fetches all rows in a view
    * @param viewId the id of the view
-   * @param query the search query
-   * @param paginate whether to paginate or not
-   * @param limit page size
-   * @param bookmark pagination cursor
-   * @param sort sort column
-   * @param sortOrder sort order
-   * @param sortType sort type (text or numeric)
+   * @param opts the search options
    */
-  fetch: async ({
-    viewId,
-    query,
-    paginate,
-    limit,
-    bookmark,
-    sort,
-    sortOrder,
-    sortType,
-  }) => {
+  fetch: async (viewId, opts: SearchViewRowRequest) => {
     return await API.post({
       url: `/api/v2/views/${encodeURIComponent(viewId)}/search`,
-      body: {
-        query,
-        paginate,
-        limit,
-        bookmark,
-        sort,
-        sortOrder,
-        sortType,
-      },
+      body: opts,
     })
   },
+
   /**
    * Delete a view
    * @param viewId the id of the view
diff --git a/packages/frontend-core/src/components/CoreFilterBuilder.svelte b/packages/frontend-core/src/components/CoreFilterBuilder.svelte
index 3aff981082..2bf40bda37 100644
--- a/packages/frontend-core/src/components/CoreFilterBuilder.svelte
+++ b/packages/frontend-core/src/components/CoreFilterBuilder.svelte
@@ -407,6 +407,7 @@
                     />
                     <FilterField
                       placeholder="Value"
+                      disabled={!filter.field && builderType === "filter"}
                       drawerTitle={builderType === "condition"
                         ? "Edit binding"
                         : null}
diff --git a/packages/frontend-core/src/components/Updating.svelte b/packages/frontend-core/src/components/Updating.svelte
index 97e83e2322..311a6b91c8 100644
--- a/packages/frontend-core/src/components/Updating.svelte
+++ b/packages/frontend-core/src/components/Updating.svelte
@@ -7,7 +7,6 @@
 
   async function checkMigrationsFinished() {
     let totalWaitMs = 0
-    // eslint-disable-next-line no-constant-condition
     while (true) {
       const waitForMs = 5000 + Math.random() * 5000
       await new Promise(resolve => setTimeout(resolve, waitForMs))
diff --git a/packages/frontend-core/src/components/grid/cells/AICell.svelte b/packages/frontend-core/src/components/grid/cells/AICell.svelte
index 38e81cefd3..b56e67b752 100644
--- a/packages/frontend-core/src/components/grid/cells/AICell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/AICell.svelte
@@ -73,6 +73,7 @@
   .value {
     display: -webkit-box;
     -webkit-line-clamp: var(--content-lines);
+    line-clamp: var(--content-lines);
     -webkit-box-orient: vertical;
     overflow: hidden;
     line-height: 20px;
diff --git a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
index 5d98ba903b..fe6d8945ba 100644
--- a/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/BBReferenceCell.svelte
@@ -26,7 +26,7 @@
         : RelationshipType.MANY_TO_MANY,
   }
 
-  async function searchFunction(searchParams) {
+  async function searchFunction(_tableId, searchParams) {
     if (
       subtype !== BBReferenceFieldSubType.USER &&
       subtype !== BBReferenceFieldSubType.USERS
diff --git a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte
index 7829e5da7d..80da91e091 100644
--- a/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/LongFormCell.svelte
@@ -93,6 +93,7 @@
   .value {
     display: -webkit-box;
     -webkit-line-clamp: var(--content-lines);
+    line-clamp: var(--content-lines);
     -webkit-box-orient: vertical;
     overflow: hidden;
     line-height: 20px;
diff --git a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
index 92186f19b1..bda0f5fd5d 100644
--- a/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/RelationshipCell.svelte
@@ -102,9 +102,8 @@
     lastSearchId = Math.random()
     searching = true
     const thisSearchId = lastSearchId
-    const results = await searchFunction({
+    const results = await searchFunction(schema.tableId, {
       paginate: false,
-      tableId: schema.tableId,
       limit: 20,
       query: {
         string: {
diff --git a/packages/frontend-core/src/components/grid/cells/TextCell.svelte b/packages/frontend-core/src/components/grid/cells/TextCell.svelte
index 9275bca3c6..b9a63eb401 100644
--- a/packages/frontend-core/src/components/grid/cells/TextCell.svelte
+++ b/packages/frontend-core/src/components/grid/cells/TextCell.svelte
@@ -74,12 +74,14 @@
   .value {
     display: -webkit-box;
     -webkit-line-clamp: var(--content-lines);
+    line-clamp: var(--content-lines);
     -webkit-box-orient: vertical;
     overflow: hidden;
     line-height: 20px;
   }
   .number .value {
     -webkit-line-clamp: 1;
+    line-clamp: 1;
   }
   input {
     flex: 1 1 auto;
@@ -110,5 +112,6 @@
   }
   input[type="number"] {
     -moz-appearance: textfield;
+    appearance: textfield;
   }
 </style>
diff --git a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
index 8ecec03e0e..96443311c2 100644
--- a/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
+++ b/packages/frontend-core/src/components/grid/controls/MigrationModal.svelte
@@ -29,11 +29,11 @@
 
   const migrateUserColumn = async () => {
     try {
-      await API.migrateColumn({
-        tableId: $definition._id,
-        oldColumn: column.schema.name,
-        newColumn: newColumnName,
-      })
+      await API.migrateColumn(
+        $definition._id,
+        column.schema.name,
+        newColumnName
+      )
       notifications.success("Column migrated")
     } catch (e) {
       notifications.error(`Failed to migrate: ${e.message}`)
diff --git a/packages/frontend-core/src/components/grid/layout/Grid.svelte b/packages/frontend-core/src/components/grid/layout/Grid.svelte
index fcaf9724c3..bd630e9908 100644
--- a/packages/frontend-core/src/components/grid/layout/Grid.svelte
+++ b/packages/frontend-core/src/components/grid/layout/Grid.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { setContext, onMount } from "svelte"
   import { writable, derived } from "svelte/store"
   import { fade } from "svelte/transition"
@@ -47,24 +47,22 @@
   export let buttonsCollapsedText = null
   export let darkMode = false
   export let isCloud = null
-  export let rowConditions = null
   export let aiEnabled = false
 
   // Unique identifier for DOM nodes inside this instance
   const gridID = `grid-${Math.random().toString().slice(2)}`
 
   // Store props in a store for reference in other stores
-  const props = writable($$props)
+  const props: any = writable($$props)
 
   // Build up context
-  let context = {
+  let context = attachStores({
     API: API || createAPIClient(),
     Constants,
     gridID,
     props,
-  }
-  context = { ...context, ...createEventManagers() }
-  context = attachStores(context)
+    ...createEventManagers(),
+  })
 
   // Reference some stores for local use
   const {
@@ -106,7 +104,6 @@
     darkMode,
     isCloud,
     aiEnabled,
-    rowConditions,
   })
 
   // Derive min height and make available in context
diff --git a/packages/frontend-core/src/components/grid/lib/constants.js b/packages/frontend-core/src/components/grid/lib/constants.ts
similarity index 95%
rename from packages/frontend-core/src/components/grid/lib/constants.js
rename to packages/frontend-core/src/components/grid/lib/constants.ts
index 81b4a2f823..fe2aa06c8e 100644
--- a/packages/frontend-core/src/components/grid/lib/constants.js
+++ b/packages/frontend-core/src/components/grid/lib/constants.ts
@@ -7,7 +7,7 @@ export const HPadding = 40
 export const ScrollBarSize = 8
 export const GutterWidth = 72
 export const DefaultColumnWidth = 200
-export const MinColumnWidth = 80
+export const MinColumnWidth = 56
 export const NewRowID = "new"
 export const BlankRowID = "blank"
 export const GeneratedIDPrefix = "‽‽"
diff --git a/packages/frontend-core/src/components/grid/lib/events.js b/packages/frontend-core/src/components/grid/lib/events.ts
similarity index 78%
rename from packages/frontend-core/src/components/grid/lib/events.js
rename to packages/frontend-core/src/components/grid/lib/events.ts
index 1c486858b2..7fd826954a 100644
--- a/packages/frontend-core/src/components/grid/lib/events.js
+++ b/packages/frontend-core/src/components/grid/lib/events.ts
@@ -2,11 +2,11 @@ import { createEventDispatcher } from "svelte"
 
 export const createEventManagers = () => {
   const svelteDispatch = createEventDispatcher()
-  let subscribers = {}
+  let subscribers: Record<string, ((...params: any) => void)[]> = {}
 
   // Dispatches an event, notifying subscribers and also emitting a normal
   // svelte event
-  const dispatch = (event, payload) => {
+  const dispatch = (event: string, payload: any) => {
     svelteDispatch(event, payload)
     const subs = subscribers[event] || []
     for (let i = 0; i < subs.length; i++) {
@@ -15,7 +15,7 @@ export const createEventManagers = () => {
   }
 
   // Subscribes to events
-  const subscribe = (event, callback) => {
+  const subscribe = (event: string, callback: () => void) => {
     const subs = subscribers[event] || []
     subscribers[event] = [...subs, callback]
 
diff --git a/packages/frontend-core/src/components/grid/lib/renderers.js b/packages/frontend-core/src/components/grid/lib/renderers.ts
similarity index 82%
rename from packages/frontend-core/src/components/grid/lib/renderers.js
rename to packages/frontend-core/src/components/grid/lib/renderers.ts
index a860d01b53..b009806cc4 100644
--- a/packages/frontend-core/src/components/grid/lib/renderers.js
+++ b/packages/frontend-core/src/components/grid/lib/renderers.ts
@@ -1,4 +1,4 @@
-import { FieldType } from "@budibase/types"
+import { FieldType, UIColumn } from "@budibase/types"
 
 import OptionsCell from "../cells/OptionsCell.svelte"
 import DateCell from "../cells/DateCell.svelte"
@@ -40,13 +40,23 @@ const TypeComponentMap = {
   // Custom types for UI only
   role: RoleCell,
 }
-export const getCellRenderer = column => {
+
+function getCellRendererByType(type: FieldType | "role" | undefined) {
+  if (!type) {
+    return
+  }
+
+  return TypeComponentMap[type as keyof typeof TypeComponentMap]
+}
+
+export const getCellRenderer = (column: UIColumn) => {
   if (column.calculationType) {
     return NumberCell
   }
+
   return (
-    TypeComponentMap[column?.schema?.cellRenderType] ||
-    TypeComponentMap[column?.schema?.type] ||
+    getCellRendererByType(column.schema?.cellRenderType) ||
+    getCellRendererByType(column.schema?.type) ||
     TextCell
   )
 }
diff --git a/packages/frontend-core/src/components/grid/lib/utils.js b/packages/frontend-core/src/components/grid/lib/utils.ts
similarity index 67%
rename from packages/frontend-core/src/components/grid/lib/utils.js
rename to packages/frontend-core/src/components/grid/lib/utils.ts
index f1f33d9950..3dd2d1ddd5 100644
--- a/packages/frontend-core/src/components/grid/lib/utils.js
+++ b/packages/frontend-core/src/components/grid/lib/utils.ts
@@ -1,7 +1,7 @@
 import { GeneratedIDPrefix, CellIDSeparator } from "./constants"
 import { Helpers } from "@budibase/bbui"
 
-export const parseCellID = cellId => {
+export const parseCellID = (cellId: string | null) => {
   if (!cellId) {
     return { rowId: undefined, field: undefined }
   }
@@ -10,11 +10,13 @@ export const parseCellID = cellId => {
   return { rowId: parts.join(CellIDSeparator), field }
 }
 
-export const getCellID = (rowId, fieldName) => {
+export const getCellID = (rowId: string, fieldName: string) => {
   return `${rowId}${CellIDSeparator}${fieldName}`
 }
 
-export const parseEventLocation = e => {
+export const parseEventLocation = (event: MouseEvent | TouchEvent) => {
+  const e = event as MouseEvent & TouchEvent
+
   return {
     x: e.clientX ?? e.touches?.[0]?.clientX,
     y: e.clientY ?? e.touches?.[0]?.clientY,
@@ -25,6 +27,6 @@ export const generateRowID = () => {
   return `${GeneratedIDPrefix}${Helpers.uuid()}`
 }
 
-export const isGeneratedRowID = id => {
+export const isGeneratedRowID = (id: string) => {
   return id?.startsWith(GeneratedIDPrefix)
 }
diff --git a/packages/frontend-core/src/components/grid/lib/websocket.js b/packages/frontend-core/src/components/grid/lib/websocket.ts
similarity index 86%
rename from packages/frontend-core/src/components/grid/lib/websocket.js
rename to packages/frontend-core/src/components/grid/lib/websocket.ts
index e7b89ff58a..bc41d594f4 100644
--- a/packages/frontend-core/src/components/grid/lib/websocket.js
+++ b/packages/frontend-core/src/components/grid/lib/websocket.ts
@@ -1,12 +1,14 @@
 import { get } from "svelte/store"
 import { createWebsocket } from "../../../utils"
 import { SocketEvent, GridSocketEvent } from "@budibase/shared-core"
+import { Store } from "../stores"
+import { UIDatasource, UIUser } from "@budibase/types"
 
-export const createGridWebsocket = context => {
+export const createGridWebsocket = (context: Store) => {
   const { rows, datasource, users, focusedCellId, definition, API } = context
   const socket = createWebsocket("/socket/grid")
 
-  const connectToDatasource = datasource => {
+  const connectToDatasource = (datasource: UIDatasource) => {
     if (!socket.connected) {
       return
     }
@@ -18,7 +20,7 @@ export const createGridWebsocket = context => {
         datasource,
         appId,
       },
-      ({ users: gridUsers }) => {
+      ({ users: gridUsers }: { users: UIUser[] }) => {
         users.set(gridUsers)
       }
     )
@@ -65,7 +67,7 @@ export const createGridWebsocket = context => {
     GridSocketEvent.DatasourceChange,
     ({ datasource: newDatasource }) => {
       // Listen builder renames, as these aren't handled otherwise
-      if (newDatasource?.name !== get(definition).name) {
+      if (newDatasource?.name !== get(definition)?.name) {
         definition.set(newDatasource)
       }
     }
diff --git a/packages/frontend-core/src/components/grid/stores/bounds.js b/packages/frontend-core/src/components/grid/stores/bounds.js
deleted file mode 100644
index c0939f7389..0000000000
--- a/packages/frontend-core/src/components/grid/stores/bounds.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { derived, writable } from "svelte/store"
-
-export const createStores = () => {
-  const bounds = writable({
-    left: 0,
-    top: 0,
-    width: 0,
-    height: 0,
-  })
-
-  // Derive height and width as primitives to avoid wasted computation
-  const width = derived(bounds, $bounds => $bounds.width, 0)
-  const height = derived(bounds, $bounds => $bounds.height, 0)
-
-  return { bounds, height, width }
-}
diff --git a/packages/frontend-core/src/components/grid/stores/bounds.ts b/packages/frontend-core/src/components/grid/stores/bounds.ts
new file mode 100644
index 0000000000..0050555f96
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/stores/bounds.ts
@@ -0,0 +1,29 @@
+import { derived, Readable, Writable, writable } from "svelte/store"
+
+interface BoundsStore {
+  bounds: Writable<{
+    left: number
+    top: number
+    width: number
+    height: number
+  }>
+  height: Readable<number>
+  width: Readable<number>
+}
+
+export type Store = BoundsStore
+
+export const createStores = (): BoundsStore => {
+  const bounds = writable({
+    left: 0,
+    top: 0,
+    width: 0,
+    height: 0,
+  })
+
+  // Derive height and width as primitives to avoid wasted computation
+  const width = derived(bounds, $bounds => $bounds.width, 0)
+  const height = derived(bounds, $bounds => $bounds.height, 0)
+
+  return { bounds, height, width }
+}
diff --git a/packages/frontend-core/src/components/grid/stores/cache.js b/packages/frontend-core/src/components/grid/stores/cache.ts
similarity index 63%
rename from packages/frontend-core/src/components/grid/stores/cache.js
rename to packages/frontend-core/src/components/grid/stores/cache.ts
index cf4690f15b..999a3ea11d 100644
--- a/packages/frontend-core/src/components/grid/stores/cache.js
+++ b/packages/frontend-core/src/components/grid/stores/cache.ts
@@ -1,16 +1,31 @@
-export const createActions = context => {
+import { FindTableResponse } from "@budibase/types"
+import { Store as StoreContext } from "."
+
+interface CacheActionStore {
+  cache: {
+    actions: {
+      getPrimaryDisplayForTableId: (tableId: string) => Promise<string>
+      getTable: (tableId: string) => Promise<FindTableResponse>
+      resetCache: () => any
+    }
+  }
+}
+
+export type Store = CacheActionStore
+
+export const createActions = (context: StoreContext): CacheActionStore => {
   const { API } = context
 
   // Cache for the primary display columns of different tables.
   // If we ever need to cache table definitions for other purposes then we can
   // expand this to be a more generic cache.
-  let tableCache = {}
+  let tableCache: Record<string, Promise<FindTableResponse>> = {}
 
   const resetCache = () => {
     tableCache = {}
   }
 
-  const fetchTable = async tableId => {
+  const fetchTable = async (tableId: string) => {
     // If we've never encountered this tableId before then store a promise that
     // resolves to the primary display so that subsequent invocations before the
     // promise completes can reuse this promise
@@ -21,13 +36,13 @@ export const createActions = context => {
     return await tableCache[tableId]
   }
 
-  const getPrimaryDisplayForTableId = async tableId => {
+  const getPrimaryDisplayForTableId = async (tableId: string) => {
     const table = await fetchTable(tableId)
     const display = table?.primaryDisplay || table?.schema?.[0]?.name
     return display
   }
 
-  const getTable = async tableId => {
+  const getTable = async (tableId: string) => {
     const table = await fetchTable(tableId)
     return table
   }
@@ -43,7 +58,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { datasource, cache } = context
 
   // Wipe the caches whenever the datasource changes to ensure we aren't
diff --git a/packages/frontend-core/src/components/grid/stores/clipboard.js b/packages/frontend-core/src/components/grid/stores/clipboard.ts
similarity index 78%
rename from packages/frontend-core/src/components/grid/stores/clipboard.js
rename to packages/frontend-core/src/components/grid/stores/clipboard.ts
index 1cb75b38b1..3489e5c847 100644
--- a/packages/frontend-core/src/components/grid/stores/clipboard.js
+++ b/packages/frontend-core/src/components/grid/stores/clipboard.ts
@@ -1,10 +1,41 @@
-import { derived, writable, get } from "svelte/store"
+import { derived, writable, get, Writable, Readable } from "svelte/store"
 import { Helpers } from "@budibase/bbui"
 import { parseCellID, getCellID } from "../lib/utils"
 import { NewRowID } from "../lib/constants"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
-  const clipboard = writable({
+type ClipboardStoreData =
+  | {
+      value: any[][]
+      multiCellCopy: true
+    }
+  | {
+      value: any | null | undefined
+      multiCellCopy: false
+    }
+
+interface ClipboardStore {
+  clipboard: Writable<ClipboardStoreData>
+}
+
+interface ClipboardDerivedStore {
+  copyAllowed: Readable<boolean>
+  pasteAllowed: Readable<boolean>
+}
+
+interface ClipboardActions {
+  clipboard: ClipboardStore["clipboard"] & {
+    actions: {
+      copy: () => void
+      paste: (progressCallback: () => void) => Promise<void>
+    }
+  }
+}
+
+export type Store = ClipboardStore & ClipboardDerivedStore & ClipboardActions
+
+export const createStores = (): ClipboardStore => {
+  const clipboard = writable<ClipboardStoreData>({
     value: null,
     multiCellCopy: false,
   })
@@ -13,7 +44,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ClipboardDerivedStore => {
   const { clipboard, focusedCellAPI, selectedCellCount, config, focusedRowId } =
     context
 
@@ -60,7 +91,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ClipboardActions => {
   const {
     clipboard,
     focusedCellAPI,
@@ -92,11 +123,11 @@ export const createActions = context => {
       const $rowChangeCache = get(rowChangeCache)
 
       // Extract value of each selected cell, accounting for the change cache
-      let value = []
-      for (let row of $selectedCells) {
+      const value = []
+      for (const row of $selectedCells) {
         const rowValues = []
-        for (let cellId of row) {
-          const { rowId, field } = parseCellID(cellId)
+        for (const cellId of row) {
+          const { rowId = "", field = "" } = parseCellID(cellId)
           const row = {
             ...$rowLookupMap[rowId],
             ...$rowChangeCache[rowId],
@@ -113,7 +144,7 @@ export const createActions = context => {
       })
     } else {
       // Single value to copy
-      const value = $focusedCellAPI.getValue()
+      const value = $focusedCellAPI?.getValue()
       clipboard.set({
         value,
         multiCellCopy,
@@ -130,7 +161,7 @@ export const createActions = context => {
   }
 
   // Pastes the previously copied value(s) into the selected cell(s)
-  const paste = async progressCallback => {
+  const paste = async (progressCallback: () => void) => {
     if (!get(pasteAllowed)) {
       return
     }
@@ -166,8 +197,8 @@ export const createActions = context => {
         const { rowId, field } = parseCellID($focusedCellId)
         const $rowLookupMap = get(rowLookupMap)
         const $columnLookupMap = get(columnLookupMap)
-        const rowIdx = $rowLookupMap[rowId].__idx
-        const colIdx = $columnLookupMap[field].__idx
+        const rowIdx = $rowLookupMap[rowId!].__idx
+        const colIdx = $columnLookupMap[field!].__idx || 0
 
         // Get limits of how many rows and columns we're able to paste into
         const $rows = get(rows)
@@ -187,7 +218,7 @@ export const createActions = context => {
         // Paste into target cell range
         if (targetCellId === $focusedCellId) {
           // Single cell edge case
-          get(focusedCellAPI).setValue(value[0][0])
+          get(focusedCellAPI)?.setValue(value[0][0])
         } else {
           // Select the new cells to paste into, then paste
           selectedCells.actions.selectRange($focusedCellId, targetCellId)
@@ -197,17 +228,20 @@ export const createActions = context => {
     } else {
       if (multiCellPaste) {
         // Single to multi - duplicate value to all selected cells
-        const newValue = get(selectedCells).map(row => row.map(() => value))
+        const newValue = get(selectedCells).map(row => row.map(() => value!))
         await pasteIntoSelectedCells(newValue, progressCallback)
       } else {
         // Single to single - just update the cell's value
-        get(focusedCellAPI).setValue(value)
+        get(focusedCellAPI)?.setValue(value ?? null)
       }
     }
   }
 
   // Paste the specified value into the currently selected cells
-  const pasteIntoSelectedCells = async (value, progressCallback) => {
+  const pasteIntoSelectedCells = async (
+    value: string[][],
+    progressCallback: () => any
+  ) => {
     const $selectedCells = get(selectedCells)
 
     // Find the extent at which we can paste
@@ -215,11 +249,13 @@ export const createActions = context => {
     const colExtent = Math.min(value[0].length, $selectedCells[0].length)
 
     // Build change map
-    let changeMap = {}
+    let changeMap: Record<string, Record<string, string>> = {}
     for (let rowIdx = 0; rowIdx < rowExtent; rowIdx++) {
       for (let colIdx = 0; colIdx < colExtent; colIdx++) {
         const cellId = $selectedCells[rowIdx][colIdx]
-        const { rowId, field } = parseCellID(cellId)
+        let { rowId, field } = parseCellID(cellId)
+        rowId = rowId!
+        field = field!
         if (!changeMap[rowId]) {
           changeMap[rowId] = {}
         }
diff --git a/packages/frontend-core/src/components/grid/stores/columns.js b/packages/frontend-core/src/components/grid/stores/columns.ts
similarity index 74%
rename from packages/frontend-core/src/components/grid/stores/columns.js
rename to packages/frontend-core/src/components/grid/stores/columns.ts
index 5f2800ba7a..1b3f6624e1 100644
--- a/packages/frontend-core/src/components/grid/stores/columns.js
+++ b/packages/frontend-core/src/components/grid/stores/columns.ts
@@ -1,8 +1,34 @@
-import { derived, get, writable } from "svelte/store"
+import { derived, get, Readable, Writable, writable } from "svelte/store"
 import { DefaultColumnWidth, GutterWidth } from "../lib/constants"
+import { UIColumn } from "@budibase/types"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
-  const columns = writable([])
+interface ColumnStore {
+  columns: Writable<UIColumn[]>
+}
+
+interface DerivedColumnStore {
+  tableColumns: Readable<UIColumn[]>
+  displayColumn: Readable<UIColumn | undefined>
+  columnLookupMap: Readable<Record<string, UIColumn>>
+  visibleColumns: Readable<UIColumn[]>
+  scrollableColumns: Readable<UIColumn[]>
+  hasNonAutoColumn: Readable<boolean>
+}
+
+interface ColumnActions {
+  columns: ColumnStore["columns"] & {
+    actions: {
+      changeAllColumnWidths: (width: number) => Promise<void>
+      isReadonly: (column: UIColumn) => boolean
+    }
+  }
+}
+
+export type Store = ColumnStore & DerivedColumnStore & ColumnActions
+
+export const createStores = (): ColumnStore => {
+  const columns = writable<UIColumn[]>([])
 
   // Enrich columns with metadata about their display position
   const enrichedColumns = derived(columns, $columns => {
@@ -16,7 +42,7 @@ export const createStores = () => {
       }
       if (col.visible) {
         idx++
-        offset += col.width
+        offset += col.width ?? 0
       }
       return enriched
     })
@@ -30,12 +56,12 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): DerivedColumnStore => {
   const { columns } = context
 
   // Derive a lookup map for all columns by name
   const columnLookupMap = derived(columns, $columns => {
-    let map = {}
+    let map: Record<string, UIColumn> = {}
     $columns.forEach(column => {
       map[column.name] = column
     })
@@ -78,11 +104,11 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ColumnActions => {
   const { columns, datasource } = context
 
   // Updates the width of all columns
-  const changeAllColumnWidths = async width => {
+  const changeAllColumnWidths = async (width: number) => {
     const $columns = get(columns)
     $columns.forEach(column => {
       const { related } = column
@@ -101,7 +127,7 @@ export const createActions = context => {
   }
 
   // Checks if a column is readonly
-  const isReadonly = column => {
+  const isReadonly = (column: UIColumn) => {
     if (!column?.schema) {
       return false
     }
@@ -125,21 +151,21 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { definition, columns, displayColumn, enrichedSchema } = context
 
   // Merge new schema fields with existing schema in order to preserve widths
-  const processColumns = $enrichedSchema => {
-    if (!$enrichedSchema) {
+  const processColumns = ($enrichedSchema: any) => {
+    const $definition = get(definition)
+    if (!$enrichedSchema || !$definition) {
       columns.set([])
       return
     }
-    const $definition = get(definition)
-    const $columns = get(columns)
+
     const $displayColumn = get(displayColumn)
 
     // Find primary display
-    let primaryDisplay
+    let primaryDisplay: string
     const candidatePD = $definition.primaryDisplay || $displayColumn?.name
     if (candidatePD && $enrichedSchema[candidatePD]) {
       primaryDisplay = candidatePD
@@ -150,18 +176,20 @@ export const initialise = context => {
       Object.keys($enrichedSchema)
         .map(field => {
           const fieldSchema = $enrichedSchema[field]
-          const oldColumn = $columns?.find(col => col.name === field)
-          const column = {
+          const column: UIColumn = {
+            type: fieldSchema.type,
             name: field,
             label: fieldSchema.displayName || field,
             schema: fieldSchema,
-            width: fieldSchema.width || oldColumn?.width || DefaultColumnWidth,
+            width: fieldSchema.width || DefaultColumnWidth,
             visible: fieldSchema.visible ?? true,
             readonly: fieldSchema.readonly,
-            order: fieldSchema.order ?? oldColumn?.order,
+            order: fieldSchema.order,
             conditions: fieldSchema.conditions,
             related: fieldSchema.related,
             calculationType: fieldSchema.calculationType,
+            __left: undefined as any, // TODO
+            __idx: undefined as any, // TODO
           }
           // Override a few properties for primary display
           if (field === primaryDisplay) {
diff --git a/packages/frontend-core/src/components/grid/stores/conditions.js b/packages/frontend-core/src/components/grid/stores/conditions.ts
similarity index 77%
rename from packages/frontend-core/src/components/grid/stores/conditions.js
rename to packages/frontend-core/src/components/grid/stores/conditions.ts
index 3800f21df1..cf47456b44 100644
--- a/packages/frontend-core/src/components/grid/stores/conditions.js
+++ b/packages/frontend-core/src/components/grid/stores/conditions.ts
@@ -1,15 +1,31 @@
-import { writable, get } from "svelte/store"
+import { writable, get, Writable, Readable } from "svelte/store"
 import { derivedMemo, QueryUtils } from "../../../utils"
-import { FieldType, EmptyFilterOption } from "@budibase/types"
+import {
+  FieldType,
+  EmptyFilterOption,
+  UIRow,
+  UICondition,
+} from "@budibase/types"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface ConditionStore {
+  metadata: Writable<Record<string, any>>
+}
+
+interface ConditionDerivedStore {
+  conditions: Readable<UICondition[]>
+}
+
+export type Store = ConditionStore & ConditionDerivedStore
+
+export const createStores = (): ConditionStore => {
   const metadata = writable({})
   return {
     metadata,
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ConditionDerivedStore => {
   const { columns } = context
 
   // Derive and memoize the cell conditions present in our columns so that we
@@ -33,12 +49,12 @@ export const deriveStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { metadata, conditions, rows } = context
 
   // Recompute all metadata if conditions change
   conditions.subscribe($conditions => {
-    let newMetadata = {}
+    let newMetadata: Record<string, any> = {}
     if ($conditions?.length) {
       for (let row of get(rows)) {
         newMetadata[row._id] = evaluateConditions(row, $conditions)
@@ -54,7 +70,7 @@ export const initialise = context => {
       return
     }
     const $metadata = get(metadata)
-    let metadataUpdates = {}
+    let metadataUpdates: Record<string, any> = {}
     for (let row of $rows) {
       if (!row._rev || $metadata[row._id]?.version !== row._rev) {
         metadataUpdates[row._id] = evaluateConditions(row, $conditions)
@@ -69,15 +85,15 @@ export const initialise = context => {
   })
 }
 
-const TypeCoercionMap = {
+const TypeCoercionMap: Partial<Record<FieldType, (val: string) => any>> = {
   [FieldType.NUMBER]: parseFloat,
-  [FieldType.DATETIME]: val => {
+  [FieldType.DATETIME]: (val: string) => {
     if (val) {
       return new Date(val).toISOString()
     }
     return null
   },
-  [FieldType.BOOLEAN]: val => {
+  [FieldType.BOOLEAN]: (val: string) => {
     if (`${val}`.toLowerCase().trim() === "true") {
       return true
     }
@@ -90,8 +106,12 @@ const TypeCoercionMap = {
 
 // Evaluates an array of cell conditions against a certain row and returns the
 // resultant metadata
-const evaluateConditions = (row, conditions) => {
-  let metadata = {
+const evaluateConditions = (row: UIRow, conditions: UICondition[]) => {
+  const metadata: {
+    version?: string
+    row: Record<string, string>
+    cell: Record<string, any>
+  } = {
     version: row._rev,
     row: {},
     cell: {},
diff --git a/packages/frontend-core/src/components/grid/stores/config.js b/packages/frontend-core/src/components/grid/stores/config.ts
similarity index 75%
rename from packages/frontend-core/src/components/grid/stores/config.js
rename to packages/frontend-core/src/components/grid/stores/config.ts
index 4a60370690..2ddaf1b65c 100644
--- a/packages/frontend-core/src/components/grid/stores/config.js
+++ b/packages/frontend-core/src/components/grid/stores/config.ts
@@ -1,10 +1,22 @@
 import { derivedMemo } from "../../../utils"
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
 import { ViewV2Type } from "@budibase/types"
+import { BaseStoreProps, Store as StoreContext } from "."
 
-export const createStores = context => {
+type ConfigStore = {
+  [key in keyof BaseStoreProps]: Readable<BaseStoreProps[key]>
+}
+
+interface ConfigDerivedStore {
+  config: Readable<BaseStoreProps>
+}
+
+export type Store = ConfigStore & ConfigDerivedStore
+
+export const createStores = (context: StoreContext): ConfigStore => {
   const { props } = context
-  const getProp = prop => derivedMemo(props, $props => $props[prop])
+  const getProp = <T extends keyof BaseStoreProps>(prop: T) =>
+    derivedMemo(props, $props => $props[prop])
 
   // Derive and memoize some props so that we can react to them in isolation
   const datasource = getProp("datasource")
@@ -15,7 +27,6 @@ export const createStores = context => {
   const schemaOverrides = getProp("schemaOverrides")
   const notifySuccess = getProp("notifySuccess")
   const notifyError = getProp("notifyError")
-  const rowConditions = getProp("rowConditions")
 
   return {
     datasource,
@@ -26,11 +37,10 @@ export const createStores = context => {
     schemaOverrides,
     notifySuccess,
     notifyError,
-    rowConditions,
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): ConfigDerivedStore => {
   const { props, definition, hasNonAutoColumn } = context
 
   // Derive features
@@ -59,7 +69,7 @@ export const deriveStores = context => {
       }
 
       // Disable features for non DS+
-      if (!["table", "viewV2"].includes(type)) {
+      if (type && !["table", "viewV2"].includes(type)) {
         config.canAddRows = false
         config.canEditRows = false
         config.canDeleteRows = false
diff --git a/packages/frontend-core/src/components/grid/stores/datasource.js b/packages/frontend-core/src/components/grid/stores/datasource.ts
similarity index 61%
rename from packages/frontend-core/src/components/grid/stores/datasource.js
rename to packages/frontend-core/src/components/grid/stores/datasource.ts
index 6aa607f7ed..5934c7c636 100644
--- a/packages/frontend-core/src/components/grid/stores/datasource.js
+++ b/packages/frontend-core/src/components/grid/stores/datasource.ts
@@ -1,10 +1,56 @@
-import { derived, get } from "svelte/store"
-import { getDatasourceDefinition, getDatasourceSchema } from "../../../fetch"
+import { derived, get, Readable, Writable } from "svelte/store"
+import {
+  DataFetchDefinition,
+  getDatasourceDefinition,
+  getDatasourceSchema,
+} from "../../../fetch"
 import { enrichSchemaWithRelColumns, memo } from "../../../utils"
 import { cloneDeep } from "lodash"
-import { ViewV2Type } from "@budibase/types"
+import {
+  SaveRowRequest,
+  UIDatasource,
+  UIFieldMutation,
+  UIFieldSchema,
+  UIRow,
+  ViewV2Type,
+} from "@budibase/types"
+import { Store as StoreContext, BaseStoreProps } from "."
+import { DatasourceActions } from "./datasources"
 
-export const createStores = () => {
+interface DatasourceStore {
+  definition: Writable<DataFetchDefinition | null>
+  schemaMutations: Writable<Record<string, UIFieldMutation>>
+  subSchemaMutations: Writable<Record<string, Record<string, UIFieldMutation>>>
+}
+
+interface DerivedDatasourceStore {
+  schema: Readable<Record<string, UIFieldSchema> | null>
+  enrichedSchema: Readable<Record<string, UIFieldSchema> | null>
+  hasBudibaseIdentifiers: Readable<boolean>
+}
+
+interface ActionDatasourceStore {
+  datasource: BaseStoreProps["datasource"] & {
+    actions: DatasourceActions & {
+      refreshDefinition: () => Promise<void>
+      changePrimaryDisplay: (column: string) => Promise<void>
+      addSchemaMutation: (field: string, mutation: UIFieldMutation) => void
+      addSubSchemaMutation: (
+        field: string,
+        fromField: string,
+        mutation: UIFieldMutation
+      ) => void
+      saveSchemaMutations: () => Promise<void>
+      resetSchemaMutations: () => void
+    }
+  }
+}
+
+export type Store = DatasourceStore &
+  DerivedDatasourceStore &
+  ActionDatasourceStore
+
+export const createStores = (): DatasourceStore => {
   const definition = memo(null)
   const schemaMutations = memo({})
   const subSchemaMutations = memo({})
@@ -16,7 +62,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): DerivedDatasourceStore => {
   const {
     API,
     definition,
@@ -27,10 +73,10 @@ export const deriveStores = context => {
   } = context
 
   const schema = derived(definition, $definition => {
-    let schema = getDatasourceSchema({
+    const schema: Record<string, any> | undefined = getDatasourceSchema({
       API,
       datasource: get(datasource),
-      definition: $definition,
+      definition: $definition ?? undefined,
     })
     if (!schema) {
       return null
@@ -38,9 +84,9 @@ export const deriveStores = context => {
 
     // Ensure schema is configured as objects.
     // Certain datasources like queries use primitives.
-    Object.keys(schema || {}).forEach(key => {
+    Object.keys(schema).forEach(key => {
       if (typeof schema[key] !== "object") {
-        schema[key] = { type: schema[key] }
+        schema[key] = { name: key, type: schema[key] }
       }
     })
 
@@ -58,19 +104,18 @@ export const deriveStores = context => {
 
       const schemaWithRelatedColumns = enrichSchemaWithRelColumns($schema)
 
-      const enrichedSchema = {}
-      Object.keys(schemaWithRelatedColumns).forEach(field => {
+      const enrichedSchema: Record<string, UIFieldSchema> = {}
+      Object.keys(schemaWithRelatedColumns || {}).forEach(field => {
         enrichedSchema[field] = {
-          ...schemaWithRelatedColumns[field],
+          ...schemaWithRelatedColumns?.[field],
           ...$schemaOverrides?.[field],
           ...$schemaMutations[field],
         }
 
         if ($subSchemaMutations[field]) {
           enrichedSchema[field].columns ??= {}
-          for (const [fieldName, mutation] of Object.entries(
-            $subSchemaMutations[field]
-          )) {
+          for (const fieldName of Object.keys($subSchemaMutations[field])) {
+            const mutation = $subSchemaMutations[field][fieldName]
             enrichedSchema[field].columns[fieldName] = {
               ...enrichedSchema[field].columns[fieldName],
               ...mutation,
@@ -86,14 +131,20 @@ export const deriveStores = context => {
     [datasource, definition],
     ([$datasource, $definition]) => {
       let type = $datasource?.type
+      // @ts-expect-error
       if (type === "provider") {
-        type = $datasource.value?.datasource?.type
+        type = ($datasource as any).value?.datasource?.type
       }
       // Handle calculation views
-      if (type === "viewV2" && $definition?.type === ViewV2Type.CALCULATION) {
+      if (
+        type === "viewV2" &&
+        $definition &&
+        "type" in $definition &&
+        $definition.type === ViewV2Type.CALCULATION
+      ) {
         return false
       }
-      return ["table", "viewV2", "link"].includes(type)
+      return !!type && ["table", "viewV2", "link"].includes(type)
     }
   )
 
@@ -104,7 +155,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ActionDatasourceStore => {
   const {
     API,
     datasource,
@@ -143,11 +194,11 @@ export const createActions = context => {
       API,
       datasource: get(datasource),
     })
-    definition.set(def)
+    definition.set(def ?? null)
   }
 
   // Saves the datasource definition
-  const saveDefinition = async newDefinition => {
+  const saveDefinition = async (newDefinition: DataFetchDefinition) => {
     // Update local state
     const originalDefinition = get(definition)
     definition.set(newDefinition)
@@ -155,13 +206,13 @@ export const createActions = context => {
     // Update server
     if (get(config).canSaveSchema) {
       try {
-        await getAPI()?.actions.saveDefinition(newDefinition)
+        await getAPI()?.actions.saveDefinition(newDefinition as never)
 
         // Broadcast change so external state can be updated, as this change
         // will not be received by the builder websocket because we caused it
         // ourselves
         dispatch("updatedatasource", newDefinition)
-      } catch (error) {
+      } catch (error: any) {
         const msg = error?.message || error || "Unknown error"
         get(notifications).error(`Error saving schema: ${msg}`)
 
@@ -172,23 +223,27 @@ export const createActions = context => {
   }
 
   // Updates the datasources primary display column
-  const changePrimaryDisplay = async column => {
-    let newDefinition = cloneDeep(get(definition))
+  const changePrimaryDisplay = async (column: string) => {
+    let newDefinition = cloneDeep(get(definition)!)
 
     // Update primary display
     newDefinition.primaryDisplay = column
 
-    // Sanitise schema to ensure field is required and has no default value
-    if (!newDefinition.schema[column].constraints) {
-      newDefinition.schema[column].constraints = {}
+    if (newDefinition.schema) {
+      // Sanitise schema to ensure field is required and has no default value
+      if (!newDefinition.schema[column].constraints) {
+        newDefinition.schema[column].constraints = {}
+      }
+      newDefinition.schema[column].constraints.presence = { allowEmpty: false }
+      if ("default" in newDefinition.schema[column]) {
+        delete newDefinition.schema[column].default
+      }
     }
-    newDefinition.schema[column].constraints.presence = { allowEmpty: false }
-    delete newDefinition.schema[column].default
     return await saveDefinition(newDefinition)
   }
 
   // Adds a schema mutation for a single field
-  const addSchemaMutation = (field, mutation) => {
+  const addSchemaMutation = (field: string, mutation: UIFieldMutation) => {
     if (!field || !mutation) {
       return
     }
@@ -204,7 +259,11 @@ export const createActions = context => {
   }
 
   // Adds a nested schema mutation for a single field
-  const addSubSchemaMutation = (field, fromField, mutation) => {
+  const addSubSchemaMutation = (
+    field: string,
+    fromField: string,
+    mutation: UIFieldMutation
+  ) => {
     if (!field || !fromField || !mutation) {
       return
     }
@@ -231,8 +290,8 @@ export const createActions = context => {
     const $definition = get(definition)
     const $schemaMutations = get(schemaMutations)
     const $subSchemaMutations = get(subSchemaMutations)
-    const $schema = get(schema)
-    let newSchema = {}
+    const $schema = get(schema) || {}
+    let newSchema: Record<string, UIFieldSchema> = {}
 
     // Build new updated datasource schema
     Object.keys($schema).forEach(column => {
@@ -242,9 +301,8 @@ export const createActions = context => {
       }
       if ($subSchemaMutations[column]) {
         newSchema[column].columns ??= {}
-        for (const [fieldName, mutation] of Object.entries(
-          $subSchemaMutations[column]
-        )) {
+        for (const fieldName of Object.keys($subSchemaMutations[column])) {
+          const mutation = $subSchemaMutations[column][fieldName]
           newSchema[column].columns[fieldName] = {
             ...newSchema[column].columns[fieldName],
             ...mutation,
@@ -267,32 +325,32 @@ export const createActions = context => {
   }
 
   // Adds a row to the datasource
-  const addRow = async row => {
+  const addRow = async (row: SaveRowRequest) => {
     return await getAPI()?.actions.addRow(row)
   }
 
   // Updates an existing row in the datasource
-  const updateRow = async row => {
+  const updateRow = async (row: SaveRowRequest) => {
     return await getAPI()?.actions.updateRow(row)
   }
 
   // Deletes rows from the datasource
-  const deleteRows = async rows => {
+  const deleteRows = async (rows: UIRow[]) => {
     return await getAPI()?.actions.deleteRows(rows)
   }
 
   // Gets a single row from a datasource
-  const getRow = async id => {
+  const getRow = async (id: string) => {
     return await getAPI()?.actions.getRow(id)
   }
 
   // Checks if a certain datasource config is valid
-  const isDatasourceValid = datasource => {
+  const isDatasourceValid = (datasource: UIDatasource) => {
     return getAPI()?.actions.isDatasourceValid(datasource)
   }
 
   // Checks if this datasource can use a specific column by name
-  const canUseColumn = name => {
+  const canUseColumn = (name: string) => {
     return getAPI()?.actions.canUseColumn(name)
   }
 
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/index.ts b/packages/frontend-core/src/components/grid/stores/datasources/index.ts
new file mode 100644
index 0000000000..4b04095c8e
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/stores/datasources/index.ts
@@ -0,0 +1,31 @@
+import {
+  SaveRowRequest,
+  SaveTableRequest,
+  UIDatasource,
+  UIRow,
+  UpdateViewRequest,
+} from "@budibase/types"
+
+interface DatasourceBaseActions<
+  TSaveDefinitionRequest = UpdateViewRequest | SaveTableRequest
+> {
+  saveDefinition: (newDefinition: TSaveDefinitionRequest) => Promise<void>
+  addRow: (row: SaveRowRequest) => Promise<UIRow | undefined>
+  updateRow: (row: SaveRowRequest) => Promise<UIRow | undefined>
+  deleteRows: (rows: UIRow[]) => Promise<void>
+  getRow: (id: string) => Promise<UIRow | void>
+  isDatasourceValid: (datasource: UIDatasource) => boolean | void
+  canUseColumn: (name: string) => boolean | void
+}
+
+export interface DatasourceTableActions
+  extends DatasourceBaseActions<SaveTableRequest> {}
+
+export interface DatasourceViewActions
+  extends DatasourceBaseActions<UpdateViewRequest> {}
+
+export interface DatasourceNonPlusActions
+  extends DatasourceBaseActions<never> {}
+
+export type DatasourceActions =
+  | DatasourceTableActions & DatasourceViewActions & DatasourceNonPlusActions
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.js b/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
similarity index 78%
rename from packages/frontend-core/src/components/grid/stores/datasources/nonPlus.js
rename to packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
index ea558d6236..6e81ff3e48 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.js
+++ b/packages/frontend-core/src/components/grid/stores/datasources/nonPlus.ts
@@ -1,7 +1,17 @@
-import { SortOrder } from "@budibase/types"
+import { SortOrder, UIDatasource } from "@budibase/types"
 import { get } from "svelte/store"
+import { Store as StoreContext } from ".."
+import { DatasourceNonPlusActions } from "."
 
-export const createActions = context => {
+interface NonPlusActions {
+  nonPlus: {
+    actions: DatasourceNonPlusActions
+  }
+}
+
+export type Store = NonPlusActions
+
+export const createActions = (context: StoreContext): NonPlusActions => {
   const { columns, table, viewV2 } = context
 
   const saveDefinition = async () => {
@@ -20,7 +30,7 @@ export const createActions = context => {
     throw "This datasource does not support fetching individual rows"
   }
 
-  const isDatasourceValid = datasource => {
+  const isDatasourceValid = (datasource: UIDatasource) => {
     // There are many different types and shapes of datasource, so we only
     // check that we aren't null
     return (
@@ -30,7 +40,7 @@ export const createActions = context => {
     )
   }
 
-  const canUseColumn = name => {
+  const canUseColumn = (name: string) => {
     return get(columns).some(col => col.name === name)
   }
 
@@ -50,11 +60,11 @@ export const createActions = context => {
 }
 
 // Small util to compare datasource definitions
-const isSameDatasource = (a, b) => {
+const isSameDatasource = (a: any, b: any) => {
   return JSON.stringify(a) === JSON.stringify(b)
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     datasource,
     sort,
@@ -69,7 +79,7 @@ export const initialise = context => {
   } = context
   // Keep a list of subscriptions so that we can clear them when the datasource
   // config changes
-  let unsubscribers = []
+  let unsubscribers: any[] = []
 
   // Observe datasource changes and apply logic for view V2 datasources
   datasource.subscribe($datasource => {
@@ -81,7 +91,7 @@ export const initialise = context => {
     }
 
     // Wipe state
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -96,7 +106,7 @@ export const initialise = context => {
         if (!isSameDatasource($fetch?.options?.datasource, $datasource)) {
           return
         }
-        $fetch.update({
+        $fetch?.update({
           filter: $allFilters,
         })
       })
@@ -110,9 +120,9 @@ export const initialise = context => {
         if (!isSameDatasource($fetch?.options?.datasource, $datasource)) {
           return
         }
-        $fetch.update({
+        $fetch?.update({
           sortOrder: $sort.order || SortOrder.ASCENDING,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/table.js b/packages/frontend-core/src/components/grid/stores/datasources/table.ts
similarity index 59%
rename from packages/frontend-core/src/components/grid/stores/datasources/table.js
rename to packages/frontend-core/src/components/grid/stores/datasources/table.ts
index e415f5914b..6ffc1fa5c5 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/table.js
+++ b/packages/frontend-core/src/components/grid/stores/datasources/table.ts
@@ -1,37 +1,51 @@
-import { SortOrder } from "@budibase/types"
+import {
+  Row,
+  SaveRowRequest,
+  SaveTableRequest,
+  SortOrder,
+  UIDatasource,
+} from "@budibase/types"
 import { get } from "svelte/store"
+import { Store as StoreContext } from ".."
+import { DatasourceTableActions } from "."
+import TableFetch from "../../../../fetch/TableFetch"
 
 const SuppressErrors = true
 
-export const createActions = context => {
+interface TableActions {
+  table: {
+    actions: DatasourceTableActions
+  }
+}
+
+export type Store = TableActions
+
+export const createActions = (context: StoreContext): TableActions => {
   const { API, datasource, columns } = context
 
-  const saveDefinition = async newDefinition => {
+  const saveDefinition = async (newDefinition: SaveTableRequest) => {
     await API.saveTable(newDefinition)
   }
 
-  const saveRow = async row => {
+  const saveRow = async (row: SaveRowRequest) => {
     row = {
       ...row,
       tableId: get(datasource)?.tableId,
     }
-    return await API.saveRow(row, SuppressErrors)
+    const newRow = await API.saveRow(row, SuppressErrors)
+    return { ...newRow, _id: newRow._id! }
   }
 
-  const deleteRows = async rows => {
-    await API.deleteRows({
-      tableId: get(datasource).tableId,
-      rows,
-    })
+  const deleteRows = async (rows: Row[]) => {
+    await API.deleteRows(get(datasource).tableId, rows)
   }
 
-  const isDatasourceValid = datasource => {
-    return datasource?.type === "table" && datasource?.tableId
+  const isDatasourceValid = (datasource: UIDatasource) => {
+    return datasource?.type === "table" && !!datasource?.tableId
   }
 
-  const getRow = async id => {
-    const res = await API.searchTable({
-      tableId: get(datasource).tableId,
+  const getRow = async (id: any) => {
+    const res = await API.searchTable(get(datasource).tableId, {
       limit: 1,
       query: {
         equal: {
@@ -40,10 +54,15 @@ export const createActions = context => {
       },
       paginate: false,
     })
-    return res?.rows?.[0]
+    const row = res?.rows?.[0]
+    if (!row) {
+      return
+    }
+
+    return { ...row, _id: row._id! }
   }
 
-  const canUseColumn = name => {
+  const canUseColumn = (name: string) => {
     return get(columns).some(col => col.name === name)
   }
 
@@ -62,7 +81,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     datasource,
     fetch,
@@ -78,7 +97,7 @@ export const initialise = context => {
 
   // Keep a list of subscriptions so that we can clear them when the datasource
   // config changes
-  let unsubscribers = []
+  let unsubscribers: any[] = []
 
   // Observe datasource changes and apply logic for table datasources
   datasource.subscribe($datasource => {
@@ -90,7 +109,7 @@ export const initialise = context => {
     }
 
     // Wipe state
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -101,7 +120,7 @@ export const initialise = context => {
     unsubscribers.push(
       allFilters.subscribe($allFilters => {
         // Ensure we're updating the correct fetch
-        const $fetch = get(fetch)
+        const $fetch = get(fetch) as TableFetch | null
         if ($fetch?.options?.datasource?.tableId !== $datasource.tableId) {
           return
         }
@@ -115,13 +134,13 @@ export const initialise = context => {
     unsubscribers.push(
       sort.subscribe($sort => {
         // Ensure we're updating the correct fetch
-        const $fetch = get(fetch)
+        const $fetch = get(fetch) as TableFetch | null
         if ($fetch?.options?.datasource?.tableId !== $datasource.tableId) {
           return
         }
         $fetch.update({
           sortOrder: $sort.order || SortOrder.ASCENDING,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
diff --git a/packages/frontend-core/src/components/grid/stores/datasources/viewV2.js b/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
similarity index 66%
rename from packages/frontend-core/src/components/grid/stores/datasources/viewV2.js
rename to packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
index 4a4a91658c..adee62822b 100644
--- a/packages/frontend-core/src/components/grid/stores/datasources/viewV2.js
+++ b/packages/frontend-core/src/components/grid/stores/datasources/viewV2.ts
@@ -1,38 +1,53 @@
 import { get } from "svelte/store"
-import { SortOrder } from "@budibase/types"
+import {
+  Row,
+  SaveRowRequest,
+  SortOrder,
+  UIDatasource,
+  UpdateViewRequest,
+} from "@budibase/types"
+import { Store as StoreContext } from ".."
+import { DatasourceViewActions } from "."
+import ViewV2Fetch from "../../../../fetch/ViewV2Fetch"
 
 const SuppressErrors = true
 
-export const createActions = context => {
+interface ViewActions {
+  viewV2: {
+    actions: DatasourceViewActions
+  }
+}
+
+export type Store = ViewActions
+
+export const createActions = (context: StoreContext): ViewActions => {
   const { API, datasource, columns } = context
 
-  const saveDefinition = async newDefinition => {
+  const saveDefinition = async (newDefinition: UpdateViewRequest) => {
     await API.viewV2.update(newDefinition)
   }
 
-  const saveRow = async row => {
+  const saveRow = async (row: SaveRowRequest) => {
     const $datasource = get(datasource)
     row = {
       ...row,
       tableId: $datasource?.tableId,
       _viewId: $datasource?.id,
     }
+    const newRow = await API.saveRow(row, SuppressErrors)
     return {
-      ...(await API.saveRow(row, SuppressErrors)),
+      ...newRow,
+      _id: newRow._id!,
       _viewId: row._viewId,
     }
   }
 
-  const deleteRows = async rows => {
-    await API.deleteRows({
-      tableId: get(datasource).id,
-      rows,
-    })
+  const deleteRows = async (rows: Row[]) => {
+    await API.deleteRows(get(datasource).id, rows)
   }
 
-  const getRow = async id => {
-    const res = await API.viewV2.fetch({
-      viewId: get(datasource).id,
+  const getRow = async (id: string) => {
+    const res = await API.viewV2.fetch(get(datasource).id, {
       limit: 1,
       query: {
         equal: {
@@ -41,16 +56,21 @@ export const createActions = context => {
       },
       paginate: false,
     })
-    return res?.rows?.[0]
+    const row = res?.rows?.[0]
+    if (!row) {
+      return
+    }
+
+    return { ...row, _id: row._id! }
   }
 
-  const isDatasourceValid = datasource => {
+  const isDatasourceValid = (datasource: UIDatasource) => {
     return (
-      datasource?.type === "viewV2" && datasource?.id && datasource?.tableId
+      datasource?.type === "viewV2" && !!datasource?.id && !!datasource?.tableId
     )
   }
 
-  const canUseColumn = name => {
+  const canUseColumn = (name: string) => {
     return get(columns).some(col => col.name === name && col.visible)
   }
 
@@ -69,7 +89,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     definition,
     datasource,
@@ -89,7 +109,7 @@ export const initialise = context => {
 
   // Keep a list of subscriptions so that we can clear them when the datasource
   // config changes
-  let unsubscribers = []
+  let unsubscribers: any[] = []
 
   // Observe datasource changes and apply logic for view V2 datasources
   datasource.subscribe($datasource => {
@@ -101,7 +121,7 @@ export const initialise = context => {
     }
 
     // Reset state for new view
-    filter.set(get(initialFilter))
+    filter.set(get(initialFilter) ?? undefined)
     inlineFilters.set([])
     sort.set({
       column: get(initialSortColumn),
@@ -114,6 +134,9 @@ export const initialise = context => {
         if (!get(config).canSaveSchema) {
           return
         }
+        if (!$definition || !("id" in $definition)) {
+          return
+        }
         if ($definition?.id !== $datasource.id) {
           return
         }
@@ -131,20 +154,49 @@ export const initialise = context => {
       })
     )
 
+    function sortHasChanged(
+      newSort: {
+        column: string | null | undefined
+        order: SortOrder
+      },
+      existingSort?: {
+        field: string
+        order?: SortOrder
+      }
+    ) {
+      const newColumn = newSort.column ?? null
+      const existingColumn = existingSort?.field ?? null
+      if (newColumn !== existingColumn) {
+        return true
+      }
+
+      if (!newColumn) {
+        return false
+      }
+
+      const newOrder = newSort.order ?? null
+      const existingOrder = existingSort?.order ?? null
+      if (newOrder !== existingOrder) {
+        return true
+      }
+
+      return false
+    }
+
     // When sorting changes, ensure view definition is kept up to date
     unsubscribers.push(
       sort.subscribe(async $sort => {
         // Ensure we're updating the correct view
         const $view = get(definition)
+        if (!$view || !("id" in $view)) {
+          return
+        }
         if ($view?.id !== $datasource.id) {
           return
         }
 
         // Skip if nothing actually changed
-        if (
-          $sort?.column === $view.sort?.field &&
-          $sort?.order === $view.sort?.order
-        ) {
+        if (!sortHasChanged($sort, $view.sort)) {
           return
         }
 
@@ -153,7 +205,7 @@ export const initialise = context => {
           await datasource.actions.saveDefinition({
             ...$view,
             sort: {
-              field: $sort.column,
+              field: $sort.column!,
               order: $sort.order || SortOrder.ASCENDING,
             },
           })
@@ -161,13 +213,13 @@ export const initialise = context => {
 
         // Also update the fetch to ensure the new sort is respected.
         // Ensure we're updating the correct fetch.
-        const $fetch = get(fetch)
+        const $fetch = get(fetch) as ViewV2Fetch | null
         if ($fetch?.options?.datasource?.id !== $datasource.id) {
           return
         }
         $fetch.update({
           sortOrder: $sort.order,
-          sortColumn: $sort.column,
+          sortColumn: $sort.column ?? undefined,
         })
       })
     )
@@ -179,6 +231,9 @@ export const initialise = context => {
           return
         }
         const $view = get(definition)
+        if (!$view || !("id" in $view)) {
+          return
+        }
         if ($view?.id !== $datasource.id) {
           return
         }
@@ -186,7 +241,7 @@ export const initialise = context => {
           await datasource.actions.saveDefinition({
             ...$view,
             queryUI: $filter,
-          })
+          } as never as UpdateViewRequest)
 
           // Refresh data since view definition changed
           await rows.actions.refreshData()
@@ -200,7 +255,7 @@ export const initialise = context => {
         if (!get(config).canSaveSchema) {
           return
         }
-        const $fetch = get(fetch)
+        const $fetch = get(fetch) as ViewV2Fetch | null
         if ($fetch?.options?.datasource?.id !== $datasource.id) {
           return
         }
@@ -216,7 +271,7 @@ export const initialise = context => {
         if (get(config).canSaveSchema) {
           return
         }
-        const $fetch = get(fetch)
+        const $fetch = get(fetch) as ViewV2Fetch | null
         if ($fetch?.options?.datasource?.id !== $datasource.id) {
           return
         }
diff --git a/packages/frontend-core/src/components/grid/stores/filter.js b/packages/frontend-core/src/components/grid/stores/filter.ts
similarity index 57%
rename from packages/frontend-core/src/components/grid/stores/filter.js
rename to packages/frontend-core/src/components/grid/stores/filter.ts
index e7adc356ae..b0a204d42c 100644
--- a/packages/frontend-core/src/components/grid/stores/filter.js
+++ b/packages/frontend-core/src/components/grid/stores/filter.ts
@@ -1,12 +1,32 @@
-import { get, derived } from "svelte/store"
-import { FieldType, UILogicalOperator } from "@budibase/types"
+import { get, derived, Writable, Readable } from "svelte/store"
+import {
+  ArrayOperator,
+  BasicOperator,
+  FieldType,
+  UIColumn,
+  UILegacyFilter,
+  UILogicalOperator,
+  UISearchFilter,
+} from "@budibase/types"
+import { Store as StoreContext } from "."
 import { memo } from "../../../utils/memo"
 
-export const createStores = context => {
+export interface FilterStore {
+  filter: Writable<UISearchFilter | undefined>
+  inlineFilters: Writable<UILegacyFilter[]>
+}
+
+export interface FilterDerivedStore {
+  allFilters: Readable<UISearchFilter | undefined>
+}
+
+export type Store = FilterStore & FilterDerivedStore
+
+export const createStores = (context: StoreContext): FilterStore => {
   const { props } = context
 
   // Initialise to default props
-  const filter = memo(get(props).initialFilter)
+  const filter = memo(get(props).initialFilter ?? undefined)
   const inlineFilters = memo([])
 
   return {
@@ -15,7 +35,7 @@ export const createStores = context => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): FilterDerivedStore => {
   const { filter, inlineFilters } = context
   const allFilters = derived(
     [filter, inlineFilters],
@@ -24,7 +44,7 @@ export const deriveStores = context => {
       if (!$inlineFilters?.length) {
         return $filter
       }
-      let allFilters = {
+      const allFilters: UISearchFilter = {
         logicalOperator: UILogicalOperator.ALL,
         groups: [
           {
@@ -33,12 +53,13 @@ export const deriveStores = context => {
           },
         ],
       }
+
       // Just use inline if no filter
       if (!$filter?.groups?.length) {
         return allFilters
       }
       // Join them together if both
-      allFilters.groups = [...allFilters.groups, ...$filter.groups]
+      allFilters.groups = [...allFilters.groups!, ...$filter.groups]
       return allFilters
     }
   )
@@ -48,16 +69,16 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const { filter, inlineFilters } = context
 
-  const addInlineFilter = (column, value) => {
+  const addInlineFilter = (column: UIColumn, value: string) => {
     const filterId = `inline-${column.name}`
     const type = column.schema.type
-    let inlineFilter = {
+    const inlineFilter: UILegacyFilter = {
       field: column.name,
       id: filterId,
-      operator: "string",
+      operator: BasicOperator.STRING,
       valueType: "value",
       type,
       value,
@@ -66,11 +87,11 @@ export const createActions = context => {
     // Add overrides specific so the certain column type
     if (type === FieldType.NUMBER) {
       inlineFilter.value = parseFloat(value)
-      inlineFilter.operator = "equal"
+      inlineFilter.operator = BasicOperator.EQUAL
     } else if (type === FieldType.BIGINT) {
-      inlineFilter.operator = "equal"
+      inlineFilter.operator = BasicOperator.EQUAL
     } else if (type === FieldType.ARRAY) {
-      inlineFilter.operator = "contains"
+      inlineFilter.operator = ArrayOperator.CONTAINS
     }
 
     inlineFilters.update($inlineFilters => {
@@ -95,9 +116,11 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { filter, initialFilter } = context
 
   // Reset filter when initial filter prop changes
-  initialFilter.subscribe(filter.set)
+  initialFilter.subscribe($initialFilter =>
+    filter.set($initialFilter ?? undefined)
+  )
 }
diff --git a/packages/frontend-core/src/components/grid/stores/index.js b/packages/frontend-core/src/components/grid/stores/index.js
deleted file mode 100644
index 6671cc729c..0000000000
--- a/packages/frontend-core/src/components/grid/stores/index.js
+++ /dev/null
@@ -1,73 +0,0 @@
-import * as Bounds from "./bounds"
-import * as Columns from "./columns"
-import * as Menu from "./menu"
-import * as Pagination from "./pagination"
-import * as Reorder from "./reorder"
-import * as Resize from "./resize"
-import * as Rows from "./rows"
-import * as Scroll from "./scroll"
-import * as UI from "./ui"
-import * as Users from "./users"
-import * as Validation from "./validation"
-import * as Viewport from "./viewport"
-import * as Clipboard from "./clipboard"
-import * as Config from "./config"
-import * as Sort from "./sort"
-import * as Filter from "./filter"
-import * as Notifications from "./notifications"
-import * as Datasource from "./datasource"
-import * as Table from "./datasources/table"
-import * as ViewV2 from "./datasources/viewV2"
-import * as NonPlus from "./datasources/nonPlus"
-import * as Cache from "./cache"
-import * as Conditions from "./conditions"
-
-const DependencyOrderedStores = [
-  Sort,
-  Filter,
-  Bounds,
-  Table,
-  ViewV2,
-  NonPlus,
-  Datasource,
-  Columns,
-  Scroll,
-  Validation,
-  Rows,
-  Conditions,
-  UI,
-  Resize,
-  Viewport,
-  Reorder,
-  Users,
-  Menu,
-  Pagination,
-  Config,
-  Clipboard,
-  Notifications,
-  Cache,
-]
-
-export const attachStores = context => {
-  // Atomic store creation
-  for (let store of DependencyOrderedStores) {
-    context = { ...context, ...store.createStores?.(context) }
-  }
-
-  // Derived store creation
-  for (let store of DependencyOrderedStores) {
-    context = { ...context, ...store.deriveStores?.(context) }
-  }
-
-  // Action creation
-  for (let store of DependencyOrderedStores) {
-    context = { ...context, ...store.createActions?.(context) }
-  }
-
-  // Initialise any store logic
-  for (let store of DependencyOrderedStores) {
-    store.initialise?.(context)
-  }
-
-  return context
-}
diff --git a/packages/frontend-core/src/components/grid/stores/index.ts b/packages/frontend-core/src/components/grid/stores/index.ts
new file mode 100644
index 0000000000..5ddf663002
--- /dev/null
+++ b/packages/frontend-core/src/components/grid/stores/index.ts
@@ -0,0 +1,143 @@
+import { Writable } from "svelte/store"
+import type { APIClient } from "../../../api/types"
+
+import * as Bounds from "./bounds"
+import * as Columns from "./columns"
+import * as Menu from "./menu"
+import * as Pagination from "./pagination"
+import * as Reorder from "./reorder"
+import * as Resize from "./resize"
+import * as Rows from "./rows"
+import * as Scroll from "./scroll"
+import * as UI from "./ui"
+import * as Users from "./users"
+import * as Validation from "./validation"
+import * as Viewport from "./viewport"
+import * as Clipboard from "./clipboard"
+import * as Config from "./config"
+import * as Sort from "./sort"
+import * as Filter from "./filter"
+import * as Notifications from "./notifications"
+import * as Datasource from "./datasource"
+import * as Table from "./datasources/table"
+import * as ViewV2 from "./datasources/viewV2"
+import * as NonPlus from "./datasources/nonPlus"
+import * as Cache from "./cache"
+import * as Conditions from "./conditions"
+import { SortOrder, UIDatasource, UISearchFilter } from "@budibase/types"
+import * as Constants from "../lib/constants"
+
+const DependencyOrderedStores = [
+  Sort,
+  Filter,
+  Bounds,
+  Table,
+  ViewV2,
+  NonPlus,
+  Datasource,
+  Columns,
+  Scroll,
+  Validation,
+  Rows,
+  Conditions,
+  UI,
+  Resize,
+  Viewport,
+  Reorder,
+  Users,
+  Menu,
+  Pagination,
+  Config as any,
+  Clipboard,
+  Notifications,
+  Cache,
+]
+
+export interface BaseStoreProps {
+  datasource: UIDatasource
+  initialSortColumn: string | null
+  initialSortOrder: SortOrder | null
+  initialFilter: UISearchFilter | null
+  fixedRowHeight: number | null
+  schemaOverrides: Record<
+    string,
+    {
+      displayName?: string
+      disabled?: boolean
+    }
+  > | null
+  notifySuccess: (message: string) => void
+  notifyError: (message: string) => void
+  canAddRows?: boolean
+  canEditRows?: boolean
+  canDeleteRows?: boolean
+  canEditColumns?: boolean
+  canExpandRows?: boolean
+  canSaveSchema?: boolean
+  minHeight?: number
+}
+
+export interface BaseStore {
+  API: APIClient
+  gridID: string
+  props: Writable<BaseStoreProps>
+  subscribe: any
+  dispatch: (event: string, data: any) => any
+  Constants: typeof Constants
+}
+
+export type Store = BaseStore &
+  Columns.Store &
+  Table.Store &
+  ViewV2.Store &
+  NonPlus.Store &
+  Datasource.Store &
+  Validation.Store &
+  Users.Store &
+  Menu.Store &
+  Filter.Store &
+  UI.Store &
+  Clipboard.Store &
+  Scroll.Store &
+  Rows.Store &
+  Reorder.Store &
+  Resize.Store &
+  Config.Store &
+  Conditions.Store &
+  Cache.Store &
+  Viewport.Store &
+  Notifications.Store &
+  Sort.Store &
+  Bounds.Store
+
+export const attachStores = (context: BaseStore): Store => {
+  // Atomic store creation
+  for (let store of DependencyOrderedStores) {
+    if ("createStores" in store) {
+      context = { ...context, ...store.createStores?.(context) }
+    }
+  }
+
+  // Derived store creation
+  for (let store of DependencyOrderedStores) {
+    if ("deriveStores" in store) {
+      context = { ...context, ...store.deriveStores?.(context) }
+    }
+  }
+
+  // Action creation
+  for (let store of DependencyOrderedStores) {
+    if ("createActions" in store) {
+      context = { ...context, ...store.createActions?.(context) }
+    }
+  }
+
+  // Initialise any store logic
+  for (let store of DependencyOrderedStores) {
+    if ("initialise" in store) {
+      store.initialise?.(context)
+    }
+  }
+
+  return context as Store
+}
diff --git a/packages/frontend-core/src/components/grid/stores/menu.js b/packages/frontend-core/src/components/grid/stores/menu.ts
similarity index 69%
rename from packages/frontend-core/src/components/grid/stores/menu.js
rename to packages/frontend-core/src/components/grid/stores/menu.ts
index 22bf26fff5..ae29ae1de3 100644
--- a/packages/frontend-core/src/components/grid/stores/menu.js
+++ b/packages/frontend-core/src/components/grid/stores/menu.ts
@@ -1,8 +1,33 @@
-import { writable, get } from "svelte/store"
+import { writable, get, Writable } from "svelte/store"
+
+import { Store as StoreContext } from "."
 import { parseCellID } from "../lib/utils"
 
+interface MenuStoreData {
+  left: number
+  top: number
+  visible: boolean
+  multiRowMode: boolean
+  multiCellMode: boolean
+}
+
+interface MenuStore {
+  menu: Writable<MenuStoreData>
+}
+
+interface MenuActions {
+  menu: MenuStore["menu"] & {
+    actions: {
+      open: (cellId: string, e: MouseEvent) => void
+      close: () => void
+    }
+  }
+}
+
+export type Store = MenuStore & MenuActions
+
 export const createStores = () => {
-  const menu = writable({
+  const menu = writable<MenuStoreData>({
     left: 0,
     top: 0,
     visible: false,
@@ -14,7 +39,7 @@ export const createStores = () => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): MenuActions => {
   const {
     menu,
     focusedCellId,
@@ -25,7 +50,7 @@ export const createActions = context => {
     selectedCellCount,
   } = context
 
-  const open = (cellId, e) => {
+  const open = (cellId: string, e: MouseEvent) => {
     e.preventDefault()
     e.stopPropagation()
 
@@ -37,14 +62,14 @@ export const createActions = context => {
     }
 
     // Compute bounds of cell relative to outer data node
-    const targetBounds = e.target.getBoundingClientRect()
+    const targetBounds = (e.target as HTMLElement).getBoundingClientRect()
     const dataBounds = dataNode.getBoundingClientRect()
 
     // Check if there are multiple rows selected, and if this is one of them
     let multiRowMode = false
     if (get(selectedRowCount) > 1) {
       const { rowId } = parseCellID(cellId)
-      if (get(selectedRows)[rowId]) {
+      if (rowId !== undefined && get(selectedRows)[rowId]) {
         multiRowMode = true
       }
     }
diff --git a/packages/frontend-core/src/components/grid/stores/notifications.js b/packages/frontend-core/src/components/grid/stores/notifications.ts
similarity index 64%
rename from packages/frontend-core/src/components/grid/stores/notifications.js
rename to packages/frontend-core/src/components/grid/stores/notifications.ts
index 4e8b49414d..429760ed50 100644
--- a/packages/frontend-core/src/components/grid/stores/notifications.js
+++ b/packages/frontend-core/src/components/grid/stores/notifications.ts
@@ -1,7 +1,17 @@
 import { notifications as BBUINotifications } from "@budibase/bbui"
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
+import { Store as StoreContext } from "."
 
-export const createStores = context => {
+interface NotificationStore {
+  notifications: Readable<{
+    success: (message: string) => void
+    error: (message: string) => void
+  }>
+}
+
+export type Store = NotificationStore
+
+export const createStores = (context: StoreContext): NotificationStore => {
   const { notifySuccess, notifyError } = context
 
   // Normally we would not derive a store in "createStores" as it should be
diff --git a/packages/frontend-core/src/components/grid/stores/pagination.js b/packages/frontend-core/src/components/grid/stores/pagination.ts
similarity index 89%
rename from packages/frontend-core/src/components/grid/stores/pagination.js
rename to packages/frontend-core/src/components/grid/stores/pagination.ts
index bcf10ee3df..5a97031147 100644
--- a/packages/frontend-core/src/components/grid/stores/pagination.js
+++ b/packages/frontend-core/src/components/grid/stores/pagination.ts
@@ -1,6 +1,7 @@
 import { derived } from "svelte/store"
+import { Store as StoreContext } from "."
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { scrolledRowCount, rows, visualRowCapacity } = context
 
   // Derive how many rows we have in total
diff --git a/packages/frontend-core/src/components/grid/stores/reorder.js b/packages/frontend-core/src/components/grid/stores/reorder.ts
similarity index 84%
rename from packages/frontend-core/src/components/grid/stores/reorder.js
rename to packages/frontend-core/src/components/grid/stores/reorder.ts
index 8153ee7084..b0bc482afb 100644
--- a/packages/frontend-core/src/components/grid/stores/reorder.js
+++ b/packages/frontend-core/src/components/grid/stores/reorder.ts
@@ -1,7 +1,24 @@
-import { get, writable, derived } from "svelte/store"
+import { get, writable, derived, Writable, Readable } from "svelte/store"
 import { parseEventLocation } from "../lib/utils"
+import { Store as StoreContext } from "."
 
-const reorderInitialState = {
+interface Breakpoint {
+  x: number
+  column: string
+  insertAfter: boolean
+}
+
+interface ReorderInitialStoreData {
+  sourceColumn: string | null
+  targetColumn: string | null
+  insertAfter?: boolean
+  breakpoints: Breakpoint[]
+  gridLeft: number
+  width: number
+  increment?: number
+}
+
+const reorderInitialState: ReorderInitialStoreData = {
   sourceColumn: null,
   targetColumn: null,
   insertAfter: false,
@@ -11,7 +28,14 @@ const reorderInitialState = {
   increment: 0,
 }
 
-export const createStores = () => {
+interface ReorderInitialStore {
+  reorder: Writable<ReorderInitialStoreData>
+  isReordering: Readable<boolean>
+}
+
+export type Store = ReorderInitialStore
+
+export const createStores = (): ReorderInitialStore => {
   const reorder = writable(reorderInitialState)
   const isReordering = derived(
     reorder,
@@ -24,7 +48,7 @@ export const createStores = () => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const {
     reorder,
     columns,
@@ -40,11 +64,11 @@ export const createActions = context => {
     maxScrollLeft,
   } = context
   let latestX = 0
-  let autoScrollInterval
-  let isAutoScrolling
+  let autoScrollInterval: NodeJS.Timeout
+  let isAutoScrolling: boolean
 
   // Callback when dragging on a colum header and starting reordering
-  const startReordering = (column, e) => {
+  const startReordering = (column: string, e: MouseEvent | TouchEvent) => {
     const $scrollableColumns = get(scrollableColumns)
     const $bounds = get(bounds)
     const $stickyWidth = get(stickyWidth)
@@ -87,7 +111,7 @@ export const createActions = context => {
   }
 
   // Callback when moving the mouse when reordering columns
-  const onReorderMouseMove = e => {
+  const onReorderMouseMove = (e: MouseEvent | TouchEvent) => {
     // Immediately handle the current position
     const { x } = parseEventLocation(e)
     latestX = x
@@ -122,7 +146,7 @@ export const createActions = context => {
     const $scrollLeft = get(scrollLeft)
 
     // Compute the closest breakpoint to the current position
-    let breakpoint
+    let breakpoint: Breakpoint | undefined
     let minDistance = Number.MAX_SAFE_INTEGER
     const mouseX = latestX - $reorder.gridLeft + $scrollLeft
     $reorder.breakpoints.forEach(point => {
@@ -139,8 +163,8 @@ export const createActions = context => {
     ) {
       reorder.update(state => ({
         ...state,
-        targetColumn: breakpoint.column,
-        insertAfter: breakpoint.insertAfter,
+        targetColumn: breakpoint!.column,
+        insertAfter: breakpoint!.insertAfter,
       }))
     }
   }
@@ -157,7 +181,7 @@ export const createActions = context => {
       const { increment } = get(reorder)
       scroll.update(state => ({
         ...state,
-        left: Math.max(0, Math.min($maxLeft, state.left + increment)),
+        left: Math.max(0, Math.min($maxLeft, state.left + increment!)),
       }))
       considerReorderPosition()
     }, 10)
@@ -185,7 +209,11 @@ export const createActions = context => {
     const { sourceColumn, targetColumn, insertAfter } = get(reorder)
     reorder.set(reorderInitialState)
     if (sourceColumn !== targetColumn) {
-      await moveColumn({ sourceColumn, targetColumn, insertAfter })
+      await moveColumn({
+        sourceColumn: sourceColumn!,
+        targetColumn: targetColumn!,
+        insertAfter,
+      })
     }
   }
 
@@ -195,6 +223,10 @@ export const createActions = context => {
     sourceColumn,
     targetColumn,
     insertAfter = false,
+  }: {
+    sourceColumn: string
+    targetColumn: string
+    insertAfter?: boolean
   }) => {
     // Find the indices in the overall columns array
     const $columns = get(columns)
@@ -232,7 +264,7 @@ export const createActions = context => {
   }
 
   // Moves a column one place left (as appears visually)
-  const moveColumnLeft = async column => {
+  const moveColumnLeft = async (column: string) => {
     const $visibleColumns = get(visibleColumns)
     const $columnLookupMap = get(columnLookupMap)
     const sourceIdx = $columnLookupMap[column].__idx
@@ -243,7 +275,7 @@ export const createActions = context => {
   }
 
   // Moves a column one place right (as appears visually)
-  const moveColumnRight = async column => {
+  const moveColumnRight = async (column: string) => {
     const $visibleColumns = get(visibleColumns)
     const $columnLookupMap = get(columnLookupMap)
     const sourceIdx = $columnLookupMap[column].__idx
diff --git a/packages/frontend-core/src/components/grid/stores/resize.js b/packages/frontend-core/src/components/grid/stores/resize.ts
similarity index 73%
rename from packages/frontend-core/src/components/grid/stores/resize.js
rename to packages/frontend-core/src/components/grid/stores/resize.ts
index c242dd9a60..90ee659a44 100644
--- a/packages/frontend-core/src/components/grid/stores/resize.js
+++ b/packages/frontend-core/src/components/grid/stores/resize.ts
@@ -1,8 +1,19 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
 import { MinColumnWidth, DefaultColumnWidth } from "../lib/constants"
 import { parseEventLocation } from "../lib/utils"
+import { Store as StoreContext } from "."
+import { UIColumn } from "@budibase/types"
 
-const initialState = {
+interface ResizeInitialStoreData {
+  initialMouseX: number | null
+  initialWidth: number | null
+  column: string | null
+  width: number
+  left: number
+  related?: UIColumn["related"]
+}
+
+const initialState: ResizeInitialStoreData = {
   initialMouseX: null,
   initialWidth: null,
   column: null,
@@ -10,7 +21,14 @@ const initialState = {
   left: 0,
 }
 
-export const createStores = () => {
+interface ResizeInitialStore {
+  resize: Writable<ResizeInitialStoreData>
+  isResizing: Readable<boolean>
+}
+
+export type Store = ResizeInitialStore
+
+export const createStores = (): ResizeInitialStore => {
   const resize = writable(initialState)
   const isResizing = derived(resize, $resize => $resize.column != null, false)
   return {
@@ -19,11 +37,11 @@ export const createStores = () => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const { resize, ui, datasource } = context
 
   // Starts resizing a certain column
-  const startResizing = (column, e) => {
+  const startResizing = (column: UIColumn, e: MouseEvent | TouchEvent) => {
     const { x } = parseEventLocation(e)
 
     // Prevent propagation to stop reordering triggering
@@ -50,11 +68,11 @@ export const createActions = context => {
   }
 
   // Handler for moving the mouse to resize columns
-  const onResizeMouseMove = e => {
+  const onResizeMouseMove = (e: MouseEvent | TouchEvent) => {
     const { initialMouseX, initialWidth, width, column, related } = get(resize)
     const { x } = parseEventLocation(e)
-    const dx = x - initialMouseX
-    const newWidth = Math.round(Math.max(MinColumnWidth, initialWidth + dx))
+    const dx = x - initialMouseX!
+    const newWidth = Math.round(Math.max(MinColumnWidth, initialWidth! + dx))
 
     // Ignore small changes
     if (Math.abs(width - newWidth) < 5) {
@@ -63,7 +81,7 @@ export const createActions = context => {
 
     // Update column state
     if (!related) {
-      datasource.actions.addSchemaMutation(column, { width })
+      datasource.actions.addSchemaMutation(column!, { width })
     } else {
       datasource.actions.addSubSchemaMutation(related.subField, related.field, {
         width,
@@ -95,7 +113,7 @@ export const createActions = context => {
   }
 
   // Resets a column size back to default
-  const resetSize = async column => {
+  const resetSize = async (column: { name: string }) => {
     datasource.actions.addSchemaMutation(column.name, {
       width: DefaultColumnWidth,
     })
diff --git a/packages/frontend-core/src/components/grid/stores/rows.js b/packages/frontend-core/src/components/grid/stores/rows.ts
similarity index 77%
rename from packages/frontend-core/src/components/grid/stores/rows.js
rename to packages/frontend-core/src/components/grid/stores/rows.ts
index 122bbc295a..7e58808327 100644
--- a/packages/frontend-core/src/components/grid/stores/rows.js
+++ b/packages/frontend-core/src/components/grid/stores/rows.ts
@@ -1,5 +1,5 @@
-import { writable, derived, get } from "svelte/store"
-import { fetchData } from "../../../fetch"
+import { writable, derived, get, Writable, Readable } from "svelte/store"
+import { DataFetch, fetchData } from "../../../fetch"
 import { NewRowID, RowPageSize } from "../lib/constants"
 import {
   generateRowID,
@@ -10,10 +10,74 @@ import {
 import { tick } from "svelte"
 import { Helpers } from "@budibase/bbui"
 import { sleep } from "../../../utils/utils"
-import { FieldType } from "@budibase/types"
+import { FieldType, Row, UIRow } from "@budibase/types"
 import { getRelatedTableValues } from "../../../utils"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface IndexedUIRow extends UIRow {
+  __idx: number
+}
+
+interface RowStore {
+  rows: Writable<UIRow[]>
+  fetch: Writable<DataFetch | null>
+  loaded: Writable<boolean>
+  refreshing: Writable<boolean>
+  loading: Writable<boolean>
+  rowChangeCache: Writable<Record<string, Record<string, any>>>
+  inProgressChanges: Writable<Record<string, number>>
+  hasNextPage: Writable<boolean>
+  error: Writable<string | null>
+}
+
+interface RowDerivedStore {
+  rows: RowStore["rows"]
+  rowLookupMap: Readable<Record<string, IndexedUIRow>>
+}
+
+interface RowActionStore {
+  rows: RowStore["rows"] & {
+    actions: {
+      addRow: (params: {
+        row: Row
+        idx: number
+        bubble: boolean
+        notify: boolean
+      }) => Promise<UIRow | undefined>
+      duplicateRow: (row: UIRow) => Promise<UIRow | undefined>
+      bulkDuplicate: (
+        rowsToDupe: UIRow[],
+        progressCallback: (progressPercentage: number) => void
+      ) => Promise<UIRow[]>
+      updateValue: (params: {
+        rowId: string
+        column: string
+        value: any
+        apply: boolean
+      }) => Promise<void>
+      applyRowChanges: (params: {
+        rowId: string
+        changes?: Record<string, any>
+        updateState?: boolean
+        handleErrors?: boolean
+      }) => Promise<UIRow | undefined>
+      deleteRows: (rowsToDelete: UIRow[]) => Promise<void>
+      loadNextPage: () => void
+      refreshRow: (id: string) => Promise<void>
+      replaceRow: (id: string, row: UIRow | undefined) => void
+      refreshData: () => Promise<void>
+      cleanRow: (row: UIRow) => Row
+      bulkUpdate: (
+        changeMap: Record<string, Record<string, any>>,
+        progressCallback: (progressPercentage: number) => void
+      ) => Promise<void>
+    }
+  }
+}
+
+export type Store = RowStore & RowDerivedStore & RowActionStore
+
+export const createStores = (): RowStore => {
   const rows = writable([])
   const loading = writable(false)
   const loaded = writable(false)
@@ -47,7 +111,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): RowDerivedStore => {
   const { rows, enrichedSchema } = context
 
   // Enrich rows with an index property and any pending changes
@@ -57,12 +121,16 @@ export const deriveStores = context => {
       const customColumns = Object.values($enrichedSchema || {}).filter(
         f => f.related
       )
-      return $rows.map((row, idx) => ({
+      return $rows.map<IndexedUIRow>((row, idx) => ({
         ...row,
         __idx: idx,
-        ...customColumns.reduce((map, column) => {
-          const fromField = $enrichedSchema[column.related.field]
-          map[column.name] = getRelatedTableValues(row, column, fromField)
+        ...customColumns.reduce<Record<string, string>>((map, column) => {
+          const fromField = $enrichedSchema![column.related!.field]
+          map[column.name] = getRelatedTableValues(
+            row,
+            { ...column, related: column.related! },
+            fromField
+          )
           return map
         }, {}),
       }))
@@ -71,7 +139,7 @@ export const deriveStores = context => {
 
   // Generate a lookup map to quick find a row by ID
   const rowLookupMap = derived(enrichedRows, $enrichedRows => {
-    let map = {}
+    let map: Record<string, IndexedUIRow> = {}
     for (let i = 0; i < $enrichedRows.length; i++) {
       map[$enrichedRows[i]._id] = $enrichedRows[i]
     }
@@ -87,7 +155,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): RowActionStore => {
   const {
     rows,
     rowLookupMap,
@@ -114,11 +182,11 @@ export const createActions = context => {
   const instanceLoaded = writable(false)
 
   // Local cache of row IDs to speed up checking if a row exists
-  let rowCacheMap = {}
+  let rowCacheMap: Record<string, boolean> = {}
 
   // Reset everything when datasource changes
-  let unsubscribe = null
-  let lastResetKey = null
+  let unsubscribe: (() => void) | null = null
+  let lastResetKey: string | null = null
   datasource.subscribe(async $datasource => {
     // Unsub from previous fetch if one exists
     unsubscribe?.()
@@ -185,7 +253,7 @@ export const createActions = context => {
 
         // Reset state properties when dataset changes
         if (!$instanceLoaded || resetRows) {
-          definition.set($fetch.definition)
+          definition.set($fetch.definition ?? null)
         }
 
         // Reset scroll state when data changes
@@ -214,7 +282,15 @@ export const createActions = context => {
 
   // Handles validation errors from the rows API and updates local validation
   // state, storing error messages against relevant cells
-  const handleValidationError = (rowId, error) => {
+  const handleValidationError = (
+    rowId: string,
+    error:
+      | string
+      | {
+          message?: string
+          json: { validationErrors: Record<string, string | undefined> }
+        }
+  ) => {
     let errorString
     if (typeof error === "string") {
       errorString = error
@@ -224,7 +300,11 @@ export const createActions = context => {
 
     // If the server doesn't reply with a valid error, assume that the source
     // of the error is the focused cell's column
-    if (!error?.json?.validationErrors && errorString) {
+    if (
+      typeof error !== "string" &&
+      !error?.json?.validationErrors &&
+      errorString
+    ) {
       const { field: focusedColumn } = parseCellID(get(focusedCellId))
       if (focusedColumn) {
         error = {
@@ -236,7 +316,7 @@ export const createActions = context => {
         }
       }
     }
-    if (error?.json?.validationErrors) {
+    if (typeof error !== "string" && error?.json?.validationErrors) {
       // Normal validation errors
       const keys = Object.keys(error.json.validationErrors)
       const $columns = get(columns)
@@ -251,11 +331,11 @@ export const createActions = context => {
           missingColumns.push(column)
         }
       }
-
+      const { json } = error
       // Process errors for columns that we have
       for (let column of erroredColumns) {
         // Ensure we have a valid error to display
-        let err = error.json.validationErrors[column]
+        let err = json.validationErrors[column]
         if (Array.isArray(err)) {
           err = err[0]
         }
@@ -287,9 +367,19 @@ export const createActions = context => {
   }
 
   // Adds a new row
-  const addRow = async ({ row, idx, bubble = false, notify = true }) => {
+  const addRow = async ({
+    row,
+    idx,
+    bubble = false,
+    notify = true,
+  }: {
+    row: Row
+    idx: number
+    bubble: boolean
+    notify: boolean
+  }) => {
     try {
-      const newRow = await datasource.actions.addRow(row)
+      const newRow = (await datasource.actions.addRow(row))!
 
       // Update state
       if (idx != null) {
@@ -306,7 +396,7 @@ export const createActions = context => {
         get(notifications).success("Row created successfully")
       }
       return newRow
-    } catch (error) {
+    } catch (error: any) {
       if (bubble) {
         throw error
       } else {
@@ -317,7 +407,7 @@ export const createActions = context => {
   }
 
   // Duplicates a row, inserting the duplicate row after the existing one
-  const duplicateRow = async row => {
+  const duplicateRow = async (row: UIRow) => {
     let clone = cleanRow(row)
     delete clone._id
     delete clone._rev
@@ -330,17 +420,20 @@ export const createActions = context => {
       })
       get(notifications).success("Duplicated 1 row")
       return duped
-    } catch (error) {
+    } catch (error: any) {
       handleValidationError(row._id, error)
       validation.actions.focusFirstRowError(row._id)
     }
   }
 
   // Duplicates multiple rows, inserting them after the last source row
-  const bulkDuplicate = async (rowsToDupe, progressCallback) => {
+  const bulkDuplicate = async (
+    rowsToDupe: UIRow[],
+    progressCallback: (progressPercentage: number) => void
+  ) => {
     // Find index of last row
     const $rowLookupMap = get(rowLookupMap)
-    const indices = rowsToDupe.map(row => $rowLookupMap[row._id]?.__idx)
+    const indices = rowsToDupe.map(row => $rowLookupMap[row._id!]?.__idx)
     const index = Math.max(...indices)
     const count = rowsToDupe.length
 
@@ -357,8 +450,9 @@ export const createActions = context => {
     let failed = 0
     for (let i = 0; i < count; i++) {
       try {
-        saved.push(await datasource.actions.addRow(clones[i]))
-        rowCacheMap[saved._id] = true
+        const newRow = (await datasource.actions.addRow(clones[i]))!
+        saved.push(newRow)
+        rowCacheMap[newRow._id] = true
         await sleep(50) // Small sleep to ensure we avoid rate limiting
       } catch (error) {
         failed++
@@ -385,7 +479,7 @@ export const createActions = context => {
 
   // Replaces a row in state with the newly defined row, handling updates,
   // addition and deletion
-  const replaceRow = (id, row) => {
+  const replaceRow = (id: string, row: UIRow | undefined) => {
     // Get index of row to check if it exists
     const $rows = get(rows)
     const $rowLookupMap = get(rowLookupMap)
@@ -410,22 +504,22 @@ export const createActions = context => {
   }
 
   // Refreshes a specific row
-  const refreshRow = async id => {
+  const refreshRow = async (id: string) => {
     try {
       const row = await datasource.actions.getRow(id)
-      replaceRow(id, row)
+      replaceRow(id, row!)
     } catch {
       // Do nothing - we probably just don't support refreshing individual rows
     }
   }
 
   // Refreshes all data
-  const refreshData = () => {
-    get(fetch)?.getInitialData()
+  const refreshData = async () => {
+    await get(fetch)?.getInitialData()
   }
 
   // Checks if a changeset for a row actually mutates the row or not
-  const changesAreValid = (row, changes) => {
+  const changesAreValid = (row: UIRow, changes: Record<string, any>) => {
     const columns = Object.keys(changes || {})
     if (!row || !columns.length) {
       return false
@@ -437,7 +531,7 @@ export const createActions = context => {
 
   // Patches a row with some changes in local state, and returns whether a
   // valid pending change was made or not
-  const stashRowChanges = (rowId, changes) => {
+  const stashRowChanges = (rowId: string, changes: Record<string, any>) => {
     const $rowLookupMap = get(rowLookupMap)
     const $columnLookupMap = get(columnLookupMap)
     const row = $rowLookupMap[rowId]
@@ -477,13 +571,18 @@ export const createActions = context => {
     changes = null,
     updateState = true,
     handleErrors = true,
+  }: {
+    rowId: string
+    changes?: Record<string, any> | null
+    updateState?: boolean
+    handleErrors?: boolean
   }) => {
     const $rowLookupMap = get(rowLookupMap)
     const row = $rowLookupMap[rowId]
     if (row == null) {
       return
     }
-    let savedRow
+    let savedRow: UIRow | undefined = undefined
 
     // Save change
     try {
@@ -496,13 +595,13 @@ export const createActions = context => {
       // Update row
       const stashedChanges = get(rowChangeCache)[rowId]
       const newRow = { ...cleanRow(row), ...stashedChanges, ...changes }
-      savedRow = await datasource.actions.updateRow(newRow)
+      savedRow = (await datasource.actions.updateRow(newRow))!
 
       // Update row state after a successful change
       if (savedRow?._id) {
         if (updateState) {
           rows.update(state => {
-            state[row.__idx] = savedRow
+            state[row.__idx] = savedRow!
             return state.slice()
           })
         }
@@ -521,7 +620,7 @@ export const createActions = context => {
         })
         return state
       })
-    } catch (error) {
+    } catch (error: any) {
       if (handleErrors) {
         handleValidationError(rowId, error)
         validation.actions.focusFirstRowError(rowId)
@@ -537,14 +636,27 @@ export const createActions = context => {
   }
 
   // Updates a value of a row
-  const updateValue = async ({ rowId, column, value, apply = true }) => {
+  const updateValue = async ({
+    rowId,
+    column,
+    value,
+    apply = true,
+  }: {
+    rowId: string
+    column: string
+    value: any
+    apply: boolean
+  }) => {
     const success = stashRowChanges(rowId, { [column]: value })
     if (success && apply) {
       await applyRowChanges({ rowId })
     }
   }
 
-  const bulkUpdate = async (changeMap, progressCallback) => {
+  const bulkUpdate = async (
+    changeMap: Record<string, Record<string, any>>,
+    progressCallback: (progressPercentage: number) => void
+  ) => {
     const rowIds = Object.keys(changeMap || {})
     const count = rowIds.length
     if (!count) {
@@ -613,7 +725,7 @@ export const createActions = context => {
   }
 
   // Deletes an array of rows
-  const deleteRows = async rowsToDelete => {
+  const deleteRows = async (rowsToDelete: UIRow[]) => {
     if (!rowsToDelete?.length) {
       return
     }
@@ -628,7 +740,7 @@ export const createActions = context => {
 
   // Local handler to process new rows inside the fetch, and append any new
   // rows to state that we haven't encountered before
-  const handleNewRows = (newRows, resetRows) => {
+  const handleNewRows = (newRows: Row[], resetRows?: boolean) => {
     if (resetRows) {
       rowCacheMap = {}
     }
@@ -645,20 +757,20 @@ export const createActions = context => {
         newRow._id = generateRowID()
       }
 
-      if (!rowCacheMap[newRow._id]) {
-        rowCacheMap[newRow._id] = true
+      if (!rowCacheMap[newRow._id!]) {
+        rowCacheMap[newRow._id!] = true
         rowsToAppend.push(newRow)
       }
     }
     if (resetRows) {
-      rows.set(rowsToAppend)
+      rows.set(rowsToAppend as UIRow[])
     } else if (rowsToAppend.length) {
-      rows.update(state => [...state, ...rowsToAppend])
+      rows.update(state => [...state, ...(rowsToAppend as UIRow[])])
     }
   }
 
   // Local handler to remove rows from state
-  const handleRemoveRows = rowsToRemove => {
+  const handleRemoveRows = (rowsToRemove: UIRow[]) => {
     const deletedIds = rowsToRemove.map(row => row._id)
 
     // We deliberately do not remove IDs from the cache map as the data may
@@ -675,11 +787,11 @@ export const createActions = context => {
 
   // Cleans a row by removing any internal grid metadata from it.
   // Call this before passing a row to any sort of external flow.
-  const cleanRow = row => {
-    let clone = { ...row }
+  const cleanRow = (row: UIRow) => {
+    let clone: Row = { ...row }
     delete clone.__idx
     delete clone.__metadata
-    if (!get(hasBudibaseIdentifiers) && isGeneratedRowID(clone._id)) {
+    if (!get(hasBudibaseIdentifiers) && isGeneratedRowID(clone._id!)) {
       delete clone._id
     }
     return clone
@@ -706,7 +818,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     rowChangeCache,
     inProgressChanges,
@@ -733,7 +845,9 @@ export const initialise = context => {
     if (!id) {
       return
     }
-    const { rowId, field } = parseCellID(id)
+    let { rowId, field } = parseCellID(id)
+    rowId = rowId!
+    field = field!
     const hasChanges = field in (get(rowChangeCache)[rowId] || {})
     const hasErrors = validation.actions.rowHasErrors(rowId)
     const isSavingChanges = get(inProgressChanges)[rowId]
diff --git a/packages/frontend-core/src/components/grid/stores/scroll.js b/packages/frontend-core/src/components/grid/stores/scroll.ts
similarity index 86%
rename from packages/frontend-core/src/components/grid/stores/scroll.js
rename to packages/frontend-core/src/components/grid/stores/scroll.ts
index 9411cb93f1..0be8fa4a77 100644
--- a/packages/frontend-core/src/components/grid/stores/scroll.js
+++ b/packages/frontend-core/src/components/grid/stores/scroll.ts
@@ -1,4 +1,4 @@
-import { writable, derived, get } from "svelte/store"
+import { writable, derived, get, Writable, Readable } from "svelte/store"
 import { tick } from "svelte"
 import {
   GutterWidth,
@@ -8,8 +8,31 @@ import {
   VPadding,
 } from "../lib/constants"
 import { parseCellID } from "../lib/utils"
+import { Store as StoreContext } from "."
 
-export const createStores = () => {
+interface ScrollStore {
+  scroll: Writable<{
+    left: number
+    top: number
+  }>
+  scrollTop: Readable<number>
+  scrollLeft: Readable<number>
+}
+
+interface ScrollDerivedStore {
+  stickyWidth: Readable<number>
+  contentHeight: Readable<number>
+  contentWidth: Readable<number>
+  screenWidth: Readable<number>
+  maxScrollTop: Readable<number>
+  maxScrollLeft: Readable<number>
+  showHScrollbar: Readable<number>
+  showVScrollbar: Readable<number>
+}
+
+export type Store = ScrollStore & ScrollDerivedStore
+
+export const createStores = (): ScrollStore => {
   const scroll = writable({
     left: 0,
     top: 0,
@@ -26,7 +49,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext) => {
   const {
     rows,
     visibleColumns,
@@ -107,7 +130,7 @@ export const deriveStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     focusedCellId,
     focusedRow,
@@ -189,7 +212,7 @@ export const initialise = context => {
     // Ensure horizontal position is viewable
     // Check horizontal position of columns next
     const { field } = parseCellID($focusedCellId)
-    const column = get(columnLookupMap)[field]
+    const column = get(columnLookupMap)[field!]
     if (!column || column.primaryDisplay) {
       return
     }
diff --git a/packages/frontend-core/src/components/grid/stores/sort.js b/packages/frontend-core/src/components/grid/stores/sort.ts
similarity index 76%
rename from packages/frontend-core/src/components/grid/stores/sort.js
rename to packages/frontend-core/src/components/grid/stores/sort.ts
index 9ab393b11f..ab58d7dabe 100644
--- a/packages/frontend-core/src/components/grid/stores/sort.js
+++ b/packages/frontend-core/src/components/grid/stores/sort.ts
@@ -1,8 +1,18 @@
-import { derived, get } from "svelte/store"
+import { derived, get, Writable } from "svelte/store"
 import { memo } from "../../../utils"
 import { SortOrder } from "@budibase/types"
+import { Store as StoreContext } from "."
 
-export const createStores = context => {
+interface SortStore {
+  sort: Writable<{
+    column: string | null | undefined
+    order: SortOrder
+  }>
+}
+
+export type Store = SortStore
+
+export const createStores = (context: StoreContext): SortStore => {
   const { props } = context
   const $props = get(props)
 
@@ -17,7 +27,7 @@ export const createStores = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { sort, initialSortColumn, initialSortOrder, schema } = context
 
   // Reset sort when initial sort props change
diff --git a/packages/frontend-core/src/components/grid/stores/ui.js b/packages/frontend-core/src/components/grid/stores/ui.ts
similarity index 79%
rename from packages/frontend-core/src/components/grid/stores/ui.js
rename to packages/frontend-core/src/components/grid/stores/ui.ts
index 7f39116b05..f279eb210f 100644
--- a/packages/frontend-core/src/components/grid/stores/ui.js
+++ b/packages/frontend-core/src/components/grid/stores/ui.ts
@@ -1,4 +1,4 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
 import { tick } from "svelte"
 import {
   DefaultRowHeight,
@@ -7,8 +7,61 @@ import {
   NewRowID,
 } from "../lib/constants"
 import { getCellID, parseCellID } from "../lib/utils"
+import { Store as StoreContext } from "."
+import { Row } from "@budibase/types"
 
-export const createStores = context => {
+export interface UIStore {
+  focusedCellId: Writable<string | null>
+  focusedCellAPI: Writable<{
+    isReadonly: () => boolean
+    getValue: () => any
+    setValue: (val: any) => void
+  } | null>
+  selectedRows: Writable<Record<string, boolean>>
+  hoveredRowId: Writable<string | null>
+  rowHeight: Writable<number>
+  previousFocusedRowId: Writable<string | null>
+  previousFocusedCellId: Writable<string | null>
+  gridFocused: Writable<boolean>
+  keyboardBlocked: Writable<boolean>
+  isDragging: Writable<boolean>
+  buttonColumnWidth: Writable<number>
+  cellSelection: Writable<{
+    active: boolean
+    sourceCellId: string | null
+    targetCellId: string | null
+  }>
+}
+
+export interface UIDerivedStore {
+  focusedRowId: Readable<string | null>
+  focusedRow: Readable<Row | undefined>
+  contentLines: Readable<3 | 2 | 1>
+  compact: Readable<boolean>
+  selectedRowCount: Readable<number>
+  isSelectingCells: Readable<boolean>
+  selectedCells: Readable<string[][]>
+  selectedCellMap: Readable<Record<string, boolean>>
+  selectedCellCount: Readable<number>
+}
+
+interface UIActionStore {
+  selectedCells: UIDerivedStore["selectedCells"] & {
+    actions: {
+      clear: () => void
+      selectRange: (source: string | null, target: string | null) => void
+    }
+  }
+  ui: {
+    actions: {
+      blur: () => void
+    }
+  }
+}
+
+export type Store = UIStore & UIDerivedStore & UIActionStore
+
+export const createStores = (context: StoreContext): UIStore => {
   const { props } = context
   const focusedCellId = writable(null)
   const focusedCellAPI = writable(null)
@@ -43,7 +96,7 @@ export const createStores = context => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): UIDerivedStore => {
   const {
     focusedCellId,
     rows,
@@ -58,13 +111,17 @@ export const deriveStores = context => {
 
   // Derive the current focused row ID
   const focusedRowId = derived(focusedCellId, $focusedCellId => {
-    return parseCellID($focusedCellId).rowId
+    return parseCellID($focusedCellId).rowId ?? null
   })
 
   // Derive the row that contains the selected cell
   const focusedRow = derived(
     [focusedRowId, rowLookupMap],
     ([$focusedRowId, $rowLookupMap]) => {
+      if ($focusedRowId === null) {
+        return
+      }
+
       if ($focusedRowId === NewRowID) {
         return { _id: NewRowID }
       }
@@ -116,8 +173,8 @@ export const deriveStores = context => {
       }
 
       // Row indices
-      const sourceRowIndex = $rowLookupMap[sourceInfo.rowId]?.__idx
-      const targetRowIndex = $rowLookupMap[targetInfo.rowId]?.__idx
+      const sourceRowIndex = $rowLookupMap[sourceInfo.rowId!]?.__idx
+      const targetRowIndex = $rowLookupMap[targetInfo.rowId!]?.__idx
       if (sourceRowIndex == null || targetRowIndex == null) {
         return []
       }
@@ -128,8 +185,8 @@ export const deriveStores = context => {
       upperRowIndex = Math.min(upperRowIndex, lowerRowIndex + 49)
 
       // Column indices
-      const sourceColIndex = $columnLookupMap[sourceInfo.field].__idx
-      const targetColIndex = $columnLookupMap[targetInfo.field].__idx
+      const sourceColIndex = $columnLookupMap[sourceInfo.field!].__idx || 0
+      const targetColIndex = $columnLookupMap[targetInfo.field!].__idx || 0
       const lowerColIndex = Math.min(sourceColIndex, targetColIndex)
       const upperColIndex = Math.max(sourceColIndex, targetColIndex)
 
@@ -151,7 +208,7 @@ export const deriveStores = context => {
 
   // Derive a quick lookup map of the selected cells
   const selectedCellMap = derived(selectedCells, $selectedCells => {
-    let map = {}
+    let map: Record<string, boolean> = {}
     for (let row of $selectedCells) {
       for (let cell of row) {
         map[cell] = true
@@ -178,7 +235,7 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext) => {
   const {
     focusedCellId,
     hoveredRowId,
@@ -190,7 +247,7 @@ export const createActions = context => {
     selectedCells,
   } = context
   // Keep the last selected index to use with bulk selection
-  let lastSelectedIndex = null
+  let lastSelectedIndex: number | null = null
 
   // Callback when leaving the grid, deselecting all focussed or selected items
   const blur = () => {
@@ -200,7 +257,7 @@ export const createActions = context => {
   }
 
   // Toggles whether a certain row ID is selected or not
-  const toggleSelectedRow = id => {
+  const toggleSelectedRow = (id: string) => {
     selectedRows.update(state => {
       let newState = {
         ...state,
@@ -215,7 +272,7 @@ export const createActions = context => {
     })
   }
 
-  const bulkSelectRows = id => {
+  const bulkSelectRows = (id: string) => {
     if (!get(selectedRowCount)) {
       toggleSelectedRow(id)
       return
@@ -241,7 +298,7 @@ export const createActions = context => {
     })
   }
 
-  const startCellSelection = sourceCellId => {
+  const startCellSelection = (sourceCellId: string) => {
     cellSelection.set({
       active: true,
       sourceCellId,
@@ -249,7 +306,7 @@ export const createActions = context => {
     })
   }
 
-  const updateCellSelection = targetCellId => {
+  const updateCellSelection = (targetCellId: string) => {
     cellSelection.update(state => ({
       ...state,
       targetCellId,
@@ -263,7 +320,7 @@ export const createActions = context => {
     }))
   }
 
-  const selectCellRange = (source, target) => {
+  const selectCellRange = (source: string, target: string) => {
     cellSelection.set({
       active: false,
       sourceCellId: source,
@@ -305,7 +362,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const {
     focusedRowId,
     previousFocusedRowId,
@@ -332,7 +389,7 @@ export const initialise = context => {
     const $focusedRowId = get(focusedRowId)
     const $selectedRows = get(selectedRows)
     const $hoveredRowId = get(hoveredRowId)
-    const hasRow = id => $rowLookupMap[id] != null
+    const hasRow = (id: string) => $rowLookupMap[id] != null
 
     // Check focused cell
     if ($focusedRowId && !hasRow($focusedRowId)) {
@@ -362,13 +419,13 @@ export const initialise = context => {
   })
 
   // Remember the last focused row ID so that we can store the previous one
-  let lastFocusedRowId = null
+  let lastFocusedRowId: string | null = null
   focusedRowId.subscribe(id => {
     previousFocusedRowId.set(lastFocusedRowId)
     lastFocusedRowId = id
   })
 
-  let lastFocusedCellId = null
+  let lastFocusedCellId: string | null = null
   focusedCellId.subscribe(id => {
     // Remember the last focused cell ID so that we can store the previous one
     previousFocusedCellId.set(lastFocusedCellId)
diff --git a/packages/frontend-core/src/components/grid/stores/users.js b/packages/frontend-core/src/components/grid/stores/users.ts
similarity index 56%
rename from packages/frontend-core/src/components/grid/stores/users.js
rename to packages/frontend-core/src/components/grid/stores/users.ts
index 64c1e27835..b3dffbcb1b 100644
--- a/packages/frontend-core/src/components/grid/stores/users.js
+++ b/packages/frontend-core/src/components/grid/stores/users.ts
@@ -1,11 +1,38 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
 import { helpers } from "@budibase/shared-core"
+import { Store as StoreContext } from "."
+import { UIUser } from "@budibase/types"
 
-export const createStores = () => {
-  const users = writable([])
+interface UIEnrichedUser extends UIUser {
+  color: string
+  label: string
+}
+
+interface UsersStore {
+  users: Writable<UIUser[]>
+}
+
+interface DerivedUsersStore {
+  userCellMap: Readable<Record<string, UIUser>>
+}
+
+interface ActionUserStore {
+  users: UsersStore["users"] &
+    Readable<UIEnrichedUser[]> & {
+      actions: {
+        updateUser: (user: UIUser) => void
+        removeUser: (sessionId: string) => void
+      }
+    }
+}
+
+export type Store = DerivedUsersStore & ActionUserStore
+
+export const createStores = (): UsersStore => {
+  const users = writable<UIUser[]>([])
 
   const enrichedUsers = derived(users, $users => {
-    return $users.map(user => ({
+    return $users.map<UIEnrichedUser>(user => ({
       ...user,
       color: helpers.getUserColor(user),
       label: helpers.getUserLabel(user),
@@ -20,7 +47,7 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): DerivedUsersStore => {
   const { users, focusedCellId } = context
 
   // Generate a lookup map of cell ID to the user that has it selected, to make
@@ -28,7 +55,7 @@ export const deriveStores = context => {
   const userCellMap = derived(
     [users, focusedCellId],
     ([$users, $focusedCellId]) => {
-      let map = {}
+      let map: Record<string, UIUser> = {}
       $users.forEach(user => {
         const cellId = user.gridMetadata?.focusedCellId
         if (cellId && cellId !== $focusedCellId) {
@@ -44,10 +71,10 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ActionUserStore => {
   const { users } = context
 
-  const updateUser = user => {
+  const updateUser = (user: UIUser) => {
     const $users = get(users)
     if (!$users.some(x => x.sessionId === user.sessionId)) {
       users.set([...$users, user])
@@ -60,7 +87,7 @@ export const createActions = context => {
     }
   }
 
-  const removeUser = sessionId => {
+  const removeUser = (sessionId: string) => {
     users.update(state => {
       return state.filter(x => x.sessionId !== sessionId)
     })
diff --git a/packages/frontend-core/src/components/grid/stores/validation.js b/packages/frontend-core/src/components/grid/stores/validation.ts
similarity index 58%
rename from packages/frontend-core/src/components/grid/stores/validation.js
rename to packages/frontend-core/src/components/grid/stores/validation.ts
index 93e67e1d31..9db432d1a5 100644
--- a/packages/frontend-core/src/components/grid/stores/validation.js
+++ b/packages/frontend-core/src/components/grid/stores/validation.ts
@@ -1,10 +1,31 @@
-import { writable, get, derived } from "svelte/store"
+import { writable, get, derived, Writable, Readable } from "svelte/store"
+import { Store as StoreContext } from "."
 import { parseCellID } from "../lib/utils"
 
+interface ValidationStore {
+  validation: Writable<Record<string, string>>
+}
+
+interface DerivedValidationStore {
+  validationRowLookupMap: Readable<Record<string, string[]>>
+}
+
+interface ValidationActions {
+  validation: ValidationStore["validation"] & {
+    actions: {
+      setError: (cellId: string | undefined, error: string) => void
+      rowHasErrors: (rowId: string) => boolean
+      focusFirstRowError: (rowId: string) => void
+    }
+  }
+}
+
+export type Store = ValidationStore & DerivedValidationStore & ValidationActions
+
 // Normally we would break out actions into the explicit "createActions"
 // function, but for validation all these actions are pure so can go into
 // "createStores" instead to make dependency ordering simpler
-export const createStores = () => {
+export const createStores = (): ValidationStore => {
   const validation = writable({})
 
   return {
@@ -12,20 +33,22 @@ export const createStores = () => {
   }
 }
 
-export const deriveStores = context => {
+export const deriveStores = (context: StoreContext): DerivedValidationStore => {
   const { validation } = context
 
   // Derive which rows have errors so that we can use that info later
   const validationRowLookupMap = derived(validation, $validation => {
-    let map = {}
+    const map: Record<string, string[]> = {}
     Object.entries($validation).forEach(([key, error]) => {
       // Extract row ID from all errored cell IDs
       if (error) {
         const { rowId } = parseCellID(key)
-        if (!map[rowId]) {
-          map[rowId] = []
+        if (rowId !== undefined) {
+          if (!map[rowId]) {
+            map[rowId] = []
+          }
+          map[rowId].push(key)
         }
-        map[rowId].push(key)
       }
     })
     return map
@@ -36,10 +59,10 @@ export const deriveStores = context => {
   }
 }
 
-export const createActions = context => {
+export const createActions = (context: StoreContext): ValidationActions => {
   const { validation, focusedCellId, validationRowLookupMap } = context
 
-  const setError = (cellId, error) => {
+  const setError = (cellId: string | undefined, error: string) => {
     if (!cellId) {
       return
     }
@@ -49,11 +72,11 @@ export const createActions = context => {
     }))
   }
 
-  const rowHasErrors = rowId => {
+  const rowHasErrors = (rowId: string) => {
     return get(validationRowLookupMap)[rowId]?.length > 0
   }
 
-  const focusFirstRowError = rowId => {
+  const focusFirstRowError = (rowId: string) => {
     const errorCells = get(validationRowLookupMap)[rowId]
     const cellId = errorCells?.[0]
     if (cellId) {
@@ -73,7 +96,7 @@ export const createActions = context => {
   }
 }
 
-export const initialise = context => {
+export const initialise = (context: StoreContext) => {
   const { validation, previousFocusedRowId, validationRowLookupMap } = context
 
   // Remove validation errors when changing rows
diff --git a/packages/frontend-core/src/components/grid/stores/viewport.js b/packages/frontend-core/src/components/grid/stores/viewport.ts
similarity index 82%
rename from packages/frontend-core/src/components/grid/stores/viewport.js
rename to packages/frontend-core/src/components/grid/stores/viewport.ts
index 0797f38b55..25620c33ef 100644
--- a/packages/frontend-core/src/components/grid/stores/viewport.js
+++ b/packages/frontend-core/src/components/grid/stores/viewport.ts
@@ -1,7 +1,18 @@
-import { derived } from "svelte/store"
+import { derived, Readable } from "svelte/store"
 import { MinColumnWidth } from "../lib/constants"
+import { Store as StoreContext } from "."
+import { Row } from "@budibase/types"
 
-export const deriveStores = context => {
+interface ViewportDerivedStore {
+  scrolledRowCount: Readable<number>
+  visualRowCapacity: Readable<number>
+  renderedRows: Readable<Row>
+  columnRenderMap: Readable<Record<string, true>>
+}
+
+export type Store = ViewportDerivedStore
+
+export const deriveStores = (context: StoreContext): ViewportDerivedStore => {
   const {
     rowHeight,
     scrollableColumns,
@@ -77,7 +88,7 @@ export const deriveStores = context => {
         leftEdge += $scrollableColumns[endColIdx].width
         endColIdx++
       }
-      let next = {}
+      let next: Record<string, true> = {}
       $scrollableColumns
         .slice(Math.max(0, startColIdx), endColIdx)
         .forEach(col => {
diff --git a/packages/frontend-core/src/constants.js b/packages/frontend-core/src/constants.ts
similarity index 97%
rename from packages/frontend-core/src/constants.js
rename to packages/frontend-core/src/constants.ts
index 662b086915..907d91825f 100644
--- a/packages/frontend-core/src/constants.js
+++ b/packages/frontend-core/src/constants.ts
@@ -32,8 +32,8 @@ export const Cookies = {
 }
 
 // Table names
-export const TableNames = {
-  USERS: "ta_users",
+export const enum TableNames {
+  USERS = "ta_users",
 }
 
 export const BudibaseRoles = {
@@ -76,9 +76,9 @@ export const ExtendedBudibaseRoleOptions = [
     value: BudibaseRoles.Owner,
     sortOrder: 0,
   },
+  ...BudibaseRoleOptions,
+  ...BudibaseRoleOptionsOld,
 ]
-  .concat(BudibaseRoleOptions)
-  .concat(BudibaseRoleOptionsOld)
 
 export const PlanType = {
   FREE: "free",
diff --git a/packages/frontend-core/src/fetch/CustomFetch.js b/packages/frontend-core/src/fetch/CustomFetch.ts
similarity index 83%
rename from packages/frontend-core/src/fetch/CustomFetch.js
rename to packages/frontend-core/src/fetch/CustomFetch.ts
index fc62d790e2..825847daaa 100644
--- a/packages/frontend-core/src/fetch/CustomFetch.js
+++ b/packages/frontend-core/src/fetch/CustomFetch.ts
@@ -1,8 +1,14 @@
-import DataFetch from "./DataFetch.js"
+import { CustomDatasource } from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
 
-export default class CustomFetch extends DataFetch {
+type CustomDefinition = Record<string, any>
+
+export default class CustomFetch extends BaseDataFetch<
+  CustomDatasource,
+  CustomDefinition
+> {
   // Gets the correct Budibase type for a JS value
-  getType(value) {
+  getType(value: any) {
     if (value == null) {
       return "string"
     }
@@ -22,7 +28,7 @@ export default class CustomFetch extends DataFetch {
   }
 
   // Parses the custom data into an array format
-  parseCustomData(data) {
+  parseCustomData(data: any) {
     if (!data) {
       return []
     }
@@ -55,7 +61,7 @@ export default class CustomFetch extends DataFetch {
   }
 
   // Enriches the custom data to ensure the structure and format is usable
-  enrichCustomData(data) {
+  enrichCustomData(data: (string | any)[]) {
     if (!data?.length) {
       return []
     }
@@ -72,7 +78,7 @@ export default class CustomFetch extends DataFetch {
       // Try parsing strings
       if (typeof value === "string") {
         const split = value.split(",").map(x => x.trim())
-        let obj = {}
+        const obj: Record<string, string> = {}
         for (let i = 0; i < split.length; i++) {
           const suffix = i === 0 ? "" : ` ${i + 1}`
           const key = `Value${suffix}`
@@ -87,27 +93,29 @@ export default class CustomFetch extends DataFetch {
   }
 
   // Extracts and parses the custom data from the datasource definition
-  getCustomData(datasource) {
+  getCustomData(datasource: CustomDatasource) {
     return this.enrichCustomData(this.parseCustomData(datasource?.data))
   }
 
-  async getDefinition(datasource) {
+  async getDefinition() {
+    const { datasource } = this.options
+
     // Try and work out the schema from the array provided
-    let schema = {}
+    const schema: CustomDefinition = {}
     const data = this.getCustomData(datasource)
     if (!data?.length) {
       return { schema }
     }
 
     // Go through every object and extract all valid keys
-    for (let datum of data) {
-      for (let key of Object.keys(datum)) {
+    for (const datum of data) {
+      for (const key of Object.keys(datum)) {
         if (key === "_id") {
           continue
         }
         if (!schema[key]) {
           let type = this.getType(datum[key])
-          let constraints = {}
+          const constraints: any = {}
 
           // Determine whether we should render text columns as options instead
           if (type === "string") {
diff --git a/packages/frontend-core/src/fetch/DataFetch.js b/packages/frontend-core/src/fetch/DataFetch.ts
similarity index 69%
rename from packages/frontend-core/src/fetch/DataFetch.js
rename to packages/frontend-core/src/fetch/DataFetch.ts
index 175365a442..298413b1e8 100644
--- a/packages/frontend-core/src/fetch/DataFetch.js
+++ b/packages/frontend-core/src/fetch/DataFetch.ts
@@ -1,25 +1,92 @@
-import { writable, derived, get } from "svelte/store"
+import { writable, derived, get, Writable, Readable } from "svelte/store"
 import { cloneDeep } from "lodash/fp"
 import { QueryUtils } from "../utils"
 import { convertJSONSchemaToTableSchema } from "../utils/json"
-import { FieldType, SortOrder, SortType } from "@budibase/types"
+import {
+  DataFetchOptions,
+  FieldType,
+  Row,
+  SearchFilters,
+  SortOrder,
+  SortType,
+  TableSchema,
+} from "@budibase/types"
+import { APIClient } from "../api/types"
+import { DataFetchType } from "."
 
 const { buildQuery, limit: queryLimit, runQuery, sort } = QueryUtils
 
+interface DataFetchStore<TDefinition, TQuery> {
+  rows: Row[]
+  info: any
+  schema: TableSchema | null
+  loading: boolean
+  loaded: boolean
+  query: TQuery
+  pageNumber: number
+  cursor: string | null
+  cursors: string[]
+  resetKey: string
+  error: {
+    message: string
+    status: number
+  } | null
+  definition?: TDefinition | null
+}
+
+interface DataFetchDerivedStore<TDefinition, TQuery>
+  extends DataFetchStore<TDefinition, TQuery> {
+  hasNextPage: boolean
+  hasPrevPage: boolean
+  supportsSearch: boolean
+  supportsSort: boolean
+  supportsPagination: boolean
+}
+
+export interface DataFetchParams<TDatasource, TQuery = SearchFilters> {
+  API: APIClient
+  datasource: TDatasource
+  query: TQuery
+  options?: Partial<DataFetchOptions<TQuery>>
+}
+
 /**
  * Parent class which handles the implementation of fetching data from an
  * internal table or datasource plus.
  * For other types of datasource, this class is overridden and extended.
  */
-export default class DataFetch {
+export default abstract class BaseDataFetch<
+  TDatasource extends { type: DataFetchType },
+  TDefinition extends {
+    schema?: Record<string, any> | null
+    primaryDisplay?: string
+  },
+  TQuery extends {} = SearchFilters
+> {
+  API: APIClient
+  features: {
+    supportsSearch: boolean
+    supportsSort: boolean
+    supportsPagination: boolean
+  }
+  options: DataFetchOptions<TQuery> & {
+    datasource: TDatasource
+
+    sortType: SortType | null
+
+    // Client side feature customisation
+    clientSideSearching: boolean
+    clientSideSorting: boolean
+    clientSideLimiting: boolean
+  }
+  store: Writable<DataFetchStore<TDefinition, TQuery>>
+  derivedStore: Readable<DataFetchDerivedStore<TDefinition, TQuery>>
+
   /**
    * Constructs a new DataFetch instance.
    * @param opts the fetch options
    */
-  constructor(opts) {
-    // API client
-    this.API = null
-
+  constructor(opts: DataFetchParams<TDatasource, TQuery>) {
     // Feature flags
     this.features = {
       supportsSearch: false,
@@ -29,12 +96,12 @@ export default class DataFetch {
 
     // Config
     this.options = {
-      datasource: null,
+      datasource: opts.datasource,
       limit: 10,
 
       // Search config
       filter: null,
-      query: null,
+      query: opts.query,
 
       // Sorting config
       sortColumn: null,
@@ -57,11 +124,11 @@ export default class DataFetch {
       schema: null,
       loading: false,
       loaded: false,
-      query: null,
+      query: opts.query,
       pageNumber: 0,
       cursor: null,
       cursors: [],
-      resetKey: Math.random(),
+      resetKey: Math.random().toString(),
       error: null,
     })
 
@@ -102,9 +169,6 @@ export default class DataFetch {
       this.store.update($store => ({ ...$store, loaded: true }))
       return
     }
-
-    // Initially fetch data but don't bother waiting for the result
-    this.getInitialData()
   }
 
   /**
@@ -118,7 +182,10 @@ export default class DataFetch {
   /**
    * Gets the default sort column for this datasource
    */
-  getDefaultSortColumn(definition, schema) {
+  getDefaultSortColumn(
+    definition: { primaryDisplay?: string } | null,
+    schema: Record<string, any>
+  ): string | null {
     if (definition?.primaryDisplay && schema[definition.primaryDisplay]) {
       return definition.primaryDisplay
     } else {
@@ -130,13 +197,13 @@ export default class DataFetch {
    * Fetches a fresh set of data from the server, resetting pagination
    */
   async getInitialData() {
-    const { datasource, filter, paginate } = this.options
+    const { filter, paginate } = this.options
 
     // Fetch datasource definition and extract sort properties if configured
-    const definition = await this.getDefinition(datasource)
+    const definition = await this.getDefinition()
 
     // Determine feature flags
-    const features = this.determineFeatureFlags(definition)
+    const features = await this.determineFeatureFlags()
     this.features = {
       supportsSearch: !!features?.supportsSearch,
       supportsSort: !!features?.supportsSort,
@@ -144,11 +211,11 @@ export default class DataFetch {
     }
 
     // Fetch and enrich schema
-    let schema = this.getSchema(datasource, definition)
-    schema = this.enrichSchema(schema)
+    let schema = this.getSchema(definition)
     if (!schema) {
       return
     }
+    schema = this.enrichSchema(schema)
 
     // If an invalid sort column is specified, delete it
     if (this.options.sortColumn && !schema[this.options.sortColumn]) {
@@ -172,20 +239,26 @@ export default class DataFetch {
       if (
         fieldSchema?.type === FieldType.NUMBER ||
         fieldSchema?.type === FieldType.BIGINT ||
-        fieldSchema?.calculationType
+        ("calculationType" in fieldSchema && fieldSchema?.calculationType)
       ) {
         this.options.sortType = SortType.NUMBER
       }
+
       // If no sort order, default to ascending
       if (!this.options.sortOrder) {
         this.options.sortOrder = SortOrder.ASCENDING
+      } else {
+        // Ensure sortOrder matches the enum
+        this.options.sortOrder =
+          this.options.sortOrder.toLowerCase() as SortOrder
       }
     }
 
     // Build the query
     let query = this.options.query
+
     if (!query) {
-      query = buildQuery(filter)
+      query = buildQuery(filter ?? undefined) as TQuery
     }
 
     // Update store
@@ -210,7 +283,7 @@ export default class DataFetch {
       info: page.info,
       cursors: paginate && page.hasNextPage ? [null, page.cursor] : [null],
       error: page.error,
-      resetKey: Math.random(),
+      resetKey: Math.random().toString(),
     }))
   }
 
@@ -238,8 +311,8 @@ export default class DataFetch {
     }
 
     // If we don't support sorting, do a client-side sort
-    if (!this.features.supportsSort && clientSideSorting) {
-      rows = sort(rows, sortColumn, sortOrder, sortType)
+    if (!this.features.supportsSort && clientSideSorting && sortType) {
+      rows = sort(rows, sortColumn as any, sortOrder, sortType)
     }
 
     // If we don't support pagination, do a client-side limit
@@ -256,49 +329,28 @@ export default class DataFetch {
     }
   }
 
-  /**
-   * Fetches a single page of data from the remote resource.
-   * Must be overridden by a datasource specific child class.
-   */
-  async getData() {
-    return {
-      rows: [],
-      info: null,
-      hasNextPage: false,
-      cursor: null,
-    }
-  }
+  abstract getData(): Promise<{
+    rows: Row[]
+    info?: any
+    hasNextPage?: boolean
+    cursor?: any
+    error?: any
+  }>
 
   /**
    * Gets the definition for this datasource.
-   * Defaults to fetching a table definition.
-   * @param datasource
+
    * @return {object} the definition
    */
-  async getDefinition(datasource) {
-    if (!datasource?.tableId) {
-      return null
-    }
-    try {
-      return await this.API.fetchTableDefinition(datasource.tableId)
-    } catch (error) {
-      this.store.update(state => ({
-        ...state,
-        error,
-      }))
-      return null
-    }
-  }
+  abstract getDefinition(): Promise<TDefinition | null>
 
   /**
    * Gets the schema definition for a datasource.
-   * Defaults to getting the "schema" property of the definition.
-   * @param datasource the datasource
    * @param definition the datasource definition
    * @return {object} the schema
    */
-  getSchema(datasource, definition) {
-    return definition?.schema
+  getSchema(definition: TDefinition | null): Record<string, any> | undefined {
+    return definition?.schema ?? undefined
   }
 
   /**
@@ -307,53 +359,56 @@ export default class DataFetch {
    * @param schema the datasource schema
    * @return {object} the enriched datasource schema
    */
-  enrichSchema(schema) {
-    if (schema == null) {
-      return null
-    }
-
+  enrichSchema(schema: TableSchema): TableSchema {
     // Check for any JSON fields so we can add any top level properties
-    let jsonAdditions = {}
-    Object.keys(schema).forEach(fieldKey => {
+    let jsonAdditions: Record<string, { type: string; nestedJSON: true }> = {}
+    for (const fieldKey of Object.keys(schema)) {
       const fieldSchema = schema[fieldKey]
-      if (fieldSchema?.type === FieldType.JSON) {
+      if (fieldSchema.type === FieldType.JSON) {
         const jsonSchema = convertJSONSchemaToTableSchema(fieldSchema, {
           squashObjects: true,
-        })
-        Object.keys(jsonSchema).forEach(jsonKey => {
-          jsonAdditions[`${fieldKey}.${jsonKey}`] = {
-            type: jsonSchema[jsonKey].type,
-            nestedJSON: true,
+        }) as Record<string, { type: string }> | null // TODO: remove when convertJSONSchemaToTableSchema is typed
+        if (jsonSchema) {
+          for (const jsonKey of Object.keys(jsonSchema)) {
+            jsonAdditions[`${fieldKey}.${jsonKey}`] = {
+              type: jsonSchema[jsonKey].type,
+              nestedJSON: true,
+            }
           }
-        })
+        }
       }
-    })
-    schema = { ...schema, ...jsonAdditions }
+    }
 
     // Ensure schema is in the correct structure
-    let enrichedSchema = {}
-    Object.entries(schema).forEach(([fieldName, fieldSchema]) => {
-      if (typeof fieldSchema === "string") {
-        enrichedSchema[fieldName] = {
-          type: fieldSchema,
-          name: fieldName,
-        }
-      } else {
-        enrichedSchema[fieldName] = {
-          ...fieldSchema,
-          name: fieldName,
+    let enrichedSchema: TableSchema = {}
+    Object.entries({ ...schema, ...jsonAdditions }).forEach(
+      ([fieldName, fieldSchema]) => {
+        if (typeof fieldSchema === "string") {
+          enrichedSchema[fieldName] = {
+            type: fieldSchema,
+            name: fieldName,
+          }
+        } else {
+          enrichedSchema[fieldName] = {
+            ...fieldSchema,
+            type: fieldSchema.type as any, // TODO: check type union definition conflicts
+            name: fieldName,
+          }
         }
       }
-    })
+    )
 
     return enrichedSchema
   }
 
   /**
-   * Determine the feature flag for this datasource definition
-   * @param definition
+   * Determine the feature flag for this datasource
    */
-  determineFeatureFlags(_definition) {
+  async determineFeatureFlags(): Promise<{
+    supportsPagination: boolean
+    supportsSearch?: boolean
+    supportsSort?: boolean
+  }> {
     return {
       supportsSearch: false,
       supportsSort: false,
@@ -365,12 +420,11 @@ export default class DataFetch {
    * Resets the data set and updates options
    * @param newOptions any new options
    */
-  async update(newOptions) {
+  async update(newOptions: Partial<DataFetchOptions<TQuery>>) {
     // Check if any settings have actually changed
     let refresh = false
-    const entries = Object.entries(newOptions || {})
-    for (let [key, value] of entries) {
-      const oldVal = this.options[key] == null ? null : this.options[key]
+    for (const [key, value] of Object.entries(newOptions || {})) {
+      const oldVal = this.options[key as keyof typeof this.options] ?? null
       const newVal = value == null ? null : value
       if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
         refresh = true
@@ -437,7 +491,7 @@ export default class DataFetch {
    * @param state the current store state
    * @return {boolean} whether there is a next page of data or not
    */
-  hasNextPage(state) {
+  private hasNextPage(state: DataFetchStore<TDefinition, TQuery>): boolean {
     return state.cursors[state.pageNumber + 1] != null
   }
 
@@ -447,7 +501,7 @@ export default class DataFetch {
    * @param state the current store state
    * @return {boolean} whether there is a previous page of data or not
    */
-  hasPrevPage(state) {
+  private hasPrevPage(state: { pageNumber: number }): boolean {
     return state.pageNumber > 0
   }
 
diff --git a/packages/frontend-core/src/fetch/FieldFetch.js b/packages/frontend-core/src/fetch/FieldFetch.js
deleted file mode 100644
index 9402a45a83..0000000000
--- a/packages/frontend-core/src/fetch/FieldFetch.js
+++ /dev/null
@@ -1,44 +0,0 @@
-import DataFetch from "./DataFetch.js"
-
-export default class FieldFetch extends DataFetch {
-  async getDefinition(datasource) {
-    // Field sources have their schema statically defined
-    let schema
-    if (datasource.fieldType === "attachment") {
-      schema = {
-        url: {
-          type: "string",
-        },
-        name: {
-          type: "string",
-        },
-      }
-    } else if (datasource.fieldType === "array") {
-      schema = {
-        value: {
-          type: "string",
-        },
-      }
-    }
-    return { schema }
-  }
-
-  async getData() {
-    const { datasource } = this.options
-
-    // These sources will be available directly from context
-    const data = datasource?.value || []
-    let rows
-    if (Array.isArray(data) && data[0] && typeof data[0] !== "object") {
-      rows = data.map(value => ({ value }))
-    } else {
-      rows = data
-    }
-
-    return {
-      rows: rows || [],
-      hasNextPage: false,
-      cursor: null,
-    }
-  }
-}
diff --git a/packages/frontend-core/src/fetch/FieldFetch.ts b/packages/frontend-core/src/fetch/FieldFetch.ts
new file mode 100644
index 0000000000..aa3584e578
--- /dev/null
+++ b/packages/frontend-core/src/fetch/FieldFetch.ts
@@ -0,0 +1,65 @@
+import {
+  FieldDatasource,
+  JSONArrayFieldDatasource,
+  QueryArrayFieldDatasource,
+  Row,
+} from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
+
+export interface FieldDefinition {
+  schema?: Record<string, { type: string }> | null
+}
+
+function isArrayOfStrings(value: string[] | Row[]): value is string[] {
+  return Array.isArray(value) && !!value[0] && typeof value[0] !== "object"
+}
+
+export default class FieldFetch<
+  TDatasource extends
+    | FieldDatasource
+    | QueryArrayFieldDatasource
+    | JSONArrayFieldDatasource = FieldDatasource
+> extends BaseDataFetch<TDatasource, FieldDefinition> {
+  async getDefinition(): Promise<FieldDefinition | null> {
+    const { datasource } = this.options
+
+    // Field sources have their schema statically defined
+    let schema
+    if (datasource.fieldType === "attachment") {
+      schema = {
+        url: {
+          type: "string",
+        },
+        name: {
+          type: "string",
+        },
+      }
+    } else if (datasource.fieldType === "array") {
+      schema = {
+        value: {
+          type: "string",
+        },
+      }
+    }
+    return { schema }
+  }
+
+  async getData() {
+    const { datasource } = this.options
+
+    // These sources will be available directly from context
+    const data = datasource?.value || []
+    let rows: Row[]
+    if (isArrayOfStrings(data)) {
+      rows = data.map(value => ({ value }))
+    } else {
+      rows = data
+    }
+
+    return {
+      rows: rows || [],
+      hasNextPage: false,
+      cursor: null,
+    }
+  }
+}
diff --git a/packages/frontend-core/src/fetch/GroupUserFetch.js b/packages/frontend-core/src/fetch/GroupUserFetch.ts
similarity index 53%
rename from packages/frontend-core/src/fetch/GroupUserFetch.js
rename to packages/frontend-core/src/fetch/GroupUserFetch.ts
index bd2cf264c5..5b07e9decb 100644
--- a/packages/frontend-core/src/fetch/GroupUserFetch.js
+++ b/packages/frontend-core/src/fetch/GroupUserFetch.ts
@@ -1,18 +1,33 @@
 import { get } from "svelte/store"
-import DataFetch from "./DataFetch.js"
-import { TableNames } from "../constants"
+import BaseDataFetch, { DataFetchParams } from "./DataFetch"
+import { GroupUserDatasource, InternalTable } from "@budibase/types"
 
-export default class GroupUserFetch extends DataFetch {
-  constructor(opts) {
+interface GroupUserQuery {
+  groupId: string
+  emailSearch: string
+}
+
+interface GroupUserDefinition {
+  schema?: Record<string, any> | null
+  primaryDisplay?: string
+}
+
+export default class GroupUserFetch extends BaseDataFetch<
+  GroupUserDatasource,
+  GroupUserDefinition,
+  GroupUserQuery
+> {
+  constructor(opts: DataFetchParams<GroupUserDatasource, GroupUserQuery>) {
     super({
       ...opts,
       datasource: {
-        tableId: TableNames.USERS,
+        type: "groupUser",
+        tableId: InternalTable.USER_METADATA,
       },
     })
   }
 
-  determineFeatureFlags() {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: false,
@@ -28,11 +43,12 @@ export default class GroupUserFetch extends DataFetch {
 
   async getData() {
     const { query, cursor } = get(this.store)
+
     try {
       const res = await this.API.getGroupUsers({
         id: query.groupId,
         emailSearch: query.emailSearch,
-        bookmark: cursor,
+        bookmark: cursor ?? undefined,
       })
 
       return {
diff --git a/packages/frontend-core/src/fetch/JSONArrayFetch.js b/packages/frontend-core/src/fetch/JSONArrayFetch.ts
similarity index 63%
rename from packages/frontend-core/src/fetch/JSONArrayFetch.js
rename to packages/frontend-core/src/fetch/JSONArrayFetch.ts
index ab2af3e2c7..22d98eb2e4 100644
--- a/packages/frontend-core/src/fetch/JSONArrayFetch.js
+++ b/packages/frontend-core/src/fetch/JSONArrayFetch.ts
@@ -1,8 +1,11 @@
-import FieldFetch from "./FieldFetch.js"
+import FieldFetch from "./FieldFetch"
 import { getJSONArrayDatasourceSchema } from "../utils/json"
+import { JSONArrayFieldDatasource } from "@budibase/types"
+
+export default class JSONArrayFetch extends FieldFetch<JSONArrayFieldDatasource> {
+  async getDefinition() {
+    const { datasource } = this.options
 
-export default class JSONArrayFetch extends FieldFetch {
-  async getDefinition(datasource) {
     // JSON arrays need their table definitions fetched.
     // We can then extract their schema as a subset of the table schema.
     try {
diff --git a/packages/frontend-core/src/fetch/NestedProviderFetch.js b/packages/frontend-core/src/fetch/NestedProviderFetch.ts
similarity index 51%
rename from packages/frontend-core/src/fetch/NestedProviderFetch.js
rename to packages/frontend-core/src/fetch/NestedProviderFetch.ts
index 0a08b00cb4..486bf490b7 100644
--- a/packages/frontend-core/src/fetch/NestedProviderFetch.js
+++ b/packages/frontend-core/src/fetch/NestedProviderFetch.ts
@@ -1,7 +1,17 @@
-import DataFetch from "./DataFetch.js"
+import { NestedProviderDatasource, TableSchema } from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
+
+interface NestedProviderDefinition {
+  schema?: TableSchema
+  primaryDisplay?: string
+}
+export default class NestedProviderFetch extends BaseDataFetch<
+  NestedProviderDatasource,
+  NestedProviderDefinition
+> {
+  async getDefinition() {
+    const { datasource } = this.options
 
-export default class NestedProviderFetch extends DataFetch {
-  async getDefinition(datasource) {
     // Nested providers should already have exposed their own schema
     return {
       schema: datasource?.value?.schema,
diff --git a/packages/frontend-core/src/fetch/QueryArrayFetch.js b/packages/frontend-core/src/fetch/QueryArrayFetch.ts
similarity index 52%
rename from packages/frontend-core/src/fetch/QueryArrayFetch.js
rename to packages/frontend-core/src/fetch/QueryArrayFetch.ts
index 0b36b640a6..309c231038 100644
--- a/packages/frontend-core/src/fetch/QueryArrayFetch.js
+++ b/packages/frontend-core/src/fetch/QueryArrayFetch.ts
@@ -1,11 +1,14 @@
-import FieldFetch from "./FieldFetch.js"
+import FieldFetch from "./FieldFetch"
 import {
   getJSONArrayDatasourceSchema,
   generateQueryArraySchemas,
 } from "../utils/json"
+import { QueryArrayFieldDatasource } from "@budibase/types"
+
+export default class QueryArrayFetch extends FieldFetch<QueryArrayFieldDatasource> {
+  async getDefinition() {
+    const { datasource } = this.options
 
-export default class QueryArrayFetch extends FieldFetch {
-  async getDefinition(datasource) {
     if (!datasource?.tableId) {
       return null
     }
@@ -14,10 +17,14 @@ export default class QueryArrayFetch extends FieldFetch {
     try {
       const table = await this.API.fetchQueryDefinition(datasource.tableId)
       const schema = generateQueryArraySchemas(
-        table?.schema,
-        table?.nestedSchemaFields
+        table.schema,
+        table.nestedSchemaFields
       )
-      return { schema: getJSONArrayDatasourceSchema(schema, datasource) }
+      const result = {
+        schema: getJSONArrayDatasourceSchema(schema, datasource),
+      }
+
+      return result
     } catch (error) {
       return null
     }
diff --git a/packages/frontend-core/src/fetch/QueryFetch.js b/packages/frontend-core/src/fetch/QueryFetch.ts
similarity index 76%
rename from packages/frontend-core/src/fetch/QueryFetch.js
rename to packages/frontend-core/src/fetch/QueryFetch.ts
index 6420893515..a9b56076f9 100644
--- a/packages/frontend-core/src/fetch/QueryFetch.js
+++ b/packages/frontend-core/src/fetch/QueryFetch.ts
@@ -1,9 +1,11 @@
-import DataFetch from "./DataFetch.js"
+import BaseDataFetch from "./DataFetch"
 import { Helpers } from "@budibase/bbui"
+import { ExecuteQueryRequest, Query, QueryDatasource } from "@budibase/types"
 import { get } from "svelte/store"
 
-export default class QueryFetch extends DataFetch {
-  determineFeatureFlags(definition) {
+export default class QueryFetch extends BaseDataFetch<QueryDatasource, Query> {
+  async determineFeatureFlags() {
+    const definition = await this.getDefinition()
     const supportsPagination =
       !!definition?.fields?.pagination?.type &&
       !!definition?.fields?.pagination?.location &&
@@ -11,7 +13,9 @@ export default class QueryFetch extends DataFetch {
     return { supportsPagination }
   }
 
-  async getDefinition(datasource) {
+  async getDefinition() {
+    const { datasource } = this.options
+
     if (!datasource?._id) {
       return null
     }
@@ -40,23 +44,23 @@ export default class QueryFetch extends DataFetch {
     const type = definition?.fields?.pagination?.type
 
     // Set the default query params
-    let parameters = Helpers.cloneDeep(datasource?.queryParams || {})
-    for (let param of datasource?.parameters || {}) {
+    const parameters = Helpers.cloneDeep(datasource.queryParams || {})
+    for (const param of datasource?.parameters || []) {
       if (!parameters[param.name]) {
         parameters[param.name] = param.default
       }
     }
 
     // Add pagination to query if supported
-    let queryPayload = { queryId: datasource?._id, parameters }
+    const queryPayload: ExecuteQueryRequest = { parameters }
     if (paginate && supportsPagination) {
-      const requestCursor = type === "page" ? parseInt(cursor || 1) : cursor
+      const requestCursor = type === "page" ? parseInt(cursor || "1") : cursor
       queryPayload.pagination = { page: requestCursor, limit }
     }
 
     // Execute query
     try {
-      const res = await this.API.executeQuery(queryPayload)
+      const res = await this.API.executeQuery(datasource?._id, queryPayload)
       const { data, pagination, ...rest } = res
 
       // Derive pagination info from response
@@ -65,7 +69,7 @@ export default class QueryFetch extends DataFetch {
       if (paginate && supportsPagination) {
         if (type === "page") {
           // For "page number" pagination, increment the existing page number
-          nextCursor = queryPayload.pagination.page + 1
+          nextCursor = queryPayload.pagination!.page! + 1
           hasNextPage = data?.length === limit && limit > 0
         } else {
           // For "cursor" pagination, the cursor should be in the response
diff --git a/packages/frontend-core/src/fetch/RelationshipFetch.js b/packages/frontend-core/src/fetch/RelationshipFetch.js
deleted file mode 100644
index 04797fcdf1..0000000000
--- a/packages/frontend-core/src/fetch/RelationshipFetch.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import DataFetch from "./DataFetch.js"
-
-export default class RelationshipFetch extends DataFetch {
-  async getData() {
-    const { datasource } = this.options
-    try {
-      const res = await this.API.fetchRelationshipData({
-        rowId: datasource?.rowId,
-        tableId: datasource?.rowTableId,
-        fieldName: datasource?.fieldName,
-      })
-      return { rows: res || [] }
-    } catch (error) {
-      return { rows: [] }
-    }
-  }
-}
diff --git a/packages/frontend-core/src/fetch/RelationshipFetch.ts b/packages/frontend-core/src/fetch/RelationshipFetch.ts
new file mode 100644
index 0000000000..162f41d58b
--- /dev/null
+++ b/packages/frontend-core/src/fetch/RelationshipFetch.ts
@@ -0,0 +1,41 @@
+import { RelationshipDatasource, Table } from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
+
+export default class RelationshipFetch extends BaseDataFetch<
+  RelationshipDatasource,
+  Table
+> {
+  async getDefinition() {
+    const { datasource } = this.options
+
+    if (!datasource?.tableId) {
+      return null
+    }
+    try {
+      return await this.API.fetchTableDefinition(datasource.tableId)
+    } catch (error: any) {
+      this.store.update(state => ({
+        ...state,
+        error,
+      }))
+      return null
+    }
+  }
+
+  async getData() {
+    const { datasource } = this.options
+    if (!datasource?.rowId || !datasource?.rowTableId) {
+      return { rows: [] }
+    }
+    try {
+      const res = await this.API.fetchRelationshipData(
+        datasource.rowTableId,
+        datasource.rowId,
+        datasource.fieldName
+      )
+      return { rows: res }
+    } catch (error) {
+      return { rows: [] }
+    }
+  }
+}
diff --git a/packages/frontend-core/src/fetch/TableFetch.js b/packages/frontend-core/src/fetch/TableFetch.ts
similarity index 53%
rename from packages/frontend-core/src/fetch/TableFetch.js
rename to packages/frontend-core/src/fetch/TableFetch.ts
index ed17c20c79..a6f92c0ab3 100644
--- a/packages/frontend-core/src/fetch/TableFetch.js
+++ b/packages/frontend-core/src/fetch/TableFetch.ts
@@ -1,9 +1,9 @@
 import { get } from "svelte/store"
-import DataFetch from "./DataFetch.js"
-import { SortOrder } from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
+import { SortOrder, Table, TableDatasource } from "@budibase/types"
 
-export default class TableFetch extends DataFetch {
-  determineFeatureFlags() {
+export default class TableFetch extends BaseDataFetch<TableDatasource, Table> {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: true,
@@ -11,6 +11,23 @@ export default class TableFetch extends DataFetch {
     }
   }
 
+  async getDefinition() {
+    const { datasource } = this.options
+
+    if (!datasource?.tableId) {
+      return null
+    }
+    try {
+      return await this.API.fetchTableDefinition(datasource.tableId)
+    } catch (error: any) {
+      this.store.update(state => ({
+        ...state,
+        error,
+      }))
+      return null
+    }
+  }
+
   async getData() {
     const { datasource, limit, sortColumn, sortOrder, sortType, paginate } =
       this.options
@@ -19,12 +36,11 @@ export default class TableFetch extends DataFetch {
 
     // Search table
     try {
-      const res = await this.API.searchTable({
-        tableId,
+      const res = await this.API.searchTable(tableId, {
         query,
         limit,
         sort: sortColumn,
-        sortOrder: sortOrder?.toLowerCase() ?? SortOrder.ASCENDING,
+        sortOrder: sortOrder ?? SortOrder.ASCENDING,
         sortType,
         paginate,
         bookmark: cursor,
diff --git a/packages/frontend-core/src/fetch/UserFetch.js b/packages/frontend-core/src/fetch/UserFetch.js
deleted file mode 100644
index 36f61542b5..0000000000
--- a/packages/frontend-core/src/fetch/UserFetch.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import { get } from "svelte/store"
-import DataFetch from "./DataFetch.js"
-import { TableNames } from "../constants"
-import { utils } from "@budibase/shared-core"
-
-export default class UserFetch extends DataFetch {
-  constructor(opts) {
-    super({
-      ...opts,
-      datasource: {
-        tableId: TableNames.USERS,
-      },
-    })
-  }
-
-  determineFeatureFlags() {
-    return {
-      supportsSearch: true,
-      supportsSort: false,
-      supportsPagination: true,
-    }
-  }
-
-  async getDefinition() {
-    return {
-      schema: {},
-    }
-  }
-
-  async getData() {
-    const { limit, paginate } = this.options
-    const { cursor, query } = get(this.store)
-
-    // Convert old format to new one - we now allow use of the lucene format
-    const { appId, paginated, ...rest } = query || {}
-    const finalQuery = utils.isSupportedUserSearch(rest)
-      ? query
-      : { string: { email: null } }
-
-    try {
-      const opts = {
-        bookmark: cursor,
-        query: finalQuery,
-        appId: appId,
-        paginate: paginated || paginate,
-        limit,
-      }
-      const res = await this.API.searchUsers(opts)
-      return {
-        rows: res?.data || [],
-        hasNextPage: res?.hasNextPage || false,
-        cursor: res?.nextPage || null,
-      }
-    } catch (error) {
-      return {
-        rows: [],
-        hasNextPage: false,
-        error,
-      }
-    }
-  }
-}
diff --git a/packages/frontend-core/src/fetch/UserFetch.ts b/packages/frontend-core/src/fetch/UserFetch.ts
new file mode 100644
index 0000000000..e72ed8997d
--- /dev/null
+++ b/packages/frontend-core/src/fetch/UserFetch.ts
@@ -0,0 +1,81 @@
+import { get } from "svelte/store"
+import BaseDataFetch, { DataFetchParams } from "./DataFetch"
+import { utils } from "@budibase/shared-core"
+import {
+  InternalTable,
+  SearchFilters,
+  SearchUsersRequest,
+  UserDatasource,
+} from "@budibase/types"
+
+interface UserFetchQuery {
+  appId: string
+  paginated: boolean
+}
+
+interface UserDefinition {
+  schema?: Record<string, any> | null
+  primaryDisplay?: string
+}
+
+export default class UserFetch extends BaseDataFetch<
+  UserDatasource,
+  UserDefinition,
+  UserFetchQuery
+> {
+  constructor(opts: DataFetchParams<UserDatasource, UserFetchQuery>) {
+    super({
+      ...opts,
+      datasource: {
+        type: "user",
+        tableId: InternalTable.USER_METADATA,
+      },
+    })
+  }
+
+  async determineFeatureFlags() {
+    return {
+      supportsSearch: true,
+      supportsSort: false,
+      supportsPagination: true,
+    }
+  }
+
+  async getDefinition() {
+    return { schema: {} }
+  }
+
+  async getData() {
+    const { limit, paginate } = this.options
+    const { cursor, query } = get(this.store)
+
+    // Convert old format to new one - we now allow use of the lucene format
+    const { appId, paginated, ...rest } = query
+
+    const finalQuery: SearchFilters = utils.isSupportedUserSearch(rest)
+      ? rest
+      : {}
+
+    try {
+      const opts: SearchUsersRequest = {
+        bookmark: cursor ?? undefined,
+        query: finalQuery ?? undefined,
+        appId: appId,
+        paginate: paginated || paginate,
+        limit,
+      }
+      const res = await this.API.searchUsers(opts)
+      return {
+        rows: res?.data || [],
+        hasNextPage: res?.hasNextPage || false,
+        cursor: res?.nextPage || null,
+      }
+    } catch (error) {
+      return {
+        rows: [],
+        hasNextPage: false,
+        error,
+      }
+    }
+  }
+}
diff --git a/packages/frontend-core/src/fetch/ViewFetch.js b/packages/frontend-core/src/fetch/ViewFetch.js
deleted file mode 100644
index 981969f46c..0000000000
--- a/packages/frontend-core/src/fetch/ViewFetch.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import DataFetch from "./DataFetch.js"
-
-export default class ViewFetch extends DataFetch {
-  getSchema(datasource, definition) {
-    return definition?.views?.[datasource.name]?.schema
-  }
-
-  async getData() {
-    const { datasource } = this.options
-    try {
-      const res = await this.API.fetchViewData(datasource)
-      return { rows: res || [] }
-    } catch (error) {
-      return { rows: [] }
-    }
-  }
-}
diff --git a/packages/frontend-core/src/fetch/ViewFetch.ts b/packages/frontend-core/src/fetch/ViewFetch.ts
new file mode 100644
index 0000000000..720f91eaab
--- /dev/null
+++ b/packages/frontend-core/src/fetch/ViewFetch.ts
@@ -0,0 +1,42 @@
+import { Table, ViewV1Datasource } from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
+
+export default class ViewFetch extends BaseDataFetch<ViewV1Datasource, Table> {
+  async getDefinition() {
+    const { datasource } = this.options
+
+    if (!datasource?.tableId) {
+      return null
+    }
+    try {
+      return await this.API.fetchTableDefinition(datasource.tableId)
+    } catch (error: any) {
+      this.store.update(state => ({
+        ...state,
+        error,
+      }))
+      return null
+    }
+  }
+
+  getSchema(definition: Table) {
+    const { datasource } = this.options
+    return definition?.views?.[datasource?.name]?.schema
+  }
+
+  async getData() {
+    const { datasource } = this.options
+    try {
+      const res = await this.API.fetchViewData(datasource.name, {
+        calculation: datasource.calculation,
+        field: datasource.field,
+        groupBy: datasource.groupBy,
+        tableId: datasource.tableId,
+      })
+      return { rows: res || [] }
+    } catch (error) {
+      console.error(error, { datasource })
+      return { rows: [] }
+    }
+  }
+}
diff --git a/packages/frontend-core/src/fetch/ViewV2Fetch.js b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
similarity index 50%
rename from packages/frontend-core/src/fetch/ViewV2Fetch.js
rename to packages/frontend-core/src/fetch/ViewV2Fetch.ts
index 6bfef0927f..fd2eab2d53 100644
--- a/packages/frontend-core/src/fetch/ViewV2Fetch.js
+++ b/packages/frontend-core/src/fetch/ViewV2Fetch.ts
@@ -1,9 +1,18 @@
-import { ViewV2Type } from "@budibase/types"
-import DataFetch from "./DataFetch.js"
+import {
+  SortOrder,
+  ViewDatasource,
+  ViewV2Enriched,
+  ViewV2Type,
+} from "@budibase/types"
+import BaseDataFetch from "./DataFetch"
 import { get } from "svelte/store"
+import { helpers } from "@budibase/shared-core"
 
-export default class ViewV2Fetch extends DataFetch {
-  determineFeatureFlags() {
+export default class ViewV2Fetch extends BaseDataFetch<
+  ViewDatasource,
+  ViewV2Enriched
+> {
+  async determineFeatureFlags() {
     return {
       supportsSearch: true,
       supportsSort: true,
@@ -11,18 +20,13 @@ export default class ViewV2Fetch extends DataFetch {
     }
   }
 
-  getSchema(datasource, definition) {
-    return definition?.schema
-  }
+  async getDefinition() {
+    const { datasource } = this.options
 
-  async getDefinition(datasource) {
-    if (!datasource?.id) {
-      return null
-    }
     try {
       const res = await this.API.viewV2.fetchDefinition(datasource.id)
       return res?.data
-    } catch (error) {
+    } catch (error: any) {
       this.store.update(state => ({
         ...state,
         error,
@@ -42,8 +46,10 @@ export default class ViewV2Fetch extends DataFetch {
 
     // If this is a calculation view and we have no calculations, return nothing
     if (
-      definition.type === ViewV2Type.CALCULATION &&
-      !Object.values(definition.schema || {}).some(x => x.calculationType)
+      definition?.type === ViewV2Type.CALCULATION &&
+      !Object.values(definition.schema || {}).some(
+        helpers.views.isCalculationField
+      )
     ) {
       return {
         rows: [],
@@ -56,26 +62,41 @@ export default class ViewV2Fetch extends DataFetch {
     // If sort/filter params are not defined, update options to store the
     // params built in to this view. This ensures that we can accurately
     // compare old and new params and skip a redundant API call.
-    if (!sortColumn && definition.sort?.field) {
+    if (!sortColumn && definition?.sort?.field) {
       this.options.sortColumn = definition.sort.field
-      this.options.sortOrder = definition.sort.order
+      this.options.sortOrder = definition.sort.order || SortOrder.ASCENDING
     }
 
     try {
-      const res = await this.API.viewV2.fetch({
-        viewId: datasource.id,
-        ...(query ? { query } : {}),
+      const request = {
+        query,
         paginate,
         limit,
         bookmark: cursor,
         sort: sortColumn,
-        sortOrder: sortOrder?.toLowerCase(),
+        sortOrder: sortOrder,
         sortType,
-      })
-      return {
-        rows: res?.rows || [],
-        hasNextPage: res?.hasNextPage || false,
-        cursor: res?.bookmark || null,
+      }
+      if (paginate) {
+        const res = await this.API.viewV2.fetch(datasource.id, {
+          ...request,
+          paginate,
+        })
+        return {
+          rows: res?.rows || [],
+          hasNextPage: res?.hasNextPage || false,
+          cursor: res?.bookmark || null,
+        }
+      } else {
+        const res = await this.API.viewV2.fetch(datasource.id, {
+          ...request,
+          paginate,
+        })
+        return {
+          rows: res?.rows || [],
+          hasNextPage: false,
+          cursor: null,
+        }
       }
     } catch (error) {
       return {
diff --git a/packages/frontend-core/src/fetch/index.js b/packages/frontend-core/src/fetch/index.js
deleted file mode 100644
index 903810ac25..0000000000
--- a/packages/frontend-core/src/fetch/index.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import TableFetch from "./TableFetch.js"
-import ViewFetch from "./ViewFetch.js"
-import ViewV2Fetch from "./ViewV2Fetch.js"
-import QueryFetch from "./QueryFetch.js"
-import RelationshipFetch from "./RelationshipFetch.js"
-import NestedProviderFetch from "./NestedProviderFetch.js"
-import FieldFetch from "./FieldFetch.js"
-import JSONArrayFetch from "./JSONArrayFetch.js"
-import UserFetch from "./UserFetch.js"
-import GroupUserFetch from "./GroupUserFetch.js"
-import CustomFetch from "./CustomFetch.js"
-import QueryArrayFetch from "./QueryArrayFetch.js"
-
-const DataFetchMap = {
-  table: TableFetch,
-  view: ViewFetch,
-  viewV2: ViewV2Fetch,
-  query: QueryFetch,
-  link: RelationshipFetch,
-  user: UserFetch,
-  groupUser: GroupUserFetch,
-  custom: CustomFetch,
-
-  // Client specific datasource types
-  provider: NestedProviderFetch,
-  field: FieldFetch,
-  jsonarray: JSONArrayFetch,
-  queryarray: QueryArrayFetch,
-}
-
-// Constructs a new fetch model for a certain datasource
-export const fetchData = ({ API, datasource, options }) => {
-  const Fetch = DataFetchMap[datasource?.type] || TableFetch
-  return new Fetch({ API, datasource, ...options })
-}
-
-// Creates an empty fetch instance with no datasource configured, so no data
-// will initially be loaded
-const createEmptyFetchInstance = ({ API, datasource }) => {
-  const handler = DataFetchMap[datasource?.type]
-  if (!handler) {
-    return null
-  }
-  return new handler({ API })
-}
-
-// Fetches the definition of any type of datasource
-export const getDatasourceDefinition = async ({ API, datasource }) => {
-  const instance = createEmptyFetchInstance({ API, datasource })
-  return await instance?.getDefinition(datasource)
-}
-
-// Fetches the schema of any type of datasource
-export const getDatasourceSchema = ({ API, datasource, definition }) => {
-  const instance = createEmptyFetchInstance({ API, datasource })
-  return instance?.getSchema(datasource, definition)
-}
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
new file mode 100644
index 0000000000..547043145d
--- /dev/null
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -0,0 +1,146 @@
+import TableFetch from "./TableFetch"
+import ViewFetch from "./ViewFetch"
+import ViewV2Fetch from "./ViewV2Fetch"
+import QueryFetch from "./QueryFetch"
+import RelationshipFetch from "./RelationshipFetch"
+import NestedProviderFetch from "./NestedProviderFetch"
+import FieldFetch from "./FieldFetch"
+import JSONArrayFetch from "./JSONArrayFetch"
+import UserFetch from "./UserFetch"
+import GroupUserFetch from "./GroupUserFetch"
+import CustomFetch from "./CustomFetch"
+import QueryArrayFetch from "./QueryArrayFetch"
+import { APIClient } from "../api/types"
+import { DataFetchDatasource, Table, ViewV2Enriched } from "@budibase/types"
+
+export type DataFetchType = keyof typeof DataFetchMap
+
+export const DataFetchMap = {
+  table: TableFetch,
+  view: ViewFetch,
+  viewV2: ViewV2Fetch,
+  query: QueryFetch,
+  link: RelationshipFetch,
+  user: UserFetch,
+  groupUser: GroupUserFetch,
+  custom: CustomFetch,
+
+  // Client specific datasource types
+  provider: NestedProviderFetch,
+  field: FieldFetch,
+  jsonarray: JSONArrayFetch,
+  queryarray: QueryArrayFetch,
+}
+
+export interface DataFetchClassMap {
+  table: TableFetch
+  view: ViewFetch
+  viewV2: ViewV2Fetch
+  query: QueryFetch
+  link: RelationshipFetch
+  user: UserFetch
+  groupUser: GroupUserFetch
+  custom: CustomFetch
+
+  // Client specific datasource types
+  provider: NestedProviderFetch
+  field: FieldFetch
+  jsonarray: JSONArrayFetch
+  queryarray: QueryArrayFetch
+}
+
+export type DataFetch =
+  | TableFetch
+  | ViewFetch
+  | ViewV2Fetch
+  | QueryFetch
+  | RelationshipFetch
+  | UserFetch
+  | GroupUserFetch
+  | CustomFetch
+  | NestedProviderFetch
+  | FieldFetch
+  | JSONArrayFetch
+  | QueryArrayFetch
+
+export type DataFetchDefinition =
+  | Table
+  | ViewV2Enriched
+  | {
+      // These fields are added to allow checking these fields on definition usages without requiring constant castings
+      schema?: Record<string, any> | null
+      primaryDisplay?: string
+      rowHeight?: number
+      type?: string
+      name?: string
+    }
+
+// Constructs a new fetch model for a certain datasource
+export const fetchData = <
+  T extends DataFetchDatasource,
+  Type extends T["type"] = T["type"]
+>({
+  API,
+  datasource,
+  options,
+}: {
+  API: APIClient
+  datasource: T
+  options: any
+}): Type extends keyof DataFetchClassMap
+  ? DataFetchClassMap[Type]
+  : TableFetch => {
+  const Fetch = DataFetchMap[datasource?.type] || TableFetch
+  const fetch = new Fetch({ API, datasource, ...options })
+
+  // Initially fetch data but don't bother waiting for the result
+  fetch.getInitialData()
+
+  return fetch as any
+}
+
+// Creates an empty fetch instance with no datasource configured, so no data
+// will initially be loaded
+const createEmptyFetchInstance = <T extends DataFetchDatasource>({
+  API,
+  datasource,
+}: {
+  API: APIClient
+  datasource: T
+}) => {
+  const handler = DataFetchMap[datasource?.type]
+  if (!handler) {
+    return null
+  }
+  return new handler({
+    API,
+    datasource: datasource as any,
+    query: null as any,
+  })
+}
+
+// Fetches the definition of any type of datasource
+export const getDatasourceDefinition = async ({
+  API,
+  datasource,
+}: {
+  API: APIClient
+  datasource: DataFetchDatasource
+}) => {
+  const instance = createEmptyFetchInstance({ API, datasource })
+  return await instance?.getDefinition()
+}
+
+// Fetches the schema of any type of datasource
+export const getDatasourceSchema = ({
+  API,
+  datasource,
+  definition,
+}: {
+  API: APIClient
+  datasource: DataFetchDatasource
+  definition?: any
+}) => {
+  const instance = createEmptyFetchInstance({ API, datasource })
+  return instance?.getSchema(definition)
+}
diff --git a/packages/frontend-core/src/index.js b/packages/frontend-core/src/index.ts
similarity index 64%
rename from packages/frontend-core/src/index.js
rename to packages/frontend-core/src/index.ts
index 37951dc776..cd668b77e7 100644
--- a/packages/frontend-core/src/index.js
+++ b/packages/frontend-core/src/index.ts
@@ -1,5 +1,6 @@
 export { createAPIClient } from "./api"
-export { fetchData } from "./fetch"
+export type { APIClient } from "./api"
+export { fetchData, DataFetchMap } from "./fetch"
 export * as Constants from "./constants"
 export * from "./stores"
 export * from "./utils"
diff --git a/packages/frontend-core/src/utils/index.js b/packages/frontend-core/src/utils/index.ts
similarity index 91%
rename from packages/frontend-core/src/utils/index.js
rename to packages/frontend-core/src/utils/index.ts
index cc44eec74c..efc694d268 100644
--- a/packages/frontend-core/src/utils/index.js
+++ b/packages/frontend-core/src/utils/index.ts
@@ -8,6 +8,7 @@ export * as search from "./searchFields"
 export * as SchemaUtils from "./schema"
 export { memo, derivedMemo } from "./memo"
 export { createWebsocket } from "./websocket"
+export * as JsonFormatter from "./jsonFormatter"
 export * from "./download"
 export * from "./settings"
 export * from "./relatedColumns"
diff --git a/packages/frontend-core/src/utils/json.d.ts b/packages/frontend-core/src/utils/json.d.ts
new file mode 100644
index 0000000000..e9b6ac5703
--- /dev/null
+++ b/packages/frontend-core/src/utils/json.d.ts
@@ -0,0 +1,23 @@
+import { JsonFieldMetadata, QuerySchema } from "@budibase/types"
+
+type Schema = Record<string, QuerySchema | string>
+
+declare module "./json" {
+  export const getJSONArrayDatasourceSchema: (
+    tableSchema: Schema,
+    datasource: any
+  ) => Record<string, { type: string; name: string; prefixKeys: string }>
+
+  export const generateQueryArraySchemas: (
+    schema: Schema,
+    nestedSchemaFields?: Record<string, Schema>
+  ) => Schema
+
+  export const convertJSONSchemaToTableSchema: (
+    jsonSchema: JsonFieldMetadata,
+    options: {
+      squashObjects?: boolean
+      prefixKeys?: string
+    }
+  ) => Record<string, { type: string; name: string; prefixKeys: string }>
+}
diff --git a/packages/frontend-core/src/utils/jsonFormatter.ts b/packages/frontend-core/src/utils/jsonFormatter.ts
new file mode 100644
index 0000000000..9f9af3a3c0
--- /dev/null
+++ b/packages/frontend-core/src/utils/jsonFormatter.ts
@@ -0,0 +1,71 @@
+import { JSONValue } from "@budibase/types"
+
+export type ColorsOptions = {
+  keyColor?: string
+  numberColor?: string
+  stringColor?: string
+  trueColor?: string
+  falseColor?: string
+  nullColor?: string
+}
+
+const defaultColors: ColorsOptions = {
+  keyColor: "dimgray",
+  numberColor: "lightskyblue",
+  stringColor: "lightcoral",
+  trueColor: "lightseagreen",
+  falseColor: "#f66578",
+  nullColor: "cornflowerblue",
+}
+
+const entityMap = {
+  "&": "&amp;",
+  "<": "&lt;",
+  ">": "&gt;",
+  '"': "&quot;",
+  "'": "&#39;",
+  "`": "&#x60;",
+  "=": "&#x3D;",
+}
+
+function escapeHtml(html: string) {
+  return String(html).replace(/[&<>"'`=]/g, function (s) {
+    return entityMap[s as keyof typeof entityMap]
+  })
+}
+
+export function format(json: JSONValue, colorOptions: ColorsOptions = {}) {
+  const valueType = typeof json
+  let jsonString =
+    typeof json === "string" ? json : JSON.stringify(json, null, 2) || valueType
+  let colors = Object.assign({}, defaultColors, colorOptions)
+  jsonString = jsonString
+    .replace(/&/g, "&")
+    .replace(/</g, "<")
+    .replace(/>/g, ">")
+  return jsonString.replace(
+    /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+]?\d+)?)/g,
+    (match: string) => {
+      let color = colors.numberColor
+      let style = ""
+      if (/^"/.test(match)) {
+        if (/:$/.test(match)) {
+          color = colors.keyColor
+        } else {
+          color = colors.stringColor
+          match = '"' + escapeHtml(match.substr(1, match.length - 2)) + '"'
+          style = "word-wrap:break-word;white-space:pre-wrap;"
+        }
+      } else {
+        color = /true/.test(match)
+          ? colors.trueColor
+          : /false/.test(match)
+          ? colors.falseColor
+          : /null/.test(match)
+          ? colors.nullColor
+          : color
+      }
+      return `<span style="${style}color:${color}">${match}</span>`
+    }
+  )
+}
diff --git a/packages/frontend-core/src/utils/memo.d.ts b/packages/frontend-core/src/utils/memo.d.ts
new file mode 100644
index 0000000000..04d3416e49
--- /dev/null
+++ b/packages/frontend-core/src/utils/memo.d.ts
@@ -0,0 +1,10 @@
+import { Readable, Writable } from "svelte/store"
+
+declare module "./memo" {
+  export function memo<T>(value: T): Writable<T>
+
+  export function derivedMemo<TStore, TResult>(
+    store: Readable<TStore>,
+    derivation: (store: TStore) => TResult
+  ): Readable<TResult>
+}
diff --git a/packages/frontend-core/src/utils/relatedColumns.js b/packages/frontend-core/src/utils/relatedColumns.js
deleted file mode 100644
index 6e7968f70c..0000000000
--- a/packages/frontend-core/src/utils/relatedColumns.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import { FieldType, RelationshipType } from "@budibase/types"
-import { Helpers } from "@budibase/bbui"
-
-const columnTypeManyTypeOverrides = {
-  [FieldType.DATETIME]: FieldType.STRING,
-  [FieldType.BOOLEAN]: FieldType.STRING,
-  [FieldType.SIGNATURE_SINGLE]: FieldType.ATTACHMENTS,
-}
-
-const columnTypeManyParser = {
-  [FieldType.DATETIME]: (value, field) => {
-    function parseDate(value) {
-      const { timeOnly, dateOnly, ignoreTimezones } = field || {}
-      const enableTime = !dateOnly
-      const parsedValue = Helpers.parseDate(value, {
-        timeOnly,
-        enableTime,
-        ignoreTimezones,
-      })
-      const parsed = Helpers.getDateDisplayValue(parsedValue, {
-        enableTime,
-        timeOnly,
-      })
-      return parsed
-    }
-
-    return value.map(v => parseDate(v))
-  },
-  [FieldType.BOOLEAN]: value => value.map(v => !!v),
-  [FieldType.BB_REFERENCE_SINGLE]: value => [
-    ...new Map(value.map(i => [i._id, i])).values(),
-  ],
-  [FieldType.BB_REFERENCE]: value => [
-    ...new Map(value.map(i => [i._id, i])).values(),
-  ],
-  [FieldType.ARRAY]: value => Array.from(new Set(value)),
-}
-
-export function enrichSchemaWithRelColumns(schema) {
-  if (!schema) {
-    return
-  }
-  const result = Object.keys(schema).reduce((result, fieldName) => {
-    const field = schema[fieldName]
-    result[fieldName] = field
-
-    if (field.visible !== false && field.columns) {
-      const fromSingle =
-        field?.relationshipType === RelationshipType.ONE_TO_MANY
-
-      for (const relColumn of Object.keys(field.columns)) {
-        const relField = field.columns[relColumn]
-        if (!relField.visible) {
-          continue
-        }
-        const name = `${field.name}.${relColumn}`
-        result[name] = {
-          ...relField,
-          name,
-          related: { field: fieldName, subField: relColumn },
-          cellRenderType:
-            (!fromSingle && columnTypeManyTypeOverrides[relField.type]) ||
-            relField.type,
-        }
-      }
-    }
-    return result
-  }, {})
-
-  return result
-}
-
-export function getRelatedTableValues(row, field, fromField) {
-  const fromSingle =
-    fromField?.relationshipType === RelationshipType.ONE_TO_MANY
-
-  let result = ""
-
-  if (fromSingle) {
-    result = row[field.related.field]?.[0]?.[field.related.subField]
-  } else {
-    const parser = columnTypeManyParser[field.type] || (value => value)
-    const value = row[field.related.field]
-      ?.flatMap(r => r[field.related.subField])
-      ?.filter(i => i !== undefined && i !== null)
-    result = parser(value || [], field)
-    if (
-      [
-        FieldType.STRING,
-        FieldType.NUMBER,
-        FieldType.BIGINT,
-        FieldType.BOOLEAN,
-        FieldType.DATETIME,
-        FieldType.LONGFORM,
-        FieldType.BARCODEQR,
-      ].includes(field.type)
-    ) {
-      result = result?.join(", ")
-    }
-  }
-
-  return result
-}
diff --git a/packages/frontend-core/src/utils/relatedColumns.ts b/packages/frontend-core/src/utils/relatedColumns.ts
new file mode 100644
index 0000000000..7bec526605
--- /dev/null
+++ b/packages/frontend-core/src/utils/relatedColumns.ts
@@ -0,0 +1,126 @@
+import { Helpers } from "@budibase/bbui"
+import {
+  FieldType,
+  isRelationshipField,
+  RelationshipType,
+  Row,
+  UIFieldSchema,
+} from "@budibase/types"
+
+const columnTypeManyTypeOverrides: Partial<Record<FieldType, FieldType>> = {
+  [FieldType.DATETIME]: FieldType.STRING,
+  [FieldType.BOOLEAN]: FieldType.STRING,
+  [FieldType.SIGNATURE_SINGLE]: FieldType.ATTACHMENTS,
+}
+
+const columnTypeManyParser = {
+  [FieldType.DATETIME]: (
+    value: any[],
+    field: {
+      timeOnly?: boolean
+      dateOnly?: boolean
+    }
+  ) => {
+    function parseDate(value: any) {
+      const { timeOnly, dateOnly } = field || {}
+      const enableTime = !dateOnly
+      const parsedValue = Helpers.parseDate(value, { enableTime })
+      const parsed = Helpers.getDateDisplayValue(parsedValue, {
+        enableTime,
+        timeOnly,
+      })
+      return parsed
+    }
+
+    return value.map(v => parseDate(v))
+  },
+  [FieldType.BOOLEAN]: (value: any[]) => value.map(v => !!v),
+  [FieldType.BB_REFERENCE_SINGLE]: (value: any[]) => [
+    ...new Map(value.map(i => [i._id, i])).values(),
+  ],
+  [FieldType.BB_REFERENCE]: (value: any[]) => [
+    ...new Map(value.map(i => [i._id, i])).values(),
+  ],
+  [FieldType.ARRAY]: (value: any[]) => Array.from(new Set(value)),
+}
+
+export function enrichSchemaWithRelColumns(
+  schema: Record<string, UIFieldSchema>
+): Record<string, UIFieldSchema> {
+  const result = Object.keys(schema).reduce<Record<string, UIFieldSchema>>(
+    (result, fieldName) => {
+      const field = schema[fieldName]
+      result[fieldName] = field
+
+      if (
+        field.visible !== false &&
+        isRelationshipField(field) &&
+        field.columns
+      ) {
+        const fromSingle =
+          field?.relationshipType === RelationshipType.ONE_TO_MANY
+
+        for (const relColumn of Object.keys(field.columns)) {
+          const relField = field.columns[relColumn]
+          if (!relField.visible) {
+            continue
+          }
+          const name = `${field.name}.${relColumn}`
+          result[name] = {
+            ...relField,
+            type: relField.type as any, // TODO
+            name,
+            related: { field: fieldName, subField: relColumn },
+            cellRenderType:
+              (!fromSingle && columnTypeManyTypeOverrides[relField.type]) ||
+              relField.type,
+          }
+        }
+      }
+      return result
+    },
+    {}
+  )
+
+  return result
+}
+
+export function getRelatedTableValues(
+  row: Row,
+  field: UIFieldSchema & { related: { field: string; subField: string } },
+  fromField: UIFieldSchema
+) {
+  const fromSingle =
+    isRelationshipField(fromField) &&
+    fromField?.relationshipType === RelationshipType.ONE_TO_MANY
+
+  let result = ""
+
+  if (fromSingle) {
+    result = row[field.related.field]?.[0]?.[field.related.subField]
+  } else {
+    const parser =
+      columnTypeManyParser[field.type as keyof typeof columnTypeManyParser] ||
+      ((value: any) => value)
+    const value = row[field.related.field]
+      ?.flatMap((r: Row) => r[field.related.subField])
+      ?.filter((i: any) => i !== undefined && i !== null)
+    const parsed = parser(value || [], field as any)
+    result = parsed as any
+    if (
+      [
+        FieldType.STRING,
+        FieldType.NUMBER,
+        FieldType.BIGINT,
+        FieldType.BOOLEAN,
+        FieldType.DATETIME,
+        FieldType.LONGFORM,
+        FieldType.BARCODEQR,
+      ].includes(field.type)
+    ) {
+      result = parsed?.join(", ")
+    }
+  }
+
+  return result
+}
diff --git a/packages/frontend-core/src/utils/utils.js b/packages/frontend-core/src/utils/utils.js
index fef9a7a31b..3dbaa23d3c 100644
--- a/packages/frontend-core/src/utils/utils.js
+++ b/packages/frontend-core/src/utils/utils.js
@@ -1,5 +1,6 @@
 import { makePropSafe as safe } from "@budibase/string-templates"
 import { Helpers } from "@budibase/bbui"
+import { cloneDeep } from "lodash"
 
 export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
 
@@ -7,7 +8,7 @@ export const sleep = ms => new Promise(resolve => setTimeout(resolve, ms))
  * Utility to wrap an async function and ensure all invocations happen
  * sequentially.
  * @param fn the async function to run
- * @return {Promise} a sequential version of the function
+ * @return {Function} a sequential version of the function
  */
 export const sequential = fn => {
   let queue = []
@@ -42,7 +43,7 @@ export const sequential = fn => {
  * invocations is enforced.
  * @param callback an async function to run
  * @param minDelay the minimum delay between invocations
- * @returns {Promise} a debounced version of the callback
+ * @returns a debounced version of the callback
  */
 export const debounce = (callback, minDelay = 1000) => {
   let timeout
@@ -208,6 +209,9 @@ export const buildFormBlockButtonConfig = props => {
     {
       "##eventHandlerType": "Close Side Panel",
     },
+    {
+      "##eventHandlerType": "Close Modal",
+    },
 
     ...(actionUrl
       ? [
@@ -351,3 +355,27 @@ export const buildMultiStepFormBlockDefaultProps = props => {
     title,
   }
 }
+
+/**
+ * Parse out empty or invalid UI filters and clear empty groups
+ * @param {Object} filter UI filter
+ * @returns {Object} parsed filter
+ */
+export function parseFilter(filter) {
+  if (!filter?.groups) {
+    return filter
+  }
+
+  const update = cloneDeep(filter)
+
+  update.groups = update.groups
+    .map(group => {
+      group.filters = group.filters.filter(filter => {
+        return filter.field && filter.operator
+      })
+      return group.filters.length ? group : null
+    })
+    .filter(group => group)
+
+  return update
+}
diff --git a/packages/frontend-core/src/utils/websocket.js b/packages/frontend-core/src/utils/websocket.ts
similarity index 78%
rename from packages/frontend-core/src/utils/websocket.js
rename to packages/frontend-core/src/utils/websocket.ts
index dee679eaef..475b14176f 100644
--- a/packages/frontend-core/src/utils/websocket.js
+++ b/packages/frontend-core/src/utils/websocket.ts
@@ -1,12 +1,18 @@
-import { io } from "socket.io-client"
+import { io, Socket } from "socket.io-client"
 import { SocketEvent, SocketSessionTTL } from "@budibase/shared-core"
 import { APISessionID } from "../api"
 
 const DefaultOptions = {
   heartbeat: true,
 }
+export interface ExtendedSocket extends Socket {
+  onOther: (event: string, callback: (data: any) => void) => void
+}
 
-export const createWebsocket = (path, options = DefaultOptions) => {
+export const createWebsocket = (
+  path: string,
+  options = DefaultOptions
+): ExtendedSocket => {
   if (!path) {
     throw "A websocket path must be provided"
   }
@@ -32,10 +38,10 @@ export const createWebsocket = (path, options = DefaultOptions) => {
     // Disable polling and rely on websocket only, as HTTP transport
     // will only work with sticky sessions which we don't have
     transports: ["websocket"],
-  })
+  }) as ExtendedSocket
 
   // Set up a heartbeat that's half of the session TTL
-  let interval
+  let interval: NodeJS.Timeout | undefined
   if (heartbeat) {
     interval = setInterval(() => {
       socket.emit(SocketEvent.Heartbeat)
@@ -48,7 +54,7 @@ export const createWebsocket = (path, options = DefaultOptions) => {
 
   // Helper utility to ignore events that were triggered due to API
   // changes made by us
-  socket.onOther = (event, callback) => {
+  socket.onOther = (event: string, callback: (data: any) => void) => {
     socket.on(event, data => {
       if (data?.apiSessionId !== APISessionID) {
         callback(data)
diff --git a/packages/frontend-core/tsconfig.json b/packages/frontend-core/tsconfig.json
new file mode 100644
index 0000000000..d06da5a713
--- /dev/null
+++ b/packages/frontend-core/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.build.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "lib": ["ESNext"],
+    "module": "preserve",
+    "moduleResolution": "bundler",
+    "outDir": "./dist",
+    "skipLibCheck": true,
+    "allowJs": true
+  },
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/packages/pro b/packages/pro
index bfeece324a..43a5785ccb 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit bfeece324a03a3a5f25137bf3f8c66d5ed6103d8
+Subproject commit 43a5785ccb4f83ce929b29f05ea0a62199fcdf23
diff --git a/packages/server/nodemon.json b/packages/server/nodemon.json
index b0e792d945..9871b9339e 100644
--- a/packages/server/nodemon.json
+++ b/packages/server/nodemon.json
@@ -1,13 +1,19 @@
 {
   "watch": [
     "src",
-    "../backend-core",
-    "../pro",
-    "../types",
-    "../shared-core",
-    "../string-templates"
+    "../backend-core/src",
+    "../pro/src",
+    "../types/src",
+    "../shared-core/src",
+    "../string-templates/src"
+  ],
+  "ext": "js,ts,json,svelte,hbs",
+  "ignore": [
+    "**/*.spec.ts",
+    "**/*.spec.js",
+    "../*/dist/**/*",
+    "client/**/*",
+    "builder/**/*"
   ],
-  "ext": "js,ts,json,svelte",
-  "ignore": ["**/*.spec.ts", "**/*.spec.js", "../*/dist/**/*", "client/**/*", "builder/**/*"],
   "exec": "yarn build && node --no-node-snapshot ./dist/index.js"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 76dd03b5a8..8cd49a0fe8 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -12,7 +12,8 @@
     "prebuild": "rimraf dist/",
     "build": "node ./scripts/build.js",
     "postbuild": "copyfiles -f ../client/dist/budibase-client.js ../client/manifest.json client && copyfiles -f ../../yarn.lock ./dist/",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
+    "check:dependencies": "node ../../scripts/depcheck.js",
     "build:isolated-vm-lib:snippets": "esbuild --minify --bundle src/jsRunner/bundles/snippets.ts --outfile=src/jsRunner/bundles/snippets.ivm.bundle.js --platform=node --format=iife --global-name=snippets",
     "build:isolated-vm-lib:string-templates": "esbuild --minify --bundle src/jsRunner/bundles/index-helpers.ts --outfile=src/jsRunner/bundles/index-helpers.ivm.bundle.js --platform=node --format=iife --external:handlebars --global-name=helpers",
     "build:isolated-vm-lib:bson": "esbuild --minify --bundle src/jsRunner/bundles/bsonPackage.ts --outfile=src/jsRunner/bundles/bson.ivm.bundle.js --platform=node --format=iife --global-name=bson",
@@ -49,26 +50,30 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@budibase/backend-core": "0.0.0",
-    "@budibase/client": "0.0.0",
-    "@budibase/frontend-core": "0.0.0",
-    "@budibase/pro": "0.0.0",
-    "@budibase/shared-core": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
+    "@azure/msal-node": "^2.5.1",
+    "@budibase/backend-core": "*",
+    "@budibase/client": "*",
+    "@budibase/frontend-core": "*",
+    "@budibase/nano": "10.1.5",
+    "@budibase/pro": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
     "@bull-board/api": "5.10.2",
     "@bull-board/koa": "5.10.2",
     "@elastic/elasticsearch": "7.10.0",
     "@google-cloud/firestore": "7.8.0",
-    "@koa/router": "8.0.8",
+    "@koa/cors": "5.0.0",
+    "@koa/router": "13.1.0",
     "@socket.io/redis-adapter": "^8.2.1",
     "@types/xml2js": "^0.4.14",
     "airtable": "0.12.2",
     "arangojs": "7.2.0",
     "archiver": "7.0.1",
-    "aws-sdk": "2.1030.0",
+    "aws-sdk": "2.1692.0",
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
+    "bson": "^6.9.0",
     "buffer": "6.0.3",
     "bull": "4.10.1",
     "chokidar": "3.5.3",
@@ -76,17 +81,20 @@
     "cookies": "0.8.0",
     "csvtojson": "2.0.10",
     "curlconverter": "3.21.0",
-    "dd-trace": "5.2.0",
+    "dayjs": "^1.10.8",
+    "dd-trace": "5.26.0",
     "dotenv": "8.2.0",
     "form-data": "4.0.0",
     "global-agent": "3.0.0",
+    "google-auth-library": "^8.0.1",
     "google-spreadsheet": "npm:@budibase/google-spreadsheet@4.1.5",
     "ioredis": "5.3.2",
     "isolated-vm": "^4.7.2",
-    "jimp": "0.22.12",
+    "jimp": "1.1.4",
     "joi": "17.6.0",
     "js-yaml": "4.1.0",
     "jsonschema": "1.4.0",
+    "jsonwebtoken": "9.0.2",
     "knex": "2.4.2",
     "koa": "2.13.4",
     "koa-body": "4.2.0",
@@ -97,7 +105,7 @@
     "lodash": "4.17.21",
     "memorystream": "0.3.1",
     "mongodb": "6.7.0",
-    "mssql": "10.0.1",
+    "mssql": "11.0.1",
     "mysql2": "3.9.8",
     "node-fetch": "2.6.7",
     "object-sizeof": "2.6.1",
@@ -105,24 +113,29 @@
     "openapi-types": "9.3.1",
     "oracledb": "6.5.1",
     "pg": "8.10.0",
-    "pouchdb": "7.3.0",
+    "pouchdb": "9.0.0",
     "pouchdb-all-dbs": "1.1.1",
-    "pouchdb-find": "7.2.2",
+    "pouchdb-find": "9.0.0",
     "redis": "4",
+    "semver": "^7.5.4",
     "serialize-error": "^7.0.1",
     "server-destroy": "1.0.1",
-    "snowflake-promise": "^4.5.0",
-    "socket.io": "4.7.5",
+    "snowflake-sdk": "^1.15.0",
+    "socket.io": "4.8.1",
+    "svelte": "4.2.19",
     "tar": "6.2.1",
     "tmp": "0.2.3",
     "to-json-schema": "0.2.5",
     "uuid": "^8.3.2",
     "validate.js": "0.13.1",
     "worker-farm": "1.7.0",
-    "xml2js": "0.5.0"
+    "xml2js": "0.6.2",
+    "zod-validation-error": "^3.4.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.22.5",
     "@babel/preset-env": "7.16.11",
+    "@jest/types": "^29.6.3",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
     "@types/archiver": "6.0.2",
@@ -130,19 +143,23 @@
     "@types/jest": "29.5.5",
     "@types/koa": "2.13.4",
     "@types/koa-send": "^4.1.6",
-    "@types/koa__router": "8.0.8",
+    "@types/koa__cors": "5.0.0",
+    "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
-    "@types/mssql": "9.1.4",
+    "@types/mssql": "9.1.5",
     "@types/node-fetch": "2.6.4",
     "@types/oracledb": "6.5.1",
     "@types/pg": "8.6.6",
+    "@types/pouchdb": "6.4.2",
     "@types/server-destroy": "1.0.1",
     "@types/supertest": "2.0.14",
     "@types/tar": "6.1.5",
     "@types/tmp": "0.2.6",
     "@types/uuid": "8.3.4",
+    "chance": "^1.1.12",
     "copyfiles": "2.4.1",
     "docker-compose": "0.23.17",
+    "ioredis-mock": "8.9.0",
     "jest": "29.7.0",
     "jest-extended": "^4.0.2",
     "jest-openapi": "0.14.2",
@@ -152,13 +169,14 @@
     "rimraf": "3.0.2",
     "supertest": "6.3.3",
     "swagger-jsdoc": "6.1.0",
-    "testcontainers": "10.7.2",
+    "testcontainers": "10.16.0",
     "timekeeper": "2.2.0",
     "ts-node": "10.8.1",
     "tsconfig-paths": "4.0.0",
-    "typescript": "5.5.2",
+    "typescript": "5.7.2",
     "update-dotenv": "1.1.1",
-    "yargs": "13.2.4"
+    "yargs": "^13.2.4",
+    "zod": "^3.23.8"
   },
   "nx": {
     "targets": {
@@ -169,7 +187,7 @@
             "projects": [
               "@budibase/backend-core"
             ],
-            "target": "build"
+            "target": "build:oss"
           }
         ]
       },
diff --git a/packages/server/scripts/dev/manage.js b/packages/server/scripts/dev/manage.js
index 0794c53506..84e1abea69 100644
--- a/packages/server/scripts/dev/manage.js
+++ b/packages/server/scripts/dev/manage.js
@@ -43,7 +43,6 @@ async function init() {
     BB_ADMIN_USER_EMAIL: "",
     BB_ADMIN_USER_PASSWORD: "",
     PLUGINS_DIR: "",
-    HTTP_MIGRATIONS: "0",
     HTTP_LOGGING: "0",
     VERSION: "0.0.0+local",
     PASSWORD_MIN_LENGTH: "1",
diff --git a/packages/server/scripts/integrations/mysql/init.sql b/packages/server/scripts/integrations/mysql/init.sql
index e687c7c3b1..bbb2425b0d 100644
--- a/packages/server/scripts/integrations/mysql/init.sql
+++ b/packages/server/scripts/integrations/mysql/init.sql
@@ -30,6 +30,10 @@ CREATE TABLE Products (
     name text,
     updated time
 );
+CREATE TABLE `table with space` (
+    id serial primary key,
+    name text
+);
 INSERT INTO Persons (FirstName, LastName, Age, Address, City, CreatedAt) VALUES ('Mike', 'Hughes', 28.2, '123 Fake Street', 'Belfast', '2021-01-19 03:14:07');
 INSERT INTO Persons (FirstName, LastName, Age, Address, City, CreatedAt) VALUES ('Dave', 'Johnson', 29, '124 Fake Street', 'Belfast', '2022-04-01 00:11:11');
 INSERT INTO Person (Name) VALUES ('Elf');
diff --git a/packages/server/specs/openapi.json b/packages/server/specs/openapi.json
index f3091a1fc7..9d356b9931 100644
--- a/packages/server/specs/openapi.json
+++ b/packages/server/specs/openapi.json
@@ -32,6 +32,15 @@
           "type": "string"
         }
       },
+      "viewId": {
+        "in": "path",
+        "name": "viewId",
+        "required": true,
+        "description": "The ID of the view which this request is targeting.",
+        "schema": {
+          "type": "string"
+        }
+      },
       "rowId": {
         "in": "path",
         "name": "rowId",
@@ -47,7 +56,7 @@
         "required": true,
         "description": "The ID of the app which this request is targeting.",
         "schema": {
-          "default": "{{ appId }}",
+          "default": "{{appId}}",
           "type": "string"
         }
       },
@@ -57,7 +66,7 @@
         "required": true,
         "description": "The ID of the app which this request is targeting.",
         "schema": {
-          "default": "{{ appId }}",
+          "default": "{{appId}}",
           "type": "string"
         }
       },
@@ -423,6 +432,110 @@
       },
       "metrics": {
         "value": "# HELP budibase_os_uptime Time in seconds that the host operating system has been up.\n# TYPE budibase_os_uptime counter\nbudibase_os_uptime 54958\n# HELP budibase_os_free_mem Bytes of memory free for usage on the host operating system.\n# TYPE budibase_os_free_mem gauge\nbudibase_os_free_mem 804507648\n# HELP budibase_os_total_mem Total bytes of memory on the host operating system.\n# TYPE budibase_os_total_mem gauge\nbudibase_os_total_mem 16742404096\n# HELP budibase_os_used_mem Total bytes of memory in use on the host operating system.\n# TYPE budibase_os_used_mem gauge\nbudibase_os_used_mem 15937896448\n# HELP budibase_os_load1 Host operating system load average.\n# TYPE budibase_os_load1 gauge\nbudibase_os_load1 1.91\n# HELP budibase_os_load5 Host operating system load average.\n# TYPE budibase_os_load5 gauge\nbudibase_os_load5 1.75\n# HELP budibase_os_load15 Host operating system load average.\n# TYPE budibase_os_load15 gauge\nbudibase_os_load15 1.56\n# HELP budibase_tenant_user_count The number of users created.\n# TYPE budibase_tenant_user_count gauge\nbudibase_tenant_user_count 1\n# HELP budibase_tenant_app_count The number of apps created by a user.\n# TYPE budibase_tenant_app_count gauge\nbudibase_tenant_app_count 2\n# HELP budibase_tenant_production_app_count The number of apps a user has published.\n# TYPE budibase_tenant_production_app_count gauge\nbudibase_tenant_production_app_count 1\n# HELP budibase_tenant_dev_app_count The number of apps a user has unpublished in development.\n# TYPE budibase_tenant_dev_app_count gauge\nbudibase_tenant_dev_app_count 1\n# HELP budibase_tenant_db_count The number of couchdb databases including global tables such as _users.\n# TYPE budibase_tenant_db_count gauge\nbudibase_tenant_db_count 3\n# HELP budibase_quota_usage_apps The number of apps created.\n# TYPE budibase_quota_usage_apps gauge\nbudibase_quota_usage_apps 1\n# HELP budibase_quota_limit_apps The limit on the number of apps that can be created.\n# TYPE budibase_quota_limit_apps gauge\nbudibase_quota_limit_apps 9007199254740991\n# HELP budibase_quota_usage_rows The number of database rows used from the quota.\n# TYPE budibase_quota_usage_rows gauge\nbudibase_quota_usage_rows 0\n# HELP budibase_quota_limit_rows The limit on the number of rows that can be created.\n# TYPE budibase_quota_limit_rows gauge\nbudibase_quota_limit_rows 9007199254740991\n# HELP budibase_quota_usage_plugins The number of plugins in use.\n# TYPE budibase_quota_usage_plugins gauge\nbudibase_quota_usage_plugins 0\n# HELP budibase_quota_limit_plugins The limit on the number of plugins that can be created.\n# TYPE budibase_quota_limit_plugins gauge\nbudibase_quota_limit_plugins 9007199254740991\n# HELP budibase_quota_usage_user_groups The number of user groups created.\n# TYPE budibase_quota_usage_user_groups gauge\nbudibase_quota_usage_user_groups 0\n# HELP budibase_quota_limit_user_groups The limit on the number of user groups that can be created.\n# TYPE budibase_quota_limit_user_groups gauge\nbudibase_quota_limit_user_groups 9007199254740991\n# HELP budibase_quota_usage_queries The number of queries used in the current month.\n# TYPE budibase_quota_usage_queries gauge\nbudibase_quota_usage_queries 0\n# HELP budibase_quota_limit_queries The limit on the number of queries for the current month.\n# TYPE budibase_quota_limit_queries gauge\nbudibase_quota_limit_queries 9007199254740991\n# HELP budibase_quota_usage_automations The number of automations used in the current month.\n# TYPE budibase_quota_usage_automations gauge\nbudibase_quota_usage_automations 0\n# HELP budibase_quota_limit_automations The limit on the number of automations that can be created.\n# TYPE budibase_quota_limit_automations gauge\nbudibase_quota_limit_automations 9007199254740991\n"
+      },
+      "view": {
+        "value": {
+          "data": {
+            "name": "peopleView",
+            "tableId": "ta_896a325f7e8147d2a2cda93c5d236511",
+            "schema": {
+              "name": {
+                "visible": true,
+                "readonly": false,
+                "order": 1,
+                "width": 300
+              },
+              "age": {
+                "visible": true,
+                "readonly": true,
+                "order": 2,
+                "width": 200
+              },
+              "salary": {
+                "visible": false,
+                "readonly": false
+              }
+            },
+            "query": {
+              "logicalOperator": "all",
+              "onEmptyFilter": "none",
+              "groups": [
+                {
+                  "logicalOperator": "any",
+                  "filters": [
+                    {
+                      "operator": "string",
+                      "field": "name",
+                      "value": "John"
+                    },
+                    {
+                      "operator": "range",
+                      "field": "age",
+                      "value": {
+                        "low": 18,
+                        "high": 100
+                      }
+                    }
+                  ]
+                }
+              ]
+            },
+            "primaryDisplay": "name"
+          }
+        }
+      },
+      "views": {
+        "value": {
+          "data": [
+            {
+              "name": "peopleView",
+              "tableId": "ta_896a325f7e8147d2a2cda93c5d236511",
+              "schema": {
+                "name": {
+                  "visible": true,
+                  "readonly": false,
+                  "order": 1,
+                  "width": 300
+                },
+                "age": {
+                  "visible": true,
+                  "readonly": true,
+                  "order": 2,
+                  "width": 200
+                },
+                "salary": {
+                  "visible": false,
+                  "readonly": false
+                }
+              },
+              "query": {
+                "logicalOperator": "all",
+                "onEmptyFilter": "none",
+                "groups": [
+                  {
+                    "logicalOperator": "any",
+                    "filters": [
+                      {
+                        "operator": "string",
+                        "field": "name",
+                        "value": "John"
+                      },
+                      {
+                        "operator": "range",
+                        "field": "age",
+                        "value": {
+                          "low": 18,
+                          "high": 100
+                        }
+                      }
+                    ]
+                  }
+                ]
+              },
+              "primaryDisplay": "name"
+            }
+          ]
+        }
       }
     },
     "securitySchemes": {
@@ -831,8 +944,7 @@
                       "type": "string",
                       "enum": [
                         "static",
-                        "dynamic",
-                        "ai"
+                        "dynamic"
                       ],
                       "description": "Defines whether this is a static or dynamic formula."
                     }
@@ -1042,8 +1154,7 @@
                           "type": "string",
                           "enum": [
                             "static",
-                            "dynamic",
-                            "ai"
+                            "dynamic"
                           ],
                           "description": "Defines whether this is a static or dynamic formula."
                         }
@@ -1264,8 +1375,7 @@
                             "type": "string",
                             "enum": [
                               "static",
-                              "dynamic",
-                              "ai"
+                              "dynamic"
                             ],
                             "description": "Defines whether this is a static or dynamic formula."
                           }
@@ -2024,6 +2134,869 @@
         "required": [
           "data"
         ]
+      },
+      "view": {
+        "description": "The view to be created/updated.",
+        "type": "object",
+        "required": [
+          "name",
+          "schema",
+          "tableId"
+        ],
+        "properties": {
+          "name": {
+            "description": "The name of the view.",
+            "type": "string"
+          },
+          "tableId": {
+            "description": "The ID of the table this view is based on.",
+            "type": "string"
+          },
+          "type": {
+            "description": "The type of view - standard (empty value) or calculation.",
+            "type": "string",
+            "enum": [
+              "calculation"
+            ]
+          },
+          "primaryDisplay": {
+            "type": "string",
+            "description": "A column used to display rows from this view - usually used when rendered in tables."
+          },
+          "query": {
+            "description": "Search parameters for view",
+            "type": "object",
+            "properties": {
+              "logicalOperator": {
+                "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                "type": "string",
+                "enum": [
+                  "all",
+                  "any"
+                ]
+              },
+              "onEmptyFilter": {
+                "description": "If no filters match, should the view return all rows, or no rows.",
+                "type": "string",
+                "enum": [
+                  "all",
+                  "none"
+                ]
+              },
+              "groups": {
+                "description": "A grouping of filters to be applied.",
+                "type": "array",
+                "items": {
+                  "type": "object",
+                  "properties": {
+                    "logicalOperator": {
+                      "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "any"
+                      ]
+                    },
+                    "filters": {
+                      "description": "A list of filters to apply",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "operator": {
+                            "type": "string",
+                            "description": "The type of search operation which is being performed.",
+                            "enum": [
+                              "equal",
+                              "notEqual",
+                              "empty",
+                              "notEmpty",
+                              "fuzzy",
+                              "string",
+                              "contains",
+                              "notContains",
+                              "containsAny",
+                              "oneOf",
+                              "range"
+                            ]
+                          },
+                          "field": {
+                            "type": "string",
+                            "description": "The field in the view to perform the search on."
+                          },
+                          "value": {
+                            "description": "The value to search for - the type will depend on the operator in use.",
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "number"
+                              },
+                              {
+                                "type": "boolean"
+                              },
+                              {
+                                "type": "object"
+                              },
+                              {
+                                "type": "array"
+                              }
+                            ]
+                          }
+                        }
+                      }
+                    },
+                    "groups": {
+                      "description": "A grouping of filters to be applied.",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "logicalOperator": {
+                            "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                            "type": "string",
+                            "enum": [
+                              "all",
+                              "any"
+                            ]
+                          },
+                          "filters": {
+                            "description": "A list of filters to apply",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "operator": {
+                                  "type": "string",
+                                  "description": "The type of search operation which is being performed.",
+                                  "enum": [
+                                    "equal",
+                                    "notEqual",
+                                    "empty",
+                                    "notEmpty",
+                                    "fuzzy",
+                                    "string",
+                                    "contains",
+                                    "notContains",
+                                    "containsAny",
+                                    "oneOf",
+                                    "range"
+                                  ]
+                                },
+                                "field": {
+                                  "type": "string",
+                                  "description": "The field in the view to perform the search on."
+                                },
+                                "value": {
+                                  "description": "The value to search for - the type will depend on the operator in use.",
+                                  "oneOf": [
+                                    {
+                                      "type": "string"
+                                    },
+                                    {
+                                      "type": "number"
+                                    },
+                                    {
+                                      "type": "boolean"
+                                    },
+                                    {
+                                      "type": "object"
+                                    },
+                                    {
+                                      "type": "array"
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "sort": {
+            "type": "object",
+            "required": [
+              "field"
+            ],
+            "properties": {
+              "field": {
+                "type": "string",
+                "description": "The field from the table/view schema to sort on."
+              },
+              "order": {
+                "type": "string",
+                "description": "The order in which to sort.",
+                "enum": [
+                  "ascending",
+                  "descending"
+                ]
+              },
+              "type": {
+                "type": "string",
+                "description": "The type of sort to perform (by number, or by alphabetically).",
+                "enum": [
+                  "string",
+                  "number"
+                ]
+              }
+            }
+          },
+          "schema": {
+            "type": "object",
+            "additionalProperties": {
+              "oneOf": [
+                {
+                  "type": "object",
+                  "properties": {
+                    "visible": {
+                      "type": "boolean",
+                      "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                    },
+                    "readonly": {
+                      "type": "boolean",
+                      "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                    },
+                    "order": {
+                      "type": "integer",
+                      "description": "A number defining where the column shows up in tables, lowest being first."
+                    },
+                    "width": {
+                      "type": "integer",
+                      "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                    },
+                    "column": {
+                      "type": "array",
+                      "description": "If this is a relationship column, we can set the columns we wish to include",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "readonly": {
+                            "type": "boolean"
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  "type": "object",
+                  "properties": {
+                    "calculationType": {
+                      "type": "string",
+                      "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                      "enum": [
+                        "sum",
+                        "avg",
+                        "count",
+                        "min",
+                        "max"
+                      ]
+                    },
+                    "field": {
+                      "type": "string",
+                      "description": "The field from the table to perform the calculation on."
+                    },
+                    "distinct": {
+                      "type": "boolean",
+                      "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        }
+      },
+      "viewOutput": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "description": "The view to be created/updated.",
+            "type": "object",
+            "required": [
+              "name",
+              "schema",
+              "tableId",
+              "id"
+            ],
+            "properties": {
+              "name": {
+                "description": "The name of the view.",
+                "type": "string"
+              },
+              "tableId": {
+                "description": "The ID of the table this view is based on.",
+                "type": "string"
+              },
+              "type": {
+                "description": "The type of view - standard (empty value) or calculation.",
+                "type": "string",
+                "enum": [
+                  "calculation"
+                ]
+              },
+              "primaryDisplay": {
+                "type": "string",
+                "description": "A column used to display rows from this view - usually used when rendered in tables."
+              },
+              "query": {
+                "description": "Search parameters for view",
+                "type": "object",
+                "properties": {
+                  "logicalOperator": {
+                    "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                    "type": "string",
+                    "enum": [
+                      "all",
+                      "any"
+                    ]
+                  },
+                  "onEmptyFilter": {
+                    "description": "If no filters match, should the view return all rows, or no rows.",
+                    "type": "string",
+                    "enum": [
+                      "all",
+                      "none"
+                    ]
+                  },
+                  "groups": {
+                    "description": "A grouping of filters to be applied.",
+                    "type": "array",
+                    "items": {
+                      "type": "object",
+                      "properties": {
+                        "logicalOperator": {
+                          "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                          "type": "string",
+                          "enum": [
+                            "all",
+                            "any"
+                          ]
+                        },
+                        "filters": {
+                          "description": "A list of filters to apply",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "operator": {
+                                "type": "string",
+                                "description": "The type of search operation which is being performed.",
+                                "enum": [
+                                  "equal",
+                                  "notEqual",
+                                  "empty",
+                                  "notEmpty",
+                                  "fuzzy",
+                                  "string",
+                                  "contains",
+                                  "notContains",
+                                  "containsAny",
+                                  "oneOf",
+                                  "range"
+                                ]
+                              },
+                              "field": {
+                                "type": "string",
+                                "description": "The field in the view to perform the search on."
+                              },
+                              "value": {
+                                "description": "The value to search for - the type will depend on the operator in use.",
+                                "oneOf": [
+                                  {
+                                    "type": "string"
+                                  },
+                                  {
+                                    "type": "number"
+                                  },
+                                  {
+                                    "type": "boolean"
+                                  },
+                                  {
+                                    "type": "object"
+                                  },
+                                  {
+                                    "type": "array"
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        },
+                        "groups": {
+                          "description": "A grouping of filters to be applied.",
+                          "type": "array",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "logicalOperator": {
+                                "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                                "type": "string",
+                                "enum": [
+                                  "all",
+                                  "any"
+                                ]
+                              },
+                              "filters": {
+                                "description": "A list of filters to apply",
+                                "type": "array",
+                                "items": {
+                                  "type": "object",
+                                  "properties": {
+                                    "operator": {
+                                      "type": "string",
+                                      "description": "The type of search operation which is being performed.",
+                                      "enum": [
+                                        "equal",
+                                        "notEqual",
+                                        "empty",
+                                        "notEmpty",
+                                        "fuzzy",
+                                        "string",
+                                        "contains",
+                                        "notContains",
+                                        "containsAny",
+                                        "oneOf",
+                                        "range"
+                                      ]
+                                    },
+                                    "field": {
+                                      "type": "string",
+                                      "description": "The field in the view to perform the search on."
+                                    },
+                                    "value": {
+                                      "description": "The value to search for - the type will depend on the operator in use.",
+                                      "oneOf": [
+                                        {
+                                          "type": "string"
+                                        },
+                                        {
+                                          "type": "number"
+                                        },
+                                        {
+                                          "type": "boolean"
+                                        },
+                                        {
+                                          "type": "object"
+                                        },
+                                        {
+                                          "type": "array"
+                                        }
+                                      ]
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              },
+              "sort": {
+                "type": "object",
+                "required": [
+                  "field"
+                ],
+                "properties": {
+                  "field": {
+                    "type": "string",
+                    "description": "The field from the table/view schema to sort on."
+                  },
+                  "order": {
+                    "type": "string",
+                    "description": "The order in which to sort.",
+                    "enum": [
+                      "ascending",
+                      "descending"
+                    ]
+                  },
+                  "type": {
+                    "type": "string",
+                    "description": "The type of sort to perform (by number, or by alphabetically).",
+                    "enum": [
+                      "string",
+                      "number"
+                    ]
+                  }
+                }
+              },
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "oneOf": [
+                    {
+                      "type": "object",
+                      "properties": {
+                        "visible": {
+                          "type": "boolean",
+                          "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                        },
+                        "readonly": {
+                          "type": "boolean",
+                          "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                        },
+                        "order": {
+                          "type": "integer",
+                          "description": "A number defining where the column shows up in tables, lowest being first."
+                        },
+                        "width": {
+                          "type": "integer",
+                          "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                        },
+                        "column": {
+                          "type": "array",
+                          "description": "If this is a relationship column, we can set the columns we wish to include",
+                          "items": {
+                            "type": "object",
+                            "properties": {
+                              "readonly": {
+                                "type": "boolean"
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "type": "object",
+                      "properties": {
+                        "calculationType": {
+                          "type": "string",
+                          "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                          "enum": [
+                            "sum",
+                            "avg",
+                            "count",
+                            "min",
+                            "max"
+                          ]
+                        },
+                        "field": {
+                          "type": "string",
+                          "description": "The field from the table to perform the calculation on."
+                        },
+                        "distinct": {
+                          "type": "boolean",
+                          "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                        }
+                      }
+                    }
+                  ]
+                }
+              },
+              "id": {
+                "description": "The ID of the view.",
+                "type": "string"
+              }
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
+      },
+      "viewSearch": {
+        "type": "object",
+        "properties": {
+          "data": {
+            "type": "array",
+            "items": {
+              "description": "The view to be created/updated.",
+              "type": "object",
+              "required": [
+                "name",
+                "schema",
+                "tableId",
+                "id"
+              ],
+              "properties": {
+                "name": {
+                  "description": "The name of the view.",
+                  "type": "string"
+                },
+                "tableId": {
+                  "description": "The ID of the table this view is based on.",
+                  "type": "string"
+                },
+                "type": {
+                  "description": "The type of view - standard (empty value) or calculation.",
+                  "type": "string",
+                  "enum": [
+                    "calculation"
+                  ]
+                },
+                "primaryDisplay": {
+                  "type": "string",
+                  "description": "A column used to display rows from this view - usually used when rendered in tables."
+                },
+                "query": {
+                  "description": "Search parameters for view",
+                  "type": "object",
+                  "properties": {
+                    "logicalOperator": {
+                      "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "any"
+                      ]
+                    },
+                    "onEmptyFilter": {
+                      "description": "If no filters match, should the view return all rows, or no rows.",
+                      "type": "string",
+                      "enum": [
+                        "all",
+                        "none"
+                      ]
+                    },
+                    "groups": {
+                      "description": "A grouping of filters to be applied.",
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "logicalOperator": {
+                            "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                            "type": "string",
+                            "enum": [
+                              "all",
+                              "any"
+                            ]
+                          },
+                          "filters": {
+                            "description": "A list of filters to apply",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "operator": {
+                                  "type": "string",
+                                  "description": "The type of search operation which is being performed.",
+                                  "enum": [
+                                    "equal",
+                                    "notEqual",
+                                    "empty",
+                                    "notEmpty",
+                                    "fuzzy",
+                                    "string",
+                                    "contains",
+                                    "notContains",
+                                    "containsAny",
+                                    "oneOf",
+                                    "range"
+                                  ]
+                                },
+                                "field": {
+                                  "type": "string",
+                                  "description": "The field in the view to perform the search on."
+                                },
+                                "value": {
+                                  "description": "The value to search for - the type will depend on the operator in use.",
+                                  "oneOf": [
+                                    {
+                                      "type": "string"
+                                    },
+                                    {
+                                      "type": "number"
+                                    },
+                                    {
+                                      "type": "boolean"
+                                    },
+                                    {
+                                      "type": "object"
+                                    },
+                                    {
+                                      "type": "array"
+                                    }
+                                  ]
+                                }
+                              }
+                            }
+                          },
+                          "groups": {
+                            "description": "A grouping of filters to be applied.",
+                            "type": "array",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "logicalOperator": {
+                                  "description": "When using groups this defines whether all of the filters must match, or only one of them.",
+                                  "type": "string",
+                                  "enum": [
+                                    "all",
+                                    "any"
+                                  ]
+                                },
+                                "filters": {
+                                  "description": "A list of filters to apply",
+                                  "type": "array",
+                                  "items": {
+                                    "type": "object",
+                                    "properties": {
+                                      "operator": {
+                                        "type": "string",
+                                        "description": "The type of search operation which is being performed.",
+                                        "enum": [
+                                          "equal",
+                                          "notEqual",
+                                          "empty",
+                                          "notEmpty",
+                                          "fuzzy",
+                                          "string",
+                                          "contains",
+                                          "notContains",
+                                          "containsAny",
+                                          "oneOf",
+                                          "range"
+                                        ]
+                                      },
+                                      "field": {
+                                        "type": "string",
+                                        "description": "The field in the view to perform the search on."
+                                      },
+                                      "value": {
+                                        "description": "The value to search for - the type will depend on the operator in use.",
+                                        "oneOf": [
+                                          {
+                                            "type": "string"
+                                          },
+                                          {
+                                            "type": "number"
+                                          },
+                                          {
+                                            "type": "boolean"
+                                          },
+                                          {
+                                            "type": "object"
+                                          },
+                                          {
+                                            "type": "array"
+                                          }
+                                        ]
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                },
+                "sort": {
+                  "type": "object",
+                  "required": [
+                    "field"
+                  ],
+                  "properties": {
+                    "field": {
+                      "type": "string",
+                      "description": "The field from the table/view schema to sort on."
+                    },
+                    "order": {
+                      "type": "string",
+                      "description": "The order in which to sort.",
+                      "enum": [
+                        "ascending",
+                        "descending"
+                      ]
+                    },
+                    "type": {
+                      "type": "string",
+                      "description": "The type of sort to perform (by number, or by alphabetically).",
+                      "enum": [
+                        "string",
+                        "number"
+                      ]
+                    }
+                  }
+                },
+                "schema": {
+                  "type": "object",
+                  "additionalProperties": {
+                    "oneOf": [
+                      {
+                        "type": "object",
+                        "properties": {
+                          "visible": {
+                            "type": "boolean",
+                            "description": "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it."
+                          },
+                          "readonly": {
+                            "type": "boolean",
+                            "description": "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated."
+                          },
+                          "order": {
+                            "type": "integer",
+                            "description": "A number defining where the column shows up in tables, lowest being first."
+                          },
+                          "width": {
+                            "type": "integer",
+                            "description": "A width for the column, defined in pixels - this affects rendering in tables."
+                          },
+                          "column": {
+                            "type": "array",
+                            "description": "If this is a relationship column, we can set the columns we wish to include",
+                            "items": {
+                              "type": "object",
+                              "properties": {
+                                "readonly": {
+                                  "type": "boolean"
+                                }
+                              }
+                            }
+                          }
+                        }
+                      },
+                      {
+                        "type": "object",
+                        "properties": {
+                          "calculationType": {
+                            "type": "string",
+                            "description": "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                            "enum": [
+                              "sum",
+                              "avg",
+                              "count",
+                              "min",
+                              "max"
+                            ]
+                          },
+                          "field": {
+                            "type": "string",
+                            "description": "The field from the table to perform the calculation on."
+                          },
+                          "distinct": {
+                            "type": "boolean",
+                            "description": "Can be used in tandem with the count calculation type, to count unique entries."
+                          }
+                        }
+                      }
+                    ]
+                  }
+                },
+                "id": {
+                  "description": "The ID of the view.",
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "required": [
+          "data"
+        ]
       }
     }
   },
@@ -2741,6 +3714,50 @@
         }
       }
     },
+    "/views/{viewId}/rows/search": {
+      "post": {
+        "operationId": "rowViewSearch",
+        "summary": "Search for rows in a view",
+        "tags": [
+          "rows"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/rowSearch"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "The response will contain an array of rows that match the search parameters.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/searchOutput"
+                },
+                "examples": {
+                  "search": {
+                    "$ref": "#/components/examples/rows"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/tables": {
       "post": {
         "operationId": "tableCreate",
@@ -3115,6 +4132,209 @@
           }
         }
       }
+    },
+    "/views": {
+      "post": {
+        "operationId": "viewCreate",
+        "summary": "Create a view",
+        "description": "Create a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/view"
+              },
+              "examples": {
+                "view": {
+                  "$ref": "#/components/examples/view"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the created view, including the ID which has been generated for it.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/views/{viewId}": {
+      "put": {
+        "operationId": "viewUpdate",
+        "summary": "Update a view",
+        "description": "Update a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/view"
+              },
+              "examples": {
+                "view": {
+                  "$ref": "#/components/examples/view"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the updated view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "delete": {
+        "operationId": "viewDestroy",
+        "summary": "Delete a view",
+        "description": "Delete a view, this can be against an internal or external table.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the deleted view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "get": {
+        "operationId": "viewGetById",
+        "summary": "Retrieve a view",
+        "description": "Lookup a view, this could be internal or external.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/viewId"
+          },
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Returns the retrieved view.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewOutput"
+                },
+                "examples": {
+                  "view": {
+                    "$ref": "#/components/examples/view"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/views/search": {
+      "post": {
+        "operationId": "viewSearch",
+        "summary": "Search for views",
+        "description": "Based on view properties (currently only name) search for views.",
+        "tags": [
+          "views"
+        ],
+        "parameters": [
+          {
+            "$ref": "#/components/parameters/appId"
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/nameSearch"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Returns the found views, based on the search parameters.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/viewSearch"
+                },
+                "examples": {
+                  "views": {
+                    "$ref": "#/components/examples/views"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
     }
   },
   "tags": []
diff --git a/packages/server/specs/openapi.yaml b/packages/server/specs/openapi.yaml
index 1e9b9921cf..9ad242f24c 100644
--- a/packages/server/specs/openapi.yaml
+++ b/packages/server/specs/openapi.yaml
@@ -23,6 +23,13 @@ components:
       description: The ID of the table which this request is targeting.
       schema:
         type: string
+    viewId:
+      in: path
+      name: viewId
+      required: true
+      description: The ID of the view which this request is targeting.
+      schema:
+        type: string
     rowId:
       in: path
       name: rowId
@@ -36,7 +43,7 @@ components:
       required: true
       description: The ID of the app which this request is targeting.
       schema:
-        default: "{{ appId }}"
+        default: "{{appId}}"
         type: string
     appIdUrl:
       in: path
@@ -44,7 +51,7 @@ components:
       required: true
       description: The ID of the app which this request is targeting.
       schema:
-        default: "{{ appId }}"
+        default: "{{appId}}"
         type: string
     queryId:
       in: path
@@ -442,6 +449,74 @@ components:
         # TYPE budibase_quota_limit_automations gauge
 
         budibase_quota_limit_automations 9007199254740991
+    view:
+      value:
+        data:
+          name: peopleView
+          tableId: ta_896a325f7e8147d2a2cda93c5d236511
+          schema:
+            name:
+              visible: true
+              readonly: false
+              order: 1
+              width: 300
+            age:
+              visible: true
+              readonly: true
+              order: 2
+              width: 200
+            salary:
+              visible: false
+              readonly: false
+          query:
+            logicalOperator: all
+            onEmptyFilter: none
+            groups:
+              - logicalOperator: any
+                filters:
+                  - operator: string
+                    field: name
+                    value: John
+                  - operator: range
+                    field: age
+                    value:
+                      low: 18
+                      high: 100
+          primaryDisplay: name
+    views:
+      value:
+        data:
+          - name: peopleView
+            tableId: ta_896a325f7e8147d2a2cda93c5d236511
+            schema:
+              name:
+                visible: true
+                readonly: false
+                order: 1
+                width: 300
+              age:
+                visible: true
+                readonly: true
+                order: 2
+                width: 200
+              salary:
+                visible: false
+                readonly: false
+            query:
+              logicalOperator: all
+              onEmptyFilter: none
+              groups:
+                - logicalOperator: any
+                  filters:
+                    - operator: string
+                      field: name
+                      value: John
+                    - operator: range
+                      field: age
+                      value:
+                        low: 18
+                        high: 100
+            primaryDisplay: name
   securitySchemes:
     ApiKeyAuth:
       type: apiKey
@@ -761,7 +836,6 @@ components:
                     enum:
                       - static
                       - dynamic
-                      - ai
                     description: Defines whether this is a static or dynamic formula.
               - type: object
                 properties:
@@ -931,7 +1005,6 @@ components:
                         enum:
                           - static
                           - dynamic
-                          - ai
                         description: Defines whether this is a static or dynamic formula.
                   - type: object
                     properties:
@@ -1108,7 +1181,6 @@ components:
                           enum:
                             - static
                             - dynamic
-                            - ai
                           description: Defines whether this is a static or dynamic formula.
                     - type: object
                       properties:
@@ -1704,6 +1776,641 @@ components:
             - userIds
       required:
         - data
+    view:
+      description: The view to be created/updated.
+      type: object
+      required:
+        - name
+        - schema
+        - tableId
+      properties:
+        name:
+          description: The name of the view.
+          type: string
+        tableId:
+          description: The ID of the table this view is based on.
+          type: string
+        type:
+          description: The type of view - standard (empty value) or calculation.
+          type: string
+          enum:
+            - calculation
+        primaryDisplay:
+          type: string
+          description: A column used to display rows from this view - usually used when
+            rendered in tables.
+        query:
+          description: Search parameters for view
+          type: object
+          properties:
+            logicalOperator:
+              description: When using groups this defines whether all of the filters must
+                match, or only one of them.
+              type: string
+              enum:
+                - all
+                - any
+            onEmptyFilter:
+              description: If no filters match, should the view return all rows, or no rows.
+              type: string
+              enum:
+                - all
+                - none
+            groups:
+              description: A grouping of filters to be applied.
+              type: array
+              items:
+                type: object
+                properties:
+                  logicalOperator:
+                    description: When using groups this defines whether all of the filters must
+                      match, or only one of them.
+                    type: string
+                    enum:
+                      - all
+                      - any
+                  filters:
+                    description: A list of filters to apply
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        operator:
+                          type: string
+                          description: The type of search operation which is being performed.
+                          enum:
+                            - equal
+                            - notEqual
+                            - empty
+                            - notEmpty
+                            - fuzzy
+                            - string
+                            - contains
+                            - notContains
+                            - containsAny
+                            - oneOf
+                            - range
+                        field:
+                          type: string
+                          description: The field in the view to perform the search on.
+                        value:
+                          description: The value to search for - the type will depend on the operator in
+                            use.
+                          oneOf:
+                            - type: string
+                            - type: number
+                            - type: boolean
+                            - type: object
+                            - type: array
+                  groups:
+                    description: A grouping of filters to be applied.
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        logicalOperator:
+                          description: When using groups this defines whether all of the filters must
+                            match, or only one of them.
+                          type: string
+                          enum:
+                            - all
+                            - any
+                        filters:
+                          description: A list of filters to apply
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              operator:
+                                type: string
+                                description: The type of search operation which is being performed.
+                                enum:
+                                  - equal
+                                  - notEqual
+                                  - empty
+                                  - notEmpty
+                                  - fuzzy
+                                  - string
+                                  - contains
+                                  - notContains
+                                  - containsAny
+                                  - oneOf
+                                  - range
+                              field:
+                                type: string
+                                description: The field in the view to perform the search on.
+                              value:
+                                description: The value to search for - the type will depend on the operator in
+                                  use.
+                                oneOf:
+                                  - type: string
+                                  - type: number
+                                  - type: boolean
+                                  - type: object
+                                  - type: array
+        sort:
+          type: object
+          required:
+            - field
+          properties:
+            field:
+              type: string
+              description: The field from the table/view schema to sort on.
+            order:
+              type: string
+              description: The order in which to sort.
+              enum:
+                - ascending
+                - descending
+            type:
+              type: string
+              description: The type of sort to perform (by number, or by alphabetically).
+              enum:
+                - string
+                - number
+        schema:
+          type: object
+          additionalProperties:
+            oneOf:
+              - type: object
+                properties:
+                  visible:
+                    type: boolean
+                    description: Defines whether the column is visible or not - rows
+                      retrieved/updated through this view will not be able to
+                      access it.
+                  readonly:
+                    type: boolean
+                    description: "When used in combination with 'visible: true' the column will be
+                      visible in row responses but cannot be updated."
+                  order:
+                    type: integer
+                    description: A number defining where the column shows up in tables, lowest being
+                      first.
+                  width:
+                    type: integer
+                    description: A width for the column, defined in pixels - this affects rendering
+                      in tables.
+                  column:
+                    type: array
+                    description: If this is a relationship column, we can set the columns we wish to
+                      include
+                    items:
+                      type: object
+                      properties:
+                        readonly:
+                          type: boolean
+              - type: object
+                properties:
+                  calculationType:
+                    type: string
+                    description: This column should be built from a calculation, specifying a type
+                      and field. It is important to note when a calculation is
+                      configured all non-calculation columns will be used for
+                      grouping.
+                    enum:
+                      - sum
+                      - avg
+                      - count
+                      - min
+                      - max
+                  field:
+                    type: string
+                    description: The field from the table to perform the calculation on.
+                  distinct:
+                    type: boolean
+                    description: Can be used in tandem with the count calculation type, to count
+                      unique entries.
+    viewOutput:
+      type: object
+      properties:
+        data:
+          description: The view to be created/updated.
+          type: object
+          required:
+            - name
+            - schema
+            - tableId
+            - id
+          properties:
+            name:
+              description: The name of the view.
+              type: string
+            tableId:
+              description: The ID of the table this view is based on.
+              type: string
+            type:
+              description: The type of view - standard (empty value) or calculation.
+              type: string
+              enum:
+                - calculation
+            primaryDisplay:
+              type: string
+              description: A column used to display rows from this view - usually used when
+                rendered in tables.
+            query:
+              description: Search parameters for view
+              type: object
+              properties:
+                logicalOperator:
+                  description: When using groups this defines whether all of the filters must
+                    match, or only one of them.
+                  type: string
+                  enum:
+                    - all
+                    - any
+                onEmptyFilter:
+                  description: If no filters match, should the view return all rows, or no rows.
+                  type: string
+                  enum:
+                    - all
+                    - none
+                groups:
+                  description: A grouping of filters to be applied.
+                  type: array
+                  items:
+                    type: object
+                    properties:
+                      logicalOperator:
+                        description: When using groups this defines whether all of the filters must
+                          match, or only one of them.
+                        type: string
+                        enum:
+                          - all
+                          - any
+                      filters:
+                        description: A list of filters to apply
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            operator:
+                              type: string
+                              description: The type of search operation which is being performed.
+                              enum:
+                                - equal
+                                - notEqual
+                                - empty
+                                - notEmpty
+                                - fuzzy
+                                - string
+                                - contains
+                                - notContains
+                                - containsAny
+                                - oneOf
+                                - range
+                            field:
+                              type: string
+                              description: The field in the view to perform the search on.
+                            value:
+                              description: The value to search for - the type will depend on the operator in
+                                use.
+                              oneOf:
+                                - type: string
+                                - type: number
+                                - type: boolean
+                                - type: object
+                                - type: array
+                      groups:
+                        description: A grouping of filters to be applied.
+                        type: array
+                        items:
+                          type: object
+                          properties:
+                            logicalOperator:
+                              description: When using groups this defines whether all of the filters must
+                                match, or only one of them.
+                              type: string
+                              enum:
+                                - all
+                                - any
+                            filters:
+                              description: A list of filters to apply
+                              type: array
+                              items:
+                                type: object
+                                properties:
+                                  operator:
+                                    type: string
+                                    description: The type of search operation which is being performed.
+                                    enum:
+                                      - equal
+                                      - notEqual
+                                      - empty
+                                      - notEmpty
+                                      - fuzzy
+                                      - string
+                                      - contains
+                                      - notContains
+                                      - containsAny
+                                      - oneOf
+                                      - range
+                                  field:
+                                    type: string
+                                    description: The field in the view to perform the search on.
+                                  value:
+                                    description: The value to search for - the type will depend on the operator in
+                                      use.
+                                    oneOf:
+                                      - type: string
+                                      - type: number
+                                      - type: boolean
+                                      - type: object
+                                      - type: array
+            sort:
+              type: object
+              required:
+                - field
+              properties:
+                field:
+                  type: string
+                  description: The field from the table/view schema to sort on.
+                order:
+                  type: string
+                  description: The order in which to sort.
+                  enum:
+                    - ascending
+                    - descending
+                type:
+                  type: string
+                  description: The type of sort to perform (by number, or by alphabetically).
+                  enum:
+                    - string
+                    - number
+            schema:
+              type: object
+              additionalProperties:
+                oneOf:
+                  - type: object
+                    properties:
+                      visible:
+                        type: boolean
+                        description: Defines whether the column is visible or not - rows
+                          retrieved/updated through this view will not be able
+                          to access it.
+                      readonly:
+                        type: boolean
+                        description: "When used in combination with 'visible: true' the column will be
+                          visible in row responses but cannot be updated."
+                      order:
+                        type: integer
+                        description: A number defining where the column shows up in tables, lowest being
+                          first.
+                      width:
+                        type: integer
+                        description: A width for the column, defined in pixels - this affects rendering
+                          in tables.
+                      column:
+                        type: array
+                        description: If this is a relationship column, we can set the columns we wish to
+                          include
+                        items:
+                          type: object
+                          properties:
+                            readonly:
+                              type: boolean
+                  - type: object
+                    properties:
+                      calculationType:
+                        type: string
+                        description: This column should be built from a calculation, specifying a type
+                          and field. It is important to note when a calculation
+                          is configured all non-calculation columns will be used
+                          for grouping.
+                        enum:
+                          - sum
+                          - avg
+                          - count
+                          - min
+                          - max
+                      field:
+                        type: string
+                        description: The field from the table to perform the calculation on.
+                      distinct:
+                        type: boolean
+                        description: Can be used in tandem with the count calculation type, to count
+                          unique entries.
+            id:
+              description: The ID of the view.
+              type: string
+      required:
+        - data
+    viewSearch:
+      type: object
+      properties:
+        data:
+          type: array
+          items:
+            description: The view to be created/updated.
+            type: object
+            required:
+              - name
+              - schema
+              - tableId
+              - id
+            properties:
+              name:
+                description: The name of the view.
+                type: string
+              tableId:
+                description: The ID of the table this view is based on.
+                type: string
+              type:
+                description: The type of view - standard (empty value) or calculation.
+                type: string
+                enum:
+                  - calculation
+              primaryDisplay:
+                type: string
+                description: A column used to display rows from this view - usually used when
+                  rendered in tables.
+              query:
+                description: Search parameters for view
+                type: object
+                properties:
+                  logicalOperator:
+                    description: When using groups this defines whether all of the filters must
+                      match, or only one of them.
+                    type: string
+                    enum:
+                      - all
+                      - any
+                  onEmptyFilter:
+                    description: If no filters match, should the view return all rows, or no rows.
+                    type: string
+                    enum:
+                      - all
+                      - none
+                  groups:
+                    description: A grouping of filters to be applied.
+                    type: array
+                    items:
+                      type: object
+                      properties:
+                        logicalOperator:
+                          description: When using groups this defines whether all of the filters must
+                            match, or only one of them.
+                          type: string
+                          enum:
+                            - all
+                            - any
+                        filters:
+                          description: A list of filters to apply
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              operator:
+                                type: string
+                                description: The type of search operation which is being performed.
+                                enum:
+                                  - equal
+                                  - notEqual
+                                  - empty
+                                  - notEmpty
+                                  - fuzzy
+                                  - string
+                                  - contains
+                                  - notContains
+                                  - containsAny
+                                  - oneOf
+                                  - range
+                              field:
+                                type: string
+                                description: The field in the view to perform the search on.
+                              value:
+                                description: The value to search for - the type will depend on the operator in
+                                  use.
+                                oneOf:
+                                  - type: string
+                                  - type: number
+                                  - type: boolean
+                                  - type: object
+                                  - type: array
+                        groups:
+                          description: A grouping of filters to be applied.
+                          type: array
+                          items:
+                            type: object
+                            properties:
+                              logicalOperator:
+                                description: When using groups this defines whether all of the filters must
+                                  match, or only one of them.
+                                type: string
+                                enum:
+                                  - all
+                                  - any
+                              filters:
+                                description: A list of filters to apply
+                                type: array
+                                items:
+                                  type: object
+                                  properties:
+                                    operator:
+                                      type: string
+                                      description: The type of search operation which is being performed.
+                                      enum:
+                                        - equal
+                                        - notEqual
+                                        - empty
+                                        - notEmpty
+                                        - fuzzy
+                                        - string
+                                        - contains
+                                        - notContains
+                                        - containsAny
+                                        - oneOf
+                                        - range
+                                    field:
+                                      type: string
+                                      description: The field in the view to perform the search on.
+                                    value:
+                                      description: The value to search for - the type will depend on the operator in
+                                        use.
+                                      oneOf:
+                                        - type: string
+                                        - type: number
+                                        - type: boolean
+                                        - type: object
+                                        - type: array
+              sort:
+                type: object
+                required:
+                  - field
+                properties:
+                  field:
+                    type: string
+                    description: The field from the table/view schema to sort on.
+                  order:
+                    type: string
+                    description: The order in which to sort.
+                    enum:
+                      - ascending
+                      - descending
+                  type:
+                    type: string
+                    description: The type of sort to perform (by number, or by alphabetically).
+                    enum:
+                      - string
+                      - number
+              schema:
+                type: object
+                additionalProperties:
+                  oneOf:
+                    - type: object
+                      properties:
+                        visible:
+                          type: boolean
+                          description: Defines whether the column is visible or not - rows
+                            retrieved/updated through this view will not be able
+                            to access it.
+                        readonly:
+                          type: boolean
+                          description: "When used in combination with 'visible: true' the column will be
+                            visible in row responses but cannot be updated."
+                        order:
+                          type: integer
+                          description: A number defining where the column shows up in tables, lowest being
+                            first.
+                        width:
+                          type: integer
+                          description: A width for the column, defined in pixels - this affects rendering
+                            in tables.
+                        column:
+                          type: array
+                          description: If this is a relationship column, we can set the columns we wish to
+                            include
+                          items:
+                            type: object
+                            properties:
+                              readonly:
+                                type: boolean
+                    - type: object
+                      properties:
+                        calculationType:
+                          type: string
+                          description: This column should be built from a calculation, specifying a type
+                            and field. It is important to note when a
+                            calculation is configured all non-calculation
+                            columns will be used for grouping.
+                          enum:
+                            - sum
+                            - avg
+                            - count
+                            - min
+                            - max
+                        field:
+                          type: string
+                          description: The field from the table to perform the calculation on.
+                        distinct:
+                          type: boolean
+                          description: Can be used in tandem with the count calculation type, to count
+                            unique entries.
+              id:
+                description: The ID of the view.
+                type: string
+      required:
+        - data
 security:
   - ApiKeyAuth: []
 paths:
@@ -2136,6 +2843,32 @@ paths:
               examples:
                 search:
                   $ref: "#/components/examples/rows"
+  "/views/{viewId}/rows/search":
+    post:
+      operationId: rowViewSearch
+      summary: Search for rows in a view
+      tags:
+        - rows
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/rowSearch"
+      responses:
+        "200":
+          description: The response will contain an array of rows that match the search
+            parameters.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/searchOutput"
+              examples:
+                search:
+                  $ref: "#/components/examples/rows"
   /tables:
     post:
       operationId: tableCreate
@@ -2359,4 +3092,123 @@ paths:
               examples:
                 users:
                   $ref: "#/components/examples/users"
+  /views:
+    post:
+      operationId: viewCreate
+      summary: Create a view
+      description: Create a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/view"
+            examples:
+              view:
+                $ref: "#/components/examples/view"
+      responses:
+        "200":
+          description: Returns the created view, including the ID which has been generated
+            for it.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+  "/views/{viewId}":
+    put:
+      operationId: viewUpdate
+      summary: Update a view
+      description: Update a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/view"
+            examples:
+              view:
+                $ref: "#/components/examples/view"
+      responses:
+        "200":
+          description: Returns the updated view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+    delete:
+      operationId: viewDestroy
+      summary: Delete a view
+      description: Delete a view, this can be against an internal or external table.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      responses:
+        "200":
+          description: Returns the deleted view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+    get:
+      operationId: viewGetById
+      summary: Retrieve a view
+      description: Lookup a view, this could be internal or external.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/viewId"
+        - $ref: "#/components/parameters/appId"
+      responses:
+        "200":
+          description: Returns the retrieved view.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewOutput"
+              examples:
+                view:
+                  $ref: "#/components/examples/view"
+  /views/search:
+    post:
+      operationId: viewSearch
+      summary: Search for views
+      description: Based on view properties (currently only name) search for views.
+      tags:
+        - views
+      parameters:
+        - $ref: "#/components/parameters/appId"
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: "#/components/schemas/nameSearch"
+      responses:
+        "200":
+          description: Returns the found views, based on the search parameters.
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/viewSearch"
+              examples:
+                views:
+                  $ref: "#/components/examples/views"
 tags: []
diff --git a/packages/server/specs/parameters.ts b/packages/server/specs/parameters.ts
index 2726ca5064..b3fb274567 100644
--- a/packages/server/specs/parameters.ts
+++ b/packages/server/specs/parameters.ts
@@ -8,6 +8,16 @@ export const tableId = {
   },
 }
 
+export const viewId = {
+  in: "path",
+  name: "viewId",
+  required: true,
+  description: "The ID of the view which this request is targeting.",
+  schema: {
+    type: "string",
+  },
+}
+
 export const rowId = {
   in: "path",
   name: "rowId",
diff --git a/packages/server/specs/resources/index.ts b/packages/server/specs/resources/index.ts
index 49508e2e4f..0d32f2a007 100644
--- a/packages/server/specs/resources/index.ts
+++ b/packages/server/specs/resources/index.ts
@@ -6,6 +6,7 @@ import user from "./user"
 import metrics from "./metrics"
 import misc from "./misc"
 import roles from "./roles"
+import view from "./view"
 
 export const examples = {
   ...application.getExamples(),
@@ -16,6 +17,7 @@ export const examples = {
   ...misc.getExamples(),
   ...metrics.getExamples(),
   ...roles.getExamples(),
+  ...view.getExamples(),
 }
 
 export const schemas = {
@@ -26,4 +28,5 @@ export const schemas = {
   ...user.getSchemas(),
   ...misc.getSchemas(),
   ...roles.getSchemas(),
+  ...view.getSchemas(),
 }
diff --git a/packages/server/specs/resources/misc.ts b/packages/server/specs/resources/misc.ts
index f56dff3301..8f77d2b22a 100644
--- a/packages/server/specs/resources/misc.ts
+++ b/packages/server/specs/resources/misc.ts
@@ -1,99 +1,101 @@
 import { object } from "./utils"
 import Resource from "./utils/Resource"
 
+export const searchSchema = {
+  type: "object",
+  properties: {
+    allOr: {
+      type: "boolean",
+      description:
+        "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used.",
+    },
+    string: {
+      type: "object",
+      example: {
+        columnName1: "value",
+        columnName2: "value",
+      },
+      description:
+        "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
+      additionalProperties: {
+        type: "string",
+        description: "The value to search for in the column.",
+      },
+    },
+    fuzzy: {
+      type: "object",
+      description:
+        "Searches for a sub-string within a string column, e.g. searching for 'dib' will match 'Budibase'.",
+    },
+    range: {
+      type: "object",
+      description:
+        'Searches within a range, the format of this must be in the format of an object with a "low" and "high" property.',
+      example: {
+        columnName1: {
+          low: 10,
+          high: 20,
+        },
+      },
+    },
+    equal: {
+      type: "object",
+      description:
+        "Searches for rows that have a column value that is exactly the value set.",
+    },
+    notEqual: {
+      type: "object",
+      description:
+        "Searches for any row which does not contain the specified column value.",
+    },
+    empty: {
+      type: "object",
+      description:
+        "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
+      example: {
+        columnName1: "",
+      },
+    },
+    notEmpty: {
+      type: "object",
+      description: "Searches for rows which have the specified column.",
+    },
+    oneOf: {
+      type: "object",
+      description:
+        "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2].",
+    },
+    contains: {
+      type: "object",
+      description:
+        "Searches for a value, or set of values in array column types (such as a multi-select). If an array of search options is provided then it must match all.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+    notContains: {
+      type: "object",
+      description:
+        "The logical inverse of contains. Only works on array column types. If an array of values is passed, the row must not match any of them to be returned in the response.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+    containsAny: {
+      type: "object",
+      description:
+        "As with the contains search, only works on array column types and searches for any of the provided values when given an array.",
+      example: {
+        arrayColumn: ["a", "b"],
+      },
+    },
+  },
+}
+
 export default new Resource().setSchemas({
   rowSearch: object(
     {
-      query: {
-        type: "object",
-        properties: {
-          allOr: {
-            type: "boolean",
-            description:
-              "Specifies that a row should be returned if it satisfies any of the specified options, rather than requiring it to fulfill all the search parameters. This defaults to false, meaning AND logic will be used.",
-          },
-          string: {
-            type: "object",
-            example: {
-              columnName1: "value",
-              columnName2: "value",
-            },
-            description:
-              "A map of field name to the string to search for, this will look for rows that have a value starting with the string value.",
-            additionalProperties: {
-              type: "string",
-              description: "The value to search for in the column.",
-            },
-          },
-          fuzzy: {
-            type: "object",
-            description:
-              "Searches for a sub-string within a string column, e.g. searching for 'dib' will match 'Budibase'.",
-          },
-          range: {
-            type: "object",
-            description:
-              'Searches within a range, the format of this must be in the format of an object with a "low" and "high" property.',
-            example: {
-              columnName1: {
-                low: 10,
-                high: 20,
-              },
-            },
-          },
-          equal: {
-            type: "object",
-            description:
-              "Searches for rows that have a column value that is exactly the value set.",
-          },
-          notEqual: {
-            type: "object",
-            description:
-              "Searches for any row which does not contain the specified column value.",
-          },
-          empty: {
-            type: "object",
-            description:
-              "Searches for rows which do not contain the specified column. The object should simply contain keys of the column names, these can map to any value.",
-            example: {
-              columnName1: "",
-            },
-          },
-          notEmpty: {
-            type: "object",
-            description: "Searches for rows which have the specified column.",
-          },
-          oneOf: {
-            type: "object",
-            description:
-              "Searches for rows which have a column value that is any of the specified values. The format of this must be columnName -> [value1, value2].",
-          },
-          contains: {
-            type: "object",
-            description:
-              "Searches for a value, or set of values in array column types (such as a multi-select). If an array of search options is provided then it must match all.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-          notContains: {
-            type: "object",
-            description:
-              "The logical inverse of contains. Only works on array column types. If an array of values is passed, the row must not match any of them to be returned in the response.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-          containsAny: {
-            type: "object",
-            description:
-              "As with the contains search, only works on array column types and searches for any of the provided values when given an array.",
-            example: {
-              arrayColumn: ["a", "b"],
-            },
-          },
-        },
-      },
+      query: searchSchema,
       paginate: {
         type: "boolean",
         description: "Enables pagination, by default this is disabled.",
diff --git a/packages/server/specs/resources/view.ts b/packages/server/specs/resources/view.ts
new file mode 100644
index 0000000000..5becd67a37
--- /dev/null
+++ b/packages/server/specs/resources/view.ts
@@ -0,0 +1,273 @@
+import { object } from "./utils"
+import Resource from "./utils/Resource"
+import {
+  ArrayOperator,
+  BasicOperator,
+  CalculationType,
+  RangeOperator,
+  SortOrder,
+  SortType,
+} from "@budibase/types"
+import { cloneDeep } from "lodash"
+
+const view = {
+  name: "peopleView",
+  tableId: "ta_896a325f7e8147d2a2cda93c5d236511",
+  schema: {
+    name: {
+      visible: true,
+      readonly: false,
+      order: 1,
+      width: 300,
+    },
+    age: {
+      visible: true,
+      readonly: true,
+      order: 2,
+      width: 200,
+    },
+    salary: {
+      visible: false,
+      readonly: false,
+    },
+  },
+  query: {
+    logicalOperator: "all",
+    onEmptyFilter: "none",
+    groups: [
+      {
+        logicalOperator: "any",
+        filters: [
+          { operator: "string", field: "name", value: "John" },
+          { operator: "range", field: "age", value: { low: 18, high: 100 } },
+        ],
+      },
+    ],
+  },
+  primaryDisplay: "name",
+}
+
+const baseColumnDef = {
+  visible: {
+    type: "boolean",
+    description:
+      "Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it.",
+  },
+  readonly: {
+    type: "boolean",
+    description:
+      "When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated.",
+  },
+  order: {
+    type: "integer",
+    description:
+      "A number defining where the column shows up in tables, lowest being first.",
+  },
+  width: {
+    type: "integer",
+    description:
+      "A width for the column, defined in pixels - this affects rendering in tables.",
+  },
+  column: {
+    type: "array",
+    description:
+      "If this is a relationship column, we can set the columns we wish to include",
+    items: {
+      type: "object",
+      properties: {
+        readonly: {
+          type: "boolean",
+        },
+      },
+    },
+  },
+}
+
+const logicalOperator = {
+  description:
+    "When using groups this defines whether all of the filters must match, or only one of them.",
+  type: "string",
+  enum: ["all", "any"],
+}
+
+const filterGroup = {
+  description: "A grouping of filters to be applied.",
+  type: "array",
+  items: {
+    type: "object",
+    properties: {
+      logicalOperator,
+      filters: {
+        description: "A list of filters to apply",
+        type: "array",
+        items: {
+          type: "object",
+          properties: {
+            operator: {
+              type: "string",
+              description:
+                "The type of search operation which is being performed.",
+              enum: [
+                ...Object.values(BasicOperator),
+                ...Object.values(ArrayOperator),
+                ...Object.values(RangeOperator),
+              ],
+            },
+            field: {
+              type: "string",
+              description: "The field in the view to perform the search on.",
+            },
+            value: {
+              description:
+                "The value to search for - the type will depend on the operator in use.",
+              oneOf: [
+                { type: "string" },
+                { type: "number" },
+                { type: "boolean" },
+                { type: "object" },
+                { type: "array" },
+              ],
+            },
+          },
+        },
+      },
+    },
+  },
+}
+
+// have to clone to avoid constantly recursive structure - we can't represent this easily
+const layeredFilterGroup: any = cloneDeep(filterGroup)
+layeredFilterGroup.items.properties.groups = filterGroup
+
+const viewQuerySchema = {
+  description: "Search parameters for view",
+  type: "object",
+  properties: {
+    logicalOperator,
+    onEmptyFilter: {
+      description:
+        "If no filters match, should the view return all rows, or no rows.",
+      type: "string",
+      enum: ["all", "none"],
+    },
+    groups: layeredFilterGroup,
+  },
+}
+
+const viewSchema = {
+  description: "The view to be created/updated.",
+  type: "object",
+  required: ["name", "schema", "tableId"],
+  properties: {
+    name: {
+      description: "The name of the view.",
+      type: "string",
+    },
+    tableId: {
+      description: "The ID of the table this view is based on.",
+      type: "string",
+    },
+    type: {
+      description: "The type of view - standard (empty value) or calculation.",
+      type: "string",
+      enum: ["calculation"],
+    },
+    primaryDisplay: {
+      type: "string",
+      description:
+        "A column used to display rows from this view - usually used when rendered in tables.",
+    },
+    query: viewQuerySchema,
+    sort: {
+      type: "object",
+      required: ["field"],
+      properties: {
+        field: {
+          type: "string",
+          description: "The field from the table/view schema to sort on.",
+        },
+        order: {
+          type: "string",
+          description: "The order in which to sort.",
+          enum: Object.values(SortOrder),
+        },
+        type: {
+          type: "string",
+          description:
+            "The type of sort to perform (by number, or by alphabetically).",
+          enum: Object.values(SortType),
+        },
+      },
+    },
+    schema: {
+      type: "object",
+      additionalProperties: {
+        oneOf: [
+          {
+            type: "object",
+            properties: baseColumnDef,
+          },
+          {
+            type: "object",
+            properties: {
+              calculationType: {
+                type: "string",
+                description:
+                  "This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.",
+                enum: Object.values(CalculationType),
+              },
+              field: {
+                type: "string",
+                description:
+                  "The field from the table to perform the calculation on.",
+              },
+              distinct: {
+                type: "boolean",
+                description:
+                  "Can be used in tandem with the count calculation type, to count unique entries.",
+              },
+            },
+          },
+        ],
+      },
+    },
+  },
+}
+
+const viewOutputSchema = {
+  ...viewSchema,
+  properties: {
+    ...viewSchema.properties,
+    id: {
+      description: "The ID of the view.",
+      type: "string",
+    },
+  },
+  required: [...viewSchema.required, "id"],
+}
+
+export default new Resource()
+  .setExamples({
+    view: {
+      value: {
+        data: view,
+      },
+    },
+    views: {
+      value: {
+        data: [view],
+      },
+    },
+  })
+  .setSchemas({
+    view: viewSchema,
+    viewOutput: object({
+      data: viewOutputSchema,
+    }),
+    viewSearch: object({
+      data: {
+        type: "array",
+        items: viewOutputSchema,
+      },
+    }),
+  })
diff --git a/packages/server/src/api/controllers/analytics.ts b/packages/server/src/api/controllers/analytics.ts
index f60c7b0961..27c981036a 100644
--- a/packages/server/src/api/controllers/analytics.ts
+++ b/packages/server/src/api/controllers/analytics.ts
@@ -1,17 +1,27 @@
-import { events, context } from "@budibase/backend-core"
-import { AnalyticsPingRequest, App, PingSource } from "@budibase/types"
+import { context, events } from "@budibase/backend-core"
+import {
+  AnalyticsEnabledResponse,
+  AnalyticsPingRequest,
+  AnalyticsPingResponse,
+  App,
+  Ctx,
+  PingSource,
+} from "@budibase/types"
 import { DocumentType, isDevAppID } from "../../db/utils"
 
-export const isEnabled = async (ctx: any) => {
+export const isEnabled = async (ctx: Ctx<void, AnalyticsEnabledResponse>) => {
   const enabled = await events.analytics.enabled()
   ctx.body = {
     enabled,
   }
 }
 
-export const ping = async (ctx: any) => {
-  const body = ctx.request.body as AnalyticsPingRequest
+export const ping = async (
+  ctx: Ctx<AnalyticsPingRequest, AnalyticsPingResponse>
+) => {
+  const body = ctx.request.body
 
+  let pingType: PingSource | undefined
   switch (body.source) {
     case PingSource.APP: {
       const db = context.getAppDB({ skip_setup: true })
@@ -23,13 +33,18 @@ export const ping = async (ctx: any) => {
       } else {
         await events.serve.servedApp(appInfo, body.timezone, body.embedded)
       }
+      pingType = PingSource.APP
       break
     }
     case PingSource.BUILDER: {
       await events.serve.servedBuilder(body.timezone)
+      pingType = PingSource.BUILDER
       break
     }
   }
 
-  ctx.status = 200
+  ctx.body = {
+    message: "pong",
+    source: pingType,
+  }
 }
diff --git a/packages/server/src/api/controllers/apikeys.ts b/packages/server/src/api/controllers/apikeys.ts
index 2a02078483..95253b09c5 100644
--- a/packages/server/src/api/controllers/apikeys.ts
+++ b/packages/server/src/api/controllers/apikeys.ts
@@ -1,18 +1,25 @@
 import { db as dbCore, tenancy } from "@budibase/backend-core"
-import { BBContext, Document } from "@budibase/types"
+import {
+  Document,
+  UserCtx,
+  ApiKeyDoc,
+  ApiKeyFetchResponse,
+  UpdateApiKeyRequest,
+  UpdateApiKeyResponse,
+} from "@budibase/types"
 
 const KEYS_DOC = dbCore.StaticDatabases.GLOBAL.docs.apiKeys
 
 async function getBuilderMainDoc() {
   const db = tenancy.getGlobalDB()
-  try {
-    return await db.get<any>(KEYS_DOC)
-  } catch (err) {
-    // doesn't exist yet, nothing to get
+  const doc = await db.tryGet<ApiKeyDoc>(KEYS_DOC)
+  if (!doc) {
     return {
       _id: KEYS_DOC,
+      apiKeys: {},
     }
   }
+  return doc
 }
 
 async function setBuilderMainDoc(doc: Document) {
@@ -22,7 +29,7 @@ async function setBuilderMainDoc(doc: Document) {
   return db.put(doc)
 }
 
-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx<void, ApiKeyFetchResponse>) {
   try {
     const mainDoc = await getBuilderMainDoc()
     ctx.body = mainDoc.apiKeys ? mainDoc.apiKeys : {}
@@ -32,7 +39,9 @@ export async function fetch(ctx: BBContext) {
   }
 }
 
-export async function update(ctx: BBContext) {
+export async function update(
+  ctx: UserCtx<UpdateApiKeyRequest, UpdateApiKeyResponse>
+) {
   const key = ctx.params.key
   const value = ctx.request.body.value
 
diff --git a/packages/server/src/api/controllers/application.ts b/packages/server/src/api/controllers/application.ts
index 101257c321..b62d022cbd 100644
--- a/packages/server/src/api/controllers/application.ts
+++ b/packages/server/src/api/controllers/application.ts
@@ -27,7 +27,6 @@ import {
   env as envCore,
   ErrorCode,
   events,
-  migrations,
   objectStore,
   roles,
   tenancy,
@@ -43,7 +42,6 @@ import { groups, licensing, quotas } from "@budibase/pro"
 import {
   App,
   Layout,
-  MigrationType,
   PlanType,
   Screen,
   UserCtx,
@@ -59,6 +57,18 @@ import {
   BBReferenceFieldSubType,
   Row,
   BBRequest,
+  SyncAppResponse,
+  CreateAppResponse,
+  FetchAppsResponse,
+  UpdateAppClientResponse,
+  RevertAppClientResponse,
+  DeleteAppResponse,
+  ImportToUpdateAppRequest,
+  ImportToUpdateAppResponse,
+  SetRevertableAppVersionRequest,
+  AddAppSampleDataResponse,
+  UnpublishAppResponse,
+  SetRevertableAppVersionResponse,
 } from "@budibase/types"
 import { BASE_LAYOUT_PROP_IDS } from "../../constants/layouts"
 import sdk from "../../sdk"
@@ -166,7 +176,9 @@ async function createInstance(appId: string, template: AppTemplate) {
   return { _id: appId }
 }
 
-export const addSampleData = async (ctx: UserCtx) => {
+export const addSampleData = async (
+  ctx: UserCtx<void, AddAppSampleDataResponse>
+) => {
   const db = context.getAppDB()
 
   try {
@@ -179,10 +191,10 @@ export const addSampleData = async (ctx: UserCtx) => {
     await db.bulkDocs([...defaultDbDocs])
   }
 
-  ctx.status = 200
+  ctx.body = { message: "Sample tables added." }
 }
 
-export async function fetch(ctx: UserCtx<void, App[]>) {
+export async function fetch(ctx: UserCtx<void, FetchAppsResponse>) {
   ctx.body = await sdk.applications.fetch(
     ctx.query.status as AppStatus,
     ctx.user
@@ -242,7 +254,9 @@ export async function fetchAppPackage(
   }
 }
 
-async function performAppCreate(ctx: UserCtx<CreateAppRequest, App>) {
+async function performAppCreate(
+  ctx: UserCtx<CreateAppRequest, CreateAppResponse>
+) {
   const apps = (await dbCore.getAllApps({ dev: true })) as App[]
   const { body } = ctx.request
   const { name, url, encryptionPassword, templateKey } = body
@@ -472,13 +486,6 @@ async function creationEvents(request: BBRequest<CreateAppRequest>, app: App) {
 }
 
 async function appPostCreate(ctx: UserCtx<CreateAppRequest, App>, app: App) {
-  const tenantId = tenancy.getTenantId()
-  await migrations.backPopulateMigrations({
-    type: MigrationType.APP,
-    tenantId,
-    appId: app.appId,
-  })
-
   await creationEvents(ctx.request, app)
 
   // app import, template creation and duplication
@@ -510,12 +517,13 @@ async function appPostCreate(ctx: UserCtx<CreateAppRequest, App>, app: App) {
   }
 }
 
-export async function create(ctx: UserCtx<CreateAppRequest, App>) {
+export async function create(
+  ctx: UserCtx<CreateAppRequest, CreateAppResponse>
+) {
   const newApplication = await quotas.addApp(() => performAppCreate(ctx))
   await appPostCreate(ctx, newApplication)
   await cache.bustCache(cache.CacheKey.CHECKLIST)
   ctx.body = newApplication
-  ctx.status = 200
 }
 
 // This endpoint currently operates as a PATCH rather than a PUT
@@ -538,7 +546,6 @@ export async function update(
 
   const app = await updateAppPackage(ctx.request.body, ctx.params.appId)
   await events.app.updated(app)
-  ctx.status = 200
   ctx.body = app
   builderSocket?.emitAppMetadataUpdate(ctx, {
     theme: app.theme,
@@ -553,7 +560,9 @@ export async function update(
   })
 }
 
-export async function updateClient(ctx: UserCtx) {
+export async function updateClient(
+  ctx: UserCtx<void, UpdateAppClientResponse>
+) {
   // Get current app version
   const application = await sdk.applications.metadata.get()
   const currentVersion = application.version
@@ -577,11 +586,12 @@ export async function updateClient(ctx: UserCtx) {
   }
   const app = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   await events.app.versionUpdated(app, currentVersion, updatedToVersion)
-  ctx.status = 200
   ctx.body = app
 }
 
-export async function revertClient(ctx: UserCtx) {
+export async function revertClient(
+  ctx: UserCtx<void, RevertAppClientResponse>
+) {
   // Check app can be reverted
   const application = await sdk.applications.metadata.get()
   if (!application.revertableVersion) {
@@ -607,7 +617,6 @@ export async function revertClient(ctx: UserCtx) {
   }
   const app = await updateAppPackage(appPackageUpdates, ctx.params.appId)
   await events.app.versionReverted(app, currentVersion, revertedToVersion)
-  ctx.status = 200
   ctx.body = app
 }
 
@@ -668,15 +677,14 @@ async function postDestroyApp(ctx: UserCtx) {
   }
 }
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, DeleteAppResponse>) {
   await preDestroyApp(ctx)
   const result = await destroyApp(ctx)
   await postDestroyApp(ctx)
-  ctx.status = 200
   ctx.body = result
 }
 
-export async function unpublish(ctx: UserCtx) {
+export async function unpublish(ctx: UserCtx<void, UnpublishAppResponse>) {
   const prodAppId = dbCore.getProdAppID(ctx.params.appId)
   const dbExists = await dbCore.dbExists(prodAppId)
 
@@ -688,11 +696,11 @@ export async function unpublish(ctx: UserCtx) {
   await preDestroyApp(ctx)
   await unpublishApp(ctx)
   await postDestroyApp(ctx)
-  ctx.status = 204
   builderSocket?.emitAppUnpublish(ctx)
+  ctx.body = { message: "App unpublished." }
 }
 
-export async function sync(ctx: UserCtx) {
+export async function sync(ctx: UserCtx<void, SyncAppResponse>) {
   const appId = ctx.params.appId
   try {
     ctx.body = await sdk.applications.syncApp(appId)
@@ -701,10 +709,12 @@ export async function sync(ctx: UserCtx) {
   }
 }
 
-export async function importToApp(ctx: UserCtx) {
+export async function importToApp(
+  ctx: UserCtx<ImportToUpdateAppRequest, ImportToUpdateAppResponse>
+) {
   const { appId } = ctx.params
   const appExport = ctx.request.files?.appExport
-  const password = ctx.request.body.encryptionPassword as string
+  const password = ctx.request.body.encryptionPassword
   if (!appExport) {
     ctx.throw(400, "Must supply app export to import")
   }
@@ -783,7 +793,6 @@ export async function duplicateApp(
     duplicateAppId: newApplication?.appId,
     sourceAppId,
   }
-  ctx.status = 200
 }
 
 export async function updateAppPackage(
@@ -811,7 +820,7 @@ export async function updateAppPackage(
 }
 
 export async function setRevertableVersion(
-  ctx: UserCtx<{ revertableVersion: string }, App>
+  ctx: UserCtx<SetRevertableAppVersionRequest, SetRevertableAppVersionResponse>
 ) {
   if (!env.isDev()) {
     ctx.status = 403
@@ -821,8 +830,7 @@ export async function setRevertableVersion(
   const app = await sdk.applications.metadata.get()
   app.revertableVersion = ctx.request.body.revertableVersion
   await db.put(app)
-
-  ctx.status = 200
+  ctx.body = { message: "Revertable version updated." }
 }
 
 async function migrateAppNavigation() {
diff --git a/packages/server/src/api/controllers/auth.ts b/packages/server/src/api/controllers/auth.ts
index 4ff592534d..0742583a8d 100644
--- a/packages/server/src/api/controllers/auth.ts
+++ b/packages/server/src/api/controllers/auth.ts
@@ -2,7 +2,7 @@ import { outputProcessing } from "../../utilities/rowProcessor"
 import { InternalTables } from "../../db/utils"
 import { getFullUser } from "../../utilities/users"
 import { roles, context, db as dbCore } from "@budibase/backend-core"
-import { ContextUser, Row, UserCtx } from "@budibase/types"
+import { AppSelfResponse, ContextUser, UserCtx } from "@budibase/types"
 import sdk from "../../sdk"
 import { processUser } from "../../utilities/global"
 
@@ -17,7 +17,7 @@ const addSessionAttributesToUser = (ctx: any) => {
   }
 }
 
-export async function fetchSelf(ctx: UserCtx) {
+export async function fetchSelf(ctx: UserCtx<void, AppSelfResponse>) {
   let userId = ctx.user.userId || ctx.user._id
   /* istanbul ignore next */
   if (!userId || !ctx.isAuthenticated) {
@@ -45,9 +45,9 @@ export async function fetchSelf(ctx: UserCtx) {
     try {
       const userTable = await sdk.tables.getTable(InternalTables.USER_METADATA)
       // specifically needs to make sure is enriched
-      ctx.body = await outputProcessing(userTable, user as Row)
+      ctx.body = await outputProcessing(userTable, user)
     } catch (err: any) {
-      let response
+      let response: ContextUser | {}
       // user didn't exist in app, don't pretend they do
       if (user.roleId === PUBLIC_ROLE) {
         response = {}
diff --git a/packages/server/src/api/controllers/automation.ts b/packages/server/src/api/controllers/automation.ts
index d8bc9d6b21..13d057ebb7 100644
--- a/packages/server/src/api/controllers/automation.ts
+++ b/packages/server/src/api/controllers/automation.ts
@@ -2,17 +2,32 @@ import * as triggers from "../../automations/triggers"
 import { sdk as coreSdk } from "@budibase/shared-core"
 import { DocumentType } from "../../db/utils"
 import { updateTestHistory, removeDeprecated } from "../../automations/utils"
-import { setTestFlag, clearTestFlag } from "../../utilities/redis"
+import { withTestFlag } from "../../utilities/redis"
 import { context, cache, events, db as dbCore } from "@budibase/backend-core"
 import { automations, features } from "@budibase/pro"
 import {
   App,
   Automation,
   AutomationActionStepId,
-  AutomationResults,
   UserCtx,
   DeleteAutomationResponse,
   FetchAutomationResponse,
+  GetAutomationTriggerDefinitionsResponse,
+  GetAutomationStepDefinitionsResponse,
+  GetAutomationActionDefinitionsResponse,
+  FindAutomationResponse,
+  UpdateAutomationRequest,
+  UpdateAutomationResponse,
+  CreateAutomationRequest,
+  CreateAutomationResponse,
+  SearchAutomationLogsRequest,
+  SearchAutomationLogsResponse,
+  ClearAutomationLogRequest,
+  ClearAutomationLogResponse,
+  TriggerAutomationRequest,
+  TriggerAutomationResponse,
+  TestAutomationRequest,
+  TestAutomationResponse,
 } from "@budibase/types"
 import { getActionDefinitions as actionDefs } from "../../automations/actions"
 import sdk from "../../sdk"
@@ -34,7 +49,7 @@ function getTriggerDefinitions() {
  *************************/
 
 export async function create(
-  ctx: UserCtx<Automation, { message: string; automation: Automation }>
+  ctx: UserCtx<CreateAutomationRequest, CreateAutomationResponse>
 ) {
   let automation = ctx.request.body
   automation.appId = ctx.appId
@@ -47,7 +62,6 @@ export async function create(
 
   const createdAutomation = await sdk.automations.create(automation)
 
-  ctx.status = 200
   ctx.body = {
     message: "Automation created successfully",
     automation: createdAutomation,
@@ -55,7 +69,9 @@ export async function create(
   builderSocket?.emitAutomationUpdate(ctx, automation)
 }
 
-export async function update(ctx: UserCtx) {
+export async function update(
+  ctx: UserCtx<UpdateAutomationRequest, UpdateAutomationResponse>
+) {
   let automation = ctx.request.body
   automation.appId = ctx.appId
 
@@ -67,7 +83,6 @@ export async function update(ctx: UserCtx) {
 
   const updatedAutomation = await sdk.automations.update(automation)
 
-  ctx.status = 200
   ctx.body = {
     message: `Automation ${automation._id} updated successfully.`,
     automation: updatedAutomation,
@@ -80,7 +95,7 @@ export async function fetch(ctx: UserCtx<void, FetchAutomationResponse>) {
   ctx.body = { automations }
 }
 
-export async function find(ctx: UserCtx) {
+export async function find(ctx: UserCtx<void, FindAutomationResponse>) {
   ctx.body = await sdk.automations.get(ctx.params.id)
 }
 
@@ -96,11 +111,15 @@ export async function destroy(ctx: UserCtx<void, DeleteAutomationResponse>) {
   builderSocket?.emitAutomationDeletion(ctx, automationId)
 }
 
-export async function logSearch(ctx: UserCtx) {
+export async function logSearch(
+  ctx: UserCtx<SearchAutomationLogsRequest, SearchAutomationLogsResponse>
+) {
   ctx.body = await automations.logs.logSearch(ctx.request.body)
 }
 
-export async function clearLogError(ctx: UserCtx) {
+export async function clearLogError(
+  ctx: UserCtx<ClearAutomationLogRequest, ClearAutomationLogResponse>
+) {
   const { automationId, appId } = ctx.request.body
   await context.doInAppContext(appId, async () => {
     const db = context.getProdAppDB()
@@ -119,15 +138,21 @@ export async function clearLogError(ctx: UserCtx) {
   })
 }
 
-export async function getActionList(ctx: UserCtx) {
+export async function getActionList(
+  ctx: UserCtx<void, GetAutomationActionDefinitionsResponse>
+) {
   ctx.body = await getActionDefinitions()
 }
 
-export async function getTriggerList(ctx: UserCtx) {
+export async function getTriggerList(
+  ctx: UserCtx<void, GetAutomationTriggerDefinitionsResponse>
+) {
   ctx.body = getTriggerDefinitions()
 }
 
-export async function getDefinitionList(ctx: UserCtx) {
+export async function getDefinitionList(
+  ctx: UserCtx<void, GetAutomationStepDefinitionsResponse>
+) {
   ctx.body = {
     trigger: getTriggerDefinitions(),
     action: await getActionDefinitions(),
@@ -140,14 +165,16 @@ export async function getDefinitionList(ctx: UserCtx) {
  *                   *
  *********************/
 
-export async function trigger(ctx: UserCtx) {
+export async function trigger(
+  ctx: UserCtx<TriggerAutomationRequest, TriggerAutomationResponse>
+) {
   const db = context.getAppDB()
   let automation = await db.get<Automation>(ctx.params.id)
 
   let hasCollectStep = sdk.automations.utils.checkForCollectStep(automation)
   if (hasCollectStep && (await features.isSyncAutomationsEnabled())) {
     try {
-      const response: AutomationResults = await triggers.externalTrigger(
+      const response = await triggers.externalTrigger(
         automation,
         {
           fields: ctx.request.body.fields,
@@ -158,6 +185,10 @@ export async function trigger(ctx: UserCtx) {
         { getResponses: true }
       )
 
+      if (!("steps" in response)) {
+        ctx.throw(400, "Unable to collect response")
+      }
+
       let collectedValue = response.steps.find(
         step => step.stepId === AutomationActionStepId.COLLECT
       )
@@ -185,7 +216,7 @@ export async function trigger(ctx: UserCtx) {
   }
 }
 
-function prepareTestInput(input: any) {
+function prepareTestInput(input: TestAutomationRequest) {
   // prepare the test parameters
   if (input.id && input.row) {
     input.row._id = input.id
@@ -196,26 +227,29 @@ function prepareTestInput(input: any) {
   return input
 }
 
-export async function test(ctx: UserCtx) {
+export async function test(
+  ctx: UserCtx<TestAutomationRequest, TestAutomationResponse>
+) {
   const db = context.getAppDB()
-  let automation = await db.get<Automation>(ctx.params.id)
-  await setTestFlag(automation._id!)
-  const testInput = prepareTestInput(ctx.request.body)
-  const response = await triggers.externalTrigger(
-    automation,
-    {
-      ...testInput,
-      appId: ctx.appId,
-      user: sdk.users.getUserContextBindings(ctx.user),
-    },
-    { getResponses: true }
-  )
-  // save a test history run
-  await updateTestHistory(ctx.appId, automation, {
-    ...ctx.request.body,
-    occurredAt: new Date().getTime(),
+  const automation = await db.tryGet<Automation>(ctx.params.id)
+  if (!automation) {
+    ctx.throw(404, `Automation ${ctx.params.id} not found`)
+  }
+
+  const { request, appId } = ctx
+  const { body } = request
+
+  ctx.body = await withTestFlag(automation._id!, async () => {
+    const occurredAt = new Date().getTime()
+    await updateTestHistory(appId, automation, { ...body, occurredAt })
+
+    const user = sdk.users.getUserContextBindings(ctx.user)
+    return await triggers.externalTrigger(
+      automation,
+      { ...prepareTestInput(body), appId, user },
+      { getResponses: true }
+    )
   })
-  await clearTestFlag(automation._id!)
-  ctx.body = response
+
   await events.automation.tested(automation)
 }
diff --git a/packages/server/src/api/controllers/backup.ts b/packages/server/src/api/controllers/backup.ts
index 8e1881a5fc..2104196139 100644
--- a/packages/server/src/api/controllers/backup.ts
+++ b/packages/server/src/api/controllers/backup.ts
@@ -1,14 +1,16 @@
 import sdk from "../../sdk"
 import { events, context, db } from "@budibase/backend-core"
 import { DocumentType } from "../../db/utils"
-import { App, Ctx } from "@budibase/types"
+import {
+  App,
+  Ctx,
+  ExportAppDumpRequest,
+  ExportAppDumpResponse,
+} from "@budibase/types"
 
-interface ExportAppDumpRequest {
-  excludeRows: boolean
-  encryptPassword?: string
-}
-
-export async function exportAppDump(ctx: Ctx<ExportAppDumpRequest>) {
+export async function exportAppDump(
+  ctx: Ctx<ExportAppDumpRequest, ExportAppDumpResponse>
+) {
   const { appId } = ctx.query as any
   const { excludeRows, encryptPassword } = ctx.request.body
 
diff --git a/packages/server/src/api/controllers/component.ts b/packages/server/src/api/controllers/component.ts
index 6d4d3e2d21..c6d8551adc 100644
--- a/packages/server/src/api/controllers/component.ts
+++ b/packages/server/src/api/controllers/component.ts
@@ -1,9 +1,16 @@
 import { DocumentType } from "../../db/utils"
-import { App, Plugin, UserCtx } from "@budibase/types"
+import {
+  App,
+  FetchComponentDefinitionResponse,
+  Plugin,
+  UserCtx,
+} from "@budibase/types"
 import { db as dbCore, context, tenancy } from "@budibase/backend-core"
 import { getComponentLibraryManifest } from "../../utilities/fileSystem"
 
-export async function fetchAppComponentDefinitions(ctx: UserCtx) {
+export async function fetchAppComponentDefinitions(
+  ctx: UserCtx<void, FetchComponentDefinitionResponse>
+) {
   try {
     const db = context.getAppDB()
     const app = await db.get<App>(DocumentType.APP_METADATA)
diff --git a/packages/server/src/api/controllers/datasource.ts b/packages/server/src/api/controllers/datasource.ts
index 794e2dfddd..8a3d5cf2ca 100644
--- a/packages/server/src/api/controllers/datasource.ts
+++ b/packages/server/src/api/controllers/datasource.ts
@@ -23,13 +23,17 @@ import {
   Table,
   RowValue,
   DynamicVariable,
+  FetchDatasourcesResponse,
+  FindDatasourcesResponse,
+  DeleteDatasourceResponse,
+  FetchExternalSchemaResponse,
 } from "@budibase/types"
 import sdk from "../../sdk"
 import { builderSocket } from "../../websockets"
 import { isEqual } from "lodash"
 import { processTable } from "../../sdk/app/tables/getters"
 
-export async function fetch(ctx: UserCtx) {
+export async function fetch(ctx: UserCtx<void, FetchDatasourcesResponse>) {
   ctx.body = await sdk.datasources.fetch()
 }
 
@@ -178,7 +182,6 @@ export async function update(
     }
   }
 
-  ctx.status = 200
   ctx.message = "Datasource saved successfully."
   ctx.body = {
     datasource: await sdk.datasources.removeSecretSingle(datasource),
@@ -260,7 +263,7 @@ async function destroyInternalTablesBySourceId(datasourceId: string) {
   }
 }
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, DeleteDatasourceResponse>) {
   const db = context.getAppDB()
   const datasourceId = ctx.params.datasourceId
 
@@ -286,27 +289,18 @@ export async function destroy(ctx: UserCtx) {
   await db.remove(datasourceId, ctx.params.revId)
   await events.datasource.deleted(datasource)
 
-  ctx.message = `Datasource deleted.`
-  ctx.status = 200
+  ctx.body = { message: `Datasource deleted.` }
   builderSocket?.emitDatasourceDeletion(ctx, datasourceId)
 }
 
-export async function find(ctx: UserCtx) {
+export async function find(ctx: UserCtx<void, FindDatasourcesResponse>) {
   const datasource = await sdk.datasources.get(ctx.params.datasourceId)
   ctx.body = await sdk.datasources.removeSecretSingle(datasource)
 }
 
-// dynamic query functionality
-export async function query(ctx: UserCtx) {
-  const queryJson = ctx.request.body
-  try {
-    ctx.body = await sdk.rows.utils.getDatasourceAndQuery(queryJson)
-  } catch (err: any) {
-    ctx.throw(400, err)
-  }
-}
-
-export async function getExternalSchema(ctx: UserCtx) {
+export async function getExternalSchema(
+  ctx: UserCtx<void, FetchExternalSchemaResponse>
+) {
   const datasource = await sdk.datasources.get(ctx.params.datasourceId)
   const enrichedDatasource = await sdk.datasources.getAndMergeDatasource(
     datasource
@@ -316,9 +310,10 @@ export async function getExternalSchema(ctx: UserCtx) {
   if (!connector.getExternalSchema) {
     ctx.throw(400, "Datasource does not support exporting external schema")
   }
-  const response = await connector.getExternalSchema()
 
-  ctx.body = {
-    schema: response,
+  try {
+    ctx.body = { schema: await connector.getExternalSchema() }
+  } catch (e: any) {
+    ctx.throw(400, e.message)
   }
 }
diff --git a/packages/server/src/api/controllers/deploy/Deployment.ts b/packages/server/src/api/controllers/deploy/Deployment.ts
index fe817730b6..9d5e543187 100644
--- a/packages/server/src/api/controllers/deploy/Deployment.ts
+++ b/packages/server/src/api/controllers/deploy/Deployment.ts
@@ -1,4 +1,5 @@
 import { context, utils } from "@budibase/backend-core"
+import { DeploymentStatus } from "@budibase/types"
 
 /**
  * This is used to pass around information about the deployment that is occurring
@@ -6,7 +7,7 @@ import { context, utils } from "@budibase/backend-core"
 export default class Deployment {
   _id: string
   verification: any
-  status?: string
+  status?: DeploymentStatus
   err?: any
   appUrl?: string
 
@@ -25,7 +26,7 @@ export default class Deployment {
     return this.verification
   }
 
-  setStatus(status: string, err?: any) {
+  setStatus(status: DeploymentStatus, err?: any) {
     this.status = status
     if (err) {
       this.err = err
diff --git a/packages/server/src/api/controllers/deploy/index.ts b/packages/server/src/api/controllers/deploy/index.ts
index 2cf3da3dda..b05b82d79a 100644
--- a/packages/server/src/api/controllers/deploy/index.ts
+++ b/packages/server/src/api/controllers/deploy/index.ts
@@ -7,20 +7,26 @@ import {
   enableCronTrigger,
 } from "../../../automations/utils"
 import { backups } from "@budibase/pro"
-import { App, AppBackupTrigger } from "@budibase/types"
+import {
+  App,
+  AppBackupTrigger,
+  DeploymentDoc,
+  FetchDeploymentResponse,
+  PublishAppResponse,
+  UserCtx,
+  DeploymentStatus,
+  DeploymentProgressResponse,
+} from "@budibase/types"
 import sdk from "../../../sdk"
 import { builderSocket } from "../../../websockets"
 
 // the max time we can wait for an invalidation to complete before considering it failed
 const MAX_PENDING_TIME_MS = 30 * 60000
-const DeploymentStatus = {
-  SUCCESS: "SUCCESS",
-  PENDING: "PENDING",
-  FAILURE: "FAILURE",
-}
 
 // checks that deployments are in a good state, any pending will be updated
-async function checkAllDeployments(deployments: any) {
+async function checkAllDeployments(
+  deployments: any
+): Promise<{ updated: boolean; deployments: DeploymentDoc }> {
   let updated = false
   let deployment: any
   for (deployment of Object.values(deployments.history)) {
@@ -96,7 +102,9 @@ async function initDeployedApp(prodAppId: any) {
   })
 }
 
-export async function fetchDeployments(ctx: any) {
+export async function fetchDeployments(
+  ctx: UserCtx<void, FetchDeploymentResponse>
+) {
   try {
     const db = context.getAppDB()
     const deploymentDoc = await db.get(DocumentType.DEPLOYMENTS)
@@ -104,17 +112,24 @@ export async function fetchDeployments(ctx: any) {
     if (updated) {
       await db.put(deployments)
     }
-    ctx.body = Object.values(deployments.history).reverse()
+    ctx.body = deployments.history
+      ? Object.values(deployments.history).reverse()
+      : []
   } catch (err) {
     ctx.body = []
   }
 }
 
-export async function deploymentProgress(ctx: any) {
+export async function deploymentProgress(
+  ctx: UserCtx<void, DeploymentProgressResponse>
+) {
   try {
     const db = context.getAppDB()
-    const deploymentDoc = await db.get<any>(DocumentType.DEPLOYMENTS)
-    ctx.body = deploymentDoc[ctx.params.deploymentId]
+    const deploymentDoc = await db.get<DeploymentDoc>(DocumentType.DEPLOYMENTS)
+    if (!deploymentDoc.history?.[ctx.params.deploymentId]) {
+      ctx.throw(404, "No deployment found")
+    }
+    ctx.body = deploymentDoc.history?.[ctx.params.deploymentId]
   } catch (err) {
     ctx.throw(
       500,
@@ -123,7 +138,9 @@ export async function deploymentProgress(ctx: any) {
   }
 }
 
-export const publishApp = async function (ctx: any) {
+export const publishApp = async function (
+  ctx: UserCtx<void, PublishAppResponse>
+) {
   let deployment = new Deployment()
   console.log("Deployment object created")
   deployment.setStatus(DeploymentStatus.PENDING)
diff --git a/packages/server/src/api/controllers/dev.ts b/packages/server/src/api/controllers/dev.ts
index 497da088c6..099f297cd4 100644
--- a/packages/server/src/api/controllers/dev.ts
+++ b/packages/server/src/api/controllers/dev.ts
@@ -11,12 +11,18 @@ import {
   db as dbCore,
   cache,
 } from "@budibase/backend-core"
-import { App } from "@budibase/types"
+import {
+  App,
+  ClearDevLockResponse,
+  Ctx,
+  GetVersionResponse,
+  RevertAppResponse,
+} from "@budibase/types"
 
 async function redirect(
   ctx: any,
   method: "GET" | "POST" | "DELETE",
-  path: string = "global"
+  path = "global"
 ) {
   const { devPath } = ctx.params
   const queryString = ctx.originalUrl.split("?")[1] || ""
@@ -69,7 +75,7 @@ export function buildRedirectDelete(path: string) {
   }
 }
 
-export async function clearLock(ctx: any) {
+export async function clearLock(ctx: Ctx<void, ClearDevLockResponse>) {
   const { appId } = ctx.params
   try {
     await redisClearLock(appId, ctx.user)
@@ -81,7 +87,7 @@ export async function clearLock(ctx: any) {
   }
 }
 
-export async function revert(ctx: any) {
+export async function revert(ctx: Ctx<void, RevertAppResponse>) {
   const { appId } = ctx.params
   const productionAppId = dbCore.getProdAppID(appId)
 
@@ -131,7 +137,7 @@ export async function revert(ctx: any) {
   }
 }
 
-export async function getBudibaseVersion(ctx: any) {
+export async function getBudibaseVersion(ctx: Ctx<void, GetVersionResponse>) {
   const version = envCore.VERSION
   ctx.body = {
     version,
diff --git a/packages/server/src/api/controllers/integration.ts b/packages/server/src/api/controllers/integration.ts
index 57038f8401..f26f8dcc52 100644
--- a/packages/server/src/api/controllers/integration.ts
+++ b/packages/server/src/api/controllers/integration.ts
@@ -1,12 +1,17 @@
 import { getDefinition, getDefinitions } from "../../integrations"
-import { SourceName, UserCtx } from "@budibase/types"
+import {
+  SourceName,
+  UserCtx,
+  FetchIntegrationsResponse,
+  FindIntegrationResponse,
+} from "@budibase/types"
 
 const DISABLED_EXTERNAL_INTEGRATIONS = [
   SourceName.AIRTABLE,
   SourceName.BUDIBASE,
 ]
 
-export async function fetch(ctx: UserCtx) {
+export async function fetch(ctx: UserCtx<void, FetchIntegrationsResponse>) {
   const definitions = await getDefinitions()
   for (let disabledIntegration of DISABLED_EXTERNAL_INTEGRATIONS) {
     delete definitions[disabledIntegration]
@@ -14,10 +19,14 @@ export async function fetch(ctx: UserCtx) {
   ctx.body = definitions
 }
 
-export async function find(ctx: UserCtx) {
+export async function find(ctx: UserCtx<void, FindIntegrationResponse>) {
   const sourceType = ctx.params?.type
   if (DISABLED_EXTERNAL_INTEGRATIONS.indexOf(sourceType) !== -1) {
     ctx.throw(400, `Invalid source type - ${sourceType} is not supported.`)
   }
-  ctx.body = await getDefinition(ctx.params.type)
+  const integration = await getDefinition(ctx.params.type)
+  if (!integration) {
+    ctx.throw(404, "Integration not found")
+  }
+  ctx.body = integration
 }
diff --git a/packages/server/src/api/controllers/layout.ts b/packages/server/src/api/controllers/layout.ts
index c0406f50ac..4c996dde35 100644
--- a/packages/server/src/api/controllers/layout.ts
+++ b/packages/server/src/api/controllers/layout.ts
@@ -2,7 +2,7 @@ import { EMPTY_LAYOUT } from "../../constants/layouts"
 import { generateLayoutID, getScreenParams } from "../../db/utils"
 import { events, context } from "@budibase/backend-core"
 import {
-  BBContext,
+  DeleteLayoutResponse,
   Layout,
   SaveLayoutRequest,
   SaveLayoutResponse,
@@ -29,10 +29,9 @@ export async function save(
   layout._rev = response.rev
 
   ctx.body = layout
-  ctx.status = 200
 }
 
-export async function destroy(ctx: BBContext) {
+export async function destroy(ctx: UserCtx<void, DeleteLayoutResponse>) {
   const db = context.getAppDB()
   const layoutId = ctx.params.layoutId,
     layoutRev = ctx.params.layoutRev
@@ -51,5 +50,4 @@ export async function destroy(ctx: BBContext) {
   await db.remove(layoutId, layoutRev)
   await events.layout.deleted(layoutId)
   ctx.body = { message: "Layout deleted successfully" }
-  ctx.status = 200
 }
diff --git a/packages/server/src/api/controllers/metadata.ts b/packages/server/src/api/controllers/metadata.ts
index f579b14499..85c1ab2be8 100644
--- a/packages/server/src/api/controllers/metadata.ts
+++ b/packages/server/src/api/controllers/metadata.ts
@@ -1,24 +1,35 @@
-import { MetadataTypes } from "../../constants"
 import { generateMetadataID } from "../../db/utils"
 import { saveEntityMetadata, deleteEntityMetadata } from "../../utilities"
 import { context } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import {
+  UserCtx,
+  MetadataType,
+  GetMetadataTypesResponse,
+  SaveMetadataRequest,
+  SaveMetadataResponse,
+  DeleteMetadataResponse,
+  FindMetadataResponse,
+} from "@budibase/types"
 
-export async function getTypes(ctx: BBContext) {
+export async function getTypes(ctx: UserCtx<void, GetMetadataTypesResponse>) {
   ctx.body = {
-    types: MetadataTypes,
+    types: MetadataType,
   }
 }
 
-export async function saveMetadata(ctx: BBContext) {
+export async function saveMetadata(
+  ctx: UserCtx<SaveMetadataRequest, SaveMetadataResponse>
+) {
   const { type, entityId } = ctx.params
-  if (type === MetadataTypes.AUTOMATION_TEST_HISTORY) {
+  if (type === MetadataType.AUTOMATION_TEST_HISTORY) {
     ctx.throw(400, "Cannot save automation history type")
   }
   ctx.body = await saveEntityMetadata(type, entityId, ctx.request.body)
 }
 
-export async function deleteMetadata(ctx: BBContext) {
+export async function deleteMetadata(
+  ctx: UserCtx<void, DeleteMetadataResponse>
+) {
   const { type, entityId } = ctx.params
   await deleteEntityMetadata(type, entityId)
   ctx.body = {
@@ -26,17 +37,9 @@ export async function deleteMetadata(ctx: BBContext) {
   }
 }
 
-export async function getMetadata(ctx: BBContext) {
+export async function getMetadata(ctx: UserCtx<void, FindMetadataResponse>) {
   const { type, entityId } = ctx.params
   const db = context.getAppDB()
   const id = generateMetadataID(type, entityId)
-  try {
-    ctx.body = await db.get(id)
-  } catch (err: any) {
-    if (err.status === 404) {
-      ctx.body = {}
-    } else {
-      ctx.throw(err.status, err)
-    }
-  }
+  ctx.body = (await db.tryGet(id)) || {}
 }
diff --git a/packages/server/src/api/controllers/migrations.ts b/packages/server/src/api/controllers/migrations.ts
index 89255e89b1..fc3a1a1548 100644
--- a/packages/server/src/api/controllers/migrations.ts
+++ b/packages/server/src/api/controllers/migrations.ts
@@ -1,24 +1,11 @@
 import { context } from "@budibase/backend-core"
-import { migrate as migrationImpl, MIGRATIONS } from "../../migrations"
-import { Ctx } from "@budibase/types"
+import { Ctx, GetMigrationStatus } from "@budibase/types"
 import {
   getAppMigrationVersion,
   getLatestEnabledMigrationId,
 } from "../../appMigrations"
 
-export async function migrate(ctx: Ctx) {
-  const options = ctx.request.body
-  // don't await as can take a while, just return
-  migrationImpl(options)
-  ctx.status = 200
-}
-
-export async function fetchDefinitions(ctx: Ctx) {
-  ctx.body = MIGRATIONS
-  ctx.status = 200
-}
-
-export async function getMigrationStatus(ctx: Ctx) {
+export async function getMigrationStatus(ctx: Ctx<void, GetMigrationStatus>) {
   const appId = context.getAppId()
 
   if (!appId) {
@@ -32,5 +19,4 @@ export async function getMigrationStatus(ctx: Ctx) {
     !latestMigrationId || latestAppliedMigration >= latestMigrationId
 
   ctx.body = { migrated }
-  ctx.status = 200
 }
diff --git a/packages/server/src/api/controllers/ops.ts b/packages/server/src/api/controllers/ops.ts
index 89ad0ac97b..dc331bb3a3 100644
--- a/packages/server/src/api/controllers/ops.ts
+++ b/packages/server/src/api/controllers/ops.ts
@@ -1,16 +1,7 @@
-import { Ctx } from "@budibase/types"
+import { Ctx, LogOpsRequest, ErrorOpsRequest } from "@budibase/types"
 import { logging } from "@budibase/backend-core"
 
-interface LogRequest {
-  message: string
-  data?: any
-}
-
-interface ErrorRequest {
-  message: string
-}
-
-export async function log(ctx: Ctx<LogRequest>) {
+export async function log(ctx: Ctx<LogOpsRequest, void>) {
   const body = ctx.request.body
   console.trace(body.message, body.data)
   console.debug(body.message, body.data)
@@ -20,13 +11,13 @@ export async function log(ctx: Ctx<LogRequest>) {
   ctx.status = 204
 }
 
-export async function alert(ctx: Ctx<ErrorRequest>) {
+export async function alert(ctx: Ctx<ErrorOpsRequest, void>) {
   const body = ctx.request.body
   logging.logAlert(body.message, new Error(body.message))
   ctx.status = 204
 }
 
-export async function error(ctx: Ctx<ErrorRequest>) {
+export async function error(ctx: Ctx<ErrorOpsRequest, void>) {
   const body = ctx.request.body
   throw new Error(body.message)
 }
diff --git a/packages/server/src/api/controllers/permission.ts b/packages/server/src/api/controllers/permission.ts
index ead48d3db8..d1522ca292 100644
--- a/packages/server/src/api/controllers/permission.ts
+++ b/packages/server/src/api/controllers/permission.ts
@@ -9,6 +9,8 @@ import {
   RemovePermissionRequest,
   RemovePermissionResponse,
   FetchResourcePermissionInfoResponse,
+  FetchBuiltinPermissionsResponse,
+  FetchPermissionLevelsRequest,
 } from "@budibase/types"
 import {
   CURRENTLY_SUPPORTED_LEVELS,
@@ -19,11 +21,13 @@ import { PermissionUpdateType } from "../../sdk/app/permissions"
 
 const SUPPORTED_LEVELS = CURRENTLY_SUPPORTED_LEVELS
 
-export function fetchBuiltin(ctx: UserCtx) {
+export function fetchBuiltin(
+  ctx: UserCtx<void, FetchBuiltinPermissionsResponse>
+) {
   ctx.body = Object.values(permissions.getBuiltinPermissions())
 }
 
-export function fetchLevels(ctx: UserCtx) {
+export function fetchLevels(ctx: UserCtx<void, FetchPermissionLevelsRequest>) {
   // for now only provide the read/write perms externally
   ctx.body = SUPPORTED_LEVELS
 }
@@ -95,7 +99,7 @@ export async function getDependantResources(
 export async function addPermission(ctx: UserCtx<void, AddPermissionResponse>) {
   const params: AddPermissionRequest = ctx.params
   await sdk.permissions.updatePermissionOnRole(params, PermissionUpdateType.ADD)
-  ctx.status = 200
+  ctx.body = { message: "Permission added." }
 }
 
 export async function removePermission(
@@ -106,5 +110,5 @@ export async function removePermission(
     params,
     PermissionUpdateType.REMOVE
   )
-  ctx.status = 200
+  ctx.body = { message: "Permission removed." }
 }
diff --git a/packages/server/src/api/controllers/plugin/file.ts b/packages/server/src/api/controllers/plugin/file.ts
index 3b21f08387..4b1f098939 100644
--- a/packages/server/src/api/controllers/plugin/file.ts
+++ b/packages/server/src/api/controllers/plugin/file.ts
@@ -3,8 +3,12 @@ import {
   getPluginMetadata,
   extractTarball,
 } from "../../../utilities/fileSystem"
+import { KoaFile } from "@budibase/types"
 
-export async function fileUpload(file: { name: string; path: string }) {
+export async function fileUpload(file: KoaFile) {
+  if (!file.name || !file.path) {
+    throw new Error("File is not valid - cannot upload.")
+  }
   if (!file.name.endsWith(".tar.gz")) {
     throw new Error("Plugin must be compressed into a gzipped tarball.")
   }
diff --git a/packages/server/src/api/controllers/plugin/index.ts b/packages/server/src/api/controllers/plugin/index.ts
index e1c51f0219..2a4d69b671 100644
--- a/packages/server/src/api/controllers/plugin/index.ts
+++ b/packages/server/src/api/controllers/plugin/index.ts
@@ -2,26 +2,37 @@ import { npmUpload, urlUpload, githubUpload } from "./uploaders"
 import { plugins as pluginCore } from "@budibase/backend-core"
 import {
   PluginType,
-  FileType,
   PluginSource,
-  Ctx,
   CreatePluginRequest,
   CreatePluginResponse,
+  UserCtx,
+  UploadPluginRequest,
+  Plugin,
+  UploadPluginResponse,
+  FetchPluginResponse,
+  DeletePluginResponse,
 } from "@budibase/types"
 import env from "../../../environment"
 import { clientAppSocket } from "../../../websockets"
 import sdk from "../../../sdk"
 import { sdk as pro } from "@budibase/pro"
 
-export async function upload(ctx: any) {
-  const plugins: FileType[] =
-    ctx.request.files.file.length > 1
-      ? Array.from(ctx.request.files.file)
-      : [ctx.request.files.file]
+export async function upload(
+  ctx: UserCtx<UploadPluginRequest, UploadPluginResponse>
+) {
+  const files = ctx.request.files
+  const plugins =
+    files && Array.isArray(files.file) && files.file.length > 1
+      ? Array.from(files.file)
+      : [files?.file]
+
   try {
-    let docs = []
+    let docs: Plugin[] = []
     // can do single or multiple plugins
     for (let plugin of plugins) {
+      if (!plugin || Array.isArray(plugin)) {
+        continue
+      }
       const doc = await sdk.plugins.processUploaded(plugin, PluginSource.FILE)
       docs.push(doc)
     }
@@ -37,7 +48,7 @@ export async function upload(ctx: any) {
 }
 
 export async function create(
-  ctx: Ctx<CreatePluginRequest, CreatePluginResponse>
+  ctx: UserCtx<CreatePluginRequest, CreatePluginResponse>
 ) {
   const { source, url, headers, githubToken } = ctx.request.body
 
@@ -91,11 +102,11 @@ export async function create(
   }
 }
 
-export async function fetch(ctx: any) {
+export async function fetch(ctx: UserCtx<void, FetchPluginResponse>) {
   ctx.body = await sdk.plugins.fetch()
 }
 
-export async function destroy(ctx: any) {
+export async function destroy(ctx: UserCtx<void, DeletePluginResponse>) {
   const { pluginId } = ctx.params
 
   try {
diff --git a/packages/server/src/api/controllers/public/mapping/applications.ts b/packages/server/src/api/controllers/public/mapping/applications.ts
index 0b729fc610..74c55e1c7b 100644
--- a/packages/server/src/api/controllers/public/mapping/applications.ts
+++ b/packages/server/src/api/controllers/public/mapping/applications.ts
@@ -1,6 +1,7 @@
 import { Application } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function application(body: any): Application {
+function application(body: any): RequiredKeys<Application> {
   let app = body?.application ? body.application : body
   return {
     _id: app.appId,
diff --git a/packages/server/src/api/controllers/public/mapping/index.ts b/packages/server/src/api/controllers/public/mapping/index.ts
index 0cdcfbbe4b..b765f4bd76 100644
--- a/packages/server/src/api/controllers/public/mapping/index.ts
+++ b/packages/server/src/api/controllers/public/mapping/index.ts
@@ -3,6 +3,7 @@ import applications from "./applications"
 import users from "./users"
 import rows from "./rows"
 import queries from "./queries"
+import views from "./views"
 
 export default {
   ...tables,
@@ -10,4 +11,5 @@ export default {
   ...users,
   ...rows,
   ...queries,
+  ...views,
 }
diff --git a/packages/server/src/api/controllers/public/mapping/queries.ts b/packages/server/src/api/controllers/public/mapping/queries.ts
index 481b5f18c4..d0857453f6 100644
--- a/packages/server/src/api/controllers/public/mapping/queries.ts
+++ b/packages/server/src/api/controllers/public/mapping/queries.ts
@@ -1,6 +1,7 @@
 import { Query, ExecuteQuery } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function query(body: any): Query {
+function query(body: any): RequiredKeys<Query> {
   return {
     _id: body._id,
     datasourceId: body.datasourceId,
diff --git a/packages/server/src/api/controllers/public/mapping/rows.ts b/packages/server/src/api/controllers/public/mapping/rows.ts
index c1cba43718..69f376bebf 100644
--- a/packages/server/src/api/controllers/public/mapping/rows.ts
+++ b/packages/server/src/api/controllers/public/mapping/rows.ts
@@ -1,6 +1,7 @@
 import { Row, RowSearch } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function row(body: any): Row {
+function row(body: any): RequiredKeys<Row> {
   delete body._rev
   // have to input everything, since structure unknown
   return {
diff --git a/packages/server/src/api/controllers/public/mapping/tables.ts b/packages/server/src/api/controllers/public/mapping/tables.ts
index 72ed9f1a9a..857feb82ca 100644
--- a/packages/server/src/api/controllers/public/mapping/tables.ts
+++ b/packages/server/src/api/controllers/public/mapping/tables.ts
@@ -1,6 +1,7 @@
 import { Table } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function table(body: any): Table {
+function table(body: any): RequiredKeys<Table> {
   return {
     _id: body._id,
     name: body.name,
diff --git a/packages/server/src/api/controllers/public/mapping/types.ts b/packages/server/src/api/controllers/public/mapping/types.ts
index 9fea9b7213..6cbcfddb92 100644
--- a/packages/server/src/api/controllers/public/mapping/types.ts
+++ b/packages/server/src/api/controllers/public/mapping/types.ts
@@ -9,6 +9,9 @@ export type CreateApplicationParams = components["schemas"]["application"]
 export type Table = components["schemas"]["tableOutput"]["data"]
 export type CreateTableParams = components["schemas"]["table"]
 
+export type View = components["schemas"]["viewOutput"]["data"]
+export type CreateViewParams = components["schemas"]["view"]
+
 export type Row = components["schemas"]["rowOutput"]["data"]
 export type RowSearch = components["schemas"]["searchOutput"]
 export type CreateRowParams = components["schemas"]["row"]
diff --git a/packages/server/src/api/controllers/public/mapping/users.ts b/packages/server/src/api/controllers/public/mapping/users.ts
index 2a158bede9..232c81cec0 100644
--- a/packages/server/src/api/controllers/public/mapping/users.ts
+++ b/packages/server/src/api/controllers/public/mapping/users.ts
@@ -1,6 +1,7 @@
 import { User } from "./types"
+import { RequiredKeys } from "@budibase/types"
 
-function user(body: any): User {
+function user(body: any): RequiredKeys<User> {
   return {
     _id: body._id,
     email: body.email,
diff --git a/packages/server/src/api/controllers/public/mapping/views.ts b/packages/server/src/api/controllers/public/mapping/views.ts
new file mode 100644
index 0000000000..9ee1fe42d5
--- /dev/null
+++ b/packages/server/src/api/controllers/public/mapping/views.ts
@@ -0,0 +1,32 @@
+import { View } from "./types"
+import { ViewV2, Ctx, RequiredKeys } from "@budibase/types"
+import { dataFilters } from "@budibase/shared-core"
+
+function view(body: ViewV2): RequiredKeys<View> {
+  return {
+    id: body.id,
+    tableId: body.tableId,
+    type: body.type,
+    name: body.name,
+    schema: body.schema!,
+    primaryDisplay: body.primaryDisplay,
+    query: dataFilters.buildQuery(body.query),
+    sort: body.sort,
+  }
+}
+
+function mapView(ctx: Ctx<{ data: ViewV2 }>): { data: View } {
+  return {
+    data: view(ctx.body.data),
+  }
+}
+
+function mapViews(ctx: Ctx<{ data: ViewV2[] }>): { data: View[] } {
+  const views = ctx.body.data.map((body: ViewV2) => view(body))
+  return { data: views }
+}
+
+export default {
+  mapView,
+  mapViews,
+}
diff --git a/packages/server/src/api/controllers/public/rows.ts b/packages/server/src/api/controllers/public/rows.ts
index 16403b06c9..3c9cbf0ddd 100644
--- a/packages/server/src/api/controllers/public/rows.ts
+++ b/packages/server/src/api/controllers/public/rows.ts
@@ -22,13 +22,13 @@ export function fixRow(row: Row, params: any) {
   return row
 }
 
-export async function search(ctx: UserCtx, next: Next) {
+function buildSearchRequestBody(ctx: UserCtx) {
   let { sort, paginate, bookmark, limit, query } = ctx.request.body
   // update the body to the correct format of the internal search
   if (!sort) {
     sort = {}
   }
-  ctx.request.body = {
+  return {
     sort: sort.column,
     sortType: sort.type,
     sortOrder: sort.order,
@@ -37,10 +37,23 @@ export async function search(ctx: UserCtx, next: Next) {
     limit,
     query,
   }
+}
+
+export async function search(ctx: UserCtx, next: Next) {
+  ctx.request.body = buildSearchRequestBody(ctx)
   await rowController.search(ctx)
   await next()
 }
 
+export async function viewSearch(ctx: UserCtx, next: Next) {
+  ctx.request.body = buildSearchRequestBody(ctx)
+  ctx.params = {
+    viewId: ctx.params.viewId,
+  }
+  await rowController.views.searchView(ctx)
+  await next()
+}
+
 export async function create(ctx: UserCtx, next: Next) {
   ctx.request.body = fixRow(ctx.request.body, ctx.params)
   await rowController.save(ctx)
@@ -79,4 +92,5 @@ export default {
   update,
   destroy,
   search,
+  viewSearch,
 }
diff --git a/packages/server/src/api/controllers/public/views.ts b/packages/server/src/api/controllers/public/views.ts
new file mode 100644
index 0000000000..5b08f39e36
--- /dev/null
+++ b/packages/server/src/api/controllers/public/views.ts
@@ -0,0 +1,95 @@
+import { search as stringSearch } from "./utils"
+import * as controller from "../view"
+import { ViewV2, UserCtx, UISearchFilter, PublicAPIView } from "@budibase/types"
+import { Next } from "koa"
+import { merge } from "lodash"
+
+function viewRequest(view: PublicAPIView, params?: { viewId: string }) {
+  const viewV2: ViewV2 = view
+  if (!viewV2) {
+    return viewV2
+  }
+  if (params?.viewId) {
+    viewV2.id = params.viewId
+  }
+  if (!view.query) {
+    viewV2.query = {}
+  } else {
+    // public API only has one form of query
+    viewV2.queryUI = viewV2.query as UISearchFilter
+  }
+  viewV2.version = 2
+  return viewV2
+}
+
+function viewResponse(view: ViewV2): PublicAPIView {
+  // remove our internal structure - always un-necessary
+  delete view.query
+  return {
+    ...view,
+    query: view.queryUI,
+  }
+}
+
+function viewsResponse(views: ViewV2[]): PublicAPIView[] {
+  return views.map(viewResponse)
+}
+
+export async function search(ctx: UserCtx, next: Next) {
+  const { name } = ctx.request.body
+  await controller.v2.fetch(ctx)
+  ctx.body.data = viewsResponse(stringSearch(ctx.body.data, name))
+  await next()
+}
+
+export async function create(ctx: UserCtx, next: Next) {
+  ctx = merge(ctx, {
+    request: {
+      body: viewRequest(ctx.request.body),
+    },
+  })
+  await controller.v2.create(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function read(ctx: UserCtx, next: Next) {
+  ctx = merge(ctx, {
+    params: {
+      viewId: ctx.params.viewId,
+    },
+  })
+  await controller.v2.get(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function update(ctx: UserCtx, next: Next) {
+  const viewId = ctx.params.viewId
+  ctx = merge(ctx, {
+    request: {
+      body: {
+        data: viewRequest(ctx.request.body, { viewId }),
+      },
+    },
+    params: {
+      viewId,
+    },
+  })
+  await controller.v2.update(ctx)
+  ctx.body.data = viewResponse(ctx.body.data)
+  await next()
+}
+
+export async function destroy(ctx: UserCtx, next: Next) {
+  await controller.v2.remove(ctx)
+  await next()
+}
+
+export default {
+  create,
+  read,
+  update,
+  destroy,
+  search,
+}
diff --git a/packages/server/src/api/controllers/query/import/sources/curl.ts b/packages/server/src/api/controllers/query/import/sources/curl.ts
index ba85d82be0..5742d254af 100644
--- a/packages/server/src/api/controllers/query/import/sources/curl.ts
+++ b/packages/server/src/api/controllers/query/import/sources/curl.ts
@@ -4,7 +4,7 @@ import { URL } from "url"
 
 const curlconverter = require("curlconverter")
 
-const parseCurl = (data: string): any => {
+const parseCurl = (data: string): Promise<any> => {
   const curlJson = curlconverter.toJsonString(data)
   return JSON.parse(curlJson)
 }
@@ -53,8 +53,7 @@ export class Curl extends ImportSource {
 
   isSupported = async (data: string): Promise<boolean> => {
     try {
-      const curl = parseCurl(data)
-      this.curl = curl
+      this.curl = parseCurl(data)
     } catch (err) {
       return false
     }
diff --git a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.ts
similarity index 69%
rename from packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js
rename to packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.ts
index 7ea2f8932b..34777b0951 100644
--- a/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.js
+++ b/packages/server/src/api/controllers/query/import/sources/tests/curl/curl.spec.ts
@@ -1,34 +1,24 @@
-const { Curl } = require("../../curl")
-const fs = require("fs")
-const path = require("path")
+import { Curl } from "../../curl"
+import { readFileSync } from "fs"
+import { join } from "path"
 
-const getData = file => {
-  return fs.readFileSync(path.join(__dirname, `./data/${file}.txt`), "utf8")
+const getData = (file: string) => {
+  return readFileSync(join(__dirname, `./data/${file}.txt`), "utf8")
 }
 
 describe("Curl Import", () => {
-  let curl
+  let curl: Curl
 
   beforeEach(() => {
     curl = new Curl()
   })
 
   it("validates unsupported data", async () => {
-    let data
-    let supported
-
-    // JSON
-    data = "{}"
-    supported = await curl.isSupported(data)
-    expect(supported).toBe(false)
-
-    // Empty
-    data = ""
-    supported = await curl.isSupported(data)
-    expect(supported).toBe(false)
+    expect(await curl.isSupported("{}")).toBe(false)
+    expect(await curl.isSupported("")).toBe(false)
   })
 
-  const init = async file => {
+  const init = async (file: string) => {
     await curl.isSupported(getData(file))
   }
 
@@ -39,14 +29,14 @@ describe("Curl Import", () => {
   })
 
   describe("Returns queries", () => {
-    const getQueries = async file => {
+    const getQueries = async (file: string) => {
       await init(file)
-      const queries = await curl.getQueries()
+      const queries = await curl.getQueries("fake_datasource_id")
       expect(queries.length).toBe(1)
       return queries
     }
 
-    const testVerb = async (file, verb) => {
+    const testVerb = async (file: string, verb: string) => {
       const queries = await getQueries(file)
       expect(queries[0].queryVerb).toBe(verb)
     }
@@ -59,7 +49,7 @@ describe("Curl Import", () => {
       await testVerb("patch", "patch")
     })
 
-    const testPath = async (file, urlPath) => {
+    const testPath = async (file: string, urlPath: string) => {
       const queries = await getQueries(file)
       expect(queries[0].fields.path).toBe(urlPath)
     }
@@ -69,7 +59,10 @@ describe("Curl Import", () => {
       await testPath("path", "http://example.com/paths/abc")
     })
 
-    const testHeaders = async (file, headers) => {
+    const testHeaders = async (
+      file: string,
+      headers: Record<string, string>
+    ) => {
       const queries = await getQueries(file)
       expect(queries[0].fields.headers).toStrictEqual(headers)
     }
@@ -82,7 +75,7 @@ describe("Curl Import", () => {
       })
     })
 
-    const testQuery = async (file, queryString) => {
+    const testQuery = async (file: string, queryString: string) => {
       const queries = await getQueries(file)
       expect(queries[0].fields.queryString).toBe(queryString)
     }
@@ -91,7 +84,7 @@ describe("Curl Import", () => {
       await testQuery("query", "q1=v1&q1=v2")
     })
 
-    const testBody = async (file, body) => {
+    const testBody = async (file: string, body?: Record<string, any>) => {
       const queries = await getQueries(file)
       expect(queries[0].fields.requestBody).toStrictEqual(
         JSON.stringify(body, null, 2)
diff --git a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js
deleted file mode 100644
index b61991f7d6..0000000000
--- a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.js
+++ /dev/null
@@ -1,243 +0,0 @@
-const { OpenAPI2 } = require("../../openapi2")
-const fs = require("fs")
-const path = require("path")
-
-const getData = (file, extension) => {
-  return fs.readFileSync(
-    path.join(__dirname, `./data/${file}/${file}.${extension}`),
-    "utf8"
-  )
-}
-
-describe("OpenAPI2 Import", () => {
-  let openapi2
-
-  beforeEach(() => {
-    openapi2 = new OpenAPI2()
-  })
-
-  it("validates unsupported data", async () => {
-    let data
-    let supported
-
-    // non json / yaml
-    data = "curl http://example.com"
-    supported = await openapi2.isSupported(data)
-    expect(supported).toBe(false)
-
-    // Empty
-    data = ""
-    supported = await openapi2.isSupported(data)
-    expect(supported).toBe(false)
-  })
-
-  const init = async (file, extension) => {
-    await openapi2.isSupported(getData(file, extension))
-  }
-
-  const runTests = async (filename, test, assertions) => {
-    for (let extension of ["json", "yaml"]) {
-      await test(filename, extension, assertions)
-    }
-  }
-
-  const testImportInfo = async (file, extension) => {
-    await init(file, extension)
-    const info = await openapi2.getInfo()
-    expect(info.name).toBe("Swagger Petstore")
-  }
-
-  it("returns import info", async () => {
-    await runTests("petstore", testImportInfo)
-  })
-
-  describe("Returns queries", () => {
-    const indexQueries = queries => {
-      return queries.reduce((acc, query) => {
-        acc[query.name] = query
-        return acc
-      }, {})
-    }
-
-    const getQueries = async (file, extension) => {
-      await init(file, extension)
-      const queries = await openapi2.getQueries()
-      expect(queries.length).toBe(6)
-      return indexQueries(queries)
-    }
-
-    const testVerb = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, method] of Object.entries(assertions)) {
-        expect(queries[operationId].queryVerb).toBe(method)
-      }
-    }
-
-    it("populates verb", async () => {
-      const assertions = {
-        createEntity: "create",
-        getEntities: "read",
-        getEntity: "read",
-        updateEntity: "update",
-        patchEntity: "patch",
-        deleteEntity: "delete",
-      }
-      await runTests("crud", testVerb, assertions)
-    })
-
-    const testPath = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, urlPath] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.path).toBe(urlPath)
-      }
-    }
-
-    it("populates path", async () => {
-      const assertions = {
-        createEntity: "http://example.com/entities",
-        getEntities: "http://example.com/entities",
-        getEntity: "http://example.com/entities/{{entityId}}",
-        updateEntity: "http://example.com/entities/{{entityId}}",
-        patchEntity: "http://example.com/entities/{{entityId}}",
-        deleteEntity: "http://example.com/entities/{{entityId}}",
-      }
-      await runTests("crud", testPath, assertions)
-    })
-
-    const testHeaders = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, headers] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.headers).toStrictEqual(headers)
-      }
-    }
-
-    const contentTypeHeader = {
-      "Content-Type": "application/json",
-    }
-
-    it("populates headers", async () => {
-      const assertions = {
-        createEntity: {
-          ...contentTypeHeader,
-        },
-        getEntities: {},
-        getEntity: {},
-        updateEntity: {
-          ...contentTypeHeader,
-        },
-        patchEntity: {
-          ...contentTypeHeader,
-        },
-        deleteEntity: {
-          "x-api-key": "{{x-api-key}}",
-        },
-      }
-
-      await runTests("crud", testHeaders, assertions)
-    })
-
-    const testQuery = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, queryString] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.queryString).toStrictEqual(
-          queryString
-        )
-      }
-    }
-
-    it("populates query", async () => {
-      const assertions = {
-        createEntity: "",
-        getEntities: "page={{page}}&size={{size}}",
-        getEntity: "",
-        updateEntity: "",
-        patchEntity: "",
-        deleteEntity: "",
-      }
-      await runTests("crud", testQuery, assertions)
-    })
-
-    const testParameters = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, parameters] of Object.entries(assertions)) {
-        expect(queries[operationId].parameters).toStrictEqual(parameters)
-      }
-    }
-
-    it("populates parameters", async () => {
-      const assertions = {
-        createEntity: [],
-        getEntities: [
-          {
-            name: "page",
-            default: "",
-          },
-          {
-            name: "size",
-            default: "",
-          },
-        ],
-        getEntity: [
-          {
-            name: "entityId",
-            default: "",
-          },
-        ],
-        updateEntity: [
-          {
-            name: "entityId",
-            default: "",
-          },
-        ],
-        patchEntity: [
-          {
-            name: "entityId",
-            default: "",
-          },
-        ],
-        deleteEntity: [
-          {
-            name: "entityId",
-            default: "",
-          },
-          {
-            name: "x-api-key",
-            default: "",
-          },
-        ],
-      }
-      await runTests("crud", testParameters, assertions)
-    })
-
-    const testBody = async (file, extension, assertions) => {
-      const queries = await getQueries(file, extension)
-      for (let [operationId, body] of Object.entries(assertions)) {
-        expect(queries[operationId].fields.requestBody).toStrictEqual(
-          JSON.stringify(body, null, 2)
-        )
-      }
-    }
-    it("populates body", async () => {
-      const assertions = {
-        createEntity: {
-          name: "name",
-          type: "type",
-        },
-        getEntities: undefined,
-        getEntity: undefined,
-        updateEntity: {
-          id: 1,
-          name: "name",
-          type: "type",
-        },
-        patchEntity: {
-          id: 1,
-          name: "name",
-          type: "type",
-        },
-        deleteEntity: undefined,
-      }
-      await runTests("crud", testBody, assertions)
-    })
-  })
-})
diff --git a/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.ts b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.ts
new file mode 100644
index 0000000000..c16b04beb7
--- /dev/null
+++ b/packages/server/src/api/controllers/query/import/sources/tests/openapi2/openapi2.spec.ts
@@ -0,0 +1,135 @@
+import { OpenAPI2 } from "../../openapi2"
+import { readFileSync } from "fs"
+import { join } from "path"
+import { groupBy, mapValues } from "lodash"
+import { Query } from "@budibase/types"
+
+const getData = (file: string, extension: string) => {
+  return readFileSync(
+    join(__dirname, `./data/${file}/${file}.${extension}`),
+    "utf8"
+  )
+}
+
+describe("OpenAPI2 Import", () => {
+  let openapi2: OpenAPI2
+
+  beforeEach(() => {
+    openapi2 = new OpenAPI2()
+  })
+
+  it("validates unsupported data", async () => {
+    expect(await openapi2.isSupported("curl http://example.com")).toBe(false)
+    expect(await openapi2.isSupported("")).toBe(false)
+  })
+
+  describe.each(["json", "yaml"])("%s", extension => {
+    describe("petstore", () => {
+      beforeEach(async () => {
+        await openapi2.isSupported(getData("petstore", extension))
+      })
+
+      it("returns import info", async () => {
+        const { name } = await openapi2.getInfo()
+        expect(name).toBe("Swagger Petstore")
+      })
+    })
+
+    describe("crud", () => {
+      let queries: Record<string, Query>
+      beforeEach(async () => {
+        await openapi2.isSupported(getData("crud", extension))
+
+        const raw = await openapi2.getQueries("fake_datasource_id")
+        queries = mapValues(groupBy(raw, "name"), group => group[0])
+      })
+
+      it("should have 6 queries", () => {
+        expect(Object.keys(queries).length).toBe(6)
+      })
+
+      it.each([
+        ["createEntity", "create"],
+        ["getEntities", "read"],
+        ["getEntity", "read"],
+        ["updateEntity", "update"],
+        ["patchEntity", "patch"],
+        ["deleteEntity", "delete"],
+      ])("should have correct verb for %s", (operationId, method) => {
+        expect(queries[operationId].queryVerb).toBe(method)
+      })
+
+      it.each([
+        ["createEntity", "http://example.com/entities"],
+        ["getEntities", "http://example.com/entities"],
+        ["getEntity", "http://example.com/entities/{{entityId}}"],
+        ["updateEntity", "http://example.com/entities/{{entityId}}"],
+        ["patchEntity", "http://example.com/entities/{{entityId}}"],
+        ["deleteEntity", "http://example.com/entities/{{entityId}}"],
+      ])("should have correct path for %s", (operationId, urlPath) => {
+        expect(queries[operationId].fields.path).toBe(urlPath)
+      })
+
+      it.each([
+        ["createEntity", { "Content-Type": "application/json" }],
+        ["getEntities", {}],
+        ["getEntity", {}],
+        ["updateEntity", { "Content-Type": "application/json" }],
+        ["patchEntity", { "Content-Type": "application/json" }],
+        ["deleteEntity", { "x-api-key": "{{x-api-key}}" }],
+      ])(`should have correct headers for %s`, (operationId, headers) => {
+        expect(queries[operationId].fields.headers).toStrictEqual(headers)
+      })
+
+      it.each([
+        ["createEntity", ""],
+        ["getEntities", "page={{page}}&size={{size}}"],
+        ["getEntity", ""],
+        ["updateEntity", ""],
+        ["patchEntity", ""],
+        ["deleteEntity", ""],
+      ])(
+        `should have correct query string for %s`,
+        (operationId, queryString) => {
+          expect(queries[operationId].fields.queryString).toBe(queryString)
+        }
+      )
+
+      it.each([
+        ["createEntity", []],
+        [
+          "getEntities",
+          [
+            { name: "page", default: "" },
+            { name: "size", default: "" },
+          ],
+        ],
+        ["getEntity", [{ name: "entityId", default: "" }]],
+        ["updateEntity", [{ name: "entityId", default: "" }]],
+        ["patchEntity", [{ name: "entityId", default: "" }]],
+        [
+          "deleteEntity",
+          [
+            { name: "entityId", default: "" },
+            { name: "x-api-key", default: "" },
+          ],
+        ],
+      ])(`should have correct parameters for %s`, (operationId, parameters) => {
+        expect(queries[operationId].parameters).toStrictEqual(parameters)
+      })
+
+      it.each([
+        ["createEntity", { name: "name", type: "type" }],
+        ["getEntities", undefined],
+        ["getEntity", undefined],
+        ["updateEntity", { id: 1, name: "name", type: "type" }],
+        ["patchEntity", { id: 1, name: "name", type: "type" }],
+        ["deleteEntity", undefined],
+      ])(`should have correct body for %s`, (operationId, body) => {
+        expect(queries[operationId].fields.requestBody).toBe(
+          JSON.stringify(body, null, 2)
+        )
+      })
+    })
+  })
+})
diff --git a/packages/server/src/api/controllers/query/import/tests/index.spec.js b/packages/server/src/api/controllers/query/import/tests/index.spec.js
index fcbd4509ee..409a55e81b 100644
--- a/packages/server/src/api/controllers/query/import/tests/index.spec.js
+++ b/packages/server/src/api/controllers/query/import/tests/index.spec.js
@@ -111,8 +111,8 @@ describe("Rest Importer", () => {
     const importResult = await restImporter.importQueries(datasource._id)
     expect(importResult.errorQueries.length).toBe(0)
     expect(importResult.queries.length).toBe(assertions[key].count)
-    expect(events.query.imported).toBeCalledTimes(1)
-    expect(events.query.imported).toBeCalledWith(
+    expect(events.query.imported).toHaveBeenCalledTimes(1)
+    expect(events.query.imported).toHaveBeenCalledWith(
       datasource,
       assertions[key].source,
       assertions[key].count
diff --git a/packages/server/src/api/controllers/query/index.ts b/packages/server/src/api/controllers/query/index.ts
index 15c60bcf47..b522008cad 100644
--- a/packages/server/src/api/controllers/query/index.ts
+++ b/packages/server/src/api/controllers/query/index.ts
@@ -4,26 +4,38 @@ import { save as saveDatasource } from "../datasource"
 import { RestImporter } from "./import"
 import { invalidateCachedVariable } from "../../../threads/utils"
 import env from "../../../environment"
-import { events, context, utils, constants } from "@budibase/backend-core"
+import { constants, context, events, utils } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 import { QueryEvent, QueryEventParameters } from "../../../threads/definitions"
 import {
   ConfigType,
-  Query,
-  UserCtx,
-  SessionCookie,
-  JsonFieldSubType,
-  QueryResponse,
-  QuerySchema,
-  FieldType,
+  CreateDatasourceRequest,
+  Datasource,
   ExecuteQueryRequest,
-  ExecuteQueryResponse,
+  ExecuteV2QueryResponse,
+  ExecuteV1QueryResponse,
+  FetchQueriesResponse,
+  FieldType,
+  FindQueryResponse,
+  ImportRestQueryRequest,
+  ImportRestQueryResponse,
+  JsonFieldSubType,
   PreviewQueryRequest,
   PreviewQueryResponse,
+  Query,
+  QueryResponse,
+  QuerySchema,
+  SaveQueryRequest,
+  SaveQueryResponse,
+  SessionCookie,
+  SourceName,
+  UserCtx,
+  DeleteQueryResponse,
 } from "@budibase/types"
-import { ValidQueryNameRegex, utils as JsonUtils } from "@budibase/shared-core"
+import { utils as JsonUtils, ValidQueryNameRegex } from "@budibase/shared-core"
 import { findHBSBlocks } from "@budibase/string-templates"
 import { ObjectId } from "mongodb"
+import { merge } from "lodash"
 
 const Runner = new Thread(ThreadType.QUERY, {
   timeoutMs: env.QUERY_THREAD_TIMEOUT,
@@ -43,11 +55,13 @@ function validateQueryInputs(parameters: QueryEventParameters) {
   }
 }
 
-export async function fetch(ctx: UserCtx) {
+export async function fetch(ctx: UserCtx<void, FetchQueriesResponse>) {
   ctx.body = await sdk.queries.fetch()
 }
 
-const _import = async (ctx: UserCtx) => {
+const _import = async (
+  ctx: UserCtx<ImportRestQueryRequest, ImportRestQueryResponse>
+) => {
   const body = ctx.request.body
   const data = body.data
 
@@ -58,9 +72,9 @@ const _import = async (ctx: UserCtx) => {
   if (!body.datasourceId) {
     // construct new datasource
     const info: any = await importer.getInfo()
-    let datasource = {
+    let datasource: Datasource = {
       type: "datasource",
-      source: "REST",
+      source: SourceName.REST,
       config: {
         url: info.url,
         defaultHeaders: [],
@@ -69,8 +83,14 @@ const _import = async (ctx: UserCtx) => {
       name: info.name,
     }
     // save the datasource
-    const datasourceCtx = { ...ctx }
-    datasourceCtx.request.body.datasource = datasource
+    const datasourceCtx: UserCtx<CreateDatasourceRequest> = merge(ctx, {
+      request: {
+        body: {
+          datasource,
+          tablesFilter: [],
+        },
+      },
+    })
     await saveDatasource(datasourceCtx)
     datasourceId = datasourceCtx.body.datasource._id
   } else {
@@ -84,11 +104,10 @@ const _import = async (ctx: UserCtx) => {
     ...importResult,
     datasourceId,
   }
-  ctx.status = 200
 }
 export { _import as import }
 
-export async function save(ctx: UserCtx<Query, Query>) {
+export async function save(ctx: UserCtx<SaveQueryRequest, SaveQueryResponse>) {
   const db = context.getAppDB()
   const query: Query = ctx.request.body
 
@@ -119,10 +138,9 @@ export async function save(ctx: UserCtx<Query, Query>) {
   query._rev = response.rev
 
   ctx.body = query
-  ctx.message = `Query ${query.name} saved successfully.`
 }
 
-export async function find(ctx: UserCtx) {
+export async function find(ctx: UserCtx<void, FindQueryResponse>) {
   const queryId = ctx.params.queryId
   ctx.body = await sdk.queries.find(queryId)
 }
@@ -335,9 +353,9 @@ export async function preview(
 async function execute(
   ctx: UserCtx<
     ExecuteQueryRequest,
-    ExecuteQueryResponse | Record<string, any>[]
+    ExecuteV2QueryResponse | ExecuteV1QueryResponse
   >,
-  opts: any = { rowsOnly: false, isAutomation: false }
+  opts = { rowsOnly: false, isAutomation: false }
 ) {
   const db = context.getAppDB()
 
@@ -390,19 +408,21 @@ async function execute(
 }
 
 export async function executeV1(
-  ctx: UserCtx<ExecuteQueryRequest, Record<string, any>[]>
+  ctx: UserCtx<ExecuteQueryRequest, ExecuteV1QueryResponse>
 ) {
   return execute(ctx, { rowsOnly: true, isAutomation: false })
 }
 
 export async function executeV2(
-  ctx: UserCtx<
-    ExecuteQueryRequest,
-    ExecuteQueryResponse | Record<string, any>[]
-  >,
-  { isAutomation }: { isAutomation?: boolean } = {}
+  ctx: UserCtx<ExecuteQueryRequest, ExecuteV2QueryResponse>
 ) {
-  return execute(ctx, { rowsOnly: false, isAutomation })
+  return execute(ctx, { rowsOnly: false, isAutomation: false })
+}
+
+export async function executeV2AsAutomation(
+  ctx: UserCtx<ExecuteQueryRequest, ExecuteV2QueryResponse>
+) {
+  return execute(ctx, { rowsOnly: false, isAutomation: true })
 }
 
 const removeDynamicVariables = async (queryId: string) => {
@@ -426,14 +446,13 @@ const removeDynamicVariables = async (queryId: string) => {
   }
 }
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, DeleteQueryResponse>) {
   const db = context.getAppDB()
   const queryId = ctx.params.queryId as string
   await removeDynamicVariables(queryId)
   const query = await db.get<Query>(queryId)
   const datasource = await sdk.datasources.get(query.datasourceId)
   await db.remove(ctx.params.queryId, ctx.params.revId)
-  ctx.message = `Query deleted.`
-  ctx.status = 200
+  ctx.body = { message: `Query deleted.` }
   await events.query.deleted(datasource, query)
 }
diff --git a/packages/server/src/api/controllers/role.ts b/packages/server/src/api/controllers/role.ts
index 7f5ac6b92f..ae1d535a7c 100644
--- a/packages/server/src/api/controllers/role.ts
+++ b/packages/server/src/api/controllers/role.ts
@@ -9,7 +9,7 @@ import { getUserMetadataParams, InternalTables } from "../../db/utils"
 import {
   AccessibleRolesResponse,
   Database,
-  DestroyRoleResponse,
+  DeleteRoleResponse,
   FetchRolesResponse,
   FindRoleResponse,
   Role,
@@ -199,7 +199,7 @@ export async function save(ctx: UserCtx<SaveRoleRequest, SaveRoleResponse>) {
   builderSocket?.emitRoleUpdate(ctx, role)
 }
 
-export async function destroy(ctx: UserCtx<void, DestroyRoleResponse>) {
+export async function destroy(ctx: UserCtx<void, DeleteRoleResponse>) {
   const db = context.getAppDB()
   let roleId = ctx.params.roleId as string
   if (roles.isBuiltin(roleId)) {
@@ -234,8 +234,7 @@ export async function destroy(ctx: UserCtx<void, DestroyRoleResponse>) {
   // clean up inherits
   await removeRoleFromOthers(roleId)
 
-  ctx.message = `Role ${ctx.params.roleId} deleted successfully`
-  ctx.status = 200
+  ctx.body = { message: `Role ${ctx.params.roleId} deleted successfully` }
   builderSocket?.emitRoleDeletion(ctx, role)
 }
 
diff --git a/packages/server/src/api/controllers/routing.ts b/packages/server/src/api/controllers/routing.ts
index 040cda4dd0..fc9e58def5 100644
--- a/packages/server/src/api/controllers/routing.ts
+++ b/packages/server/src/api/controllers/routing.ts
@@ -1,11 +1,17 @@
 import { getRoutingInfo } from "../../utilities/routing"
 import { roles } from "@budibase/backend-core"
-import { UserCtx } from "@budibase/types"
+import {
+  FetchClientScreenRoutingResponse,
+  FetchScreenRoutingResponse,
+  ScreenRoutingJson,
+  UserCtx,
+} from "@budibase/types"
 
 const URL_SEPARATOR = "/"
 
 class Routing {
-  json: any
+  json: ScreenRoutingJson
+
   constructor() {
     this.json = {}
   }
@@ -43,7 +49,7 @@ class Routing {
  * @returns The routing structure, this is the full structure designed for use in the builder,
  * if the client routing is required then the updateRoutingStructureForUserRole should be used.
  */
-async function getRoutingStructure() {
+async function getRoutingStructure(): Promise<{ routes: ScreenRoutingJson }> {
   const screenRoutes = await getRoutingInfo()
   const routing = new Routing()
 
@@ -56,11 +62,13 @@ async function getRoutingStructure() {
   return { routes: routing.json }
 }
 
-export async function fetch(ctx: UserCtx) {
+export async function fetch(ctx: UserCtx<void, FetchScreenRoutingResponse>) {
   ctx.body = await getRoutingStructure()
 }
 
-export async function clientFetch(ctx: UserCtx) {
+export async function clientFetch(
+  ctx: UserCtx<void, FetchClientScreenRoutingResponse>
+) {
   const routing = await getRoutingStructure()
   let roleId = ctx.user?.role?._id
   const roleIds = roleId ? await roles.getUserRoleIdHierarchy(roleId) : []
diff --git a/packages/server/src/api/controllers/row/ExternalRequest.ts b/packages/server/src/api/controllers/row/ExternalRequest.ts
index 939ea399d9..e0171a062e 100644
--- a/packages/server/src/api/controllers/row/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/row/ExternalRequest.ts
@@ -42,7 +42,7 @@ import {
   sqlOutputProcessing,
 } from "./utils"
 import {
-  getDatasourceAndQuery,
+  enrichQueryJson,
   processRowCountResponse,
 } from "../../../sdk/app/rows/utils"
 import { processObjectSync } from "@budibase/string-templates"
@@ -135,16 +135,9 @@ function cleanupConfig(config: RunConfig, table: Table): RunConfig {
   return config
 }
 
-function getEndpoint(tableId: string | undefined, operation: string) {
-  if (!tableId) {
-    throw new Error("Cannot get endpoint information - no table ID specified")
-  }
+function getEndpoint(tableId: string, operation: Operation) {
   const { datasourceId, tableName } = breakExternalTableId(tableId)
-  return {
-    datasourceId: datasourceId,
-    entityId: tableName,
-    operation: operation as Operation,
-  }
+  return { datasourceId, entityId: tableName, operation }
 }
 
 function isOneSide(
@@ -268,12 +261,9 @@ export class ExternalRequest<T extends Operation> {
     const filters = this.prepareFilters(rowId, {}, table)
     // safety check, if there are no filters on deletion bad things happen
     if (Object.keys(filters).length !== 0) {
-      return getDatasourceAndQuery({
+      return makeExternalQuery({
         endpoint: getEndpoint(tableId, Operation.DELETE),
         filters,
-        meta: {
-          table,
-        },
       })
     } else {
       return []
@@ -289,13 +279,10 @@ export class ExternalRequest<T extends Operation> {
     const filters = this.prepareFilters(rowId, {}, table)
     // safety check, if there are no filters on deletion bad things happen
     if (Object.keys(filters).length !== 0) {
-      return getDatasourceAndQuery({
+      return makeExternalQuery({
         endpoint: getEndpoint(tableId, Operation.UPDATE),
         body: { [colName]: null },
         filters,
-        meta: {
-          table,
-        },
       })
     } else {
       return []
@@ -311,12 +298,9 @@ export class ExternalRequest<T extends Operation> {
   }
 
   async getRow(table: Table, rowId: string): Promise<Row> {
-    const response = await getDatasourceAndQuery({
+    const response = await makeExternalQuery({
       endpoint: getEndpoint(table._id!, Operation.READ),
       filters: this.prepareFilters(rowId, {}, table),
-      meta: {
-        table,
-      },
     })
     if (Array.isArray(response) && response.length > 0) {
       return response[0]
@@ -394,7 +378,7 @@ export class ExternalRequest<T extends Operation> {
         }
         // many to one
         else {
-          const thisKey: string = "id"
+          const thisKey = "id"
           // @ts-ignore
           const otherKey: string = field.fieldName
           for (const relationship of row[key]) {
@@ -490,16 +474,13 @@ export class ExternalRequest<T extends Operation> {
       if (!relatedTable) {
         throw new Error("unable to find related table")
       }
-      const response = await getDatasourceAndQuery({
-        endpoint: endpoint,
+      const response = await makeExternalQuery({
+        endpoint,
         filters: {
           equal: {
             [fieldName]: row[lookupField],
           },
         },
-        meta: {
-          table: relatedTable,
-        },
       })
       // this is the response from knex if no rows found
       const rows: Row[] =
@@ -537,6 +518,11 @@ export class ExternalRequest<T extends Operation> {
     for (let relationship of relationships) {
       const { key, tableId, isUpdate, id, relationshipType, ...rest } =
         relationship
+
+      if (!tableId) {
+        throw new Error("Table ID is unknown, cannot find table")
+      }
+
       const body: { [key: string]: any } = processObjectSync(rest, row, {})
       const linkTable = this.getTable(tableId)
       const relationshipPrimary = linkTable?.primary || []
@@ -583,14 +569,11 @@ export class ExternalRequest<T extends Operation> {
       const operation = isUpdate ? Operation.UPDATE : Operation.CREATE
       if (!existingRelationship) {
         promises.push(
-          getDatasourceAndQuery({
+          makeExternalQuery({
             endpoint: getEndpoint(tableId, operation),
             // if we're doing many relationships then we're writing, only one response
             body,
             filters: this.prepareFilters(id, {}, linkTable),
-            meta: {
-              table: linkTable,
-            },
           })
         )
       } else {
@@ -723,8 +706,8 @@ export class ExternalRequest<T extends Operation> {
 
     let json: QueryJson = {
       endpoint: {
-        datasourceId: this.datasource._id!,
-        entityId: table.name,
+        datasourceId: this.datasource,
+        entityId: table,
         operation,
       },
       resource: {
@@ -749,10 +732,6 @@ export class ExternalRequest<T extends Operation> {
           table
         ),
       },
-      meta: {
-        table,
-        tables: this.tables,
-      },
     }
 
     // remove any relationships that could block deletion
@@ -773,8 +752,11 @@ export class ExternalRequest<T extends Operation> {
       response = [unprocessedRow]
     } else {
       response = env.SQL_ALIASING_DISABLE
-        ? await getDatasourceAndQuery(json)
-        : await aliasing.queryWithAliasing(json, makeExternalQuery)
+        ? await makeExternalQuery(json)
+        : await aliasing.queryWithAliasing(
+            await enrichQueryJson(json),
+            makeExternalQuery
+          )
     }
 
     // if it's a counting operation there will be no more processing, just return the number
diff --git a/packages/server/src/api/controllers/row/external.ts b/packages/server/src/api/controllers/row/external.ts
index 082d07283b..1c021baab5 100644
--- a/packages/server/src/api/controllers/row/external.ts
+++ b/packages/server/src/api/controllers/row/external.ts
@@ -45,6 +45,9 @@ export async function handleRequest<T extends Operation>(
 export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
   const source = await utils.getSource(ctx)
 
+  const { viewId, tableId } = utils.getSourceId(ctx)
+  const sourceId = viewId || tableId
+
   if (sdk.views.isView(source) && helpers.views.isCalculationView(source)) {
     ctx.throw(400, "Cannot update rows through a calculation view")
   }
@@ -52,10 +55,22 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
   const table = await utils.getTableFromSource(source)
   const { _id, ...rowData } = ctx.request.body
 
-  const dataToUpdate = await inputProcessing(
+  const beforeRow = await sdk.rows.external.getRow(table._id!, _id, {
+    relationships: true,
+  })
+
+  let dataToUpdate = cloneDeep(beforeRow)
+  const allowedField = utils.getSourceFields(source)
+  for (const key of Object.keys(rowData)) {
+    if (!allowedField.includes(key)) continue
+
+    dataToUpdate[key] = rowData[key]
+  }
+
+  dataToUpdate = await inputProcessing(
     ctx.user?._id,
     cloneDeep(source),
-    rowData
+    dataToUpdate
   )
 
   const validateResult = await sdk.rows.utils.validate({
@@ -66,10 +81,6 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
     throw { validation: validateResult.errors }
   }
 
-  const beforeRow = await sdk.rows.external.getRow(table._id!, _id, {
-    relationships: true,
-  })
-
   const response = await handleRequest(Operation.UPDATE, source, {
     id: breakRowIdField(_id),
     row: dataToUpdate,
@@ -78,7 +89,7 @@ export async function patch(ctx: UserCtx<PatchRowRequest, PatchRowResponse>) {
   // The id might have been changed, so the refetching would fail. Recalculating the id just in case
   const updatedId =
     generateIdForRow({ ...beforeRow, ...dataToUpdate }, table) || _id
-  const row = await sdk.rows.external.getRow(table._id!, updatedId, {
+  const row = await sdk.rows.external.getRow(sourceId, updatedId, {
     relationships: true,
   })
 
diff --git a/packages/server/src/api/controllers/row/index.ts b/packages/server/src/api/controllers/row/index.ts
index fe29d46700..8f4629a5b0 100644
--- a/packages/server/src/api/controllers/row/index.ts
+++ b/packages/server/src/api/controllers/row/index.ts
@@ -11,23 +11,30 @@ import {
   DeleteRow,
   DeleteRowRequest,
   DeleteRows,
+  DownloadAttachmentResponse,
   EventType,
   ExportRowsRequest,
   ExportRowsResponse,
+  FetchEnrichedRowResponse,
+  FetchRowsResponse,
   FieldType,
-  GetRowResponse,
+  FindRowResponse,
   isRelationshipField,
   PatchRowRequest,
   PatchRowResponse,
+  RequiredKeys,
   Row,
   RowAttachment,
   RowSearchParams,
+  SaveRowRequest,
+  SaveRowResponse,
   SearchFilters,
   SearchRowRequest,
   SearchRowResponse,
   Table,
   UserCtx,
-  ValidateResponse,
+  ValidateRowRequest,
+  ValidateRowResponse,
 } from "@budibase/types"
 import * as utils from "./utils"
 import { gridSocket } from "../../../websockets"
@@ -64,7 +71,6 @@ export async function patch(
     if (!row) {
       ctx.throw(404, "Row not found")
     }
-    ctx.status = 200
 
     ctx.eventEmitter?.emitRow({
       eventName: EventType.ROW_UPDATE,
@@ -82,7 +88,7 @@ export async function patch(
   }
 }
 
-export const save = async (ctx: UserCtx<Row, Row>) => {
+export const save = async (ctx: UserCtx<SaveRowRequest, SaveRowResponse>) => {
   const { tableId, viewId } = utils.getSourceId(ctx)
   const sourceId = viewId || tableId
 
@@ -103,7 +109,6 @@ export const save = async (ctx: UserCtx<Row, Row>) => {
     : await quotas.addRow(() =>
         sdk.rows.save(sourceId, ctx.request.body, ctx.user?._id)
       )
-  ctx.status = 200
 
   ctx.eventEmitter?.emitRow({
     eventName: EventType.ROW_SAVE,
@@ -130,12 +135,12 @@ export async function fetchLegacyView(ctx: any) {
   })
 }
 
-export async function fetch(ctx: any) {
+export async function fetch(ctx: UserCtx<void, FetchRowsResponse>) {
   const { tableId } = utils.getSourceId(ctx)
   ctx.body = await sdk.rows.fetch(tableId)
 }
 
-export async function find(ctx: UserCtx<void, GetRowResponse>) {
+export async function find(ctx: UserCtx<void, FindRowResponse>) {
   const { tableId, viewId } = utils.getSourceId(ctx)
   const sourceId = viewId || tableId
   const rowId = ctx.params.rowId
@@ -216,7 +221,6 @@ async function deleteRow(ctx: UserCtx<DeleteRowRequest>) {
 
 export async function destroy(ctx: UserCtx<DeleteRowRequest>) {
   let response, row
-  ctx.status = 200
 
   if (isDeleteRows(ctx.request.body)) {
     response = await deleteRows(ctx)
@@ -239,7 +243,8 @@ export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
 
   await context.ensureSnippetContext(true)
 
-  let { query } = ctx.request.body
+  const searchRequest = ctx.request.body
+  let { query } = searchRequest
   if (query) {
     const allTables = await sdk.tables.getAllTables()
     query = replaceTableNamesInFilters(tableId, query, allTables)
@@ -249,14 +254,24 @@ export async function search(ctx: Ctx<SearchRowRequest, SearchRowResponse>) {
     user: sdk.users.getUserContextBindings(ctx.user),
   })
 
-  const searchParams: RowSearchParams = {
-    ...ctx.request.body,
+  const searchParams: RequiredKeys<RowSearchParams> = {
     query: enrichedQuery,
     tableId,
     viewId,
+    bookmark: searchRequest.bookmark ?? undefined,
+    paginate: searchRequest.paginate,
+    limit: searchRequest.limit,
+    sort: searchRequest.sort ?? undefined,
+    sortOrder: searchRequest.sortOrder,
+    sortType: searchRequest.sortType ?? undefined,
+    countRows: searchRequest.countRows,
+    version: searchRequest.version,
+    disableEscaping: searchRequest.disableEscaping,
+    fields: undefined,
+    indexer: undefined,
+    rows: undefined,
   }
 
-  ctx.status = 200
   ctx.body = await sdk.rows.search(searchParams)
 }
 
@@ -269,19 +284,21 @@ function replaceTableNamesInFilters(
     for (const key of Object.keys(filter)) {
       const matches = key.match(`^(?<relation>.+)\\.(?<field>.+)`)
 
-      const relation = matches?.groups?.["relation"]
+      // this is the possible table name which we need to check if it needs to be converted
+      const relatedTableName = matches?.groups?.["relation"]
       const field = matches?.groups?.["field"]
 
-      if (!relation || !field) {
+      if (!relatedTableName || !field) {
         continue
       }
 
-      const table = allTables.find(r => r._id === tableId)!
-      if (Object.values(table.schema).some(f => f.name === relation)) {
+      const table = allTables.find(r => r._id === tableId)
+      const isColumnName = !!table?.schema[relatedTableName]
+      if (!table || isColumnName) {
         continue
       }
 
-      const matchedTable = allTables.find(t => t.name === relation)
+      const matchedTable = allTables.find(t => t.name === relatedTableName)
       const relationship = Object.values(table.schema).find(
         f => isRelationshipField(f) && f.tableId === matchedTable?._id
       )
@@ -301,7 +318,9 @@ function replaceTableNamesInFilters(
   })
 }
 
-export async function validate(ctx: Ctx<Row, ValidateResponse>) {
+export async function validate(
+  ctx: Ctx<ValidateRowRequest, ValidateRowResponse>
+) {
   const source = await utils.getSource(ctx)
   const table = await utils.getTableFromSource(source)
   // external tables are hard to validate currently
@@ -315,7 +334,9 @@ export async function validate(ctx: Ctx<Row, ValidateResponse>) {
   }
 }
 
-export async function fetchEnrichedRow(ctx: UserCtx<void, Row>) {
+export async function fetchEnrichedRow(
+  ctx: UserCtx<void, FetchEnrichedRowResponse>
+) {
   const { tableId } = utils.getSourceId(ctx)
   ctx.body = await pickApi(tableId).fetchEnrichedRow(ctx)
 }
@@ -353,7 +374,9 @@ export const exportRows = async (
   ctx.body = apiFileReturn(content)
 }
 
-export async function downloadAttachment(ctx: UserCtx) {
+export async function downloadAttachment(
+  ctx: UserCtx<void, DownloadAttachmentResponse>
+) {
   const { columnName } = ctx.params
 
   const { tableId } = utils.getSourceId(ctx)
diff --git a/packages/server/src/api/controllers/row/staticFormula.ts b/packages/server/src/api/controllers/row/staticFormula.ts
index 31a6678012..1feecb4429 100644
--- a/packages/server/src/api/controllers/row/staticFormula.ts
+++ b/packages/server/src/api/controllers/row/staticFormula.ts
@@ -4,21 +4,25 @@ import {
   processAIColumns,
   processFormulas,
 } from "../../../utilities/rowProcessor"
-import { context, features } from "@budibase/backend-core"
-import {
-  Table,
-  Row,
-  FeatureFlag,
-  FormulaType,
-  FieldType,
-  ViewV2,
-} from "@budibase/types"
+import { context } from "@budibase/backend-core"
+import { Table, Row, FormulaType, FieldType, ViewV2 } from "@budibase/types"
 import * as linkRows from "../../../db/linkedRows"
 import isEqual from "lodash/isEqual"
-import { cloneDeep } from "lodash/fp"
+import { cloneDeep, merge } from "lodash/fp"
 import sdk from "../../../sdk"
 import * as pro from "@budibase/pro"
 
+function mergeRows(row1: Row, row2: Row) {
+  const merged = merge(row1, row2)
+  // make sure any specifically undefined fields are removed
+  for (const key of Object.keys(row2)) {
+    if (row2[key] === undefined) {
+      delete merged[key]
+    }
+  }
+  return merged
+}
+
 /**
  * This function runs through a list of enriched rows, looks at the rows which
  * are related and then checks if they need the state of their formulas
@@ -151,28 +155,27 @@ export async function finaliseRow(
     dynamic: false,
     contextRows: [enrichedRow],
   })
+
   const aiEnabled =
-    ((await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
-      (await pro.features.isBudibaseAIEnabled())) ||
-    ((await features.flags.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) &&
-      (await pro.features.isAICustomConfigsEnabled()))
+    (await pro.features.isBudibaseAIEnabled()) ||
+    (await pro.features.isAICustomConfigsEnabled())
   if (aiEnabled) {
     row = await processAIColumns(table, row, {
       contextRows: [enrichedRow],
     })
   }
 
-  const response = await db.put(row)
-  // for response, calculate the formulas for the enriched row
-  enrichedRow._rev = response.rev
+  await db.put(row)
+  const retrieved = await db.tryGet<Row>(row._id)
+  if (!retrieved) {
+    throw new Error(`Unable to retrieve row ${row._id} after saving.`)
+  }
+
+  delete enrichedRow._rev
+  enrichedRow = mergeRows(retrieved, enrichedRow)
   enrichedRow = await processFormulas(table, enrichedRow, {
     dynamic: false,
   })
-  if (aiEnabled) {
-    enrichedRow = await processAIColumns(table, enrichedRow, {
-      contextRows: [enrichedRow],
-    })
-  }
 
   // this updates the related formulas in other rows based on the relations to this row
   if (updateFormula) {
diff --git a/packages/server/src/api/controllers/row/utils/basic.ts b/packages/server/src/api/controllers/row/utils/basic.ts
index a7aa82e1f2..214080382c 100644
--- a/packages/server/src/api/controllers/row/utils/basic.ts
+++ b/packages/server/src/api/controllers/row/utils/basic.ts
@@ -45,7 +45,7 @@ export function getInternalRowId(row: Row, table: Table): string {
 export function generateIdForRow(
   row: Row | undefined,
   table: Table,
-  isLinked: boolean = false
+  isLinked = false
 ): string {
   const primary = table.primary
   if (!row || !primary) {
diff --git a/packages/server/src/api/controllers/row/utils/sqlUtils.ts b/packages/server/src/api/controllers/row/utils/sqlUtils.ts
index af696c0758..1793d64b89 100644
--- a/packages/server/src/api/controllers/row/utils/sqlUtils.ts
+++ b/packages/server/src/api/controllers/row/utils/sqlUtils.ts
@@ -14,7 +14,8 @@ import {
 import { breakExternalTableId } from "../../../../integrations/utils"
 import { generateJunctionTableID } from "../../../../db/utils"
 import sdk from "../../../../sdk"
-import { helpers } from "@budibase/shared-core"
+import { helpers, PROTECTED_INTERNAL_COLUMNS } from "@budibase/shared-core"
+import { sql } from "@budibase/backend-core"
 
 type TableMap = Record<string, Table>
 
@@ -118,45 +119,131 @@ export async function buildSqlFieldList(
   opts?: { relationships: boolean }
 ) {
   const { relationships } = opts || {}
+
+  const nonMappedColumns = [FieldType.LINK, FieldType.FORMULA, FieldType.AI]
+
   function extractRealFields(table: Table, existing: string[] = []) {
     return Object.entries(table.schema)
       .filter(
         ([columnName, column]) =>
-          column.type !== FieldType.LINK &&
-          column.type !== FieldType.FORMULA &&
-          column.type !== FieldType.AI &&
-          !existing.find(
-            (field: string) => field === `${table.name}.${columnName}`
-          )
+          !nonMappedColumns.includes(column.type) &&
+          !existing.find((field: string) => field === columnName)
       )
-      .map(([columnName]) => `${table.name}.${columnName}`)
+      .map(([columnName]) => columnName)
+  }
+
+  function getRequiredFields(table: Table, existing: string[] = []) {
+    const requiredFields: string[] = []
+    if (table.primary) {
+      requiredFields.push(...table.primary)
+    }
+    if (table.primaryDisplay) {
+      requiredFields.push(table.primaryDisplay)
+    }
+
+    if (!sql.utils.isExternalTable(table)) {
+      requiredFields.push(...PROTECTED_INTERNAL_COLUMNS)
+    }
+
+    return requiredFields.filter(
+      column =>
+        !existing.find((field: string) => field === column) &&
+        table.schema[column] &&
+        !nonMappedColumns.includes(table.schema[column].type)
+    )
   }
 
   let fields: string[] = []
-  if (sdk.views.isView(source)) {
-    fields = Object.keys(helpers.views.basicFields(source))
-  } else {
-    fields = extractRealFields(source)
-  }
+
+  const isView = sdk.views.isView(source)
 
   let table: Table
-  if (sdk.views.isView(source)) {
+  if (isView) {
     table = await sdk.views.getTable(source.id)
+
+    fields = Object.keys(helpers.views.basicFields(source)).filter(
+      f => table.schema[f].type !== FieldType.LINK
+    )
   } else {
     table = source
+    fields = extractRealFields(source).filter(
+      f => table.schema[f].visible !== false
+    )
   }
 
-  for (let field of Object.values(table.schema)) {
+  const containsFormula = (isView ? fields : Object.keys(table.schema)).some(
+    f => table.schema[f]?.type === FieldType.FORMULA
+  )
+  // If are requesting for a formula field, we need to retrieve all fields
+  if (containsFormula) {
+    fields = extractRealFields(table)
+  }
+
+  if (!isView || !helpers.views.isCalculationView(source)) {
+    fields.push(
+      ...getRequiredFields(
+        {
+          ...table,
+          primaryDisplay: source.primaryDisplay || table.primaryDisplay,
+        },
+        fields
+      )
+    )
+  }
+
+  fields = fields.map(c => `${table.name}.${c}`)
+
+  for (const field of Object.values(table.schema)) {
     if (field.type !== FieldType.LINK || !relationships || !field.tableId) {
       continue
     }
-    const { tableName } = breakExternalTableId(field.tableId)
-    if (tables[tableName]) {
-      fields = fields.concat(extractRealFields(tables[tableName], fields))
+
+    if (
+      isView &&
+      (!source.schema?.[field.name] ||
+        !helpers.views.isVisible(source.schema[field.name])) &&
+      !containsFormula
+    ) {
+      continue
     }
+
+    const { tableName } = breakExternalTableId(field.tableId)
+    const relatedTable = tables[tableName]
+    if (!relatedTable) {
+      continue
+    }
+
+    const viewFields = new Set<string>()
+    if (containsFormula) {
+      extractRealFields(relatedTable).forEach(f => viewFields.add(f))
+    } else {
+      relatedTable.primary?.forEach(f => viewFields.add(f))
+      if (relatedTable.primaryDisplay) {
+        viewFields.add(relatedTable.primaryDisplay)
+      }
+
+      if (isView) {
+        Object.entries(source.schema?.[field.name]?.columns || {})
+          .filter(
+            ([columnName, columnConfig]) =>
+              relatedTable.schema[columnName] &&
+              helpers.views.isVisible(columnConfig) &&
+              ![FieldType.LINK, FieldType.FORMULA].includes(
+                relatedTable.schema[columnName].type
+              )
+          )
+          .forEach(([field]) => viewFields.add(field))
+      }
+    }
+
+    const fieldsToAdd = Array.from(viewFields)
+      .filter(f => !nonMappedColumns.includes(relatedTable.schema[f].type))
+      .map(f => `${relatedTable.name}.${f}`)
+      .filter(f => !fields.includes(f))
+    fields.push(...fieldsToAdd)
   }
 
-  return fields
+  return [...new Set(fields)]
 }
 
 export function isKnexEmptyReadResponse(resp: DatasourcePlusQueryResponse) {
diff --git a/packages/server/src/api/controllers/row/utils/tests/sqlUtils.spec.ts b/packages/server/src/api/controllers/row/utils/tests/sqlUtils.spec.ts
new file mode 100644
index 0000000000..365f571fcf
--- /dev/null
+++ b/packages/server/src/api/controllers/row/utils/tests/sqlUtils.spec.ts
@@ -0,0 +1,511 @@
+import {
+  AIOperationEnum,
+  CalculationType,
+  FieldType,
+  RelationshipType,
+  SourceName,
+  Table,
+  ViewV2,
+  ViewV2Type,
+} from "@budibase/types"
+import { buildSqlFieldList } from "../sqlUtils"
+import { structures } from "../../../../routes/tests/utilities"
+import { sql } from "@budibase/backend-core"
+import { generator } from "@budibase/backend-core/tests"
+import { generateViewID } from "../../../../../db/utils"
+
+import sdk from "../../../../../sdk"
+import { cloneDeep } from "lodash"
+import { utils } from "@budibase/shared-core"
+
+jest.mock("../../../../../sdk/app/views", () => ({
+  ...jest.requireActual("../../../../../sdk/app/views"),
+  getTable: jest.fn(),
+}))
+const getTableMock = sdk.views.getTable as jest.MockedFunction<
+  typeof sdk.views.getTable
+>
+
+describe("buildSqlFieldList", () => {
+  let allTables: Record<string, Table>
+
+  class TableConfig {
+    private _table: Table & { _id: string }
+
+    constructor(name: string) {
+      this._table = {
+        ...structures.tableForDatasource({
+          type: "datasource",
+          source: SourceName.POSTGRES,
+        }),
+        name,
+        _id: sql.utils.buildExternalTableId("ds_id", name),
+        schema: {
+          name: {
+            name: "name",
+            type: FieldType.STRING,
+          },
+          description: {
+            name: "description",
+            type: FieldType.STRING,
+          },
+          amount: {
+            name: "amount",
+            type: FieldType.NUMBER,
+          },
+        },
+      }
+
+      allTables[name] = this._table
+    }
+
+    withHiddenField(field: string) {
+      this._table.schema[field].visible = false
+      return this
+    }
+
+    withField(
+      name: string,
+      type:
+        | FieldType.STRING
+        | FieldType.NUMBER
+        | FieldType.FORMULA
+        | FieldType.AI,
+      options?: { visible: boolean }
+    ) {
+      switch (type) {
+        case FieldType.NUMBER:
+        case FieldType.STRING:
+          this._table.schema[name] = {
+            name,
+            type,
+            ...options,
+          }
+          break
+        case FieldType.FORMULA:
+          this._table.schema[name] = {
+            name,
+            type,
+            formula: "any",
+            ...options,
+          }
+          break
+        case FieldType.AI:
+          this._table.schema[name] = {
+            name,
+            type,
+            operation: AIOperationEnum.PROMPT,
+            ...options,
+          }
+          break
+        default:
+          utils.unreachable(type)
+      }
+      return this
+    }
+
+    withRelation(name: string, toTableId: string) {
+      this._table.schema[name] = {
+        name,
+        type: FieldType.LINK,
+        relationshipType: RelationshipType.ONE_TO_MANY,
+        fieldName: "link",
+        tableId: toTableId,
+      }
+      return this
+    }
+
+    withPrimary(field: string) {
+      this._table.primary = [field]
+      return this
+    }
+
+    withDisplay(field: string) {
+      this._table.primaryDisplay = field
+      return this
+    }
+
+    create() {
+      return cloneDeep(this._table)
+    }
+  }
+
+  class ViewConfig {
+    private _table: Table
+    private _view: ViewV2
+
+    constructor(table: Table) {
+      this._table = table
+      this._view = {
+        version: 2,
+        id: generateViewID(table._id!),
+        name: generator.word(),
+        tableId: table._id!,
+      }
+    }
+
+    withVisible(field: string) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].visible = true
+      return this
+    }
+
+    withHidden(field: string) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].visible = false
+      return this
+    }
+
+    withRelationshipColumns(
+      field: string,
+      columns: Record<string, { visible: boolean }>
+    ) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].columns = columns
+      return this
+    }
+
+    withCalculation(
+      name: string,
+      field: string,
+      calculationType: CalculationType
+    ) {
+      this._view.type = ViewV2Type.CALCULATION
+      this._view.schema ??= {}
+      this._view.schema[name] = {
+        field,
+        calculationType,
+        visible: true,
+      }
+      return this
+    }
+
+    create() {
+      getTableMock.mockResolvedValueOnce(this._table)
+      return cloneDeep(this._view)
+    }
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    allTables = {}
+  })
+
+  describe("table", () => {
+    it("extracts fields from table schema", async () => {
+      const table = new TableConfig("table").create()
+      const result = await buildSqlFieldList(table, {})
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+      ])
+    })
+
+    it("excludes hidden fields", async () => {
+      const table = new TableConfig("table")
+        .withHiddenField("description")
+        .create()
+      const result = await buildSqlFieldList(table, {})
+      expect(result).toEqual(["table.name", "table.amount"])
+    })
+
+    it("excludes non-sql fields fields", async () => {
+      const table = new TableConfig("table")
+        .withField("formula", FieldType.FORMULA)
+        .withField("ai", FieldType.AI)
+        .withRelation("link", "otherTableId")
+        .create()
+
+      const result = await buildSqlFieldList(table, {})
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+      ])
+    })
+
+    it("includes hidden fields if there is a formula column", async () => {
+      const table = new TableConfig("table")
+        .withHiddenField("description")
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const result = await buildSqlFieldList(table, {})
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+      ])
+    })
+
+    it("includes relationships fields when flagged", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withPrimary("id")
+        .withDisplay("name")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const result = await buildSqlFieldList(table, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+        "linkedTable.id",
+        "linkedTable.name",
+      ])
+    })
+
+    it("includes all relationship fields if there is a formula column", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("hidden", FieldType.STRING, { visible: false })
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const result = await buildSqlFieldList(table, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+        "linkedTable.name",
+        "linkedTable.description",
+        "linkedTable.amount",
+        "linkedTable.hidden",
+      ])
+    })
+
+    it("never includes non-sql columns from relationships", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withField("hidden", FieldType.STRING, { visible: false })
+        .withField("formula", FieldType.FORMULA)
+        .withField("ai", FieldType.AI)
+        .withRelation("link", "otherTableId")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const result = await buildSqlFieldList(table, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+        "linkedTable.name",
+        "linkedTable.description",
+        "linkedTable.amount",
+        "linkedTable.id",
+        "linkedTable.hidden",
+      ])
+    })
+  })
+
+  describe("view", () => {
+    it("extracts fields from table schema", async () => {
+      const view = new ViewConfig(new TableConfig("table").create())
+        .withVisible("amount")
+        .withHidden("name")
+        .create()
+
+      const result = await buildSqlFieldList(view, {})
+      expect(result).toEqual(["table.amount"])
+    })
+
+    it("includes all fields if there is a formula column", async () => {
+      const table = new TableConfig("table")
+        .withField("formula", FieldType.FORMULA)
+        .create()
+      const view = new ViewConfig(table)
+        .withHidden("name")
+        .withVisible("amount")
+        .withVisible("formula")
+        .create()
+
+      const result = await buildSqlFieldList(view, {})
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+      ])
+    })
+
+    it("does not includes all fields if the formula column is not included", async () => {
+      const table = new TableConfig("table")
+        .withField("formula", FieldType.FORMULA)
+        .create()
+      const view = new ViewConfig(table)
+        .withHidden("name")
+        .withVisible("amount")
+        .withHidden("formula")
+        .create()
+
+      const result = await buildSqlFieldList(view, {})
+      expect(result).toEqual(["table.amount"])
+    })
+
+    it("includes relationships columns", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withField("formula", FieldType.FORMULA)
+        .withPrimary("id")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withVisible("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const result = await buildSqlFieldList(view, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual([
+        "table.name",
+        "linkedTable.id",
+        "linkedTable.amount",
+      ])
+    })
+
+    it("excludes relationships fields when view is not included in the view", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withPrimary("id")
+        .withDisplay("name")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withHidden("amount")
+        .create()
+
+      const result = await buildSqlFieldList(view, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual(["table.name"])
+    })
+
+    it("does not include relationships columns for hidden links", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withField("formula", FieldType.FORMULA)
+        .withPrimary("id")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withHidden("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const result = await buildSqlFieldList(view, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual(["table.name"])
+    })
+
+    it("includes all relationship fields if there is a formula column", async () => {
+      const otherTable = new TableConfig("linkedTable")
+        .withField("id", FieldType.NUMBER)
+        .withField("hidden", FieldType.STRING, { visible: false })
+        .withField("formula", FieldType.FORMULA)
+        .withField("ai", FieldType.AI)
+        .withRelation("link", "otherTableId")
+        .withPrimary("id")
+        .create()
+
+      const table = new TableConfig("table")
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withVisible("formula")
+        .withHidden("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const result = await buildSqlFieldList(view, allTables, {
+        relationships: true,
+      })
+      expect(result).toEqual([
+        "table.name",
+        "table.description",
+        "table.amount",
+        "linkedTable.name",
+        "linkedTable.description",
+        "linkedTable.amount",
+        "linkedTable.id",
+        "linkedTable.hidden",
+      ])
+    })
+  })
+
+  describe("calculation view", () => {
+    it("does not include calculation fields", async () => {
+      const view = new ViewConfig(new TableConfig("table").create())
+        .withCalculation("average", "amount", CalculationType.AVG)
+
+        .create()
+
+      const result = await buildSqlFieldList(view, {})
+      expect(result).toEqual([])
+    })
+
+    it("includes visible fields calculation fields", async () => {
+      const view = new ViewConfig(new TableConfig("table").create())
+        .withCalculation("average", "amount", CalculationType.AVG)
+        .withHidden("name")
+        .withVisible("amount")
+
+        .create()
+
+      const result = await buildSqlFieldList(view, {})
+      expect(result).toEqual(["table.amount"])
+    })
+  })
+})
diff --git a/packages/server/src/api/controllers/row/utils/utils.ts b/packages/server/src/api/controllers/row/utils/utils.ts
index 4188fcced3..0f4056c201 100644
--- a/packages/server/src/api/controllers/row/utils/utils.ts
+++ b/packages/server/src/api/controllers/row/utils/utils.ts
@@ -1,6 +1,6 @@
 import * as utils from "../../../../db/utils"
 
-import { docIds } from "@budibase/backend-core"
+import { docIds, sql } from "@budibase/backend-core"
 import {
   Ctx,
   DatasourcePlusQueryResponse,
@@ -66,18 +66,18 @@ export function getSourceId(ctx: Ctx): { tableId: string; viewId?: string } {
     if (docIds.isViewId(sourceId)) {
       return {
         tableId: utils.extractViewInfoFromID(sourceId).tableId,
-        viewId: sourceId,
+        viewId: sql.utils.encodeViewId(sourceId),
       }
     }
-    return { tableId: ctx.params.sourceId }
+    return { tableId: sql.utils.encodeTableId(ctx.params.sourceId) }
   }
   // now check for old way of specifying table ID
   if (ctx.params?.tableId) {
-    return { tableId: ctx.params.tableId }
+    return { tableId: sql.utils.encodeTableId(ctx.params.tableId) }
   }
   // check body for a table ID
   if (ctx.request.body?.tableId) {
-    return { tableId: ctx.request.body.tableId }
+    return { tableId: sql.utils.encodeTableId(ctx.request.body.tableId) }
   }
   throw new Error("Unable to find table ID in request")
 }
@@ -110,6 +110,21 @@ function fixBooleanFields(row: Row, table: Table) {
   return row
 }
 
+export function getSourceFields(source: Table | ViewV2): string[] {
+  const isView = sdk.views.isView(source)
+  if (isView) {
+    const fields = Object.keys(
+      helpers.views.basicFields(source, { visible: true })
+    )
+    return fields
+  }
+
+  const fields = Object.entries(source.schema)
+    .filter(([_, field]) => field.visible !== false)
+    .map(([columnName]) => columnName)
+  return fields
+}
+
 export async function sqlOutputProcessing(
   rows: DatasourcePlusQueryResponse,
   source: Table | ViewV2,
@@ -175,7 +190,7 @@ export async function enrichArrayContext(
 }
 
 export async function enrichSearchContext(
-  fields: Record<string, any>,
+  fields: Record<string, any> | undefined,
   inputs = {},
   helpers = true
 ): Promise<Record<string, any>> {
diff --git a/packages/server/src/api/controllers/row/views.ts b/packages/server/src/api/controllers/row/views.ts
index b8d01424f2..418aa462c4 100644
--- a/packages/server/src/api/controllers/row/views.ts
+++ b/packages/server/src/api/controllers/row/views.ts
@@ -1,16 +1,16 @@
 import {
   UserCtx,
   ViewV2,
-  SearchRowResponse,
   SearchViewRowRequest,
   RequiredKeys,
   RowSearchParams,
+  PaginatedSearchRowResponse,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 import { context } from "@budibase/backend-core"
 
 export async function searchView(
-  ctx: UserCtx<SearchViewRowRequest, SearchRowResponse>
+  ctx: UserCtx<SearchViewRowRequest, PaginatedSearchRowResponse>
 ) {
   const { viewId } = ctx.params
 
@@ -29,33 +29,41 @@ export async function searchView(
 
   await context.ensureSnippetContext(true)
 
-  const searchOptions: RequiredKeys<SearchViewRowRequest> &
-    RequiredKeys<
-      Pick<RowSearchParams, "tableId" | "viewId" | "query" | "fields">
-    > = {
+  const searchOptions: RequiredKeys<RowSearchParams> = {
     tableId: view.tableId,
     viewId: view.id,
-    query: body.query,
+    query: body.query || {},
     fields: viewFields,
     ...getSortOptions(body, view),
     limit: body.limit,
-    bookmark: body.bookmark,
+    bookmark: body.bookmark ?? undefined,
     paginate: body.paginate,
     countRows: body.countRows,
+    version: undefined,
+    disableEscaping: undefined,
+    indexer: undefined,
+    rows: undefined,
   }
 
   const result = await sdk.rows.search(searchOptions, {
     user: sdk.users.getUserContextBindings(ctx.user),
   })
   result.rows.forEach(r => (r._viewId = view.id))
-  ctx.body = result
+
+  ctx.body = {
+    rows: result.rows,
+    bookmark: result.bookmark,
+    hasNextPage: result.hasNextPage,
+    totalRows: result.totalRows,
+  }
 }
+
 function getSortOptions(request: SearchViewRowRequest, view: ViewV2) {
   if (request.sort) {
     return {
       sort: request.sort,
       sortOrder: request.sortOrder,
-      sortType: request.sortType,
+      sortType: request.sortType ?? undefined,
     }
   }
   if (view.sort) {
diff --git a/packages/server/src/api/controllers/rowAction/crud.ts b/packages/server/src/api/controllers/rowAction/crud.ts
index 3baaff6fcc..525fcabcfc 100644
--- a/packages/server/src/api/controllers/rowAction/crud.ts
+++ b/packages/server/src/api/controllers/rowAction/crud.ts
@@ -6,6 +6,7 @@ import {
   RowActionResponse,
   RowActionsResponse,
 } from "@budibase/types"
+import { events } from "@budibase/backend-core"
 import sdk from "../../../sdk"
 
 async function getTable(ctx: Ctx) {
@@ -59,6 +60,8 @@ export async function create(
     name: ctx.request.body.name,
   })
 
+  await events.rowAction.created(createdAction)
+
   ctx.body = {
     tableId,
     id: createdAction.id,
diff --git a/packages/server/src/api/controllers/rowAction/run.ts b/packages/server/src/api/controllers/rowAction/run.ts
index 05bdb7bace..069e38b86a 100644
--- a/packages/server/src/api/controllers/rowAction/run.ts
+++ b/packages/server/src/api/controllers/rowAction/run.ts
@@ -1,10 +1,16 @@
-import { RowActionTriggerRequest, Ctx } from "@budibase/types"
+import {
+  RowActionTriggerRequest,
+  Ctx,
+  RowActionTriggerResponse,
+} from "@budibase/types"
 import sdk from "../../../sdk"
 
-export async function run(ctx: Ctx<RowActionTriggerRequest, void>) {
+export async function run(
+  ctx: Ctx<RowActionTriggerRequest, RowActionTriggerResponse>
+) {
   const { tableId, actionId } = ctx.params
   const { rowId } = ctx.request.body
 
   await sdk.rowActions.run(tableId, actionId, rowId, ctx.user)
-  ctx.status = 200
+  ctx.body = { message: "Row action triggered." }
 }
diff --git a/packages/server/src/api/controllers/screen.ts b/packages/server/src/api/controllers/screen.ts
index ee8e0ff892..ad000871fe 100644
--- a/packages/server/src/api/controllers/screen.ts
+++ b/packages/server/src/api/controllers/screen.ts
@@ -10,13 +10,16 @@ import { updateAppPackage } from "./application"
 import {
   Plugin,
   ScreenProps,
-  BBContext,
   Screen,
   UserCtx,
+  FetchScreenResponse,
+  SaveScreenRequest,
+  SaveScreenResponse,
+  DeleteScreenResponse,
 } from "@budibase/types"
 import { builderSocket } from "../../websockets"
 
-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx<void, FetchScreenResponse>) {
   const db = context.getAppDB()
 
   const screens = (
@@ -37,7 +40,9 @@ export async function fetch(ctx: BBContext) {
   )
 }
 
-export async function save(ctx: UserCtx<Screen, Screen>) {
+export async function save(
+  ctx: UserCtx<SaveScreenRequest, SaveScreenResponse>
+) {
   const db = context.getAppDB()
   let screen = ctx.request.body
 
@@ -107,7 +112,7 @@ export async function save(ctx: UserCtx<Screen, Screen>) {
   builderSocket?.emitScreenUpdate(ctx, savedScreen)
 }
 
-export async function destroy(ctx: BBContext) {
+export async function destroy(ctx: UserCtx<void, DeleteScreenResponse>) {
   const db = context.getAppDB()
   const id = ctx.params.screenId
   const screen = await db.get<Screen>(id)
@@ -118,7 +123,6 @@ export async function destroy(ctx: BBContext) {
   ctx.body = {
     message: "Screen deleted successfully",
   }
-  ctx.status = 200
   builderSocket?.emitScreenDeletion(ctx, id)
 }
 
diff --git a/packages/server/src/api/controllers/script.ts b/packages/server/src/api/controllers/script.ts
index 0565b30f74..ac6ac24fcc 100644
--- a/packages/server/src/api/controllers/script.ts
+++ b/packages/server/src/api/controllers/script.ts
@@ -14,7 +14,3 @@ export async function execute(ctx: Ctx) {
     throw err
   }
 }
-
-export async function save(ctx: Ctx) {
-  ctx.throw(501, "Not currently implemented")
-}
diff --git a/packages/server/src/api/controllers/static/index.ts b/packages/server/src/api/controllers/static/index.ts
index 1bf04e94f0..0dd5e77c50 100644
--- a/packages/server/src/api/controllers/static/index.ts
+++ b/packages/server/src/api/controllers/static/index.ts
@@ -27,7 +27,13 @@ import {
   Ctx,
   DocumentType,
   Feature,
+  GetSignedUploadUrlRequest,
+  GetSignedUploadUrlResponse,
   ProcessAttachmentResponse,
+  ServeAppResponse,
+  ServeBuilderPreviewResponse,
+  ServeClientLibraryResponse,
+  ToggleBetaFeatureResponse,
   UserCtx,
 } from "@budibase/types"
 import {
@@ -38,7 +44,9 @@ import {
 import send from "koa-send"
 import { getThemeVariables } from "../../../constants/themes"
 
-export const toggleBetaUiFeature = async function (ctx: Ctx) {
+export const toggleBetaUiFeature = async function (
+  ctx: Ctx<void, ToggleBetaFeatureResponse>
+) {
   const cookieName = `beta:${ctx.params.feature}`
 
   if (ctx.cookies.get(cookieName)) {
@@ -66,13 +74,13 @@ export const toggleBetaUiFeature = async function (ctx: Ctx) {
   }
 }
 
-export const serveBuilder = async function (ctx: Ctx) {
+export const serveBuilder = async function (ctx: Ctx<void, void>) {
   const builderPath = join(TOP_LEVEL_PATH, "builder")
   await send(ctx, ctx.file, { root: builderPath })
 }
 
 export const uploadFile = async function (
-  ctx: Ctx<{}, ProcessAttachmentResponse>
+  ctx: Ctx<void, ProcessAttachmentResponse>
 ) {
   const file = ctx.request?.files?.file
   if (!file) {
@@ -144,7 +152,7 @@ const requiresMigration = async (ctx: Ctx) => {
   return latestMigrationApplied !== latestMigration
 }
 
-export const serveApp = async function (ctx: UserCtx) {
+export const serveApp = async function (ctx: UserCtx<void, ServeAppResponse>) {
   if (ctx.url.includes("apple-touch-icon.png")) {
     ctx.redirect("/builder/bblogo.png")
     return
@@ -249,7 +257,9 @@ export const serveApp = async function (ctx: UserCtx) {
   }
 }
 
-export const serveBuilderPreview = async function (ctx: Ctx) {
+export const serveBuilderPreview = async function (
+  ctx: Ctx<void, ServeBuilderPreviewResponse>
+) {
   const db = context.getAppDB({ skip_setup: true })
   const appInfo = await db.get<App>(DocumentType.APP_METADATA)
 
@@ -268,7 +278,9 @@ export const serveBuilderPreview = async function (ctx: Ctx) {
   }
 }
 
-export const serveClientLibrary = async function (ctx: Ctx) {
+export const serveClientLibrary = async function (
+  ctx: Ctx<void, ServeClientLibraryResponse>
+) {
   const version = ctx.request.query.version
 
   if (Array.isArray(version)) {
@@ -297,7 +309,9 @@ export const serveClientLibrary = async function (ctx: Ctx) {
   }
 }
 
-export const getSignedUploadURL = async function (ctx: Ctx) {
+export const getSignedUploadURL = async function (
+  ctx: Ctx<GetSignedUploadUrlRequest, GetSignedUploadUrlResponse>
+) {
   // Ensure datasource is valid
   let datasource
   try {
diff --git a/packages/server/src/api/controllers/static/templates/preview.hbs b/packages/server/src/api/controllers/static/templates/preview.hbs
index 87b9ad6ea3..750a780897 100644
--- a/packages/server/src/api/controllers/static/templates/preview.hbs
+++ b/packages/server/src/api/controllers/static/templates/preview.hbs
@@ -73,7 +73,8 @@
         hiddenComponentIds,
         usedPlugins,
         location,
-        snippets
+        snippets,
+        componentErrors
       } = parsed
 
       // Set some flags so the app knows we're in the builder
@@ -91,6 +92,7 @@
       window["##BUDIBASE_USED_PLUGINS##"] = usedPlugins
       window["##BUDIBASE_LOCATION##"] = location
       window["##BUDIBASE_SNIPPETS##"] = snippets
+      window['##BUDIBASE_COMPONENT_ERRORS##'] = componentErrors
 
       // Initialise app
       try {
diff --git a/packages/server/src/api/controllers/table/ExternalRequest.ts b/packages/server/src/api/controllers/table/ExternalRequest.ts
index 1e57ea3294..df5707b072 100644
--- a/packages/server/src/api/controllers/table/ExternalRequest.ts
+++ b/packages/server/src/api/controllers/table/ExternalRequest.ts
@@ -11,27 +11,24 @@ export async function makeTableRequest(
   datasource: Datasource,
   operation: Operation,
   table: Table,
-  tables: Record<string, Table>,
   oldTable?: Table,
   renamed?: RenameColumn
 ) {
   const json: QueryJson = {
     endpoint: {
-      datasourceId: datasource._id!,
-      entityId: table._id!,
+      datasourceId: datasource,
+      entityId: table,
       operation,
     },
-    meta: {
-      table,
-      tables,
-    },
-    table,
+  }
+  if (!json.meta) {
+    json.meta = {}
   }
   if (oldTable) {
-    json.meta!.table = oldTable
+    json.meta.oldTable = oldTable
   }
   if (renamed) {
-    json.meta!.renamed = renamed
+    json.meta.renamed = renamed
   }
-  return makeExternalQuery(datasource, json)
+  return makeExternalQuery(json)
 }
diff --git a/packages/server/src/api/controllers/table/external.ts b/packages/server/src/api/controllers/table/external.ts
index 6f09bf4a61..d3f5ef99f6 100644
--- a/packages/server/src/api/controllers/table/external.ts
+++ b/packages/server/src/api/controllers/table/external.ts
@@ -45,13 +45,13 @@ export async function updateTable(
     inputs.created = true
   }
   try {
-    const { datasource, table } = await sdk.tables.external.save(
+    const { datasource, oldTable, table } = await sdk.tables.external.save(
       datasourceId!,
       inputs,
       { tableId, renaming }
     )
     builderSocket?.emitDatasourceUpdate(ctx, datasource)
-    return table
+    return { table, oldTable }
   } catch (err: any) {
     if (err instanceof Error) {
       ctx.throw(400, err.message)
diff --git a/packages/server/src/api/controllers/table/index.ts b/packages/server/src/api/controllers/table/index.ts
index 77c1f3923a..06d44bc41c 100644
--- a/packages/server/src/api/controllers/table/index.ts
+++ b/packages/server/src/api/controllers/table/index.ts
@@ -19,23 +19,25 @@ import {
   EventType,
   FetchTablesResponse,
   FieldType,
-  MigrateRequest,
-  MigrateResponse,
+  MigrateTableRequest,
+  MigrateTableResponse,
   SaveTableRequest,
   SaveTableResponse,
   Table,
-  TableResponse,
+  FindTableResponse,
   TableSourceType,
   UserCtx,
   ValidateNewTableImportRequest,
   ValidateTableImportRequest,
   ValidateTableImportResponse,
+  DeleteTableResponse,
 } from "@budibase/types"
 import sdk from "../../../sdk"
 import { jsonFromCsvString } from "../../../utilities/csv"
 import { builderSocket } from "../../../websockets"
 import { cloneDeep } from "lodash"
 import {
+  canBeDisplayColumn,
   helpers,
   PROTECTED_EXTERNAL_COLUMNS,
   PROTECTED_INTERNAL_COLUMNS,
@@ -66,6 +68,27 @@ function checkDefaultFields(table: Table) {
   }
 }
 
+async function guardTable(table: Table, isCreate: boolean) {
+  checkDefaultFields(table)
+
+  if (
+    table.primaryDisplay &&
+    !canBeDisplayColumn(table.schema[table.primaryDisplay]?.type)
+  ) {
+    // Prevent throwing errors from existing badly configured tables. Only throw for new tables or if this setting is being updated
+    if (
+      isCreate ||
+      (await sdk.tables.getTable(table._id!)).primaryDisplay !==
+        table.primaryDisplay
+    ) {
+      throw new HTTPError(
+        `Column "${table.primaryDisplay}" cannot be used as a display type.`,
+        400
+      )
+    }
+  }
+}
+
 // covers both internal and external
 export async function fetch(ctx: UserCtx<void, FetchTablesResponse>) {
   const internal = await sdk.tables.getAllInternalTables()
@@ -94,7 +117,7 @@ export async function fetch(ctx: UserCtx<void, FetchTablesResponse>) {
   ctx.body = result
 }
 
-export async function find(ctx: UserCtx<void, TableResponse>) {
+export async function find(ctx: UserCtx<void, FindTableResponse>) {
   const tableId = ctx.params.tableId
   const table = await sdk.tables.getTable(tableId)
 
@@ -110,7 +133,7 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
 
   const isCreate = !table._id
 
-  checkDefaultFields(table)
+  await guardTable(table, isCreate)
 
   let savedTable: Table
   if (isCreate) {
@@ -119,8 +142,15 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
     await events.table.created(savedTable)
   } else {
     const api = pickApi({ table })
-    savedTable = await api.updateTable(ctx, renaming)
-    await events.table.updated(savedTable)
+    const { table: updatedTable, oldTable } = await api.updateTable(
+      ctx,
+      renaming
+    )
+    savedTable = updatedTable
+
+    if (oldTable) {
+      await events.table.updated(oldTable, savedTable)
+    }
   }
   if (renaming) {
     await sdk.views.renameLinkedViews(savedTable, renaming)
@@ -128,7 +158,6 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
   if (isImport) {
     await events.table.imported(savedTable)
   }
-  ctx.status = 200
   ctx.message = `Table ${table.name} saved successfully.`
   ctx.eventEmitter?.emitTable(EventType.TABLE_SAVE, appId, { ...savedTable })
   ctx.body = savedTable
@@ -137,7 +166,7 @@ export async function save(ctx: UserCtx<SaveTableRequest, SaveTableResponse>) {
   builderSocket?.emitTableUpdate(ctx, cloneDeep(savedTable))
 }
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, DeleteTableResponse>) {
   const appId = ctx.appId
   const tableId = ctx.params.tableId
   await sdk.rowActions.deleteAll(tableId)
@@ -145,7 +174,6 @@ export async function destroy(ctx: UserCtx) {
   await events.table.deleted(deletedTable)
 
   ctx.eventEmitter?.emitTable(EventType.TABLE_DELETE, appId, deletedTable)
-  ctx.status = 200
   ctx.table = deletedTable
   ctx.body = { message: `Table ${tableId} deleted.` }
   builderSocket?.emitTableDeletion(ctx, deletedTable)
@@ -161,7 +189,6 @@ export async function bulkImport(
   // can only be done in the builder, but in the future we may need to
   // think about events for bulk items
 
-  ctx.status = 200
   ctx.body = { message: `Bulk rows created.` }
 }
 
@@ -172,7 +199,6 @@ export async function csvToJson(
 
   const result = await jsonFromCsvString(csvString)
 
-  ctx.status = 200
   ctx.body = result
 }
 
@@ -182,7 +208,6 @@ export async function validateNewTableImport(
   const { rows, schema } = ctx.request.body
 
   if (isRows(rows) && isSchema(schema)) {
-    ctx.status = 200
     ctx.body = validateSchema(rows, schema, PROTECTED_INTERNAL_COLUMNS)
   } else {
     ctx.status = 422
@@ -216,14 +241,15 @@ export async function validateExistingTableImport(
   }
 
   if (tableId && isRows(rows) && isSchema(schema)) {
-    ctx.status = 200
     ctx.body = validateSchema(rows, schema, protectedColumnNames)
   } else {
     ctx.status = 422
   }
 }
 
-export async function migrate(ctx: UserCtx<MigrateRequest, MigrateResponse>) {
+export async function migrate(
+  ctx: UserCtx<MigrateTableRequest, MigrateTableResponse>
+) {
   const { oldColumn, newColumn } = ctx.request.body
   let tableId = ctx.params.tableId as string
   const table = await sdk.tables.getTable(tableId)
@@ -235,6 +261,5 @@ export async function migrate(ctx: UserCtx<MigrateRequest, MigrateResponse>) {
     })
   }
 
-  ctx.status = 200
   ctx.body = { message: `Column ${oldColumn} migrated.` }
 }
diff --git a/packages/server/src/api/controllers/table/internal.ts b/packages/server/src/api/controllers/table/internal.ts
index 40ce5e279d..67c4ec100c 100644
--- a/packages/server/src/api/controllers/table/internal.ts
+++ b/packages/server/src/api/controllers/table/internal.ts
@@ -30,14 +30,14 @@ export async function updateTable(
   }
 
   try {
-    const { table } = await sdk.tables.internal.save(tableToSave, {
+    const { table, oldTable } = await sdk.tables.internal.save(tableToSave, {
       userId: ctx.user._id,
       rowsToImport: rows,
       tableId: ctx.request.body._id,
       renaming,
     })
 
-    return table
+    return { table, oldTable }
   } catch (err: any) {
     if (err instanceof Error) {
       ctx.throw(400, err.message)
diff --git a/packages/server/src/api/controllers/templates.ts b/packages/server/src/api/controllers/templates.ts
index 6774fa2766..fd3e28aa55 100644
--- a/packages/server/src/api/controllers/templates.ts
+++ b/packages/server/src/api/controllers/templates.ts
@@ -1,13 +1,17 @@
 import nodeFetch from "node-fetch"
 import { downloadTemplate as dlTemplate } from "../../utilities/fileSystem"
 import env from "../../environment"
-import { BBContext } from "@budibase/types"
+import {
+  DownloadTemplateResponse,
+  FetchGlobalTemplateResponse,
+  UserCtx,
+} from "@budibase/types"
 
 // development flag, can be used to test against templates exported locally
 const DEFAULT_TEMPLATES_BUCKET =
   "prod-budi-templates.s3-eu-west-1.amazonaws.com"
 
-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: UserCtx<void, FetchGlobalTemplateResponse>) {
   let type = env.TEMPLATE_REPOSITORY
   let response,
     error = false
@@ -32,7 +36,9 @@ export async function fetch(ctx: BBContext) {
 
 // can't currently test this, have to ignore from coverage
 /* istanbul ignore next */
-export async function downloadTemplate(ctx: BBContext) {
+export async function downloadTemplate(
+  ctx: UserCtx<void, DownloadTemplateResponse>
+) {
   const { type, name } = ctx.params
 
   await dlTemplate(type, name)
diff --git a/packages/server/src/api/controllers/user.ts b/packages/server/src/api/controllers/user.ts
index 108e29fd3d..d8ce37edb4 100644
--- a/packages/server/src/api/controllers/user.ts
+++ b/packages/server/src/api/controllers/user.ts
@@ -7,19 +7,24 @@ import {
   FetchUserMetadataResponse,
   FindUserMetadataResponse,
   Flags,
-  SetFlagRequest,
+  SetUserFlagRequest,
+  UpdateSelfMetadataRequest,
+  UpdateSelfMetadataResponse,
+  UpdateUserMetadataResponse,
+  UpdateUserMetadataRequest,
   UserCtx,
-  UserMetadata,
+  DeleteUserMetadataResponse,
+  SetUserFlagResponse,
+  GetUserFlagsResponse,
 } from "@budibase/types"
 import sdk from "../../sdk"
-import { DocumentInsertResponse } from "@budibase/nano"
 
 export async function fetchMetadata(ctx: Ctx<void, FetchUserMetadataResponse>) {
   ctx.body = await sdk.users.fetchMetadata()
 }
 
 export async function updateSelfMetadata(
-  ctx: UserCtx<UserMetadata, DocumentInsertResponse>
+  ctx: UserCtx<UpdateSelfMetadataRequest, UpdateSelfMetadataResponse>
 ) {
   // overwrite the ID with current users
   ctx.request.body._id = ctx.user?._id
@@ -31,7 +36,7 @@ export async function updateSelfMetadata(
 }
 
 export async function updateMetadata(
-  ctx: UserCtx<UserMetadata, DocumentInsertResponse>
+  ctx: UserCtx<UpdateUserMetadataRequest, UpdateUserMetadataResponse>
 ) {
   const db = context.getAppDB()
   const user = ctx.request.body
@@ -44,7 +49,9 @@ export async function updateMetadata(
   ctx.body = await db.put(metadata)
 }
 
-export async function destroyMetadata(ctx: UserCtx<void, { message: string }>) {
+export async function destroyMetadata(
+  ctx: UserCtx<void, DeleteUserMetadataResponse>
+) {
   const db = context.getAppDB()
   try {
     const dbUser = await sdk.users.get(ctx.params.id)
@@ -64,7 +71,7 @@ export async function findMetadata(
 }
 
 export async function setFlag(
-  ctx: UserCtx<SetFlagRequest, { message: string }>
+  ctx: UserCtx<SetUserFlagRequest, SetUserFlagResponse>
 ) {
   const userId = ctx.user?._id
   const { flag, value } = ctx.request.body
@@ -84,7 +91,7 @@ export async function setFlag(
   ctx.body = { message: "Flag set successfully" }
 }
 
-export async function getFlags(ctx: UserCtx<void, Flags>) {
+export async function getFlags(ctx: UserCtx<void, GetUserFlagsResponse>) {
   const userId = ctx.user?._id
   const docId = generateUserFlagID(userId!)
   const db = context.getAppDB()
diff --git a/packages/server/src/api/controllers/view/exporters.ts b/packages/server/src/api/controllers/view/exporters.ts
index 87e4bfc056..76e5f865a3 100644
--- a/packages/server/src/api/controllers/view/exporters.ts
+++ b/packages/server/src/api/controllers/view/exporters.ts
@@ -16,7 +16,7 @@ function escapeCsvString(str: string) {
 export function csv(
   headers: string[],
   rows: Row[],
-  delimiter: string = ",",
+  delimiter = ",",
   customHeaders: { [key: string]: string } = {}
 ) {
   let csvRows = [getHeaders(headers, customHeaders)]
diff --git a/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap b/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
deleted file mode 100644
index 80f2188e69..0000000000
--- a/packages/server/src/api/controllers/view/tests/__snapshots__/viewBuilder.spec.js.snap
+++ /dev/null
@@ -1,147 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`viewBuilder Calculate and filter creates a view with the calculation statistics and filter schema 1`] = `
-{
-  "map": "function (doc) {
-      if ((doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && !(
-      doc["myField"] === undefined ||
-      doc["myField"] === null ||
-      doc["myField"] === "" ||
-      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
-  )) && (doc["age"] > 17)) {
-        emit(doc["_id"], doc["myField"]);
-      }
-    }",
-  "meta": {
-    "calculation": "stats",
-    "field": "myField",
-    "filters": [
-      {
-        "condition": "MT",
-        "key": "age",
-        "value": 17,
-      },
-    ],
-    "groupBy": undefined,
-    "schema": {
-      "avg": {
-        "type": "number",
-      },
-      "count": {
-        "type": "number",
-      },
-      "field": {
-        "type": "string",
-      },
-      "max": {
-        "type": "number",
-      },
-      "min": {
-        "type": "number",
-      },
-      "sum": {
-        "type": "number",
-      },
-      "sumsqr": {
-        "type": "number",
-      },
-    },
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-  },
-  "reduce": "_stats",
-}
-`;
-
-exports[`viewBuilder Calculate creates a view with the calculation statistics schema 1`] = `
-{
-  "map": "function (doc) {
-      if ((doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && !(
-      doc["myField"] === undefined ||
-      doc["myField"] === null ||
-      doc["myField"] === "" ||
-      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
-  )) ) {
-        emit(doc["_id"], doc["myField"]);
-      }
-    }",
-  "meta": {
-    "calculation": "stats",
-    "field": "myField",
-    "filters": [],
-    "groupBy": undefined,
-    "schema": {
-      "avg": {
-        "type": "number",
-      },
-      "count": {
-        "type": "number",
-      },
-      "field": {
-        "type": "string",
-      },
-      "max": {
-        "type": "number",
-      },
-      "min": {
-        "type": "number",
-      },
-      "sum": {
-        "type": "number",
-      },
-      "sumsqr": {
-        "type": "number",
-      },
-    },
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-  },
-  "reduce": "_stats",
-}
-`;
-
-exports[`viewBuilder Filter creates a view with multiple filters and conjunctions 1`] = `
-{
-  "map": "function (doc) {
-      if (doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" && (doc["Name"] === "Test" || doc["Yes"] > "Value")) {
-        emit(doc["_id"], doc["undefined"]);
-      }
-    }",
-  "meta": {
-    "calculation": undefined,
-    "field": undefined,
-    "filters": [
-      {
-        "condition": "EQUALS",
-        "key": "Name",
-        "value": "Test",
-      },
-      {
-        "condition": "MT",
-        "conjunction": "OR",
-        "key": "Yes",
-        "value": "Value",
-      },
-    ],
-    "groupBy": undefined,
-    "schema": null,
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-  },
-}
-`;
-
-exports[`viewBuilder Group By creates a view emitting the group by field 1`] = `
-{
-  "map": "function (doc) {
-      if (doc.tableId === "14f1c4e94d6a47b682ce89d35d4c78b0" ) {
-        emit(doc["age"], doc["score"]);
-      }
-    }",
-  "meta": {
-    "calculation": undefined,
-    "field": "score",
-    "filters": [],
-    "groupBy": "age",
-    "schema": null,
-    "tableId": "14f1c4e94d6a47b682ce89d35d4c78b0",
-  },
-}
-`;
diff --git a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js
deleted file mode 100644
index 7f4298b2ff..0000000000
--- a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.js
+++ /dev/null
@@ -1,75 +0,0 @@
-const viewTemplate = require("../viewBuilder").default
-
-describe("viewBuilder", () => {
-  describe("Filter", () => {
-    it("creates a view with multiple filters and conjunctions", () => {
-      expect(
-        viewTemplate({
-          name: "Test View",
-          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
-          filters: [
-            {
-              value: "Test",
-              condition: "EQUALS",
-              key: "Name",
-            },
-            {
-              value: "Value",
-              condition: "MT",
-              key: "Yes",
-              conjunction: "OR",
-            },
-          ],
-        })
-      ).toMatchSnapshot()
-    })
-  })
-
-  describe("Calculate", () => {
-    it("creates a view with the calculation statistics schema", () => {
-      expect(
-        viewTemplate({
-          name: "Calculate View",
-          field: "myField",
-          calculation: "stats",
-          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
-          filters: [],
-        })
-      ).toMatchSnapshot()
-    })
-  })
-
-  describe("Group By", () => {
-    it("creates a view emitting the group by field", () => {
-      expect(
-        viewTemplate({
-          name: "Test Scores Grouped By Age",
-          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
-          groupBy: "age",
-          field: "score",
-          filters: [],
-        })
-      ).toMatchSnapshot()
-    })
-  })
-
-  describe("Calculate and filter", () => {
-    it("creates a view with the calculation statistics and filter schema", () => {
-      expect(
-        viewTemplate({
-          name: "Calculate View",
-          field: "myField",
-          calculation: "stats",
-          tableId: "14f1c4e94d6a47b682ce89d35d4c78b0",
-          filters: [
-            {
-              value: 17,
-              condition: "MT",
-              key: "age",
-            },
-          ],
-        })
-      ).toMatchSnapshot()
-    })
-  })
-})
diff --git a/packages/server/src/api/controllers/view/tests/viewBuilder.spec.ts b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.ts
new file mode 100644
index 0000000000..34526345f3
--- /dev/null
+++ b/packages/server/src/api/controllers/view/tests/viewBuilder.spec.ts
@@ -0,0 +1,174 @@
+import viewTemplate from "../viewBuilder"
+
+describe("viewBuilder", () => {
+  describe("Filter", () => {
+    it("creates a view with multiple filters and conjunctions", () => {
+      expect(
+        viewTemplate({
+          field: "myField",
+          tableId: "tableId",
+          filters: [
+            {
+              value: "Test",
+              condition: "EQUALS",
+              key: "Name",
+            },
+            {
+              value: "Value",
+              condition: "MT",
+              key: "Yes",
+              conjunction: "OR",
+            },
+          ],
+        })
+      ).toEqual({
+        map: `function (doc) {
+      if (doc.tableId === "tableId" && (doc["Name"] === "Test" || doc["Yes"] > "Value")) {
+        emit(doc["_id"], doc["myField"]);
+      }
+    }`,
+        meta: {
+          calculation: undefined,
+          field: "myField",
+          filters: [
+            {
+              condition: "EQUALS",
+              key: "Name",
+              value: "Test",
+            },
+            {
+              condition: "MT",
+              conjunction: "OR",
+              key: "Yes",
+              value: "Value",
+            },
+          ],
+          groupBy: undefined,
+          schema: null,
+          tableId: "tableId",
+        },
+      })
+    })
+  })
+
+  describe("Calculate", () => {
+    it("creates a view with the calculation statistics schema", () => {
+      expect(
+        viewTemplate({
+          field: "myField",
+          calculation: "stats",
+          tableId: "tableId",
+          filters: [],
+        })
+      ).toEqual({
+        map: `function (doc) {
+      if ((doc.tableId === "tableId" && !(
+      doc["myField"] === undefined ||
+      doc["myField"] === null ||
+      doc["myField"] === "" ||
+      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
+  )) ) {
+        emit(doc["_id"], doc["myField"]);
+      }
+    }`,
+        meta: {
+          calculation: "stats",
+          field: "myField",
+          filters: [],
+          groupBy: undefined,
+          schema: {
+            min: { type: "number" },
+            max: { type: "number" },
+            avg: { type: "number" },
+            count: { type: "number" },
+            sumsqr: { type: "number" },
+            sum: { type: "number" },
+            field: { type: "string" },
+          },
+          tableId: "tableId",
+        },
+        reduce: "_stats",
+      })
+    })
+  })
+
+  describe("Group By", () => {
+    it("creates a view emitting the group by field", () => {
+      expect(
+        viewTemplate({
+          tableId: "tableId",
+          groupBy: "age",
+          field: "score",
+          filters: [],
+        })
+      ).toEqual({
+        map: `function (doc) {
+      if (doc.tableId === "tableId" ) {
+        emit(doc["age"], doc["score"]);
+      }
+    }`,
+        meta: {
+          calculation: undefined,
+          field: "score",
+          filters: [],
+          groupBy: "age",
+          schema: null,
+          tableId: "tableId",
+        },
+      })
+    })
+  })
+
+  describe("Calculate and filter", () => {
+    it("creates a view with the calculation statistics and filter schema", () => {
+      expect(
+        viewTemplate({
+          field: "myField",
+          calculation: "stats",
+          tableId: "tableId",
+          filters: [
+            {
+              value: 17,
+              condition: "MT",
+              key: "age",
+            },
+          ],
+        })
+      ).toEqual({
+        map: `function (doc) {
+      if ((doc.tableId === "tableId" && !(
+      doc["myField"] === undefined ||
+      doc["myField"] === null ||
+      doc["myField"] === "" ||
+      (Array.isArray(doc["myField"]) && doc["myField"].length === 0)
+  )) && (doc["age"] > 17)) {
+        emit(doc["_id"], doc["myField"]);
+      }
+    }`,
+        meta: {
+          calculation: "stats",
+          field: "myField",
+          filters: [
+            {
+              condition: "MT",
+              key: "age",
+              value: 17,
+            },
+          ],
+          groupBy: undefined,
+          schema: {
+            min: { type: "number" },
+            max: { type: "number" },
+            avg: { type: "number" },
+            count: { type: "number" },
+            sumsqr: { type: "number" },
+            sum: { type: "number" },
+            field: { type: "string" },
+          },
+          tableId: "tableId",
+        },
+        reduce: "_stats",
+      })
+    })
+  })
+})
diff --git a/packages/server/src/api/controllers/view/viewBuilder.ts b/packages/server/src/api/controllers/view/viewBuilder.ts
index 3df9df6657..2cedd1fc40 100644
--- a/packages/server/src/api/controllers/view/viewBuilder.ts
+++ b/packages/server/src/api/controllers/view/viewBuilder.ts
@@ -1,4 +1,4 @@
-import { ViewFilter, ViewTemplateOpts, DBView } from "@budibase/types"
+import { ViewFilter, DBView } from "@budibase/types"
 
 const TOKEN_MAP: Record<string, string> = {
   EQUALS: "===",
@@ -120,7 +120,7 @@ function parseFilterExpression(filters: ViewFilter[]) {
  * @param groupBy - field to group calculation results on, if any
  */
 function parseEmitExpression(field: string, groupBy: string) {
-  return `emit(doc["${groupBy || "_id"}"], doc["${field}"]);`
+  return `emit(doc["${groupBy}"], doc["${field}"]);`
 }
 
 /**
@@ -135,7 +135,19 @@ function parseEmitExpression(field: string, groupBy: string) {
  * calculation: an optional calculation to be performed over the view data.
  */
 export default function (
-  { field, tableId, groupBy, filters = [], calculation }: ViewTemplateOpts,
+  {
+    field,
+    tableId,
+    groupBy,
+    filters = [],
+    calculation,
+  }: {
+    field: string
+    tableId: string
+    groupBy?: string
+    filters?: ViewFilter[]
+    calculation?: string
+  },
   groupByMulti?: boolean
 ): DBView {
   // first filter can't have a conjunction
@@ -168,7 +180,7 @@ export default function (
   const parsedFilters = parseFilterExpression(filters)
   const filterExpression = parsedFilters ? `&& (${parsedFilters})` : ""
 
-  const emitExpression = parseEmitExpression(field, groupBy)
+  const emitExpression = parseEmitExpression(field, groupBy || "_id")
   const tableExpression = `doc.tableId === "${tableId}"`
   const coreExpression = statFilter
     ? `(${tableExpression} && ${statFilter})`
diff --git a/packages/server/src/api/controllers/view/views.ts b/packages/server/src/api/controllers/view/views.ts
index b1f1f6c154..bc734c5657 100644
--- a/packages/server/src/api/controllers/view/views.ts
+++ b/packages/server/src/api/controllers/view/views.ts
@@ -19,8 +19,6 @@ import { builderSocket } from "../../../websockets"
 
 const cloneDeep = require("lodash/cloneDeep")
 
-import isEqual from "lodash/isEqual"
-
 export async function fetch(ctx: Ctx) {
   ctx.body = await getViews()
 }
@@ -60,71 +58,11 @@ export async function save(ctx: Ctx) {
     existingTable.views[viewName] = existingTable.views[originalName]
   }
   await db.put(table)
-  await handleViewEvents(
-    existingTable.views[viewName] as View,
-    table.views[viewName]
-  )
 
   ctx.body = table.views[viewName]
   builderSocket?.emitTableUpdate(ctx, table)
 }
 
-export async function calculationEvents(existingView: View, newView: View) {
-  const existingCalculation = existingView && existingView.calculation
-  const newCalculation = newView && newView.calculation
-
-  if (existingCalculation && !newCalculation) {
-    await events.view.calculationDeleted(existingView)
-  }
-
-  if (!existingCalculation && newCalculation) {
-    await events.view.calculationCreated(newView)
-  }
-
-  if (
-    existingCalculation &&
-    newCalculation &&
-    existingCalculation !== newCalculation
-  ) {
-    await events.view.calculationUpdated(newView)
-  }
-}
-
-export async function filterEvents(existingView: View, newView: View) {
-  const hasExistingFilters = !!(
-    existingView &&
-    existingView.filters &&
-    existingView.filters.length
-  )
-  const hasNewFilters = !!(newView && newView.filters && newView.filters.length)
-
-  if (hasExistingFilters && !hasNewFilters) {
-    await events.view.filterDeleted(newView)
-  }
-
-  if (!hasExistingFilters && hasNewFilters) {
-    await events.view.filterCreated(newView)
-  }
-
-  if (
-    hasExistingFilters &&
-    hasNewFilters &&
-    !isEqual(existingView.filters, newView.filters)
-  ) {
-    await events.view.filterUpdated(newView)
-  }
-}
-
-async function handleViewEvents(existingView: View, newView: View) {
-  if (!existingView) {
-    await events.view.created(newView)
-  } else {
-    await events.view.updated(newView)
-  }
-  await calculationEvents(existingView, newView)
-  await filterEvents(existingView, newView)
-}
-
 export async function destroy(ctx: Ctx) {
   const db = context.getAppDB()
   const viewName = decodeURIComponent(ctx.params.viewName)
diff --git a/packages/server/src/api/controllers/view/viewsV2.ts b/packages/server/src/api/controllers/view/viewsV2.ts
index 753125e0f6..ff8daf3bc6 100644
--- a/packages/server/src/api/controllers/view/viewsV2.ts
+++ b/packages/server/src/api/controllers/view/viewsV2.ts
@@ -4,7 +4,6 @@ import {
   Ctx,
   RequiredKeys,
   UpdateViewRequest,
-  ViewResponse,
   ViewResponseEnriched,
   ViewV2,
   BasicViewFieldMetadata,
@@ -12,9 +11,13 @@ import {
   RelationSchemaField,
   ViewFieldMetadata,
   CalculationType,
+  ViewFetchResponseEnriched,
   CountDistinctCalculationFieldMetadata,
   CountCalculationFieldMetadata,
+  CreateViewResponse,
+  UpdateViewResponse,
 } from "@budibase/types"
+import { events } from "@budibase/backend-core"
 import { builderSocket, gridSocket } from "../../../websockets"
 import { helpers } from "@budibase/shared-core"
 
@@ -120,12 +123,20 @@ async function parseSchema(view: CreateViewRequest) {
 }
 
 export async function get(ctx: Ctx<void, ViewResponseEnriched>) {
+  const view = await sdk.views.getEnriched(ctx.params.viewId)
+  if (!view) {
+    ctx.throw(404)
+  }
+  ctx.body = { data: view }
+}
+
+export async function fetch(ctx: Ctx<void, ViewFetchResponseEnriched>) {
   ctx.body = {
-    data: await sdk.views.getEnriched(ctx.params.viewId),
+    data: await sdk.views.getAllEnriched(),
   }
 }
 
-export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
+export async function create(ctx: Ctx<CreateViewRequest, CreateViewResponse>) {
   const view = ctx.request.body
   const { tableId } = view
 
@@ -140,8 +151,12 @@ export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    rowHeight: view.rowHeight,
   }
   const result = await sdk.views.create(tableId, parsedView)
+
+  await events.view.created(result)
+
   ctx.status = 201
   ctx.body = {
     data: result,
@@ -152,7 +167,47 @@ export async function create(ctx: Ctx<CreateViewRequest, ViewResponse>) {
   gridSocket?.emitViewUpdate(ctx, result)
 }
 
-export async function update(ctx: Ctx<UpdateViewRequest, ViewResponse>) {
+async function handleViewFilterEvents(existingView: ViewV2, view: ViewV2) {
+  const filterGroups = view.queryUI?.groups?.length || 0
+  const properties = { filterGroups, tableId: view.tableId }
+  if (
+    filterGroups >= 2 &&
+    filterGroups > (existingView?.queryUI?.groups?.length || 0)
+  ) {
+    await events.view.filterUpdated(properties)
+  }
+}
+
+async function handleViewEvents(existingView: ViewV2, view: ViewV2) {
+  // Grouped filters
+  if (view.queryUI?.groups) {
+    await handleViewFilterEvents(existingView, view)
+  }
+
+  // if new columns in the view
+  for (const key in view.schema) {
+    if ("calculationType" in view.schema[key] && !existingView?.schema?.[key]) {
+      await events.view.calculationCreated({
+        calculationType: view.schema[key].calculationType,
+        tableId: view.tableId,
+      })
+    }
+
+    // view joins
+    for (const column in view.schema[key]?.columns ?? []) {
+      // if the new column is visible and it wasn't before
+      if (
+        !existingView?.schema?.[key].columns?.[column].visible &&
+        view.schema?.[key].columns?.[column].visible
+      ) {
+        // new view join exposing a column
+        await events.view.viewJoinCreated({ tableId: view.tableId })
+      }
+    }
+  }
+}
+
+export async function update(ctx: Ctx<UpdateViewRequest, UpdateViewResponse>) {
   const view = ctx.request.body
 
   if (view.version !== 2) {
@@ -177,19 +232,25 @@ export async function update(ctx: Ctx<UpdateViewRequest, ViewResponse>) {
     sort: view.sort,
     schema,
     primaryDisplay: view.primaryDisplay,
+    rowHeight: view.rowHeight,
   }
 
-  const result = await sdk.views.update(tableId, parsedView)
-  ctx.body = {
-    data: result,
-  }
+  const { view: result, existingView } = await sdk.views.update(
+    tableId,
+    parsedView
+  )
+
+  await handleViewEvents(existingView, result)
+  await events.view.updated(result)
+
+  ctx.body = { data: result }
 
   const table = await sdk.tables.getTable(tableId)
   builderSocket?.emitTableUpdate(ctx, table)
   gridSocket?.emitViewUpdate(ctx, result)
 }
 
-export async function remove(ctx: Ctx) {
+export async function remove(ctx: Ctx<void, void>) {
   const { viewId } = ctx.params
 
   const view = await sdk.views.remove(viewId)
diff --git a/packages/server/src/api/controllers/webhook.ts b/packages/server/src/api/controllers/webhook.ts
index d667134f4d..11bcb06362 100644
--- a/packages/server/src/api/controllers/webhook.ts
+++ b/packages/server/src/api/controllers/webhook.ts
@@ -4,9 +4,18 @@ import { db as dbCore, context } from "@budibase/backend-core"
 import {
   Webhook,
   WebhookActionType,
-  BBContext,
+  Ctx,
   Automation,
   AutomationActionStepId,
+  FetchWebhooksResponse,
+  SaveWebhookResponse,
+  SaveWebhookRequest,
+  DeleteWebhookResponse,
+  BuildWebhookSchemaRequest,
+  BuildWebhookSchemaResponse,
+  TriggerWebhookRequest,
+  TriggerWebhookResponse,
+  AutomationIOType,
 } from "@budibase/types"
 import sdk from "../../sdk"
 import * as pro from "@budibase/pro"
@@ -16,17 +25,17 @@ const validate = require("jsonschema").validate
 
 const AUTOMATION_DESCRIPTION = "Generated from Webhook Schema"
 
-export async function fetch(ctx: BBContext) {
+export async function fetch(ctx: Ctx<void, FetchWebhooksResponse>) {
   const db = context.getAppDB()
-  const response = await db.allDocs(
+  const response = await db.allDocs<Webhook>(
     getWebhookParams(null, {
       include_docs: true,
     })
   )
-  ctx.body = response.rows.map((row: any) => row.doc)
+  ctx.body = response.rows.filter(row => row.doc).map(row => row.doc!)
 }
 
-export async function save(ctx: BBContext) {
+export async function save(ctx: Ctx<SaveWebhookRequest, SaveWebhookResponse>) {
   const webhook = await sdk.automations.webhook.save(ctx.request.body)
   ctx.body = {
     message: "Webhook created successfully",
@@ -34,30 +43,39 @@ export async function save(ctx: BBContext) {
   }
 }
 
-export async function destroy(ctx: BBContext) {
+export async function destroy(ctx: Ctx<void, DeleteWebhookResponse>) {
   ctx.body = await sdk.automations.webhook.destroy(
     ctx.params.id,
     ctx.params.rev
   )
 }
 
-export async function buildSchema(ctx: BBContext) {
+export async function buildSchema(
+  ctx: Ctx<BuildWebhookSchemaRequest, BuildWebhookSchemaResponse>
+) {
   await context.doInAppContext(ctx.params.instance, async () => {
     const db = context.getAppDB()
-    const webhook = (await db.get(ctx.params.id)) as Webhook
+    const webhook = await db.get<Webhook>(ctx.params.id)
     webhook.bodySchema = toJsonSchema(ctx.request.body)
     // update the automation outputs
     if (webhook.action.type === WebhookActionType.AUTOMATION) {
-      let automation = (await db.get(webhook.action.target)) as Automation
+      let automation = await db.get<Automation>(webhook.action.target)
       const autoOutputs = automation.definition.trigger.schema.outputs
-      let properties = webhook.bodySchema.properties
+      let properties = webhook.bodySchema?.properties
       // reset webhook outputs
       autoOutputs.properties = {
         body: autoOutputs.properties.body,
       }
-      for (let prop of Object.keys(properties)) {
+      for (let prop of Object.keys(properties || {})) {
+        if (properties?.[prop] == null) {
+          continue
+        }
+        const def = properties[prop]
+        if (typeof def === "boolean") {
+          continue
+        }
         autoOutputs.properties[prop] = {
-          type: properties[prop].type,
+          type: def.type as AutomationIOType,
           description: AUTOMATION_DESCRIPTION,
         }
       }
@@ -67,56 +85,66 @@ export async function buildSchema(ctx: BBContext) {
   })
 }
 
-export async function trigger(ctx: BBContext) {
+export async function trigger(
+  ctx: Ctx<TriggerWebhookRequest, TriggerWebhookResponse>
+) {
   const prodAppId = dbCore.getProdAppID(ctx.params.instance)
+  const appNotDeployed = () => {
+    ctx.body = {
+      message: "Application not deployed yet.",
+    }
+  }
   await context.doInAppContext(prodAppId, async () => {
-    try {
-      const db = context.getAppDB()
-      const webhook = (await db.get(ctx.params.id)) as Webhook
-      // validate against the schema
-      if (webhook.bodySchema) {
-        validate(ctx.request.body, webhook.bodySchema)
-      }
-      const target = await db.get<Automation>(webhook.action.target)
-      if (webhook.action.type === WebhookActionType.AUTOMATION) {
-        // trigger with both the pure request and then expand it
-        // incase the user has produced a schema to bind to
-        let hasCollectStep = sdk.automations.utils.checkForCollectStep(target)
+    const db = context.getAppDB()
+    const webhook = await db.tryGet<Webhook>(ctx.params.id)
+    if (!webhook) {
+      return appNotDeployed()
+    }
+    // validate against the schema
+    if (webhook.bodySchema) {
+      validate(ctx.request.body, webhook.bodySchema)
+    }
+    const target = await db.tryGet<Automation>(webhook.action.target)
+    if (!target) {
+      return appNotDeployed()
+    }
+    if (webhook.action.type === WebhookActionType.AUTOMATION) {
+      // trigger with both the pure request and then expand it
+      // incase the user has produced a schema to bind to
+      let hasCollectStep = sdk.automations.utils.checkForCollectStep(target)
 
-        if (hasCollectStep && (await pro.features.isSyncAutomationsEnabled())) {
-          const response = await triggers.externalTrigger(
-            target,
-            {
-              body: ctx.request.body,
+      if (hasCollectStep && (await pro.features.isSyncAutomationsEnabled())) {
+        const response = await triggers.externalTrigger(
+          target,
+          {
+            fields: {
               ...ctx.request.body,
-              appId: prodAppId,
+              body: ctx.request.body,
             },
-            { getResponses: true }
-          )
+            appId: prodAppId,
+          },
+          { getResponses: true }
+        )
 
+        if (triggers.isAutomationResults(response)) {
           let collectedValue = response.steps.find(
             (step: any) => step.stepId === AutomationActionStepId.COLLECT
           )
 
-          ctx.status = 200
-          ctx.body = collectedValue.outputs
+          ctx.body = collectedValue?.outputs
         } else {
-          await triggers.externalTrigger(target, {
-            body: ctx.request.body,
-            ...ctx.request.body,
-            appId: prodAppId,
-          })
-          ctx.status = 200
-          ctx.body = {
-            message: "Webhook trigger fired successfully",
-          }
+          ctx.throw(400, "Automation did not have a collect block.")
         }
-      }
-    } catch (err: any) {
-      if (err.status === 404) {
-        ctx.status = 200
+      } else {
+        await triggers.externalTrigger(target, {
+          fields: {
+            ...ctx.request.body,
+            body: ctx.request.body,
+          },
+          appId: prodAppId,
+        })
         ctx.body = {
-          message: "Application not deployed yet.",
+          message: "Webhook trigger fired successfully",
         }
       }
     }
diff --git a/packages/server/src/api/index.ts b/packages/server/src/api/index.ts
index 92cee95ea6..230e5079b4 100644
--- a/packages/server/src/api/index.ts
+++ b/packages/server/src/api/index.ts
@@ -58,12 +58,9 @@ if (apiEnabled()) {
       })
     )
     .use(pro.licensing())
-    // @ts-ignore
     .use(currentApp)
     .use(auth.auditLog)
-    // @ts-ignore
     .use(migrations)
-    // @ts-ignore
     .use(cleanup)
 
   // authenticated routes
diff --git a/packages/server/src/api/routes/datasource.ts b/packages/server/src/api/routes/datasource.ts
index 755088c56c..9ec792632a 100644
--- a/packages/server/src/api/routes/datasource.ts
+++ b/packages/server/src/api/routes/datasource.ts
@@ -2,10 +2,7 @@ import Router from "@koa/router"
 import * as datasourceController from "../controllers/datasource"
 import authorized from "../../middleware/authorized"
 import { permissions } from "@budibase/backend-core"
-import {
-  datasourceValidator,
-  datasourceQueryValidator,
-} from "./utils/validators"
+import { datasourceValidator } from "./utils/validators"
 
 const router: Router = new Router()
 
@@ -41,15 +38,6 @@ router
     ),
     datasourceController.update
   )
-  .post(
-    "/api/datasources/query",
-    authorized(
-      permissions.PermissionType.TABLE,
-      permissions.PermissionLevel.READ
-    ),
-    datasourceQueryValidator(),
-    datasourceController.query
-  )
   .post(
     "/api/datasources/:datasourceId/schema",
     authorized(permissions.BUILDER),
diff --git a/packages/server/src/api/routes/migrations.ts b/packages/server/src/api/routes/migrations.ts
index 918b197de2..0ffc334551 100644
--- a/packages/server/src/api/routes/migrations.ts
+++ b/packages/server/src/api/routes/migrations.ts
@@ -1,16 +1,8 @@
 import Router from "@koa/router"
 import * as migrationsController from "../controllers/migrations"
-import { auth } from "@budibase/backend-core"
 
 const router: Router = new Router()
 
-router
-  .post("/api/migrations/run", auth.internalApi, migrationsController.migrate)
-  .get(
-    "/api/migrations/definitions",
-    auth.internalApi,
-    migrationsController.fetchDefinitions
-  )
-  .get("/api/migrations/status", migrationsController.getMigrationStatus)
+router.get("/api/migrations/status", migrationsController.getMigrationStatus)
 
 export default router
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index b665e83f6f..531192811c 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -4,19 +4,21 @@ import queryEndpoints from "./queries"
 import tableEndpoints from "./tables"
 import rowEndpoints from "./rows"
 import userEndpoints from "./users"
+import viewEndpoints from "./views"
 import roleEndpoints from "./roles"
 import authorized from "../../../middleware/authorized"
 import publicApi from "../../../middleware/publicApi"
 import { paramResource, paramSubResource } from "../../../middleware/resourceId"
-import { PermissionType, PermissionLevel } from "@budibase/types"
+import { PermissionLevel, PermissionType } from "@budibase/types"
 import { CtxFn } from "./utils/Endpoint"
 import mapperMiddleware from "./middleware/mapper"
 import env from "../../../environment"
+import { middleware, redis } from "@budibase/backend-core"
+import { SelectableDatabase } from "@budibase/backend-core/src/redis/utils"
+import cors from "@koa/cors"
 // below imports don't have declaration files
 const Router = require("@koa/router")
 const { RateLimit, Stores } = require("koa2-ratelimit")
-import { middleware, redis } from "@budibase/backend-core"
-import { SelectableDatabase } from "@budibase/backend-core/src/redis/utils"
 
 interface KoaRateLimitOptions {
   socket: {
@@ -81,6 +83,7 @@ const publicRouter = new Router({
 if (limiter && !env.isDev()) {
   publicRouter.use(limiter)
 }
+publicRouter.use(cors())
 
 function addMiddleware(
   endpoints: any,
@@ -149,6 +152,7 @@ applyAdminRoutes(metricEndpoints)
 applyAdminRoutes(roleEndpoints)
 applyRoutes(appEndpoints, PermissionType.APP, "appId")
 applyRoutes(tableEndpoints, PermissionType.TABLE, "tableId")
+applyRoutes(viewEndpoints, PermissionType.VIEW, "viewId")
 applyRoutes(userEndpoints, PermissionType.USER, "userId")
 applyRoutes(queryEndpoints, PermissionType.QUERY, "queryId")
 // needs to be applied last for routing purposes, don't override other endpoints
diff --git a/packages/server/src/api/routes/public/middleware/mapper.ts b/packages/server/src/api/routes/public/middleware/mapper.ts
index 03feb6cc5c..9d0cae5d61 100644
--- a/packages/server/src/api/routes/public/middleware/mapper.ts
+++ b/packages/server/src/api/routes/public/middleware/mapper.ts
@@ -1,9 +1,10 @@
 import { Ctx } from "@budibase/types"
 import mapping from "../../../controllers/public/mapping"
 
-enum Resources {
+enum Resource {
   APPLICATION = "applications",
   TABLES = "tables",
+  VIEWS = "views",
   ROWS = "rows",
   USERS = "users",
   QUERIES = "queries",
@@ -15,7 +16,7 @@ function isAttachment(ctx: Ctx) {
 }
 
 function isArrayResponse(ctx: Ctx) {
-  return ctx.url.endsWith(Resources.SEARCH) || Array.isArray(ctx.body)
+  return ctx.url.endsWith(Resource.SEARCH) || Array.isArray(ctx.body)
 }
 
 function noResponse(ctx: Ctx) {
@@ -38,6 +39,14 @@ function processTables(ctx: Ctx) {
   }
 }
 
+function processViews(ctx: Ctx) {
+  if (isArrayResponse(ctx)) {
+    return mapping.mapViews(ctx)
+  } else {
+    return mapping.mapView(ctx)
+  }
+}
+
 function processRows(ctx: Ctx) {
   if (isArrayResponse(ctx)) {
     return mapping.mapRowSearch(ctx)
@@ -71,20 +80,27 @@ export default async (ctx: Ctx, next: any) => {
   let body = {}
 
   switch (urlParts[0]) {
-    case Resources.APPLICATION:
+    case Resource.APPLICATION:
       body = processApplications(ctx)
       break
-    case Resources.TABLES:
-      if (urlParts[2] === Resources.ROWS) {
+    case Resource.TABLES:
+      if (urlParts[2] === Resource.ROWS) {
         body = processRows(ctx)
       } else {
         body = processTables(ctx)
       }
       break
-    case Resources.USERS:
+    case Resource.VIEWS:
+      if (urlParts[2] === Resource.ROWS) {
+        body = processRows(ctx)
+      } else {
+        body = processViews(ctx)
+      }
+      break
+    case Resource.USERS:
       body = processUsers(ctx)
       break
-    case Resources.QUERIES:
+    case Resource.QUERIES:
       body = processQueries(ctx)
       break
   }
diff --git a/packages/server/src/api/routes/public/rows.ts b/packages/server/src/api/routes/public/rows.ts
index 80ad6d6434..2fb81d4601 100644
--- a/packages/server/src/api/routes/public/rows.ts
+++ b/packages/server/src/api/routes/public/rows.ts
@@ -1,4 +1,4 @@
-import controller from "../../controllers/public/rows"
+import controller, { viewSearch } from "../../controllers/public/rows"
 import Endpoint from "./utils/Endpoint"
 import { externalSearchValidator } from "../utils/validators"
 
@@ -168,4 +168,40 @@ read.push(
   ).addMiddleware(externalSearchValidator())
 )
 
+/**
+ * @openapi
+ * /views/{viewId}/rows/search:
+ *   post:
+ *     operationId: rowViewSearch
+ *     summary: Search for rows in a view
+ *     tags:
+ *       - rows
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/rowSearch'
+ *     responses:
+ *       200:
+ *         description: The response will contain an array of rows that match the search parameters.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/searchOutput'
+ *             examples:
+ *               search:
+ *                 $ref: '#/components/examples/rows'
+ */
+read.push(
+  new Endpoint(
+    "post",
+    "/views/:viewId/rows/search",
+    controller.viewSearch
+  ).addMiddleware(externalSearchValidator())
+)
+
 export default { read, write }
diff --git a/packages/server/src/api/routes/public/tests/Request.ts b/packages/server/src/api/routes/public/tests/Request.ts
index 92a4996124..3dfa11c0b3 100644
--- a/packages/server/src/api/routes/public/tests/Request.ts
+++ b/packages/server/src/api/routes/public/tests/Request.ts
@@ -1,13 +1,24 @@
-import { User, Table, SearchFilters, Row } from "@budibase/types"
+import {
+  User,
+  Table,
+  SearchFilters,
+  Row,
+  ViewV2Schema,
+  ViewV2,
+  ViewV2Type,
+  PublicAPIView,
+} from "@budibase/types"
 import { HttpMethod, MakeRequestResponse, generateMakeRequest } from "./utils"
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
-import { Expectations } from "../../../../tests/utilities/api/base"
 
 type RequestOpts = { internal?: boolean; appId?: string }
 
+type Response<T> = { data: T }
+
 export interface PublicAPIExpectations {
   status?: number
   body?: Record<string, any>
+  headers?: Record<string, string>
 }
 
 export class PublicAPIRequest {
@@ -15,6 +26,7 @@ export class PublicAPIRequest {
   private appId: string | undefined
 
   tables: PublicTableAPI
+  views: PublicViewAPI
   rows: PublicRowAPI
   apiKey: string
 
@@ -28,6 +40,7 @@ export class PublicAPIRequest {
     this.appId = appId
     this.tables = new PublicTableAPI(this)
     this.rows = new PublicRowAPI(this)
+    this.views = new PublicViewAPI(this)
   }
 
   static async init(config: TestConfiguration, user: User, opts?: RequestOpts) {
@@ -59,6 +72,12 @@ export class PublicAPIRequest {
     if (expectations?.body) {
       expect(res.body).toEqual(expectations?.body)
     }
+    if (expectations?.headers) {
+      for (let [header, value] of Object.entries(expectations.headers)) {
+        const found = res.headers[header]
+        expect(found?.toLowerCase()).toEqual(value)
+      }
+    }
     return res.body
   }
 }
@@ -73,9 +92,16 @@ export class PublicTableAPI {
   async create(
     table: Table,
     expectations?: PublicAPIExpectations
-  ): Promise<{ data: Table }> {
+  ): Promise<Response<Table>> {
     return this.request.send("post", "/tables", table, expectations)
   }
+
+  async search(
+    name: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Table[]>> {
+    return this.request.send("post", "/tables/search", { name }, expectations)
+  }
 }
 
 export class PublicRowAPI {
@@ -85,11 +111,24 @@ export class PublicRowAPI {
     this.request = request
   }
 
+  async create(
+    tableId: string,
+    row: Row,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Row>> {
+    return this.request.send(
+      "post",
+      `/tables/${tableId}/rows`,
+      row,
+      expectations
+    )
+  }
+
   async search(
     tableId: string,
     query: SearchFilters,
     expectations?: PublicAPIExpectations
-  ): Promise<{ data: Row[] }> {
+  ): Promise<Response<Row[]>> {
     return this.request.send(
       "post",
       `/tables/${tableId}/rows/search`,
@@ -99,4 +138,75 @@ export class PublicRowAPI {
       expectations
     )
   }
+
+  async viewSearch(
+    viewId: string,
+    query: SearchFilters,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<Row[]>> {
+    return this.request.send(
+      "post",
+      `/views/${viewId}/rows/search`,
+      {
+        query,
+      },
+      expectations
+    )
+  }
+}
+
+export class PublicViewAPI {
+  request: PublicAPIRequest
+
+  constructor(request: PublicAPIRequest) {
+    this.request = request
+  }
+
+  async create(
+    view: Omit<PublicAPIView, "id" | "version">,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("post", "/views", view, expectations)
+  }
+
+  async update(
+    viewId: string,
+    view: Omit<PublicAPIView, "id" | "version">,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("put", `/views/${viewId}`, view, expectations)
+  }
+
+  async destroy(
+    viewId: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<void> {
+    return this.request.send(
+      "delete",
+      `/views/${viewId}`,
+      undefined,
+      expectations
+    )
+  }
+
+  async find(
+    viewId: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView>> {
+    return this.request.send("get", `/views/${viewId}`, undefined, expectations)
+  }
+
+  async search(
+    viewName: string,
+    expectations?: PublicAPIExpectations
+  ): Promise<Response<PublicAPIView[]>> {
+    return this.request.send(
+      "post",
+      "/views/search",
+      {
+        name: viewName,
+      },
+      expectations
+    )
+  }
 }
diff --git a/packages/server/src/api/routes/public/tests/cors.spec.ts b/packages/server/src/api/routes/public/tests/cors.spec.ts
new file mode 100644
index 0000000000..1a5895575d
--- /dev/null
+++ b/packages/server/src/api/routes/public/tests/cors.spec.ts
@@ -0,0 +1,21 @@
+import * as setup from "../../tests/utilities"
+import { PublicAPIRequest } from "./Request"
+
+describe("check public API security", () => {
+  const config = setup.getConfig()
+  let request: PublicAPIRequest
+
+  beforeAll(async () => {
+    await config.init()
+    request = await PublicAPIRequest.init(config, await config.globalUser())
+  })
+
+  it("should have Access-Control-Allow-Origin set to *", async () => {
+    await request.tables.search("", {
+      status: 200,
+      headers: {
+        "access-control-allow-origin": "*",
+      },
+    })
+  })
+})
diff --git a/packages/server/src/api/routes/public/tests/views.spec.ts b/packages/server/src/api/routes/public/tests/views.spec.ts
new file mode 100644
index 0000000000..1cbc383f7e
--- /dev/null
+++ b/packages/server/src/api/routes/public/tests/views.spec.ts
@@ -0,0 +1,95 @@
+import * as setup from "../../tests/utilities"
+import { basicTable } from "../../../../tests/utilities/structures"
+import { BasicOperator, Table, UILogicalOperator } from "@budibase/types"
+import { PublicAPIRequest } from "./Request"
+import { generator } from "@budibase/backend-core/tests"
+
+describe("check public API security", () => {
+  const config = setup.getConfig()
+  let request: PublicAPIRequest, table: Table
+
+  beforeAll(async () => {
+    await config.init()
+    request = await PublicAPIRequest.init(config, await config.globalUser())
+    table = (await request.tables.create(basicTable())).data
+  })
+
+  function baseView() {
+    return {
+      name: generator.word(),
+      tableId: table._id!,
+      query: {},
+      schema: {
+        name: {
+          readonly: true,
+          visible: true,
+        },
+      },
+    }
+  }
+
+  it("should be able to create a view", async () => {
+    await request.views.create(baseView(), { status: 201 })
+  })
+
+  it("should be able to update a view", async () => {
+    const view = await request.views.create(baseView(), { status: 201 })
+    const response = await request.views.update(view.data.id, {
+      ...view.data,
+      name: "new name",
+    })
+  })
+
+  it("should be able to search views", async () => {
+    const viewName = "view to search for"
+    const view = await request.views.create(
+      {
+        ...baseView(),
+        name: viewName,
+      },
+      { status: 201 }
+    )
+    const results = await request.views.search(viewName, {
+      status: 200,
+    })
+    expect(results.data.length).toEqual(1)
+    expect(results.data[0].id).toEqual(view.data.id)
+  })
+
+  it("should be able to delete a view", async () => {
+    const view = await request.views.create(baseView(), { status: 201 })
+    const result = await request.views.destroy(view.data.id, { status: 204 })
+    expect(result).toBeDefined()
+  })
+
+  it("should be able to search rows through a view", async () => {
+    const row1 = await request.rows.create(
+      table._id!,
+      { name: "hello world" },
+      { status: 200 }
+    )
+    await request.rows.create(table._id!, { name: "foo bar" }, { status: 200 })
+    const response = await request.views.create(
+      {
+        ...baseView(),
+        query: {
+          logicalOperator: UILogicalOperator.ANY,
+          groups: [
+            {
+              filters: [
+                {
+                  operator: BasicOperator.STRING,
+                  field: "name",
+                  value: "hello",
+                },
+              ],
+            },
+          ],
+        },
+      },
+      { status: 201 }
+    )
+    const results = await request.rows.viewSearch(response.data.id, {})
+    expect(results.data.length).toEqual(1)
+  })
+})
diff --git a/packages/server/src/api/routes/public/views.ts b/packages/server/src/api/routes/public/views.ts
new file mode 100644
index 0000000000..139d79be1f
--- /dev/null
+++ b/packages/server/src/api/routes/public/views.ts
@@ -0,0 +1,165 @@
+import controller from "../../controllers/public/views"
+import Endpoint from "./utils/Endpoint"
+import { viewValidator, nameValidator } from "../utils/validators"
+
+const read = [],
+  write = []
+
+/**
+ * @openapi
+ * /views:
+ *   post:
+ *     operationId: viewCreate
+ *     summary: Create a view
+ *     description: Create a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/view'
+ *           examples:
+ *             view:
+ *               $ref: '#/components/examples/view'
+ *     responses:
+ *       200:
+ *         description: Returns the created view, including the ID which has been generated for it.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(
+  new Endpoint("post", "/views", controller.create).addMiddleware(
+    viewValidator()
+  )
+)
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   put:
+ *     operationId: viewUpdate
+ *     summary: Update a view
+ *     description: Update a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/view'
+ *           examples:
+ *             view:
+ *               $ref: '#/components/examples/view'
+ *     responses:
+ *       200:
+ *         description: Returns the updated view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(
+  new Endpoint("put", "/views/:viewId", controller.update).addMiddleware(
+    viewValidator()
+  )
+)
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   delete:
+ *     operationId: viewDestroy
+ *     summary: Delete a view
+ *     description: Delete a view, this can be against an internal or external table.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     responses:
+ *       200:
+ *         description: Returns the deleted view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+write.push(new Endpoint("delete", "/views/:viewId", controller.destroy))
+
+/**
+ * @openapi
+ * /views/{viewId}:
+ *   get:
+ *     operationId: viewGetById
+ *     summary: Retrieve a view
+ *     description: Lookup a view, this could be internal or external.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/viewId'
+ *       - $ref: '#/components/parameters/appId'
+ *     responses:
+ *       200:
+ *         description: Returns the retrieved view.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewOutput'
+ *             examples:
+ *               view:
+ *                 $ref: '#/components/examples/view'
+ */
+read.push(new Endpoint("get", "/views/:viewId", controller.read))
+
+/**
+ * @openapi
+ * /views/search:
+ *   post:
+ *     operationId: viewSearch
+ *     summary: Search for views
+ *     description: Based on view properties (currently only name) search for views.
+ *     tags:
+ *       - views
+ *     parameters:
+ *       - $ref: '#/components/parameters/appId'
+ *     requestBody:
+ *       required: true
+ *       content:
+ *         application/json:
+ *           schema:
+ *             $ref: '#/components/schemas/nameSearch'
+ *     responses:
+ *       200:
+ *         description: Returns the found views, based on the search parameters.
+ *         content:
+ *           application/json:
+ *             schema:
+ *               $ref: '#/components/schemas/viewSearch'
+ *             examples:
+ *               views:
+ *                 $ref: '#/components/examples/views'
+ */
+read.push(
+  new Endpoint("post", "/views/search", controller.search).addMiddleware(
+    nameValidator()
+  )
+)
+
+export default { read, write }
diff --git a/packages/server/src/api/routes/query.ts b/packages/server/src/api/routes/query.ts
index eb857d0637..89d3651227 100644
--- a/packages/server/src/api/routes/query.ts
+++ b/packages/server/src/api/routes/query.ts
@@ -56,7 +56,7 @@ router
     "/api/v2/queries/:queryId",
     paramResource("queryId"),
     authorized(PermissionType.QUERY, PermissionLevel.WRITE),
-    queryController.executeV2 as any
+    queryController.executeV2
   )
 
 export default router
diff --git a/packages/server/src/api/routes/row.ts b/packages/server/src/api/routes/row.ts
index e443b2daeb..61cdee0c2f 100644
--- a/packages/server/src/api/routes/row.ts
+++ b/packages/server/src/api/routes/row.ts
@@ -5,6 +5,8 @@ import { paramResource, paramSubResource } from "../../middleware/resourceId"
 import { permissions } from "@budibase/backend-core"
 import { internalSearchValidator } from "./utils/validators"
 import trimViewRowInfo from "../../middleware/trimViewRowInfo"
+import { validateBody } from "../../middleware/zod-validator"
+import { searchRowRequestValidator } from "@budibase/types"
 
 const { PermissionType, PermissionLevel } = permissions
 
@@ -32,6 +34,7 @@ router
   .post(
     "/api/:sourceId/search",
     internalSearchValidator(),
+    validateBody(searchRowRequestValidator),
     paramResource("sourceId"),
     authorized(PermissionType.TABLE, PermissionLevel.READ),
     rowController.search
@@ -87,6 +90,7 @@ router
 router.post(
   "/api/v2/views/:viewId/search",
   internalSearchValidator(),
+  validateBody(searchRowRequestValidator),
   authorizedResource(PermissionType.VIEW, PermissionLevel.READ, "viewId"),
   rowController.views.searchView
 )
diff --git a/packages/server/src/api/routes/script.ts b/packages/server/src/api/routes/script.ts
deleted file mode 100644
index 3780142ab5..0000000000
--- a/packages/server/src/api/routes/script.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import Router from "@koa/router"
-import * as controller from "../controllers/script"
-import authorized from "../../middleware/authorized"
-import { permissions } from "@budibase/backend-core"
-
-const router: Router = new Router()
-
-router.post("/api/script", authorized(permissions.BUILDER), controller.save)
-
-export default router
diff --git a/packages/server/src/api/routes/tests/analytics.spec.js b/packages/server/src/api/routes/tests/analytics.spec.js
index c69307656d..0b947ebcd9 100644
--- a/packages/server/src/api/routes/tests/analytics.spec.js
+++ b/packages/server/src/api/routes/tests/analytics.spec.js
@@ -4,14 +4,13 @@ const { events, constants } = require("@budibase/backend-core")
 describe("/static", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let app
 
   const timezone = "Europe/London"
 
   afterAll(setup.afterAll)
 
   beforeAll(async () => {
-    app = await config.init()
+    await config.init()
   })
 
   beforeEach(() => {
@@ -26,10 +25,10 @@ describe("/static", () => {
         .set(config.defaultHeaders())
         .expect(200)
 
-      expect(events.serve.servedBuilder).toBeCalledTimes(1)
-      expect(events.serve.servedBuilder).toBeCalledWith(timezone)
-      expect(events.serve.servedApp).not.toBeCalled()
-      expect(events.serve.servedAppPreview).not.toBeCalled()
+      expect(events.serve.servedBuilder).toHaveBeenCalledTimes(1)
+      expect(events.serve.servedBuilder).toHaveBeenCalledWith(timezone)
+      expect(events.serve.servedApp).not.toHaveBeenCalled()
+      expect(events.serve.servedAppPreview).not.toHaveBeenCalled()
     })
 
     it("should ping from app preview", async () => {
@@ -39,12 +38,12 @@ describe("/static", () => {
         .set(config.defaultHeaders())
         .expect(200)
 
-      expect(events.serve.servedAppPreview).toBeCalledTimes(1)
-      expect(events.serve.servedAppPreview).toBeCalledWith(
+      expect(events.serve.servedAppPreview).toHaveBeenCalledTimes(1)
+      expect(events.serve.servedAppPreview).toHaveBeenCalledWith(
         config.getApp(),
         timezone
       )
-      expect(events.serve.servedApp).not.toBeCalled()
+      expect(events.serve.servedApp).not.toHaveBeenCalled()
     })
 
     it("should ping from app", async () => {
@@ -57,13 +56,13 @@ describe("/static", () => {
         .set(headers)
         .expect(200)
 
-      expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(
+      expect(events.serve.servedApp).toHaveBeenCalledTimes(1)
+      expect(events.serve.servedApp).toHaveBeenCalledWith(
         config.getProdApp(),
         timezone,
         undefined
       )
-      expect(events.serve.servedAppPreview).not.toBeCalled()
+      expect(events.serve.servedAppPreview).not.toHaveBeenCalled()
     })
 
     it("should ping from an embedded app", async () => {
@@ -76,13 +75,13 @@ describe("/static", () => {
         .set(headers)
         .expect(200)
 
-      expect(events.serve.servedApp).toBeCalledTimes(1)
-      expect(events.serve.servedApp).toBeCalledWith(
+      expect(events.serve.servedApp).toHaveBeenCalledTimes(1)
+      expect(events.serve.servedApp).toHaveBeenCalledWith(
         config.getProdApp(),
         timezone,
         true
       )
-      expect(events.serve.servedAppPreview).not.toBeCalled()
+      expect(events.serve.servedAppPreview).not.toHaveBeenCalled()
     })
   })
 })
diff --git a/packages/server/src/api/routes/tests/application.spec.ts b/packages/server/src/api/routes/tests/application.spec.ts
index 1511c1aa61..9480593c2a 100644
--- a/packages/server/src/api/routes/tests/application.spec.ts
+++ b/packages/server/src/api/routes/tests/application.spec.ts
@@ -208,7 +208,7 @@ describe("/applications", () => {
 
     it("should reject with a known url", async () => {
       await config.api.application.create(
-        { name: "made up", url: app?.url! },
+        { name: "made up", url: app!.url! },
         { body: { message: "App URL is already in use." }, status: 400 }
       )
     })
diff --git a/packages/server/src/api/routes/tests/automation.spec.ts b/packages/server/src/api/routes/tests/automation.spec.ts
index a517346c82..5c0b86d9a0 100644
--- a/packages/server/src/api/routes/tests/automation.spec.ts
+++ b/packages/server/src/api/routes/tests/automation.spec.ts
@@ -19,9 +19,11 @@ import {
   Table,
 } from "@budibase/types"
 import { mocks } from "@budibase/backend-core/tests"
-import { FilterConditions } from "../../../automations/steps/filter"
 import { removeDeprecated } from "../../../automations/utils"
 import { createAutomationBuilder } from "../../../automations/tests/utilities/AutomationTestBuilder"
+import { automations } from "@budibase/shared-core"
+
+const FilterConditions = automations.steps.filter.FilterConditions
 
 const MAX_RETRIES = 4
 let {
diff --git a/packages/server/src/api/routes/tests/datasource.spec.ts b/packages/server/src/api/routes/tests/datasource.spec.ts
index 6b811cc716..21e9effa77 100644
--- a/packages/server/src/api/routes/tests/datasource.spec.ts
+++ b/packages/server/src/api/routes/tests/datasource.spec.ts
@@ -164,333 +164,533 @@ describe("/datasources", () => {
   })
 })
 
-datasourceDescribe(
-  { name: "%s", exclude: [DatabaseName.MONGODB, DatabaseName.SQS] },
-  ({ config, dsProvider }) => {
-    let datasource: Datasource
-    let rawDatasource: Datasource
-    let client: Knex
+const descriptions = datasourceDescribe({
+  exclude: [DatabaseName.MONGODB, DatabaseName.SQS],
+})
 
-    beforeEach(async () => {
-      const ds = await dsProvider()
-      rawDatasource = ds.rawDatasource!
-      datasource = ds.datasource!
-      client = ds.client!
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "$dbName",
+    ({ config, dsProvider, isOracle, isMSSQL }) => {
+      let datasource: Datasource
+      let rawDatasource: Datasource
+      let client: Knex
 
-      jest.clearAllMocks()
-      nock.cleanAll()
-    })
+      beforeEach(async () => {
+        const ds = await dsProvider()
+        rawDatasource = ds.rawDatasource!
+        datasource = ds.datasource!
+        client = ds.client!
 
-    describe("get", () => {
-      it("should be able to get a datasource", async () => {
-        const ds = await config.api.datasource.get(datasource._id!)
-        expect(ds).toEqual({
-          config: expect.any(Object),
-          plus: datasource.plus,
-          source: datasource.source,
-          isSQL: true,
-          type: "datasource_plus",
-          _id: datasource._id,
-          _rev: expect.any(String),
-          createdAt: expect.any(String),
-          updatedAt: expect.any(String),
-        })
+        jest.clearAllMocks()
+        nock.cleanAll()
       })
 
-      it("should not return database password", async () => {
-        const ds = await config.api.datasource.get(datasource._id!)
-        expect(ds.config!.password).toBe("--secret-value--")
-      })
-    })
-
-    describe("list", () => {
-      it("returns all the datasources", async () => {
-        const datasources = await config.api.datasource.fetch()
-        expect(datasources).toContainEqual(expect.objectContaining(datasource))
-      })
-    })
-
-    describe("put", () => {
-      it("should update an existing datasource", async () => {
-        const newName = generator.guid()
-        datasource.name = newName
-        const updatedDs = await config.api.datasource.update(datasource)
-        expect(updatedDs.name).toEqual(newName)
-        expect(events.datasource.updated).toHaveBeenCalledTimes(1)
-      })
-
-      it("should not overwrite database password with --secret-value--", async () => {
-        const password = await context.doInAppContext(
-          config.getAppId(),
-          async () => {
-            const ds = await sdk.datasources.get(datasource._id!)
-            return ds.config!.password
-          }
-        )
-
-        expect(password).not.toBe("--secret-value--")
-
-        const ds = await config.api.datasource.get(datasource._id!)
-        expect(ds.config!.password).toBe("--secret-value--")
-
-        await config.api.datasource.update(
-          await config.api.datasource.get(datasource._id!)
-        )
-
-        const newPassword = await context.doInAppContext(
-          config.getAppId(),
-          async () => {
-            const ds = await sdk.datasources.get(datasource._id!)
-            return ds.config!.password
-          }
-        )
-
-        expect(newPassword).not.toBe("--secret-value--")
-        expect(newPassword).toBe(password)
-      })
-    })
-
-    describe("destroy", () => {
-      it("deletes queries for the datasource after deletion and returns a success message", async () => {
-        await config.api.query.save({
-          datasourceId: datasource._id!,
-          name: "Test Query",
-          parameters: [],
-          fields: {},
-          schema: {},
-          queryVerb: "read",
-          transformer: null,
-          readable: true,
-        })
-
-        await config.api.datasource.delete(datasource)
-        const datasources = await config.api.datasource.fetch()
-        expect(datasources).not.toContainEqual(
-          expect.objectContaining(datasource)
-        )
-        expect(events.datasource.deleted).toHaveBeenCalledTimes(1)
-      })
-    })
-
-    describe("schema", () => {
-      it("fetching schema will not drop tables or columns", async () => {
-        const datasourceId = datasource!._id!
-
-        const simpleTable = await config.api.table.save(
-          tableForDatasource(datasource, {
-            name: "simple",
-            schema: {
-              name: {
-                name: "name",
-                type: FieldType.STRING,
-              },
-            },
+      describe("get", () => {
+        it("should be able to get a datasource", async () => {
+          const ds = await config.api.datasource.get(datasource._id!)
+          expect(ds).toEqual({
+            config: expect.any(Object),
+            plus: datasource.plus,
+            source: datasource.source,
+            isSQL: true,
+            type: "datasource_plus",
+            _id: datasource._id,
+            _rev: expect.any(String),
+            createdAt: expect.any(String),
+            updatedAt: expect.any(String),
           })
-        )
-
-        const stringName = "string"
-        const fullSchema: {
-          [type in SupportedSqlTypes]: FieldSchema & { type: type }
-        } = {
-          [FieldType.STRING]: {
-            name: stringName,
-            type: FieldType.STRING,
-          },
-          [FieldType.LONGFORM]: {
-            name: "longform",
-            type: FieldType.LONGFORM,
-          },
-          [FieldType.OPTIONS]: {
-            name: "options",
-            type: FieldType.OPTIONS,
-            constraints: {
-              presence: {
-                allowEmpty: false,
-              },
-              inclusion: [],
-            },
-          },
-          [FieldType.NUMBER]: {
-            name: "number",
-            type: FieldType.NUMBER,
-          },
-          [FieldType.BOOLEAN]: {
-            name: "boolean",
-            type: FieldType.BOOLEAN,
-          },
-          [FieldType.ARRAY]: {
-            name: "array",
-            type: FieldType.ARRAY,
-            constraints: {
-              type: JsonFieldSubType.ARRAY,
-              inclusion: [],
-            },
-          },
-          [FieldType.DATETIME]: {
-            name: "datetime",
-            type: FieldType.DATETIME,
-            dateOnly: true,
-            timeOnly: false,
-          },
-          [FieldType.LINK]: {
-            name: "link",
-            type: FieldType.LINK,
-            tableId: simpleTable._id!,
-            relationshipType: RelationshipType.ONE_TO_MANY,
-            fieldName: "link",
-          },
-          [FieldType.FORMULA]: {
-            name: "formula",
-            type: FieldType.FORMULA,
-            formula: "any formula",
-          },
-          [FieldType.BARCODEQR]: {
-            name: "barcodeqr",
-            type: FieldType.BARCODEQR,
-          },
-          [FieldType.BIGINT]: {
-            name: "bigint",
-            type: FieldType.BIGINT,
-          },
-          [FieldType.BB_REFERENCE]: {
-            name: "bb_reference",
-            type: FieldType.BB_REFERENCE,
-            subtype: BBReferenceFieldSubType.USER,
-          },
-          [FieldType.BB_REFERENCE_SINGLE]: {
-            name: "bb_reference_single",
-            type: FieldType.BB_REFERENCE_SINGLE,
-            subtype: BBReferenceFieldSubType.USER,
-          },
-        }
-
-        await config.api.table.save(
-          tableForDatasource(datasource, {
-            name: "full",
-            schema: fullSchema,
-          })
-        )
-
-        const persisted = await config.api.datasource.get(datasourceId)
-        await config.api.datasource.fetchSchema({ datasourceId })
-
-        const updated = await config.api.datasource.get(datasourceId)
-        const expected: Datasource = {
-          ...persisted,
-          entities:
-            persisted?.entities &&
-            Object.entries(persisted.entities).reduce<Record<string, Table>>(
-              (acc, [tableName, table]) => {
-                acc[tableName] = expect.objectContaining({
-                  ...table,
-                  primaryDisplay: expect.not.stringMatching(
-                    new RegExp(`^${table.primaryDisplay || ""}$`)
-                  ),
-                  schema: Object.entries(table.schema).reduce<TableSchema>(
-                    (acc, [fieldName, field]) => {
-                      acc[fieldName] = {
-                        ...field,
-                        externalType: allowUndefined(expect.any(String)),
-                        constraints: allowUndefined(expect.any(Object)),
-                        autocolumn: allowUndefined(expect.any(Boolean)),
-                      }
-                      return acc
-                    },
-                    {}
-                  ),
-                })
-                return acc
-              },
-              {}
-            ),
-
-          _rev: expect.any(String),
-          updatedAt: expect.any(String),
-        }
-        expect(updated).toEqual(expected)
-      })
-    })
-
-    describe("verify", () => {
-      it("should be able to verify the connection", async () => {
-        await config.api.datasource.verify(
-          {
-            datasource: rawDatasource,
-          },
-          {
-            body: {
-              connected: true,
-            },
-          }
-        )
-      })
-
-      it("should state an invalid datasource cannot connect", async () => {
-        await config.api.datasource.verify(
-          {
-            datasource: {
-              ...rawDatasource,
-              config: {
-                ...rawDatasource.config,
-                password: "wrongpassword",
-              },
-            },
-          },
-          {
-            body: {
-              connected: false,
-              error: /.*/, // error message differs between databases
-            },
-          }
-        )
-      })
-    })
-
-    describe("info", () => {
-      it("should fetch information about a datasource with a single table", async () => {
-        const existingTableNames = (
-          await config.api.datasource.info(datasource)
-        ).tableNames
-
-        const tableName = generator.guid()
-        await client.schema.createTable(tableName, table => {
-          table.increments("id").primary()
-          table.string("name")
         })
 
-        const info = await config.api.datasource.info(datasource)
-        expect(info.tableNames).toEqual(
-          expect.arrayContaining([tableName, ...existingTableNames])
-        )
-        expect(info.tableNames).toHaveLength(existingTableNames.length + 1)
+        it("should not return database password", async () => {
+          const ds = await config.api.datasource.get(datasource._id!)
+          expect(ds.config!.password).toBe("--secret-value--")
+        })
       })
 
-      it("should fetch information about a datasource with multiple tables", async () => {
-        const existingTableNames = (
-          await config.api.datasource.info(datasource)
-        ).tableNames
+      describe("list", () => {
+        it("returns all the datasources", async () => {
+          const datasources = await config.api.datasource.fetch()
+          expect(datasources).toContainEqual(
+            expect.objectContaining(datasource)
+          )
+        })
+      })
 
-        const tableNames = [
-          generator.guid(),
-          generator.guid(),
-          generator.guid(),
-          generator.guid(),
-        ]
-        for (const tableName of tableNames) {
+      describe("put", () => {
+        it("should update an existing datasource", async () => {
+          const newName = generator.guid()
+          datasource.name = newName
+          const updatedDs = await config.api.datasource.update(datasource)
+          expect(updatedDs.name).toEqual(newName)
+          expect(events.datasource.updated).toHaveBeenCalledTimes(1)
+        })
+
+        it("should not overwrite database password with --secret-value--", async () => {
+          const password = await context.doInAppContext(
+            config.getAppId(),
+            async () => {
+              const ds = await sdk.datasources.get(datasource._id!)
+              return ds.config!.password
+            }
+          )
+
+          expect(password).not.toBe("--secret-value--")
+
+          const ds = await config.api.datasource.get(datasource._id!)
+          expect(ds.config!.password).toBe("--secret-value--")
+
+          await config.api.datasource.update(
+            await config.api.datasource.get(datasource._id!)
+          )
+
+          const newPassword = await context.doInAppContext(
+            config.getAppId(),
+            async () => {
+              const ds = await sdk.datasources.get(datasource._id!)
+              return ds.config!.password
+            }
+          )
+
+          expect(newPassword).not.toBe("--secret-value--")
+          expect(newPassword).toBe(password)
+        })
+      })
+
+      describe("destroy", () => {
+        it("deletes queries for the datasource after deletion and returns a success message", async () => {
+          await config.api.query.save({
+            datasourceId: datasource._id!,
+            name: "Test Query",
+            parameters: [],
+            fields: {},
+            schema: {},
+            queryVerb: "read",
+            transformer: null,
+            readable: true,
+          })
+
+          await config.api.datasource.delete(datasource)
+          const datasources = await config.api.datasource.fetch()
+          expect(datasources).not.toContainEqual(
+            expect.objectContaining(datasource)
+          )
+          expect(events.datasource.deleted).toHaveBeenCalledTimes(1)
+        })
+      })
+
+      describe("schema", () => {
+        it("fetching schema will not drop tables or columns", async () => {
+          const datasourceId = datasource!._id!
+
+          const simpleTable = await config.api.table.save(
+            tableForDatasource(datasource, {
+              name: "simple",
+              schema: {
+                name: {
+                  name: "name",
+                  type: FieldType.STRING,
+                },
+              },
+            })
+          )
+
+          const stringName = "string"
+          const fullSchema: {
+            [type in SupportedSqlTypes]: FieldSchema & { type: type }
+          } = {
+            [FieldType.STRING]: {
+              name: stringName,
+              type: FieldType.STRING,
+            },
+            [FieldType.LONGFORM]: {
+              name: "longform",
+              type: FieldType.LONGFORM,
+            },
+            [FieldType.OPTIONS]: {
+              name: "options",
+              type: FieldType.OPTIONS,
+              constraints: {
+                presence: {
+                  allowEmpty: false,
+                },
+                inclusion: ["1", "2", "3"],
+              },
+            },
+            [FieldType.NUMBER]: {
+              name: "number",
+              type: FieldType.NUMBER,
+            },
+            [FieldType.BOOLEAN]: {
+              name: "boolean",
+              type: FieldType.BOOLEAN,
+            },
+            [FieldType.ARRAY]: {
+              name: "array",
+              type: FieldType.ARRAY,
+              constraints: {
+                type: JsonFieldSubType.ARRAY,
+                inclusion: [],
+              },
+            },
+            [FieldType.DATETIME]: {
+              name: "datetime",
+              type: FieldType.DATETIME,
+              dateOnly: true,
+              timeOnly: false,
+            },
+            [FieldType.LINK]: {
+              name: "link",
+              type: FieldType.LINK,
+              tableId: simpleTable._id!,
+              relationshipType: RelationshipType.ONE_TO_MANY,
+              fieldName: "link",
+            },
+            [FieldType.FORMULA]: {
+              name: "formula",
+              type: FieldType.FORMULA,
+              formula: "any formula",
+            },
+            [FieldType.BARCODEQR]: {
+              name: "barcodeqr",
+              type: FieldType.BARCODEQR,
+            },
+            [FieldType.BIGINT]: {
+              name: "bigint",
+              type: FieldType.BIGINT,
+            },
+            [FieldType.BB_REFERENCE]: {
+              name: "bb_reference",
+              type: FieldType.BB_REFERENCE,
+              subtype: BBReferenceFieldSubType.USER,
+            },
+            [FieldType.BB_REFERENCE_SINGLE]: {
+              name: "bb_reference_single",
+              type: FieldType.BB_REFERENCE_SINGLE,
+              subtype: BBReferenceFieldSubType.USER,
+            },
+          }
+
+          await config.api.table.save(
+            tableForDatasource(datasource, {
+              name: "full",
+              schema: fullSchema,
+            })
+          )
+
+          const persisted = await config.api.datasource.get(datasourceId)
+          await config.api.datasource.fetchSchema({ datasourceId })
+
+          const updated = await config.api.datasource.get(datasourceId)
+          const expected: Datasource = {
+            ...persisted,
+            entities:
+              persisted?.entities &&
+              Object.entries(persisted.entities).reduce<Record<string, Table>>(
+                (acc, [tableName, table]) => {
+                  acc[tableName] = expect.objectContaining({
+                    ...table,
+                    primaryDisplay: expect.not.stringMatching(
+                      new RegExp(`^${table.primaryDisplay || ""}$`)
+                    ),
+                    schema: Object.entries(table.schema).reduce<TableSchema>(
+                      (acc, [fieldName, field]) => {
+                        acc[fieldName] = {
+                          ...field,
+                          externalType: allowUndefined(expect.any(String)),
+                          constraints: allowUndefined(expect.any(Object)),
+                          autocolumn: allowUndefined(expect.any(Boolean)),
+                        }
+                        return acc
+                      },
+                      {}
+                    ),
+                  })
+                  return acc
+                },
+                {}
+              ),
+
+            _rev: expect.any(String),
+            updatedAt: expect.any(String),
+          }
+          expect(updated).toEqual(expected)
+        })
+
+        !isOracle &&
+          !isMSSQL &&
+          it("can fetch options columns with a large number of options", async () => {
+            const enumOptions = new Array(1000)
+              .fill(0)
+              .map((_, i) => i.toString())
+              .toSorted()
+            await client.schema.createTable("options", table => {
+              table.increments("id").primary()
+              table.enum("enum", enumOptions, {
+                useNative: true,
+                enumName: "enum",
+              })
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource._id!,
+            })
+            expect(resp.errors).toEqual({})
+
+            const table = resp.datasource.entities!.options
+            expect(
+              table.schema.enum.constraints!.inclusion!.toSorted()
+            ).toEqual(enumOptions)
+          })
+
+        !isOracle &&
+          !isMSSQL &&
+          it("can fetch options with commas in them", async () => {
+            const enumOptions = [
+              "Lincoln, Abraham",
+              "Washington, George",
+              "Fred",
+              "Bob",
+            ].toSorted()
+            await client.schema.createTable("options", table => {
+              table.increments("id").primary()
+              table.enum("enum", enumOptions, {
+                useNative: true,
+                enumName: "enum",
+              })
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource._id!,
+            })
+            expect(resp.errors).toEqual({})
+
+            const table = resp.datasource.entities!.options
+            expect(
+              table.schema.enum.constraints!.inclusion!.toSorted()
+            ).toEqual(enumOptions)
+          })
+
+        !isOracle &&
+          !isMSSQL &&
+          it("can fetch options that may include other type names", async () => {
+            const enumOptions = [
+              "int",
+              "bigint",
+              "float",
+              "numeric",
+              "json",
+              "map",
+            ].toSorted()
+
+            await client.schema.createTable("options", table => {
+              table.increments("id").primary()
+              table.enum("enum", enumOptions, {
+                useNative: true,
+                enumName: "enum",
+              })
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource._id!,
+            })
+
+            expect(resp.errors).toEqual({})
+
+            const table = resp.datasource.entities!.options
+            expect(
+              table.schema.enum.constraints!.inclusion!.toSorted()
+            ).toEqual(enumOptions)
+          })
+      })
+
+      describe("verify", () => {
+        it("should be able to verify the connection", async () => {
+          await config.api.datasource.verify(
+            {
+              datasource: rawDatasource,
+            },
+            {
+              body: {
+                connected: true,
+              },
+            }
+          )
+        })
+
+        it("should state an invalid datasource cannot connect", async () => {
+          await config.api.datasource.verify(
+            {
+              datasource: {
+                ...rawDatasource,
+                config: {
+                  ...rawDatasource.config,
+                  password: "wrongpassword",
+                },
+              },
+            },
+            {
+              body: {
+                connected: false,
+                error: /.*/, // error message differs between databases
+              },
+            }
+          )
+        })
+      })
+
+      describe("info", () => {
+        it("should fetch information about a datasource with a single table", async () => {
+          const existingTableNames = (
+            await config.api.datasource.info(datasource)
+          ).tableNames
+
+          const tableName = generator.guid()
           await client.schema.createTable(tableName, table => {
             table.increments("id").primary()
             table.string("name")
           })
-        }
 
-        const info = await config.api.datasource.info(datasource)
-        expect(info.tableNames).toEqual(
-          expect.arrayContaining([...tableNames, ...existingTableNames])
-        )
-        expect(info.tableNames).toHaveLength(
-          existingTableNames.length + tableNames.length
-        )
+          const info = await config.api.datasource.info(datasource)
+          expect(info.tableNames).toEqual(
+            expect.arrayContaining([tableName, ...existingTableNames])
+          )
+          expect(info.tableNames).toHaveLength(existingTableNames.length + 1)
+        })
+
+        it("should fetch information about a datasource with multiple tables", async () => {
+          const existingTableNames = (
+            await config.api.datasource.info(datasource)
+          ).tableNames
+
+          const tableNames = [
+            generator.guid(),
+            generator.guid(),
+            generator.guid(),
+            generator.guid(),
+          ]
+          for (const tableName of tableNames) {
+            await client.schema.createTable(tableName, table => {
+              table.increments("id").primary()
+              table.string("name")
+            })
+          }
+
+          const info = await config.api.datasource.info(datasource)
+          expect(info.tableNames).toEqual(
+            expect.arrayContaining([...tableNames, ...existingTableNames])
+          )
+          expect(info.tableNames).toHaveLength(
+            existingTableNames.length + tableNames.length
+          )
+        })
       })
-    })
-  }
-)
+    }
+  )
+}
+
+const datasources = datasourceDescribe({
+  exclude: [DatabaseName.MONGODB, DatabaseName.SQS, DatabaseName.ORACLE],
+})
+
+if (datasources.length) {
+  describe.each(datasources)(
+    "$dbName",
+    ({ config, dsProvider, isPostgres, isLegacy, isMySQL, isMariaDB }) => {
+      let datasource: Datasource
+      let client: Knex
+
+      beforeEach(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource!
+        client = ds.client!
+      })
+
+      describe("external export", () => {
+        let table: Table
+
+        beforeEach(async () => {
+          table = await config.api.table.save(
+            tableForDatasource(datasource, {
+              name: "simple",
+              primary: ["id"],
+              primaryDisplay: "name",
+              schema: {
+                id: {
+                  name: "id",
+                  autocolumn: true,
+                  type: FieldType.NUMBER,
+                  constraints: {
+                    presence: false,
+                  },
+                },
+                name: {
+                  name: "name",
+                  autocolumn: false,
+                  type: FieldType.STRING,
+                  constraints: {
+                    presence: false,
+                  },
+                },
+              },
+            })
+          )
+        })
+
+        it("should be able to export and reimport a schema", async () => {
+          let { schema } = await config.api.datasource.externalSchema(
+            datasource
+          )
+
+          if (isPostgres) {
+            // pg_dump 17 puts this config parameter into the dump but no DB < 17
+            // can load it. We're using postgres 16 in tests at the time of writing.
+            schema = schema.replace("SET transaction_timeout = 0;", "")
+          }
+          if (isPostgres && isLegacy) {
+            // in older versions of Postgres, this is not a valid option - Postgres 9.5 does not support this.
+            schema = schema.replace(
+              "SET idle_in_transaction_session_timeout = 0;",
+              ""
+            )
+          }
+
+          await config.api.table.destroy(table._id!, table._rev!)
+
+          if (isMySQL || isMariaDB) {
+            // MySQL/MariaDB clients don't let you run multiple queries in a
+            // single call.  They also throw an error when given an empty query.
+            // The below handles both of these things.
+            for (let query of schema.split(";\n")) {
+              query = query.trim()
+              if (!query) {
+                continue
+              }
+              await client.raw(query)
+            }
+          } else {
+            await client.raw(schema)
+          }
+
+          await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+
+          const tables = await config.api.table.fetch()
+          const newTable = tables.find(t => t.name === table.name)!
+
+          // This is only set on tables created through Budibase, we don't
+          // expect it to match after we import the table.
+          delete table.created
+
+          for (const field of Object.values(newTable.schema)) {
+            // Will differ per-database, not useful for this test.
+            delete field.externalType
+          }
+
+          expect(newTable).toEqual(table)
+        })
+      })
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/dev.spec.js b/packages/server/src/api/routes/tests/dev.spec.js
index 73f506d17f..4c999e98c3 100644
--- a/packages/server/src/api/routes/tests/dev.spec.js
+++ b/packages/server/src/api/routes/tests/dev.spec.js
@@ -19,7 +19,7 @@ describe("/dev", () => {
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
-      expect(events.app.reverted).toBeCalledTimes(1)
+      expect(events.app.reverted).toHaveBeenCalledTimes(1)
     })
   })
 
@@ -32,8 +32,10 @@ describe("/dev", () => {
         .expect(200)
 
       expect(res.body.version).toBe("0.0.0+jest")
-      expect(events.installation.versionChecked).toBeCalledTimes(1)
-      expect(events.installation.versionChecked).toBeCalledWith("0.0.0+jest")
+      expect(events.installation.versionChecked).toHaveBeenCalledTimes(1)
+      expect(events.installation.versionChecked).toHaveBeenCalledWith(
+        "0.0.0+jest"
+      )
     })
   })
 })
diff --git a/packages/server/src/api/routes/tests/layout.spec.js b/packages/server/src/api/routes/tests/layout.spec.js
index c3a3010e32..c5ffeb9c20 100644
--- a/packages/server/src/api/routes/tests/layout.spec.js
+++ b/packages/server/src/api/routes/tests/layout.spec.js
@@ -25,7 +25,7 @@ describe("/layouts", () => {
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body._rev).toBeDefined()
-      expect(events.layout.created).toBeCalledTimes(1)
+      expect(events.layout.created).toHaveBeenCalledTimes(1)
     })
 
     it("should apply authorization to endpoint", async () => {
@@ -45,7 +45,7 @@ describe("/layouts", () => {
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.message).toBeDefined()
-      expect(events.layout.deleted).toBeCalledTimes(1)
+      expect(events.layout.deleted).toHaveBeenCalledTimes(1)
     })
 
     it("should apply authorization to endpoint", async () => {
diff --git a/packages/server/src/api/routes/tests/metadata.spec.js b/packages/server/src/api/routes/tests/metadata.spec.ts
similarity index 69%
rename from packages/server/src/api/routes/tests/metadata.spec.js
rename to packages/server/src/api/routes/tests/metadata.spec.ts
index d5563f417e..6e991a272e 100644
--- a/packages/server/src/api/routes/tests/metadata.spec.js
+++ b/packages/server/src/api/routes/tests/metadata.spec.ts
@@ -1,11 +1,11 @@
-const { testAutomation } = require("./utilities/TestFunctions")
-const setup = require("./utilities")
-const { MetadataTypes } = require("../../../constants")
+import { testAutomation } from "./utilities/TestFunctions"
+import * as setup from "./utilities"
+import { MetadataType, Automation } from "@budibase/types"
 
 describe("/metadata", () => {
   let request = setup.getRequest()
   let config = setup.getConfig()
-  let automation
+  let automation: Automation
 
   afterAll(setup.afterAll)
 
@@ -15,8 +15,8 @@ describe("/metadata", () => {
   })
 
   async function createMetadata(
-    data,
-    type = MetadataTypes.AUTOMATION_TEST_INPUT
+    data: Record<string, string>,
+    type = MetadataType.AUTOMATION_TEST_INPUT
   ) {
     const res = await request
       .post(`/api/metadata/${type}/${automation._id}`)
@@ -27,7 +27,7 @@ describe("/metadata", () => {
     expect(res.body._rev).toBeDefined()
   }
 
-  async function getMetadata(type) {
+  async function getMetadata(type: MetadataType) {
     const res = await request
       .get(`/api/metadata/${type}/${automation._id}`)
       .set(config.defaultHeaders())
@@ -39,14 +39,14 @@ describe("/metadata", () => {
   describe("save", () => {
     it("should be able to save some metadata", async () => {
       await createMetadata({ test: "a" })
-      const testInput = await getMetadata(MetadataTypes.AUTOMATION_TEST_INPUT)
+      const testInput = await getMetadata(MetadataType.AUTOMATION_TEST_INPUT)
       expect(testInput.test).toBe("a")
     })
 
     it("should save history metadata on automation run", async () => {
       // this should have created some history
-      await testAutomation(config, automation)
-      const metadata = await getMetadata(MetadataTypes.AUTOMATION_TEST_HISTORY)
+      await testAutomation(config, automation, {})
+      const metadata = await getMetadata(MetadataType.AUTOMATION_TEST_HISTORY)
       expect(metadata).toBeDefined()
       expect(metadata.history.length).toBe(1)
       expect(typeof metadata.history[0].occurredAt).toBe("number")
@@ -57,13 +57,13 @@ describe("/metadata", () => {
     it("should be able to delete some test inputs", async () => {
       const res = await request
         .delete(
-          `/api/metadata/${MetadataTypes.AUTOMATION_TEST_INPUT}/${automation._id}`
+          `/api/metadata/${MetadataType.AUTOMATION_TEST_INPUT}/${automation._id}`
         )
         .set(config.defaultHeaders())
         .expect("Content-Type", /json/)
         .expect(200)
       expect(res.body.message).toBeDefined()
-      const metadata = await getMetadata(MetadataTypes.AUTOMATION_TEST_INPUT)
+      const metadata = await getMetadata(MetadataType.AUTOMATION_TEST_INPUT)
       expect(metadata.test).toBeUndefined()
     })
   })
diff --git a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
index aea4e5b2a2..13dd1b719b 100644
--- a/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/generic-sql.spec.ts
@@ -1,596 +1,486 @@
-import {
-  Datasource,
-  Operation,
-  Query,
-  QueryPreview,
-  TableSourceType,
-} from "@budibase/types"
+import { Datasource, Query, QueryPreview } from "@budibase/types"
 import {
   DatabaseName,
   datasourceDescribe,
 } from "../../../../integrations/tests/utils"
-import { Expectations } from "src/tests/utilities/api/base"
+import { Expectations } from "../../../../tests/utilities/api/base"
 import { events } from "@budibase/backend-core"
 import { Knex } from "knex"
 import { generator } from "@budibase/backend-core/tests"
 
-datasourceDescribe(
-  { name: "queries (%s)", exclude: [DatabaseName.MONGODB, DatabaseName.SQS] },
-  ({ config, dsProvider, isOracle, isMSSQL, isPostgres }) => {
-    let rawDatasource: Datasource
-    let datasource: Datasource
-    let client: Knex
+const descriptions = datasourceDescribe({
+  exclude: [DatabaseName.MONGODB, DatabaseName.SQS],
+})
 
-    let tableName: string
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "queries ($dbName)",
+    ({ config, dsProvider, isOracle, isMSSQL, isPostgres }) => {
+      let rawDatasource: Datasource
+      let datasource: Datasource
+      let client: Knex
 
-    async function createQuery(
-      query: Partial<Query>,
-      expectations?: Expectations
-    ): Promise<Query> {
-      const defaultQuery: Query = {
-        datasourceId: datasource._id!,
-        name: "New Query",
-        parameters: [],
-        fields: {},
-        schema: {},
-        queryVerb: "read",
-        transformer: "return data",
-        readable: true,
-      }
-      if (query.fields?.sql && typeof query.fields.sql !== "string") {
-        throw new Error("Unable to create with knex structure in 'sql' field")
-      }
-      return await config.api.query.save(
-        { ...defaultQuery, ...query },
-        expectations
-      )
-    }
+      let tableName: string
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      rawDatasource = ds.rawDatasource!
-      datasource = ds.datasource!
-      client = ds.client!
-    })
-
-    beforeEach(async () => {
-      // The Datasource API doesn ot return the password, but we need it later to
-      // connect to the underlying database, so we fill it back in here.
-      datasource.config!.password = rawDatasource.config!.password
-
-      tableName = generator.guid()
-
-      await client.schema.dropTableIfExists(tableName)
-      await client.schema.createTable(tableName, table => {
-        table.increments("id").primary()
-        table.string("name")
-        table.timestamp("birthday")
-        table.integer("number")
-      })
-
-      await client(tableName).insert([
-        { name: "one" },
-        { name: "two" },
-        { name: "three" },
-        { name: "four" },
-        { name: "five" },
-      ])
-
-      jest.clearAllMocks()
-    })
-
-    describe("query admin", () => {
-      describe("create", () => {
-        it("should be able to create a query", async () => {
-          const query = await createQuery({
-            name: "New Query",
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-          })
-
-          expect(query).toMatchObject({
-            datasourceId: datasource._id!,
-            name: "New Query",
-            parameters: [],
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-            schema: {},
-            queryVerb: "read",
-            transformer: "return data",
-            readable: true,
-            createdAt: expect.any(String),
-            updatedAt: expect.any(String),
-          })
-
-          expect(events.query.created).toHaveBeenCalledTimes(1)
-          expect(events.query.updated).not.toHaveBeenCalled()
-        })
-      })
-
-      describe("update", () => {
-        it("should be able to update a query", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-          })
-
-          jest.clearAllMocks()
-
-          const updatedQuery = await config.api.query.save({
-            ...query,
-            name: "Updated Query",
-            fields: {
-              sql: client(tableName).where({ id: 1 }).toString(),
-            },
-          })
-
-          expect(updatedQuery).toMatchObject({
-            datasourceId: datasource._id!,
-            name: "Updated Query",
-            parameters: [],
-            fields: {
-              sql: client(tableName).where({ id: 1 }).toString(),
-            },
-            schema: {},
-            queryVerb: "read",
-            transformer: "return data",
-            readable: true,
-          })
-
-          expect(events.query.created).not.toHaveBeenCalled()
-          expect(events.query.updated).toHaveBeenCalledTimes(1)
-        })
-      })
-
-      describe("delete", () => {
-        it("should be able to delete a query", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-          })
-
-          await config.api.query.delete(query)
-          await config.api.query.get(query._id!, { status: 404 })
-
-          const queries = await config.api.query.fetch()
-          expect(queries).not.toContainEqual(query)
-
-          expect(events.query.deleted).toHaveBeenCalledTimes(1)
-          expect(events.query.deleted).toHaveBeenCalledWith(datasource, query)
-        })
-      })
-
-      describe("read", () => {
-        it("should be able to list queries", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-          })
-
-          const queries = await config.api.query.fetch()
-          expect(queries).toContainEqual(query)
-        })
-
-        it("should strip sensitive fields for prod apps", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).select("*").toString(),
-            },
-          })
-
-          await config.api.application.publish(config.getAppId())
-          const prodQuery = await config.api.query.getProd(query._id!)
-
-          expect(prodQuery._id).toEqual(query._id)
-          expect(prodQuery.fields).toBeUndefined()
-          expect(prodQuery.parameters).toBeUndefined()
-          expect(prodQuery.schema).toBeDefined()
-        })
-
-        isPostgres &&
-          it("should be able to handle a JSON aggregate with newlines", async () => {
-            const jsonStatement = `COALESCE(json_build_object('name', name),'{"name":{}}'::json)`
-            const query = await createQuery({
-              fields: {
-                sql: client(tableName)
-                  .select([
-                    "*",
-                    client.raw(
-                      `${jsonStatement} as json,\n${jsonStatement} as json2`
-                    ),
-                  ])
-                  .toString(),
-              },
-            })
-            const res = await config.api.query.execute(
-              query._id!,
-              {},
-              {
-                status: 200,
-              }
-            )
-            expect(res).toBeDefined()
-          })
-      })
-    })
-
-    describe("preview", () => {
-      it("should be able to preview a query", async () => {
-        const request: QueryPreview = {
+      async function createQuery(
+        query: Partial<Query>,
+        expectations?: Expectations
+      ): Promise<Query> {
+        const defaultQuery: Query = {
           datasourceId: datasource._id!,
-          queryVerb: "read",
-          fields: {
-            sql: client(tableName).where({ id: 1 }).toString(),
-          },
+          name: "New Query",
           parameters: [],
-          transformer: "return data",
-          name: datasource.name!,
+          fields: {},
           schema: {},
+          queryVerb: "read",
+          transformer: "return data",
           readable: true,
         }
-        const response = await config.api.query.preview(request)
-        expect(response.schema).toEqual({
-          birthday: {
-            name: "birthday",
-            type: "string",
-          },
-          id: {
-            name: "id",
-            type: "number",
-          },
-          name: {
-            name: "name",
-            type: "string",
-          },
-          number: {
-            name: "number",
-            type: "string",
-          },
-        })
-        expect(response.rows).toEqual([
-          {
-            birthday: null,
-            id: 1,
-            name: "one",
-            number: null,
-          },
-        ])
-        expect(events.query.previewed).toHaveBeenCalledTimes(1)
+        if (query.fields?.sql && typeof query.fields.sql !== "string") {
+          throw new Error("Unable to create with knex structure in 'sql' field")
+        }
+        return await config.api.query.save(
+          { ...defaultQuery, ...query },
+          expectations
+        )
+      }
+
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        rawDatasource = ds.rawDatasource!
+        datasource = ds.datasource!
+        client = ds.client!
       })
 
-      it("should update schema when column type changes from number to string", async () => {
-        const tableName = "schema_change_test"
-        await client.schema.dropTableIfExists(tableName)
+      beforeEach(async () => {
+        // The Datasource API doesn ot return the password, but we need it later to
+        // connect to the underlying database, so we fill it back in here.
+        datasource.config!.password = rawDatasource.config!.password
 
+        tableName = generator.guid()
+
+        await client.schema.dropTableIfExists(tableName)
         await client.schema.createTable(tableName, table => {
           table.increments("id").primary()
           table.string("name")
-          table.integer("data")
+          table.timestamp("birthday")
+          table.integer("number")
         })
 
-        await client(tableName).insert({
-          name: "test",
-          data: 123,
-        })
-
-        const firstPreview = await config.api.query.preview({
-          datasourceId: datasource._id!,
-          name: "Test Query",
-          queryVerb: "read",
-          fields: {
-            sql: client(tableName).select("*").toString(),
-          },
-          parameters: [],
-          transformer: "return data",
-          schema: {},
-          readable: true,
-        })
-
-        expect(firstPreview.schema).toEqual(
-          expect.objectContaining({
-            data: { type: "number", name: "data" },
-          })
-        )
-
-        await client(tableName).delete()
-        await client.schema.alterTable(tableName, table => {
-          table.string("data").alter()
-        })
-
-        await client(tableName).insert({
-          name: "test",
-          data: "string value",
-        })
-
-        const secondPreview = await config.api.query.preview({
-          datasourceId: datasource._id!,
-          name: "Test Query",
-          queryVerb: "read",
-          fields: {
-            sql: client(tableName).select("*").toString(),
-          },
-          parameters: [],
-          transformer: "return data",
-          schema: firstPreview.schema,
-          readable: true,
-        })
-
-        expect(secondPreview.schema).toEqual(
-          expect.objectContaining({
-            data: { type: "string", name: "data" },
-          })
-        )
-      })
-
-      it("should work with static variables", async () => {
-        const datasource = await config.api.datasource.create({
-          ...rawDatasource,
-          config: {
-            ...rawDatasource.config,
-            staticVariables: {
-              foo: "bar",
-            },
-          },
-        })
-
-        const request: QueryPreview = {
-          datasourceId: datasource._id!,
-          queryVerb: "read",
-          fields: {
-            sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
-          },
-          parameters: [],
-          transformer: "return data",
-          name: datasource.name!,
-          schema: {},
-          readable: true,
-        }
-
-        const response = await config.api.query.preview(request)
-
-        let key = isOracle ? "FOO" : "foo"
-        expect(response.schema).toEqual({
-          [key]: {
-            name: key,
-            type: "string",
-          },
-        })
-
-        expect(response.rows).toEqual([
-          {
-            [key]: "bar",
-          },
+        await client(tableName).insert([
+          { name: "one" },
+          { name: "two" },
+          { name: "three" },
+          { name: "four" },
+          { name: "five" },
         ])
+
+        jest.clearAllMocks()
       })
 
-      it("should work with dynamic variables", async () => {
-        const datasource = await config.api.datasource.create(rawDatasource)
-
-        const basedOnQuery = await createQuery({
-          datasourceId: datasource._id!,
-          fields: {
-            sql: client(tableName).select("name").where({ id: 1 }).toString(),
-          },
-        })
-
-        await config.api.datasource.update({
-          ...datasource,
-          config: {
-            ...datasource.config,
-            dynamicVariables: [
-              {
-                queryId: basedOnQuery._id!,
-                name: "foo",
-                value: "{{ data[0].name }}",
+      describe("query admin", () => {
+        describe("create", () => {
+          it("should be able to create a query", async () => {
+            const query = await createQuery({
+              name: "New Query",
+              fields: {
+                sql: client(tableName).select("*").toString(),
               },
-            ],
-          },
-        })
+            })
 
-        const preview = await config.api.query.preview({
-          datasourceId: datasource._id!,
-          queryVerb: "read",
-          fields: {
-            sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
-          },
-          parameters: [],
-          transformer: "return data",
-          name: datasource.name!,
-          schema: {},
-          readable: true,
-        })
-
-        let key = isOracle ? "FOO" : "foo"
-        expect(preview.schema).toEqual({
-          [key]: {
-            name: key,
-            type: "string",
-          },
-        })
-
-        expect(preview.rows).toEqual([
-          {
-            [key]: "one",
-          },
-        ])
-      })
-
-      it("should handle the dynamic base query being deleted", async () => {
-        const datasource = await config.api.datasource.create(rawDatasource)
-
-        const basedOnQuery = await createQuery({
-          datasourceId: datasource._id!,
-          fields: {
-            sql: client(tableName).select("name").where({ id: 1 }).toString(),
-          },
-        })
-
-        await config.api.datasource.update({
-          ...datasource,
-          config: {
-            ...datasource.config,
-            dynamicVariables: [
-              {
-                queryId: basedOnQuery._id!,
-                name: "foo",
-                value: "{{ data[0].name }}",
+            expect(query).toMatchObject({
+              datasourceId: datasource._id!,
+              name: "New Query",
+              parameters: [],
+              fields: {
+                sql: client(tableName).select("*").toString(),
               },
-            ],
-          },
+              schema: {},
+              queryVerb: "read",
+              transformer: "return data",
+              readable: true,
+              createdAt: expect.any(String),
+              updatedAt: expect.any(String),
+            })
+
+            expect(events.query.created).toHaveBeenCalledTimes(1)
+            expect(events.query.updated).not.toHaveBeenCalled()
+          })
         })
 
-        await config.api.query.delete(basedOnQuery)
-
-        const preview = await config.api.query.preview({
-          datasourceId: datasource._id!,
-          queryVerb: "read",
-          fields: {
-            sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
-          },
-          parameters: [],
-          transformer: "return data",
-          name: datasource.name!,
-          schema: {},
-          readable: true,
-        })
-
-        let key = isOracle ? "FOO" : "foo"
-        expect(preview.schema).toEqual({
-          [key]: {
-            name: key,
-            type: "string",
-          },
-        })
-
-        expect(preview.rows).toEqual([{ [key]: isMSSQL ? "" : null }])
-      })
-    })
-
-    describe("query verbs", () => {
-      describe("create", () => {
-        it("should be able to insert with bindings", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).insert({ name: "{{ foo }}" }).toString(),
-            },
-            parameters: [
-              {
-                name: "foo",
-                default: "bar",
+        describe("update", () => {
+          it("should be able to update a query", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).select("*").toString(),
               },
-            ],
-            queryVerb: "create",
+            })
+
+            jest.clearAllMocks()
+
+            const updatedQuery = await config.api.query.save({
+              ...query,
+              name: "Updated Query",
+              fields: {
+                sql: client(tableName).where({ id: 1 }).toString(),
+              },
+            })
+
+            expect(updatedQuery).toMatchObject({
+              datasourceId: datasource._id!,
+              name: "Updated Query",
+              parameters: [],
+              fields: {
+                sql: client(tableName).where({ id: 1 }).toString(),
+              },
+              schema: {},
+              queryVerb: "read",
+              transformer: "return data",
+              readable: true,
+            })
+
+            expect(events.query.created).not.toHaveBeenCalled()
+            expect(events.query.updated).toHaveBeenCalledTimes(1)
+          })
+        })
+
+        describe("delete", () => {
+          it("should be able to delete a query", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).select("*").toString(),
+              },
+            })
+
+            await config.api.query.delete(query)
+            await config.api.query.get(query._id!, { status: 404 })
+
+            const queries = await config.api.query.fetch()
+            expect(queries).not.toContainEqual(query)
+
+            expect(events.query.deleted).toHaveBeenCalledTimes(1)
+            expect(events.query.deleted).toHaveBeenCalledWith(datasource, query)
+          })
+        })
+
+        describe("read", () => {
+          it("should be able to list queries", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).select("*").toString(),
+              },
+            })
+
+            const queries = await config.api.query.fetch()
+            expect(queries).toContainEqual(query)
           })
 
-          const result = await config.api.query.execute(query._id!, {
-            parameters: {
-              foo: "baz",
-            },
+          it("should strip sensitive fields for prod apps", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).select("*").toString(),
+              },
+            })
+
+            await config.api.application.publish(config.getAppId())
+            const prodQuery = await config.api.query.getProd(query._id!)
+
+            expect(prodQuery._id).toEqual(query._id)
+            expect(prodQuery.fields).toBeUndefined()
+            expect(prodQuery.parameters).toBeUndefined()
+            expect(prodQuery.schema).toBeDefined()
           })
 
-          expect(result.data).toEqual([
-            {
-              created: true,
-            },
-          ])
-
-          const rows = await client(tableName).where({ name: "baz" }).select()
-          expect(rows).toHaveLength(1)
-          for (const row of rows) {
-            expect(row).toMatchObject({ name: "baz" })
-          }
-        })
-
-        it("should not allow handlebars as parameters", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).insert({ name: "{{ foo }}" }).toString(),
-            },
-            parameters: [
-              {
-                name: "foo",
-                default: "bar",
-              },
-            ],
-            queryVerb: "create",
-          })
-
-          await config.api.query.execute(
-            query._id!,
-            {
-              parameters: {
-                foo: "{{ 'test' }}",
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  "Parameter 'foo' input contains a handlebars binding - this is not allowed.",
-              },
-            }
-          )
-        })
-
-        // Oracle doesn't automatically coerce strings into dates.
-        !isOracle &&
-          it.each(["2021-02-05T12:01:00.000Z", "2021-02-05"])(
-            "should coerce %s into a date",
-            async datetimeStr => {
-              const date = new Date(datetimeStr)
+          isPostgres &&
+            it("should be able to handle a JSON aggregate with newlines", async () => {
+              const jsonStatement = `COALESCE(json_build_object('name', name),'{"name":{}}'::json)`
               const query = await createQuery({
                 fields: {
                   sql: client(tableName)
-                    .insert({
-                      name: "foo",
-                      birthday: client.raw("{{ birthday }}"),
-                    })
+                    .select([
+                      "*",
+                      client.raw(
+                        `${jsonStatement} as json,\n${jsonStatement} as json2`
+                      ),
+                    ])
                     .toString(),
                 },
-                parameters: [
-                  {
-                    name: "birthday",
-                    default: "",
-                  },
-                ],
-                queryVerb: "create",
               })
+              const res = await config.api.query.execute(
+                query._id!,
+                {},
+                {
+                  status: 200,
+                }
+              )
+              expect(res).toBeDefined()
+            })
+        })
+      })
 
-              const result = await config.api.query.execute(query._id!, {
-                parameters: { birthday: datetimeStr },
-              })
+      describe("preview", () => {
+        it("should be able to preview a query", async () => {
+          const request: QueryPreview = {
+            datasourceId: datasource._id!,
+            queryVerb: "read",
+            fields: {
+              sql: client(tableName).where({ id: 1 }).toString(),
+            },
+            parameters: [],
+            transformer: "return data",
+            name: datasource.name!,
+            schema: {},
+            readable: true,
+          }
+          const response = await config.api.query.preview(request)
+          expect(response.schema).toEqual({
+            birthday: {
+              name: "birthday",
+              type: "string",
+            },
+            id: {
+              name: "id",
+              type: "number",
+            },
+            name: {
+              name: "name",
+              type: "string",
+            },
+            number: {
+              name: "number",
+              type: "string",
+            },
+          })
+          expect(response.rows).toEqual([
+            {
+              birthday: null,
+              id: 1,
+              name: "one",
+              number: null,
+            },
+          ])
+          expect(events.query.previewed).toHaveBeenCalledTimes(1)
+        })
 
-              expect(result.data).toEqual([{ created: true }])
+        it("should update schema when column type changes from number to string", async () => {
+          const tableName = "schema_change_test"
+          await client.schema.dropTableIfExists(tableName)
 
-              const rows = await client(tableName)
-                .where({ birthday: datetimeStr })
-                .select()
-              expect(rows).toHaveLength(1)
+          await client.schema.createTable(tableName, table => {
+            table.increments("id").primary()
+            table.string("name")
+            table.integer("data")
+          })
 
-              for (const row of rows) {
-                expect(new Date(row.birthday)).toEqual(date)
-              }
-            }
+          await client(tableName).insert({
+            name: "test",
+            data: 123,
+          })
+
+          const firstPreview = await config.api.query.preview({
+            datasourceId: datasource._id!,
+            name: "Test Query",
+            queryVerb: "read",
+            fields: {
+              sql: client(tableName).select("*").toString(),
+            },
+            parameters: [],
+            transformer: "return data",
+            schema: {},
+            readable: true,
+          })
+
+          expect(firstPreview.schema).toEqual(
+            expect.objectContaining({
+              data: { type: "number", name: "data" },
+            })
           )
 
-        it.each(["2021,02,05", "202205-1500"])(
-          "should not coerce %s as a date",
-          async notDateStr => {
+          await client(tableName).delete()
+          await client.schema.alterTable(tableName, table => {
+            table.string("data").alter()
+          })
+
+          await client(tableName).insert({
+            name: "test",
+            data: "string value",
+          })
+
+          const secondPreview = await config.api.query.preview({
+            datasourceId: datasource._id!,
+            name: "Test Query",
+            queryVerb: "read",
+            fields: {
+              sql: client(tableName).select("*").toString(),
+            },
+            parameters: [],
+            transformer: "return data",
+            schema: firstPreview.schema,
+            readable: true,
+          })
+
+          expect(secondPreview.schema).toEqual(
+            expect.objectContaining({
+              data: { type: "string", name: "data" },
+            })
+          )
+        })
+
+        it("should work with static variables", async () => {
+          const datasource = await config.api.datasource.create({
+            ...rawDatasource,
+            config: {
+              ...rawDatasource.config,
+              staticVariables: {
+                foo: "bar",
+              },
+            },
+          })
+
+          const request: QueryPreview = {
+            datasourceId: datasource._id!,
+            queryVerb: "read",
+            fields: {
+              sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
+            },
+            parameters: [],
+            transformer: "return data",
+            name: datasource.name!,
+            schema: {},
+            readable: true,
+          }
+
+          const response = await config.api.query.preview(request)
+
+          let key = isOracle ? "FOO" : "foo"
+          expect(response.schema).toEqual({
+            [key]: {
+              name: key,
+              type: "string",
+            },
+          })
+
+          expect(response.rows).toEqual([
+            {
+              [key]: "bar",
+            },
+          ])
+        })
+
+        it("should work with dynamic variables", async () => {
+          const datasource = await config.api.datasource.create(rawDatasource)
+
+          const basedOnQuery = await createQuery({
+            datasourceId: datasource._id!,
+            fields: {
+              sql: client(tableName).select("name").where({ id: 1 }).toString(),
+            },
+          })
+
+          await config.api.datasource.update({
+            ...datasource,
+            config: {
+              ...datasource.config,
+              dynamicVariables: [
+                {
+                  queryId: basedOnQuery._id!,
+                  name: "foo",
+                  value: "{{ data[0].name }}",
+                },
+              ],
+            },
+          })
+
+          const preview = await config.api.query.preview({
+            datasourceId: datasource._id!,
+            queryVerb: "read",
+            fields: {
+              sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
+            },
+            parameters: [],
+            transformer: "return data",
+            name: datasource.name!,
+            schema: {},
+            readable: true,
+          })
+
+          let key = isOracle ? "FOO" : "foo"
+          expect(preview.schema).toEqual({
+            [key]: {
+              name: key,
+              type: "string",
+            },
+          })
+
+          expect(preview.rows).toEqual([
+            {
+              [key]: "one",
+            },
+          ])
+        })
+
+        it("should handle the dynamic base query being deleted", async () => {
+          const datasource = await config.api.datasource.create(rawDatasource)
+
+          const basedOnQuery = await createQuery({
+            datasourceId: datasource._id!,
+            fields: {
+              sql: client(tableName).select("name").where({ id: 1 }).toString(),
+            },
+          })
+
+          await config.api.datasource.update({
+            ...datasource,
+            config: {
+              ...datasource.config,
+              dynamicVariables: [
+                {
+                  queryId: basedOnQuery._id!,
+                  name: "foo",
+                  value: "{{ data[0].name }}",
+                },
+              ],
+            },
+          })
+
+          await config.api.query.delete(basedOnQuery)
+
+          const preview = await config.api.query.preview({
+            datasourceId: datasource._id!,
+            queryVerb: "read",
+            fields: {
+              sql: `SELECT '{{ foo }}' AS foo ${isOracle ? "FROM dual" : ""}`,
+            },
+            parameters: [],
+            transformer: "return data",
+            name: datasource.name!,
+            schema: {},
+            readable: true,
+          })
+
+          let key = isOracle ? "FOO" : "foo"
+          expect(preview.schema).toEqual({
+            [key]: {
+              name: key,
+              type: "string",
+            },
+          })
+
+          expect(preview.rows).toEqual([{ [key]: isMSSQL ? "" : null }])
+        })
+      })
+
+      describe("query verbs", () => {
+        describe("create", () => {
+          it("should be able to insert with bindings", async () => {
             const query = await createQuery({
               fields: {
-                sql: client(tableName)
-                  .insert({ name: client.raw("{{ name }}") })
-                  .toString(),
+                sql: client(tableName).insert({ name: "{{ foo }}" }).toString(),
               },
               parameters: [
                 {
-                  name: "name",
-                  default: "",
+                  name: "foo",
+                  default: "bar",
                 },
               ],
               queryVerb: "create",
@@ -598,274 +488,399 @@ datasourceDescribe(
 
             const result = await config.api.query.execute(query._id!, {
               parameters: {
-                name: notDateStr,
+                foo: "baz",
               },
             })
 
-            expect(result.data).toEqual([{ created: true }])
+            expect(result.data).toEqual([
+              {
+                created: true,
+              },
+            ])
 
-            const rows = await client(tableName)
-              .where({ name: notDateStr })
-              .select()
+            const rows = await client(tableName).where({ name: "baz" }).select()
             expect(rows).toHaveLength(1)
-          }
-        )
-      })
-
-      describe("read", () => {
-        it("should execute a query", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).select("*").orderBy("id").toString(),
-            },
+            for (const row of rows) {
+              expect(row).toMatchObject({ name: "baz" })
+            }
           })
 
-          const result = await config.api.query.execute(query._id!)
+          it("should not allow handlebars as parameters", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).insert({ name: "{{ foo }}" }).toString(),
+              },
+              parameters: [
+                {
+                  name: "foo",
+                  default: "bar",
+                },
+              ],
+              queryVerb: "create",
+            })
 
-          expect(result.data).toEqual([
-            {
-              id: 1,
-              name: "one",
-              birthday: null,
-              number: null,
-            },
-            {
-              id: 2,
-              name: "two",
-              birthday: null,
-              number: null,
-            },
-            {
-              id: 3,
-              name: "three",
-              birthday: null,
-              number: null,
-            },
-            {
-              id: 4,
-              name: "four",
-              birthday: null,
-              number: null,
-            },
-            {
-              id: 5,
-              name: "five",
-              birthday: null,
-              number: null,
-            },
-          ])
+            await config.api.query.execute(
+              query._id!,
+              {
+                parameters: {
+                  foo: "{{ 'test' }}",
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    "Parameter 'foo' input contains a handlebars binding - this is not allowed.",
+                },
+              }
+            )
+          })
+
+          // Oracle doesn't automatically coerce strings into dates.
+          !isOracle &&
+            it.each(["2021-02-05T12:01:00.000Z", "2021-02-05"])(
+              "should coerce %s into a date",
+              async datetimeStr => {
+                const date = new Date(datetimeStr)
+                const query = await createQuery({
+                  fields: {
+                    sql: client(tableName)
+                      .insert({
+                        name: "foo",
+                        birthday: client.raw("{{ birthday }}"),
+                      })
+                      .toString(),
+                  },
+                  parameters: [
+                    {
+                      name: "birthday",
+                      default: "",
+                    },
+                  ],
+                  queryVerb: "create",
+                })
+
+                const result = await config.api.query.execute(query._id!, {
+                  parameters: { birthday: datetimeStr },
+                })
+
+                expect(result.data).toEqual([{ created: true }])
+
+                const rows = await client(tableName)
+                  .where({ birthday: datetimeStr })
+                  .select()
+                expect(rows).toHaveLength(1)
+
+                for (const row of rows) {
+                  expect(new Date(row.birthday)).toEqual(date)
+                }
+              }
+            )
+
+          it.each(["2021,02,05", "202205-1500"])(
+            "should not coerce %s as a date",
+            async notDateStr => {
+              const query = await createQuery({
+                fields: {
+                  sql: client(tableName)
+                    .insert({ name: client.raw("{{ name }}") })
+                    .toString(),
+                },
+                parameters: [
+                  {
+                    name: "name",
+                    default: "",
+                  },
+                ],
+                queryVerb: "create",
+              })
+
+              const result = await config.api.query.execute(query._id!, {
+                parameters: {
+                  name: notDateStr,
+                },
+              })
+
+              expect(result.data).toEqual([{ created: true }])
+
+              const rows = await client(tableName)
+                .where({ name: notDateStr })
+                .select()
+              expect(rows).toHaveLength(1)
+            }
+          )
         })
 
-        it("should be able to transform a query", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).where({ id: 1 }).select("*").toString(),
-            },
-            transformer: `
+        describe("read", () => {
+          it("should execute a query", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).select("*").orderBy("id").toString(),
+              },
+            })
+
+            const result = await config.api.query.execute(query._id!)
+
+            expect(result.data).toEqual([
+              {
+                id: 1,
+                name: "one",
+                birthday: null,
+                number: null,
+              },
+              {
+                id: 2,
+                name: "two",
+                birthday: null,
+                number: null,
+              },
+              {
+                id: 3,
+                name: "three",
+                birthday: null,
+                number: null,
+              },
+              {
+                id: 4,
+                name: "four",
+                birthday: null,
+                number: null,
+              },
+              {
+                id: 5,
+                name: "five",
+                birthday: null,
+                number: null,
+              },
+            ])
+          })
+
+          it("should be able to transform a query", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).where({ id: 1 }).select("*").toString(),
+              },
+              transformer: `
             data[0].id = data[0].id + 1;
             return data;
           `,
+            })
+
+            const result = await config.api.query.execute(query._id!)
+
+            expect(result.data).toEqual([
+              {
+                id: 2,
+                name: "one",
+                birthday: null,
+                number: null,
+              },
+            ])
           })
 
-          const result = await config.api.query.execute(query._id!)
+          it("should coerce numeric bindings", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName)
+                  .where({ id: client.raw("{{ id }}") })
+                  .select("*")
+                  .toString(),
+              },
+              parameters: [
+                {
+                  name: "id",
+                  default: "",
+                },
+              ],
+            })
 
-          expect(result.data).toEqual([
-            {
-              id: 2,
-              name: "one",
-              birthday: null,
-              number: null,
-            },
-          ])
+            const result = await config.api.query.execute(query._id!, {
+              parameters: {
+                id: "1",
+              },
+            })
+
+            expect(result.data).toEqual([
+              {
+                id: 1,
+                name: "one",
+                birthday: null,
+                number: null,
+              },
+            ])
+          })
         })
 
-        it("should coerce numeric bindings", async () => {
+        describe("update", () => {
+          it("should be able to update rows", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName)
+                  .update({ name: client.raw("{{ name }}") })
+                  .where({ id: client.raw("{{ id }}") })
+                  .toString(),
+              },
+              parameters: [
+                {
+                  name: "id",
+                  default: "",
+                },
+                {
+                  name: "name",
+                  default: "updated",
+                },
+              ],
+              queryVerb: "update",
+            })
+
+            await config.api.query.execute(query._id!, {
+              parameters: {
+                id: "1",
+                name: "foo",
+              },
+            })
+
+            const rows = await client(tableName).where({ id: 1 }).select()
+            expect(rows).toEqual([
+              { id: 1, name: "foo", birthday: null, number: null },
+            ])
+          })
+
+          it("should be able to execute an update that updates no rows", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName)
+                  .update({ name: "updated" })
+                  .where({ id: 100 })
+                  .toString(),
+              },
+              queryVerb: "update",
+            })
+
+            await config.api.query.execute(query._id!)
+
+            const rows = await client(tableName).select()
+            for (const row of rows) {
+              expect(row.name).not.toEqual("updated")
+            }
+          })
+
+          it("should be able to execute a delete that deletes no rows", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName).where({ id: 100 }).delete().toString(),
+              },
+              queryVerb: "delete",
+            })
+
+            await config.api.query.execute(query._id!)
+
+            const rows = await client(tableName).select()
+            expect(rows).toHaveLength(5)
+          })
+        })
+
+        describe("delete", () => {
+          it("should be able to delete rows", async () => {
+            const query = await createQuery({
+              fields: {
+                sql: client(tableName)
+                  .where({ id: client.raw("{{ id }}") })
+                  .delete()
+                  .toString(),
+              },
+              parameters: [
+                {
+                  name: "id",
+                  default: "",
+                },
+              ],
+              queryVerb: "delete",
+            })
+
+            await config.api.query.execute(query._id!, {
+              parameters: {
+                id: "1",
+              },
+            })
+
+            const rows = await client(tableName).where({ id: 1 }).select()
+            expect(rows).toHaveLength(0)
+          })
+        })
+      })
+
+      describe("query through datasource", () => {
+        // this parameter really only impacts SQL queries
+        describe("confirm nullDefaultSupport", () => {
+          let queryParams: Partial<Query>
+          beforeAll(async () => {
+            queryParams = {
+              fields: {
+                sql: client(tableName)
+                  .insert({
+                    name: client.raw("{{ bindingName }}"),
+                    number: client.raw("{{ bindingNumber }}"),
+                  })
+                  .toString(),
+              },
+              parameters: [
+                {
+                  name: "bindingName",
+                  default: "",
+                },
+                {
+                  name: "bindingNumber",
+                  default: "",
+                },
+              ],
+              queryVerb: "create",
+            }
+          })
+
+          it("should error for old queries", async () => {
+            const query = await createQuery(queryParams)
+            await config.api.query.save({ ...query, nullDefaultSupport: false })
+            let error: string | undefined
+            try {
+              await config.api.query.execute(query._id!, {
+                parameters: {
+                  bindingName: "testing",
+                },
+              })
+            } catch (err: any) {
+              error = err.message
+            }
+            if (isMSSQL || isOracle) {
+              expect(error).toBeUndefined()
+            } else {
+              expect(error).toBeDefined()
+              expect(error).toContain("integer")
+            }
+          })
+
+          it("should not error for new queries", async () => {
+            const query = await createQuery(queryParams)
+            const results = await config.api.query.execute(query._id!, {
+              parameters: {
+                bindingName: "testing",
+              },
+            })
+            expect(results).toEqual({ data: [{ created: true }] })
+          })
+        })
+      })
+
+      describe("edge cases", () => {
+        it("should find rows with a binding containing a slash", async () => {
+          const slashValue = "1/10"
+          await client(tableName).insert([{ name: slashValue }])
+
           const query = await createQuery({
             fields: {
               sql: client(tableName)
-                .where({ id: client.raw("{{ id }}") })
                 .select("*")
-                .toString(),
-            },
-            parameters: [
-              {
-                name: "id",
-                default: "",
-              },
-            ],
-          })
-
-          const result = await config.api.query.execute(query._id!, {
-            parameters: {
-              id: "1",
-            },
-          })
-
-          expect(result.data).toEqual([
-            {
-              id: 1,
-              name: "one",
-              birthday: null,
-              number: null,
-            },
-          ])
-        })
-      })
-
-      describe("update", () => {
-        it("should be able to update rows", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName)
-                .update({ name: client.raw("{{ name }}") })
-                .where({ id: client.raw("{{ id }}") })
-                .toString(),
-            },
-            parameters: [
-              {
-                name: "id",
-                default: "",
-              },
-              {
-                name: "name",
-                default: "updated",
-              },
-            ],
-            queryVerb: "update",
-          })
-
-          await config.api.query.execute(query._id!, {
-            parameters: {
-              id: "1",
-              name: "foo",
-            },
-          })
-
-          const rows = await client(tableName).where({ id: 1 }).select()
-          expect(rows).toEqual([
-            { id: 1, name: "foo", birthday: null, number: null },
-          ])
-        })
-
-        it("should be able to execute an update that updates no rows", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName)
-                .update({ name: "updated" })
-                .where({ id: 100 })
-                .toString(),
-            },
-            queryVerb: "update",
-          })
-
-          await config.api.query.execute(query._id!)
-
-          const rows = await client(tableName).select()
-          for (const row of rows) {
-            expect(row.name).not.toEqual("updated")
-          }
-        })
-
-        it("should be able to execute a delete that deletes no rows", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName).where({ id: 100 }).delete().toString(),
-            },
-            queryVerb: "delete",
-          })
-
-          await config.api.query.execute(query._id!)
-
-          const rows = await client(tableName).select()
-          expect(rows).toHaveLength(5)
-        })
-      })
-
-      describe("delete", () => {
-        it("should be able to delete rows", async () => {
-          const query = await createQuery({
-            fields: {
-              sql: client(tableName)
-                .where({ id: client.raw("{{ id }}") })
-                .delete()
-                .toString(),
-            },
-            parameters: [
-              {
-                name: "id",
-                default: "",
-              },
-            ],
-            queryVerb: "delete",
-          })
-
-          await config.api.query.execute(query._id!, {
-            parameters: {
-              id: "1",
-            },
-          })
-
-          const rows = await client(tableName).where({ id: 1 }).select()
-          expect(rows).toHaveLength(0)
-        })
-      })
-    })
-
-    describe("query through datasource", () => {
-      it("should be able to query the datasource", async () => {
-        const datasource = await config.api.datasource.create(rawDatasource)
-
-        const entityId = tableName
-        await config.api.datasource.update({
-          ...datasource,
-          entities: {
-            [entityId]: {
-              name: entityId,
-              schema: {},
-              type: "table",
-              primary: ["id"],
-              sourceId: datasource._id!,
-              sourceType: TableSourceType.EXTERNAL,
-            },
-          },
-        })
-
-        const res = await config.api.datasource.query({
-          endpoint: {
-            datasourceId: datasource._id!,
-            operation: Operation.READ,
-            entityId,
-          },
-          resource: {
-            fields: ["id", "name"],
-          },
-          filters: {
-            string: {
-              name: "two",
-            },
-          },
-        })
-        expect(res).toHaveLength(1)
-        expect(res[0]).toEqual({
-          id: 2,
-          name: "two",
-          // the use of table.* introduces the possibility of nulls being returned
-          birthday: null,
-          number: null,
-        })
-      })
-
-      // this parameter really only impacts SQL queries
-      describe("confirm nullDefaultSupport", () => {
-        let queryParams: Partial<Query>
-        beforeAll(async () => {
-          queryParams = {
-            fields: {
-              sql: client(tableName)
-                .insert({
-                  name: client.raw("{{ bindingName }}"),
-                  number: client.raw("{{ bindingNumber }}"),
-                })
+                .where("name", "=", client.raw("{{ bindingName }}"))
                 .toString(),
             },
             parameters: [
@@ -873,76 +888,18 @@ datasourceDescribe(
                 name: "bindingName",
                 default: "",
               },
-              {
-                name: "bindingNumber",
-                default: "",
-              },
             ],
-            queryVerb: "create",
-          }
-        })
-
-        it("should error for old queries", async () => {
-          const query = await createQuery(queryParams)
-          await config.api.query.save({ ...query, nullDefaultSupport: false })
-          let error: string | undefined
-          try {
-            await config.api.query.execute(query._id!, {
-              parameters: {
-                bindingName: "testing",
-              },
-            })
-          } catch (err: any) {
-            error = err.message
-          }
-          if (isMSSQL || isOracle) {
-            expect(error).toBeUndefined()
-          } else {
-            expect(error).toBeDefined()
-            expect(error).toContain("integer")
-          }
-        })
-
-        it("should not error for new queries", async () => {
-          const query = await createQuery(queryParams)
+            queryVerb: "read",
+          })
           const results = await config.api.query.execute(query._id!, {
             parameters: {
-              bindingName: "testing",
+              bindingName: slashValue,
             },
           })
-          expect(results).toEqual({ data: [{ created: true }] })
+          expect(results).toBeDefined()
+          expect(results.data.length).toEqual(1)
         })
       })
-    })
-
-    describe("edge cases", () => {
-      it("should find rows with a binding containing a slash", async () => {
-        const slashValue = "1/10"
-        await client(tableName).insert([{ name: slashValue }])
-
-        const query = await createQuery({
-          fields: {
-            sql: client(tableName)
-              .select("*")
-              .where("name", "=", client.raw("{{ bindingName }}"))
-              .toString(),
-          },
-          parameters: [
-            {
-              name: "bindingName",
-              default: "",
-            },
-          ],
-          queryVerb: "read",
-        })
-        const results = await config.api.query.execute(query._id!, {
-          parameters: {
-            bindingName: slashValue,
-          },
-        })
-        expect(results).toBeDefined()
-        expect(results.data.length).toEqual(1)
-      })
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/queries/mongodb.spec.ts b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
index 44d1553f9b..a37957fe7e 100644
--- a/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
@@ -9,465 +9,698 @@ import { generator } from "@budibase/backend-core/tests"
 const expectValidId = expect.stringMatching(/^\w{24}$/)
 const expectValidBsonObjectId = expect.any(BSON.ObjectId)
 
-datasourceDescribe(
-  { name: "/queries", only: [DatabaseName.MONGODB] },
-  ({ config, dsProvider }) => {
-    let collection: string
-    let datasource: Datasource
+const descriptions = datasourceDescribe({ only: [DatabaseName.MONGODB] })
 
-    async function createQuery(query: Partial<Query>): Promise<Query> {
-      const defaultQuery: Query = {
-        datasourceId: datasource._id!,
-        name: "New Query",
-        parameters: [],
-        fields: {},
-        schema: {},
-        queryVerb: "read",
-        transformer: "return data",
-        readable: true,
-      }
-      const combinedQuery = { ...defaultQuery, ...query }
-      if (
-        combinedQuery.fields &&
-        combinedQuery.fields.extra &&
-        !combinedQuery.fields.extra.collection
-      ) {
-        combinedQuery.fields.extra.collection = collection
-      }
-      return await config.api.query.save(combinedQuery)
-    }
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "/queries ($dbName)",
+    ({ config, dsProvider }) => {
+      let collection: string
+      let datasource: Datasource
 
-    async function withClient<T>(
-      callback: (client: MongoClient) => Promise<T>
-    ): Promise<T> {
-      const client = new MongoClient(datasource.config!.connectionString)
-      await client.connect()
-      try {
-        return await callback(client)
-      } finally {
-        await client.close()
-      }
-    }
-
-    async function withDb<T>(callback: (db: Db) => Promise<T>): Promise<T> {
-      return await withClient(async client => {
-        return await callback(client.db(datasource.config!.db))
-      })
-    }
-
-    async function withCollection<T>(
-      callback: (collection: Collection) => Promise<T>
-    ): Promise<T> {
-      return await withDb(async db => {
-        return await callback(db.collection(collection))
-      })
-    }
-
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource!
-    })
-
-    beforeEach(async () => {
-      collection = generator.guid()
-      await withCollection(async collection => {
-        await collection.insertMany([
-          { name: "one" },
-          { name: "two" },
-          { name: "three" },
-          { name: "four" },
-          { name: "five" },
-        ])
-      })
-    })
-
-    afterEach(async () => {
-      await withCollection(collection => collection.drop())
-    })
-
-    describe("preview", () => {
-      it("should generate a nested schema with an empty array", async () => {
-        const name = generator.guid()
-        await withCollection(
-          async collection => await collection.insertOne({ name, nested: [] })
-        )
-
-        const preview = await config.api.query.preview({
+      async function createQuery(query: Partial<Query>): Promise<Query> {
+        const defaultQuery: Query = {
+          datasourceId: datasource._id!,
           name: "New Query",
-          datasourceId: datasource._id!,
-          fields: {
-            json: {
-              name: { $eq: name },
-            },
-            extra: {
-              collection,
-              actionType: "findOne",
-            },
-          },
+          parameters: [],
+          fields: {},
           schema: {},
           queryVerb: "read",
-          parameters: [],
           transformer: "return data",
           readable: true,
-        })
-
-        expect(preview).toEqual({
-          nestedSchemaFields: {},
-          rows: [{ _id: expect.any(String), name, nested: [] }],
-          schema: {
-            _id: {
-              type: "string",
-              name: "_id",
-            },
-            name: {
-              type: "string",
-              name: "name",
-            },
-            nested: {
-              type: "array",
-              name: "nested",
-            },
-          },
-        })
-      })
-
-      it("should update schema when structure changes from object to array", async () => {
-        const name = generator.guid()
-
-        await withCollection(async collection => {
-          await collection.insertOne({ name, field: { subfield: "value" } })
-        })
-
-        const firstPreview = await config.api.query.preview({
-          name: "Test Query",
-          datasourceId: datasource._id!,
-          fields: {
-            json: { name: { $eq: name } },
-            extra: {
-              collection,
-              actionType: "findOne",
-            },
-          },
-          schema: {},
-          queryVerb: "read",
-          parameters: [],
-          transformer: "return data",
-          readable: true,
-        })
-
-        expect(firstPreview.schema).toEqual(
-          expect.objectContaining({
-            field: { type: "json", name: "field" },
-          })
-        )
-
-        await withCollection(async collection => {
-          await collection.updateOne(
-            { name },
-            { $set: { field: ["value1", "value2"] } }
-          )
-        })
-
-        const secondPreview = await config.api.query.preview({
-          name: "Test Query",
-          datasourceId: datasource._id!,
-          fields: {
-            json: { name: { $eq: name } },
-            extra: {
-              collection,
-              actionType: "findOne",
-            },
-          },
-          schema: firstPreview.schema,
-          queryVerb: "read",
-          parameters: [],
-          transformer: "return data",
-          readable: true,
-        })
-
-        expect(secondPreview.schema).toEqual(
-          expect.objectContaining({
-            field: { type: "array", name: "field" },
-          })
-        )
-      })
-
-      it("should generate a nested schema based on all of the nested items", async () => {
-        const name = generator.guid()
-        const item = {
-          name,
-          contacts: [
-            {
-              address: "123 Lane",
-            },
-            {
-              address: "456 Drive",
-            },
-            {
-              postcode: "BT1 12N",
-              lat: 54.59,
-              long: -5.92,
-            },
-            {
-              city: "Belfast",
-            },
-            {
-              address: "789 Avenue",
-              phoneNumber: "0800-999-5555",
-            },
-            {
-              name: "Name",
-              isActive: false,
-            },
-          ],
         }
+        const combinedQuery = { ...defaultQuery, ...query }
+        if (
+          combinedQuery.fields &&
+          combinedQuery.fields.extra &&
+          !combinedQuery.fields.extra.collection
+        ) {
+          combinedQuery.fields.extra.collection = collection
+        }
+        return await config.api.query.save(combinedQuery)
+      }
 
-        await withCollection(collection => collection.insertOne(item))
+      async function withClient<T>(
+        callback: (client: MongoClient) => Promise<T>
+      ): Promise<T> {
+        const client = new MongoClient(datasource.config!.connectionString)
+        await client.connect()
+        try {
+          return await callback(client)
+        } finally {
+          await client.close()
+        }
+      }
 
-        const preview = await config.api.query.preview({
-          name: "New Query",
-          datasourceId: datasource._id!,
-          fields: {
-            json: {
-              name: { $eq: name },
-            },
-            extra: {
-              collection,
-              actionType: "findOne",
-            },
-          },
-          schema: {},
-          queryVerb: "read",
-          parameters: [],
-          transformer: "return data",
-          readable: true,
+      async function withDb<T>(callback: (db: Db) => Promise<T>): Promise<T> {
+        return await withClient(async client => {
+          return await callback(client.db(datasource.config!.db))
         })
+      }
 
-        expect(preview).toEqual({
-          nestedSchemaFields: {
-            contacts: {
-              address: {
+      async function withCollection<T>(
+        callback: (collection: Collection) => Promise<T>
+      ): Promise<T> {
+        return await withDb(async db => {
+          return await callback(db.collection(collection))
+        })
+      }
+
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource!
+      })
+
+      beforeEach(async () => {
+        collection = generator.guid()
+        await withCollection(async collection => {
+          await collection.insertMany([
+            { name: "one" },
+            { name: "two" },
+            { name: "three" },
+            { name: "four" },
+            { name: "five" },
+          ])
+        })
+      })
+
+      afterEach(async () => {
+        await withCollection(collection => collection.drop())
+      })
+
+      describe("preview", () => {
+        it("should generate a nested schema with an empty array", async () => {
+          const name = generator.guid()
+          await withCollection(
+            async collection => await collection.insertOne({ name, nested: [] })
+          )
+
+          const preview = await config.api.query.preview({
+            name: "New Query",
+            datasourceId: datasource._id!,
+            fields: {
+              json: {
+                name: { $eq: name },
+              },
+              extra: {
+                collection,
+                actionType: "findOne",
+              },
+            },
+            schema: {},
+            queryVerb: "read",
+            parameters: [],
+            transformer: "return data",
+            readable: true,
+          })
+
+          expect(preview).toEqual({
+            nestedSchemaFields: {},
+            rows: [{ _id: expect.any(String), name, nested: [] }],
+            schema: {
+              _id: {
                 type: "string",
-                name: "address",
-              },
-              postcode: {
-                type: "string",
-                name: "postcode",
-              },
-              lat: {
-                type: "number",
-                name: "lat",
-              },
-              long: {
-                type: "number",
-                name: "long",
-              },
-              city: {
-                type: "string",
-                name: "city",
-              },
-              phoneNumber: {
-                type: "string",
-                name: "phoneNumber",
+                name: "_id",
               },
               name: {
                 type: "string",
                 name: "name",
               },
-              isActive: {
-                type: "boolean",
-                name: "isActive",
+              nested: {
+                type: "array",
+                name: "nested",
               },
             },
-          },
-          rows: [{ ...item, _id: expect.any(String) }],
-          schema: {
-            _id: { type: "string", name: "_id" },
-            name: { type: "string", name: "name" },
-            contacts: { type: "json", name: "contacts", subtype: "array" },
-          },
-        })
-      })
-    })
-
-    describe("execute", () => {
-      it("a count query", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {},
-            extra: {
-              actionType: "count",
-            },
-          },
+          })
         })
 
-        const result = await config.api.query.execute(query._id!)
+        it("should update schema when structure changes from object to array", async () => {
+          const name = generator.guid()
 
-        expect(result.data).toEqual([{ value: 5 }])
-      })
+          await withCollection(async collection => {
+            await collection.insertOne({ name, field: { subfield: "value" } })
+          })
 
-      it("should be able to updateOne by ObjectId", async () => {
-        const insertResult = await withCollection(c =>
-          c.insertOne({ name: "one" })
-        )
-        const query = await createQuery({
-          fields: {
-            json: {
-              filter: {
-                _id: { $eq: `ObjectId("${insertResult.insertedId}")` },
+          const firstPreview = await config.api.query.preview({
+            name: "Test Query",
+            datasourceId: datasource._id!,
+            fields: {
+              json: { name: { $eq: name } },
+              extra: {
+                collection,
+                actionType: "findOne",
               },
-              update: { $set: { name: "newName" } },
             },
-            extra: {
-              actionType: "updateOne",
+            schema: {},
+            queryVerb: "read",
+            parameters: [],
+            transformer: "return data",
+            readable: true,
+          })
+
+          expect(firstPreview.schema).toEqual(
+            expect.objectContaining({
+              field: { type: "json", name: "field" },
+            })
+          )
+
+          await withCollection(async collection => {
+            await collection.updateOne(
+              { name },
+              { $set: { field: ["value1", "value2"] } }
+            )
+          })
+
+          const secondPreview = await config.api.query.preview({
+            name: "Test Query",
+            datasourceId: datasource._id!,
+            fields: {
+              json: { name: { $eq: name } },
+              extra: {
+                collection,
+                actionType: "findOne",
+              },
             },
-          },
-          queryVerb: "update",
+            schema: firstPreview.schema,
+            queryVerb: "read",
+            parameters: [],
+            transformer: "return data",
+            readable: true,
+          })
+
+          expect(secondPreview.schema).toEqual(
+            expect.objectContaining({
+              field: { type: "array", name: "field" },
+            })
+          )
         })
 
-        const result = await config.api.query.execute(query._id!)
+        it("should generate a nested schema based on all of the nested items", async () => {
+          const name = generator.guid()
+          const item = {
+            name,
+            contacts: [
+              {
+                address: "123 Lane",
+              },
+              {
+                address: "456 Drive",
+              },
+              {
+                postcode: "BT1 12N",
+                lat: 54.59,
+                long: -5.92,
+              },
+              {
+                city: "Belfast",
+              },
+              {
+                address: "789 Avenue",
+                phoneNumber: "0800-999-5555",
+              },
+              {
+                name: "Name",
+                isActive: false,
+              },
+            ],
+          }
 
-        expect(result.data).toEqual([
-          {
-            acknowledged: true,
-            matchedCount: 1,
-            modifiedCount: 1,
-            upsertedCount: 0,
-            upsertedId: null,
-          },
-        ])
+          await withCollection(collection => collection.insertOne(item))
 
-        await withCollection(async collection => {
-          const doc = await collection.findOne({ name: { $eq: "newName" } })
-          expect(doc).toEqual({
-            _id: insertResult.insertedId,
-            name: "newName",
+          const preview = await config.api.query.preview({
+            name: "New Query",
+            datasourceId: datasource._id!,
+            fields: {
+              json: {
+                name: { $eq: name },
+              },
+              extra: {
+                collection,
+                actionType: "findOne",
+              },
+            },
+            schema: {},
+            queryVerb: "read",
+            parameters: [],
+            transformer: "return data",
+            readable: true,
+          })
+
+          expect(preview).toEqual({
+            nestedSchemaFields: {
+              contacts: {
+                address: {
+                  type: "string",
+                  name: "address",
+                },
+                postcode: {
+                  type: "string",
+                  name: "postcode",
+                },
+                lat: {
+                  type: "number",
+                  name: "lat",
+                },
+                long: {
+                  type: "number",
+                  name: "long",
+                },
+                city: {
+                  type: "string",
+                  name: "city",
+                },
+                phoneNumber: {
+                  type: "string",
+                  name: "phoneNumber",
+                },
+                name: {
+                  type: "string",
+                  name: "name",
+                },
+                isActive: {
+                  type: "boolean",
+                  name: "isActive",
+                },
+              },
+            },
+            rows: [{ ...item, _id: expect.any(String) }],
+            schema: {
+              _id: { type: "string", name: "_id" },
+              name: { type: "string", name: "name" },
+              contacts: { type: "json", name: "contacts", subtype: "array" },
+            },
           })
         })
       })
 
-      it("a count query with a transformer", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {},
-            extra: {
-              actionType: "count",
+      describe("execute", () => {
+        it("a count query", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {},
+              extra: {
+                actionType: "count",
+              },
             },
-          },
-          transformer: "return data + 1",
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([{ value: 5 }])
         })
 
-        const result = await config.api.query.execute(query._id!)
-
-        expect(result.data).toEqual([{ value: 6 }])
-      })
-
-      it("a find query", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {},
-            extra: {
-              actionType: "find",
+        it("should be able to updateOne by ObjectId", async () => {
+          const insertResult = await withCollection(c =>
+            c.insertOne({ name: "one" })
+          )
+          const query = await createQuery({
+            fields: {
+              json: {
+                filter: {
+                  _id: { $eq: `ObjectId("${insertResult.insertedId}")` },
+                },
+                update: { $set: { name: "newName" } },
+              },
+              extra: {
+                actionType: "updateOne",
+              },
             },
-          },
+            queryVerb: "update",
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              matchedCount: 1,
+              modifiedCount: 1,
+              upsertedCount: 0,
+              upsertedId: null,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const doc = await collection.findOne({ name: { $eq: "newName" } })
+            expect(doc).toEqual({
+              _id: insertResult.insertedId,
+              name: "newName",
+            })
+          })
         })
 
-        const result = await config.api.query.execute(query._id!)
-
-        expect(result.data).toEqual([
-          { _id: expectValidId, name: "one" },
-          { _id: expectValidId, name: "two" },
-          { _id: expectValidId, name: "three" },
-          { _id: expectValidId, name: "four" },
-          { _id: expectValidId, name: "five" },
-        ])
-      })
-
-      it("a findOne query", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {},
-            extra: {
-              actionType: "findOne",
+        it("a count query with a transformer", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {},
+              extra: {
+                actionType: "count",
+              },
             },
-          },
+            transformer: "return data + 1",
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([{ value: 6 }])
         })
 
-        const result = await config.api.query.execute(query._id!)
-
-        expect(result.data).toEqual([{ _id: expectValidId, name: "one" }])
-      })
-
-      it("a findOneAndUpdate query", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {
-              filter: { name: { $eq: "one" } },
-              update: { $set: { name: "newName" } },
+        it("a find query", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {},
+              extra: {
+                actionType: "find",
+              },
             },
-            extra: {
-              actionType: "findOneAndUpdate",
-            },
-          },
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([
+            { _id: expectValidId, name: "one" },
+            { _id: expectValidId, name: "two" },
+            { _id: expectValidId, name: "three" },
+            { _id: expectValidId, name: "four" },
+            { _id: expectValidId, name: "five" },
+          ])
         })
 
-        const result = await config.api.query.execute(query._id!)
+        it("a findOne query", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {},
+              extra: {
+                actionType: "findOne",
+              },
+            },
+          })
 
-        expect(result.data).toEqual([
-          {
-            lastErrorObject: { n: 1, updatedExisting: true },
-            ok: 1,
-            value: { _id: expectValidId, name: "one" },
-          },
-        ])
+          const result = await config.api.query.execute(query._id!)
 
-        await withCollection(async collection => {
-          expect(await collection.countDocuments()).toBe(5)
+          expect(result.data).toEqual([{ _id: expectValidId, name: "one" }])
+        })
 
-          const doc = await collection.findOne({ name: { $eq: "newName" } })
-          expect(doc).toEqual({
-            _id: expectValidBsonObjectId,
-            name: "newName",
+        it("a findOneAndUpdate query", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {
+                filter: { name: { $eq: "one" } },
+                update: { $set: { name: "newName" } },
+              },
+              extra: {
+                actionType: "findOneAndUpdate",
+              },
+            },
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([
+            {
+              lastErrorObject: { n: 1, updatedExisting: true },
+              ok: 1,
+              value: { _id: expectValidId, name: "one" },
+            },
+          ])
+
+          await withCollection(async collection => {
+            expect(await collection.countDocuments()).toBe(5)
+
+            const doc = await collection.findOne({ name: { $eq: "newName" } })
+            expect(doc).toEqual({
+              _id: expectValidBsonObjectId,
+              name: "newName",
+            })
+          })
+        })
+
+        it("a distinct query", async () => {
+          const query = await createQuery({
+            fields: {
+              json: "name",
+              extra: {
+                actionType: "distinct",
+              },
+            },
+          })
+
+          const result = await config.api.query.execute(query._id!)
+          const values = result.data.map(o => o.value).sort()
+          expect(values).toEqual(["five", "four", "one", "three", "two"])
+        })
+
+        it("a create query with parameters", async () => {
+          const query = await createQuery({
+            fields: {
+              json: { foo: "{{ foo }}" },
+              extra: {
+                actionType: "insertOne",
+              },
+            },
+            queryVerb: "create",
+            parameters: [
+              {
+                name: "foo",
+                default: "default",
+              },
+            ],
+          })
+
+          const result = await config.api.query.execute(query._id!, {
+            parameters: { foo: "bar" },
+          })
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              insertedId: expectValidId,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const doc = await collection.findOne({ foo: { $eq: "bar" } })
+            expect(doc).toEqual({
+              _id: expectValidBsonObjectId,
+              foo: "bar",
+            })
+          })
+        })
+
+        it("a delete query with parameters", async () => {
+          const query = await createQuery({
+            fields: {
+              json: { name: { $eq: "{{ name }}" } },
+              extra: {
+                actionType: "deleteOne",
+              },
+            },
+            queryVerb: "delete",
+            parameters: [
+              {
+                name: "name",
+                default: "",
+              },
+            ],
+          })
+
+          const result = await config.api.query.execute(query._id!, {
+            parameters: { name: "one" },
+          })
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              deletedCount: 1,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const doc = await collection.findOne({ name: { $eq: "one" } })
+            expect(doc).toBeNull()
+          })
+        })
+
+        it("an update query with parameters", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {
+                filter: { name: { $eq: "{{ name }}" } },
+                update: { $set: { name: "{{ newName }}" } },
+              },
+              extra: {
+                actionType: "updateOne",
+              },
+            },
+            queryVerb: "update",
+            parameters: [
+              {
+                name: "name",
+                default: "",
+              },
+              {
+                name: "newName",
+                default: "",
+              },
+            ],
+          })
+
+          const result = await config.api.query.execute(query._id!, {
+            parameters: { name: "one", newName: "newOne" },
+          })
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              matchedCount: 1,
+              modifiedCount: 1,
+              upsertedCount: 0,
+              upsertedId: null,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const doc = await collection.findOne({ name: { $eq: "newOne" } })
+            expect(doc).toEqual({
+              _id: expectValidBsonObjectId,
+              name: "newOne",
+            })
+
+            const oldDoc = await collection.findOne({ name: { $eq: "one" } })
+            expect(oldDoc).toBeNull()
+          })
+        })
+
+        it("should be able to delete all records", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {},
+              extra: {
+                actionType: "deleteMany",
+              },
+            },
+            queryVerb: "delete",
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              deletedCount: 5,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const docs = await collection.find().toArray()
+            expect(docs).toHaveLength(0)
+          })
+        })
+
+        it("should be able to update all documents", async () => {
+          const query = await createQuery({
+            fields: {
+              json: {
+                filter: {},
+                update: { $set: { name: "newName" } },
+              },
+              extra: {
+                actionType: "updateMany",
+              },
+            },
+            queryVerb: "update",
+          })
+
+          const result = await config.api.query.execute(query._id!)
+
+          expect(result.data).toEqual([
+            {
+              acknowledged: true,
+              matchedCount: 5,
+              modifiedCount: 5,
+              upsertedCount: 0,
+              upsertedId: null,
+            },
+          ])
+
+          await withCollection(async collection => {
+            const docs = await collection.find().toArray()
+            expect(docs).toHaveLength(5)
+            for (const doc of docs) {
+              expect(doc).toEqual({
+                _id: expectValidBsonObjectId,
+                name: "newName",
+              })
+            }
           })
         })
       })
 
-      it("a distinct query", async () => {
-        const query = await createQuery({
-          fields: {
-            json: "name",
-            extra: {
-              actionType: "distinct",
-            },
-          },
-        })
-
-        const result = await config.api.query.execute(query._id!)
-        const values = result.data.map(o => o.value).sort()
-        expect(values).toEqual(["five", "four", "one", "three", "two"])
+      it("should throw an error if the incorrect actionType is specified", async () => {
+        const verbs = ["read", "create", "update", "delete"]
+        for (const verb of verbs) {
+          const query = await createQuery({
+            fields: { json: {}, extra: { actionType: "invalid" } },
+            queryVerb: verb,
+          })
+          await config.api.query.execute(query._id!, undefined, { status: 400 })
+        }
       })
 
-      it("a create query with parameters", async () => {
+      it("should ignore extra brackets in query", async () => {
         const query = await createQuery({
           fields: {
-            json: { foo: "{{ foo }}" },
+            json: { foo: "te}st" },
             extra: {
               actionType: "insertOne",
             },
           },
           queryVerb: "create",
-          parameters: [
+        })
+
+        const result = await config.api.query.execute(query._id!)
+        expect(result.data).toEqual([
+          {
+            acknowledged: true,
+            insertedId: expectValidId,
+          },
+        ])
+
+        await withCollection(async collection => {
+          const doc = await collection.findOne({ foo: { $eq: "te}st" } })
+          expect(doc).toEqual({
+            _id: expectValidBsonObjectId,
+            foo: "te}st",
+          })
+        })
+      })
+
+      it("should be able to save deeply nested data", async () => {
+        const data = {
+          foo: "bar",
+          data: [
+            { cid: 1 },
+            { cid: 2 },
             {
-              name: "foo",
-              default: "default",
+              nested: {
+                name: "test",
+                ary: [1, 2, 3],
+                aryOfObjects: [{ a: 1 }, { b: 2 }],
+              },
             },
           ],
+        }
+        const query = await createQuery({
+          fields: {
+            json: data,
+            extra: {
+              actionType: "insertOne",
+            },
+          },
+          queryVerb: "create",
         })
 
-        const result = await config.api.query.execute(query._id!, {
-          parameters: { foo: "bar" },
-        })
-
+        const result = await config.api.query.execute(query._id!)
         expect(result.data).toEqual([
           {
             acknowledged: true,
@@ -479,239 +712,10 @@ datasourceDescribe(
           const doc = await collection.findOne({ foo: { $eq: "bar" } })
           expect(doc).toEqual({
             _id: expectValidBsonObjectId,
-            foo: "bar",
+            ...data,
           })
         })
       })
-
-      it("a delete query with parameters", async () => {
-        const query = await createQuery({
-          fields: {
-            json: { name: { $eq: "{{ name }}" } },
-            extra: {
-              actionType: "deleteOne",
-            },
-          },
-          queryVerb: "delete",
-          parameters: [
-            {
-              name: "name",
-              default: "",
-            },
-          ],
-        })
-
-        const result = await config.api.query.execute(query._id!, {
-          parameters: { name: "one" },
-        })
-
-        expect(result.data).toEqual([
-          {
-            acknowledged: true,
-            deletedCount: 1,
-          },
-        ])
-
-        await withCollection(async collection => {
-          const doc = await collection.findOne({ name: { $eq: "one" } })
-          expect(doc).toBeNull()
-        })
-      })
-
-      it("an update query with parameters", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {
-              filter: { name: { $eq: "{{ name }}" } },
-              update: { $set: { name: "{{ newName }}" } },
-            },
-            extra: {
-              actionType: "updateOne",
-            },
-          },
-          queryVerb: "update",
-          parameters: [
-            {
-              name: "name",
-              default: "",
-            },
-            {
-              name: "newName",
-              default: "",
-            },
-          ],
-        })
-
-        const result = await config.api.query.execute(query._id!, {
-          parameters: { name: "one", newName: "newOne" },
-        })
-
-        expect(result.data).toEqual([
-          {
-            acknowledged: true,
-            matchedCount: 1,
-            modifiedCount: 1,
-            upsertedCount: 0,
-            upsertedId: null,
-          },
-        ])
-
-        await withCollection(async collection => {
-          const doc = await collection.findOne({ name: { $eq: "newOne" } })
-          expect(doc).toEqual({
-            _id: expectValidBsonObjectId,
-            name: "newOne",
-          })
-
-          const oldDoc = await collection.findOne({ name: { $eq: "one" } })
-          expect(oldDoc).toBeNull()
-        })
-      })
-
-      it("should be able to delete all records", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {},
-            extra: {
-              actionType: "deleteMany",
-            },
-          },
-          queryVerb: "delete",
-        })
-
-        const result = await config.api.query.execute(query._id!)
-
-        expect(result.data).toEqual([
-          {
-            acknowledged: true,
-            deletedCount: 5,
-          },
-        ])
-
-        await withCollection(async collection => {
-          const docs = await collection.find().toArray()
-          expect(docs).toHaveLength(0)
-        })
-      })
-
-      it("should be able to update all documents", async () => {
-        const query = await createQuery({
-          fields: {
-            json: {
-              filter: {},
-              update: { $set: { name: "newName" } },
-            },
-            extra: {
-              actionType: "updateMany",
-            },
-          },
-          queryVerb: "update",
-        })
-
-        const result = await config.api.query.execute(query._id!)
-
-        expect(result.data).toEqual([
-          {
-            acknowledged: true,
-            matchedCount: 5,
-            modifiedCount: 5,
-            upsertedCount: 0,
-            upsertedId: null,
-          },
-        ])
-
-        await withCollection(async collection => {
-          const docs = await collection.find().toArray()
-          expect(docs).toHaveLength(5)
-          for (const doc of docs) {
-            expect(doc).toEqual({
-              _id: expectValidBsonObjectId,
-              name: "newName",
-            })
-          }
-        })
-      })
-    })
-
-    it("should throw an error if the incorrect actionType is specified", async () => {
-      const verbs = ["read", "create", "update", "delete"]
-      for (const verb of verbs) {
-        const query = await createQuery({
-          fields: { json: {}, extra: { actionType: "invalid" } },
-          queryVerb: verb,
-        })
-        await config.api.query.execute(query._id!, undefined, { status: 400 })
-      }
-    })
-
-    it("should ignore extra brackets in query", async () => {
-      const query = await createQuery({
-        fields: {
-          json: { foo: "te}st" },
-          extra: {
-            actionType: "insertOne",
-          },
-        },
-        queryVerb: "create",
-      })
-
-      const result = await config.api.query.execute(query._id!)
-      expect(result.data).toEqual([
-        {
-          acknowledged: true,
-          insertedId: expectValidId,
-        },
-      ])
-
-      await withCollection(async collection => {
-        const doc = await collection.findOne({ foo: { $eq: "te}st" } })
-        expect(doc).toEqual({
-          _id: expectValidBsonObjectId,
-          foo: "te}st",
-        })
-      })
-    })
-
-    it("should be able to save deeply nested data", async () => {
-      const data = {
-        foo: "bar",
-        data: [
-          { cid: 1 },
-          { cid: 2 },
-          {
-            nested: {
-              name: "test",
-              ary: [1, 2, 3],
-              aryOfObjects: [{ a: 1 }, { b: 2 }],
-            },
-          },
-        ],
-      }
-      const query = await createQuery({
-        fields: {
-          json: data,
-          extra: {
-            actionType: "insertOne",
-          },
-        },
-        queryVerb: "create",
-      })
-
-      const result = await config.api.query.execute(query._id!)
-      expect(result.data).toEqual([
-        {
-          acknowledged: true,
-          insertedId: expectValidId,
-        },
-      ])
-
-      await withCollection(async collection => {
-        const doc = await collection.findOne({ foo: { $eq: "bar" } })
-        expect(doc).toEqual({
-          _id: expectValidBsonObjectId,
-          ...data,
-        })
-      })
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/row.spec.ts b/packages/server/src/api/routes/tests/row.spec.ts
index 5bdd341beb..576f0bb663 100644
--- a/packages/server/src/api/routes/tests/row.spec.ts
+++ b/packages/server/src/api/routes/tests/row.spec.ts
@@ -8,7 +8,13 @@ import {
 import tk from "timekeeper"
 import emitter from "../../../../src/events"
 import { outputProcessing } from "../../../utilities/rowProcessor"
-import { context, InternalTable, tenancy, utils } from "@budibase/backend-core"
+import {
+  context,
+  setEnv,
+  InternalTable,
+  tenancy,
+  utils,
+} from "@budibase/backend-core"
 import { quotas } from "@budibase/pro"
 import {
   AIOperationEnum,
@@ -42,19 +48,8 @@ import { InternalTables } from "../../../db/utils"
 import { withEnv } from "../../../environment"
 import { JsTimeoutError } from "@budibase/string-templates"
 import { isDate } from "../../../utilities"
-
-jest.mock("@budibase/pro", () => ({
-  ...jest.requireActual("@budibase/pro"),
-  ai: {
-    LargeLanguageModel: {
-      forCurrentTenant: async () => ({
-        initialised: true,
-        run: jest.fn(() => `Mock LLM Response`),
-        buildPromptFromAIOperation: jest.fn(),
-      }),
-    },
-  },
-}))
+import nock from "nock"
+import { mockChatGPTResponse } from "../../../tests/utilities/mocks/openai"
 
 const timestamp = new Date("2023-01-26T11:48:57.597Z").toISOString()
 tk.freeze(timestamp)
@@ -85,619 +80,313 @@ function encodeJS(binding: string) {
   return `{{ js "${Buffer.from(binding).toString("base64")}"}}`
 }
 
-datasourceDescribe(
-  { name: "/rows (%s)", exclude: [DatabaseName.MONGODB] },
-  ({ config, dsProvider, isInternal, isMSSQL, isOracle }) => {
-    let table: Table
-    let datasource: Datasource | undefined
-    let client: Knex | undefined
+const descriptions = datasourceDescribe({ exclude: [DatabaseName.MONGODB] })
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource
-      client = ds.client
-    })
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "/rows ($dbName)",
+    ({ config, dsProvider, isInternal, isMSSQL, isOracle }) => {
+      let table: Table
+      let datasource: Datasource | undefined
+      let client: Knex | undefined
 
-    afterAll(async () => {
-      setup.afterAll()
-    })
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource
+        client = ds.client
 
-    function saveTableRequest(
-      // We omit the name field here because it's generated in the function with a
-      // high likelihood to be unique. Tests should not have any reason to control
-      // the table name they're writing to.
-      ...overrides: Partial<Omit<SaveTableRequest, "name">>[]
-    ): SaveTableRequest {
-      const defaultSchema: TableSchema = {
-        id: {
-          type: FieldType.NUMBER,
-          name: "id",
-          autocolumn: true,
-          constraints: {
-            presence: true,
-          },
-        },
-      }
-
-      for (const override of overrides) {
-        if (override.primary) {
-          delete defaultSchema.id
-        }
-      }
-
-      const req: SaveTableRequest = {
-        name: uuid.v4().substring(0, 10),
-        type: "table",
-        sourceType: datasource
-          ? TableSourceType.EXTERNAL
-          : TableSourceType.INTERNAL,
-        sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
-        primary: ["id"],
-        schema: defaultSchema,
-      }
-      const merged = merge(req, ...overrides)
-      return merged
-    }
-
-    function defaultTable(
-      // We omit the name field here because it's generated in the function with a
-      // high likelihood to be unique. Tests should not have any reason to control
-      // the table name they're writing to.
-      ...overrides: Partial<Omit<SaveTableRequest, "name">>[]
-    ): SaveTableRequest {
-      return saveTableRequest(
-        {
-          primaryDisplay: "name",
-          schema: {
-            name: {
-              type: FieldType.STRING,
-              name: "name",
-              constraints: {
-                type: "string",
-              },
-            },
-            description: {
-              type: FieldType.STRING,
-              name: "description",
-              constraints: {
-                type: "string",
-              },
-            },
-          },
-        },
-        ...overrides
-      )
-    }
-
-    beforeEach(async () => {
-      mocks.licenses.useCloudFree()
-    })
-
-    const getRowUsage = async () => {
-      const { total } = await config.doInContext(undefined, () =>
-        quotas.getCurrentUsageValues(
-          QuotaUsageType.STATIC,
-          StaticQuotaName.ROWS
-        )
-      )
-      return total
-    }
-
-    const assertRowUsage = async (expected: number) => {
-      const usage = await getRowUsage()
-
-      // Because our quota tracking is not perfect, we allow a 10% margin of
-      // error.  This is to account for the fact that parallel writes can result
-      // in some quota updates getting lost. We don't have any need to solve this
-      // right now, so we just allow for some error.
-      if (expected === 0) {
-        expect(usage).toEqual(0)
-        return
-      }
-      expect(usage).toBeGreaterThan(expected * 0.9)
-      expect(usage).toBeLessThan(expected * 1.1)
-    }
-
-    const defaultRowFields = isInternal
-      ? {
-          type: "row",
-          createdAt: timestamp,
-          updatedAt: timestamp,
-        }
-      : undefined
-
-    beforeAll(async () => {
-      table = await config.api.table.save(defaultTable())
-    })
-
-    describe("create", () => {
-      it("creates a new row successfully", async () => {
-        const rowUsage = await getRowUsage()
-        const row = await config.api.row.save(table._id!, {
-          name: "Test Contact",
-        })
-        expect(row.name).toEqual("Test Contact")
-        expect(row._rev).toBeDefined()
-        await assertRowUsage(isInternal ? rowUsage + 1 : rowUsage)
+        mocks.licenses.useCloudFree()
       })
 
-      it("fails to create a row for a table that does not exist", async () => {
-        const rowUsage = await getRowUsage()
-        await config.api.row.save("1234567", {}, { status: 404 })
-        await assertRowUsage(rowUsage)
+      afterAll(async () => {
+        setup.afterAll()
       })
 
-      it("fails to create a row if required fields are missing", async () => {
-        const rowUsage = await getRowUsage()
-        const table = await config.api.table.save(
-          saveTableRequest({
-            schema: {
-              required: {
-                type: FieldType.STRING,
-                name: "required",
-                constraints: {
-                  type: "string",
-                  presence: true,
-                },
-              },
+      function saveTableRequest(
+        // We omit the name field here because it's generated in the function with a
+        // high likelihood to be unique. Tests should not have any reason to control
+        // the table name they're writing to.
+        ...overrides: Partial<Omit<SaveTableRequest, "name">>[]
+      ): SaveTableRequest {
+        const defaultSchema: TableSchema = {
+          id: {
+            type: FieldType.NUMBER,
+            name: "id",
+            autocolumn: true,
+            constraints: {
+              presence: true,
             },
-          })
-        )
-        await config.api.row.save(
-          table._id!,
-          {},
+          },
+        }
+
+        for (const override of overrides) {
+          if (override.primary) {
+            delete defaultSchema.id
+          }
+        }
+
+        const req: SaveTableRequest = {
+          name: uuid.v4().substring(0, 10),
+          type: "table",
+          sourceType: datasource
+            ? TableSourceType.EXTERNAL
+            : TableSourceType.INTERNAL,
+          sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
+          primary: ["id"],
+          schema: defaultSchema,
+        }
+        const merged = merge(req, ...overrides)
+        return merged
+      }
+
+      function defaultTable(
+        // We omit the name field here because it's generated in the function with a
+        // high likelihood to be unique. Tests should not have any reason to control
+        // the table name they're writing to.
+        ...overrides: Partial<Omit<SaveTableRequest, "name">>[]
+      ): SaveTableRequest {
+        return saveTableRequest(
           {
-            status: 500,
-            body: {
-              validationErrors: {
-                required: ["can't be blank"],
-              },
-            },
-          }
-        )
-        await assertRowUsage(rowUsage)
-      })
-
-      isInternal &&
-        it("increment row autoId per create row request", async () => {
-          const rowUsage = await getRowUsage()
-
-          const newTable = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                "Row ID": {
-                  name: "Row ID",
-                  type: FieldType.NUMBER,
-                  subtype: AutoFieldSubType.AUTO_ID,
-                  icon: "ri-magic-line",
-                  autocolumn: true,
-                  constraints: {
-                    type: "number",
-                    presence: true,
-                    numericality: {
-                      greaterThanOrEqualTo: "",
-                      lessThanOrEqualTo: "",
-                    },
-                  },
-                },
-              },
-            })
-          )
-
-          let previousId = 0
-          for (let i = 0; i < 10; i++) {
-            const row = await config.api.row.save(newTable._id!, {})
-            expect(row["Row ID"]).toBeGreaterThan(previousId)
-            previousId = row["Row ID"]
-          }
-          await assertRowUsage(isInternal ? rowUsage + 10 : rowUsage)
-        })
-
-      isInternal &&
-        it("should increment auto ID correctly when creating rows in parallel", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                "Row ID": {
-                  name: "Row ID",
-                  type: FieldType.NUMBER,
-                  subtype: AutoFieldSubType.AUTO_ID,
-                  icon: "ri-magic-line",
-                  autocolumn: true,
-                  constraints: {
-                    type: "number",
-                    presence: true,
-                    numericality: {
-                      greaterThanOrEqualTo: "",
-                      lessThanOrEqualTo: "",
-                    },
-                  },
-                },
-              },
-            })
-          )
-
-          const sequence = Array(50)
-            .fill(0)
-            .map((_, i) => i + 1)
-
-          // This block of code is simulating users creating auto ID rows at the
-          // same time. It's expected that this operation will sometimes return
-          // a document conflict error (409), but the idea is to retry in those
-          // situations. The code below does this a large number of times with
-          // small, random delays between them to try and get through the list
-          // as quickly as possible.
-          await Promise.all(
-            sequence.map(async () => {
-              const attempts = 30
-              for (let attempt = 0; attempt < attempts; attempt++) {
-                try {
-                  await config.api.row.save(table._id!, {})
-                  return
-                } catch (e) {
-                  await new Promise(r => setTimeout(r, Math.random() * 50))
-                }
-              }
-              throw new Error(`Failed to create row after ${attempts} attempts`)
-            })
-          )
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows).toHaveLength(50)
-
-          // The main purpose of this test is to ensure that even under pressure,
-          // we maintain data integrity. An auto ID column should hand out
-          // monotonically increasing unique integers no matter what.
-          const ids = rows.map(r => r["Row ID"])
-          expect(ids).toEqual(expect.arrayContaining(sequence))
-        })
-
-      isInternal &&
-        it("doesn't allow creating in user table", async () => {
-          const response = await config.api.row.save(
-            InternalTable.USER_METADATA,
-            {
-              firstName: "Joe",
-              lastName: "Joe",
-              email: "joe@joe.com",
-              roles: {},
-            },
-            { status: 400 }
-          )
-          expect(response.message).toBe("Cannot create new user entry.")
-        })
-
-      it("should not mis-parse date string out of JSON", async () => {
-        const table = await config.api.table.save(
-          saveTableRequest({
+            primaryDisplay: "name",
             schema: {
               name: {
                 type: FieldType.STRING,
                 name: "name",
+                constraints: {
+                  type: "string",
+                },
+              },
+              description: {
+                type: FieldType.STRING,
+                name: "description",
+                constraints: {
+                  type: "string",
+                },
               },
             },
-          })
+          },
+          ...overrides
         )
+      }
 
-        const row = await config.api.row.save(table._id!, {
-          name: `{ "foo": "2023-01-26T11:48:57.000Z" }`,
-        })
+      const getRowUsage = async () => {
+        const { total } = await config.doInContext(undefined, () =>
+          quotas.getCurrentUsageValues(
+            QuotaUsageType.STATIC,
+            StaticQuotaName.ROWS
+          )
+        )
+        return total
+      }
 
-        expect(row.name).toEqual(`{ "foo": "2023-01-26T11:48:57.000Z" }`)
+      const assertRowUsage = async (expected: number) => {
+        const usage = await getRowUsage()
+
+        // Because our quota tracking is not perfect, we allow a 10% margin of
+        // error.  This is to account for the fact that parallel writes can result
+        // in some quota updates getting lost. We don't have any need to solve this
+        // right now, so we just allow for some error.
+        if (expected === 0) {
+          expect(usage).toEqual(0)
+          return
+        }
+        expect(usage).toBeGreaterThan(expected * 0.9)
+        expect(usage).toBeLessThan(expected * 1.1)
+      }
+
+      const defaultRowFields = isInternal
+        ? {
+            type: "row",
+            createdAt: timestamp,
+            updatedAt: timestamp,
+          }
+        : undefined
+
+      beforeAll(async () => {
+        table = await config.api.table.save(defaultTable())
       })
 
-      describe("default values", () => {
-        let table: Table
-
-        describe("string column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  description: {
-                    name: "description",
-                    type: FieldType.STRING,
-                    default: "default description",
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.description).toEqual("default description")
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              description: "specified description",
-            })
-            expect(row.description).toEqual("specified description")
-          })
-
-          it("uses the default value if value is null", async () => {
-            const row = await config.api.row.save(table._id!, {
-              description: null,
-            })
-            expect(row.description).toEqual("default description")
-          })
-
-          it("uses the default value if value is undefined", async () => {
-            const row = await config.api.row.save(table._id!, {
-              description: undefined,
-            })
-            expect(row.description).toEqual("default description")
+      describe("create", () => {
+        it("creates a new row successfully", async () => {
+          const rowUsage = await getRowUsage()
+          const row = await config.api.row.save(table._id!, {
+            name: "Test Contact",
           })
+          expect(row.name).toEqual("Test Contact")
+          expect(row._rev).toBeDefined()
+          await assertRowUsage(isInternal ? rowUsage + 1 : rowUsage)
         })
 
-        describe("number column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
+        it("fails to create a row for a table that does not exist", async () => {
+          const rowUsage = await getRowUsage()
+          await config.api.row.save("1234567", {}, { status: 404 })
+          await assertRowUsage(rowUsage)
+        })
+
+        it("fails to create a row if required fields are missing", async () => {
+          const rowUsage = await getRowUsage()
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                required: {
+                  type: FieldType.STRING,
+                  name: "required",
+                  constraints: {
+                    type: "string",
+                    presence: true,
+                  },
+                },
+              },
+            })
+          )
+          await config.api.row.save(
+            table._id!,
+            {},
+            {
+              status: 500,
+              body: {
+                validationErrors: {
+                  required: ["can't be blank"],
+                },
+              },
+            }
+          )
+          await assertRowUsage(rowUsage)
+        })
+
+        isInternal &&
+          it("increment row autoId per create row request", async () => {
+            const rowUsage = await getRowUsage()
+
+            const newTable = await config.api.table.save(
               saveTableRequest({
                 schema: {
-                  age: {
-                    name: "age",
+                  "Row ID": {
+                    name: "Row ID",
                     type: FieldType.NUMBER,
-                    default: "25",
+                    subtype: AutoFieldSubType.AUTO_ID,
+                    icon: "ri-magic-line",
+                    autocolumn: true,
+                    constraints: {
+                      type: "number",
+                      presence: true,
+                      numericality: {
+                        greaterThanOrEqualTo: "",
+                        lessThanOrEqualTo: "",
+                      },
+                    },
                   },
                 },
               })
             )
+
+            let previousId = 0
+            for (let i = 0; i < 10; i++) {
+              const row = await config.api.row.save(newTable._id!, {})
+              expect(row["Row ID"]).toBeGreaterThan(previousId)
+              previousId = row["Row ID"]
+            }
+            await assertRowUsage(isInternal ? rowUsage + 10 : rowUsage)
           })
 
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.age).toEqual(25)
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              age: 30,
-            })
-            expect(row.age).toEqual(30)
-          })
-        })
-
-        describe("date column", () => {
-          it("creates a row with a default value successfully", async () => {
+        isInternal &&
+          it("should increment auto ID correctly when creating rows in parallel", async () => {
             const table = await config.api.table.save(
               saveTableRequest({
                 schema: {
-                  date: {
-                    name: "date",
-                    type: FieldType.DATETIME,
-                    default: "2023-01-26T11:48:57.000Z",
+                  "Row ID": {
+                    name: "Row ID",
+                    type: FieldType.NUMBER,
+                    subtype: AutoFieldSubType.AUTO_ID,
+                    icon: "ri-magic-line",
+                    autocolumn: true,
+                    constraints: {
+                      type: "number",
+                      presence: true,
+                      numericality: {
+                        greaterThanOrEqualTo: "",
+                        lessThanOrEqualTo: "",
+                      },
+                    },
                   },
                 },
               })
             )
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.date).toEqual("2023-01-26T11:48:57.000Z")
+
+            const sequence = Array(50)
+              .fill(0)
+              .map((_, i) => i + 1)
+
+            // This block of code is simulating users creating auto ID rows at the
+            // same time. It's expected that this operation will sometimes return
+            // a document conflict error (409), but the idea is to retry in those
+            // situations. The code below does this a large number of times with
+            // small, random delays between them to try and get through the list
+            // as quickly as possible.
+            await Promise.all(
+              sequence.map(async () => {
+                const attempts = 30
+                for (let attempt = 0; attempt < attempts; attempt++) {
+                  try {
+                    await config.api.row.save(table._id!, {})
+                    return
+                  } catch (e) {
+                    await new Promise(r => setTimeout(r, Math.random() * 50))
+                  }
+                }
+                throw new Error(
+                  `Failed to create row after ${attempts} attempts`
+                )
+              })
+            )
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows).toHaveLength(50)
+
+            // The main purpose of this test is to ensure that even under pressure,
+            // we maintain data integrity. An auto ID column should hand out
+            // monotonically increasing unique integers no matter what.
+            const ids = rows.map(r => r["Row ID"])
+            expect(ids).toEqual(expect.arrayContaining(sequence))
           })
 
-          it("gives an error if the default value is invalid", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  date: {
-                    name: "date",
-                    type: FieldType.DATETIME,
-                    default: "invalid",
-                  },
-                },
-              })
-            )
-            await config.api.row.save(
-              table._id!,
-              {},
+        isInternal &&
+          it("doesn't allow creating in user table", async () => {
+            const response = await config.api.row.save(
+              InternalTable.USER_METADATA,
               {
-                status: 400,
-                body: {
-                  message: `Invalid default value for field 'date' - Invalid date value: "invalid"`,
-                },
-              }
+                firstName: "Joe",
+                lastName: "Joe",
+                email: "joe@joe.com",
+                roles: {},
+              },
+              { status: 400 }
             )
+            expect(response.message).toBe("Cannot create new user entry.")
           })
+
+        it("should not mis-parse date string out of JSON", async () => {
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                name: {
+                  type: FieldType.STRING,
+                  name: "name",
+                },
+              },
+            })
+          )
+
+          const row = await config.api.row.save(table._id!, {
+            name: `{ "foo": "2023-01-26T11:48:57.000Z" }`,
+          })
+
+          expect(row.name).toEqual(`{ "foo": "2023-01-26T11:48:57.000Z" }`)
         })
 
-        describe("options column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  status: {
-                    name: "status",
-                    type: FieldType.OPTIONS,
-                    default: "requested",
-                    constraints: {
-                      inclusion: ["requested", "approved"],
-                    },
-                  },
-                },
-              })
-            )
-          })
+        describe("default values", () => {
+          let table: Table
 
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.status).toEqual("requested")
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              status: "approved",
-            })
-            expect(row.status).toEqual("approved")
-          })
-        })
-
-        describe("array column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  food: {
-                    name: "food",
-                    type: FieldType.ARRAY,
-                    default: ["apple", "orange"],
-                    constraints: {
-                      type: JsonFieldSubType.ARRAY,
-                      inclusion: ["apple", "orange", "banana"],
-                    },
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.food).toEqual(["apple", "orange"])
-          })
-
-          it("creates a new row with a default value when given an empty list", async () => {
-            const row = await config.api.row.save(table._id!, { food: [] })
-            expect(row.food).toEqual(["apple", "orange"])
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              food: ["orange"],
-            })
-            expect(row.food).toEqual(["orange"])
-          })
-
-          it("resets back to its default value when empty", async () => {
-            let row = await config.api.row.save(table._id!, {
-              food: ["orange"],
-            })
-            row = await config.api.row.save(table._id!, { ...row, food: [] })
-            expect(row.food).toEqual(["apple", "orange"])
-          })
-        })
-
-        describe("user column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  user: {
-                    name: "user",
-                    type: FieldType.BB_REFERENCE_SINGLE,
-                    subtype: BBReferenceFieldSubType.USER,
-                    default: "{{ [Current User]._id }}",
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.user._id).toEqual(config.getUser()._id)
-          })
-
-          it("does not use default value if value specified", async () => {
-            const id = `us_${utils.newid()}`
-            await config.createUser({ _id: id })
-            const row = await config.api.row.save(table._id!, {
-              user: id,
-            })
-            expect(row.user._id).toEqual(id)
-          })
-        })
-
-        describe("multi-user column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  users: {
-                    name: "users",
-                    type: FieldType.BB_REFERENCE,
-                    subtype: BBReferenceFieldSubType.USER,
-                    default: ["{{ [Current User]._id }}"],
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.users).toHaveLength(1)
-            expect(row.users[0]._id).toEqual(config.getUser()._id)
-          })
-
-          it("does not use default value if value specified", async () => {
-            const id = `us_${utils.newid()}`
-            await config.createUser({ _id: id })
-            const row = await config.api.row.save(table._id!, {
-              users: [id],
-            })
-            expect(row.users).toHaveLength(1)
-            expect(row.users[0]._id).toEqual(id)
-          })
-        })
-
-        describe("boolean column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  active: {
-                    name: "active",
-                    type: FieldType.BOOLEAN,
-                    default: "true",
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.active).toEqual(true)
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              active: false,
-            })
-            expect(row.active).toEqual(false)
-          })
-        })
-
-        describe("bigint column", () => {
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  bigNumber: {
-                    name: "bigNumber",
-                    type: FieldType.BIGINT,
-                    default: "1234567890",
-                  },
-                },
-              })
-            )
-          })
-
-          it("creates a new row with a default value successfully", async () => {
-            const row = await config.api.row.save(table._id!, {})
-            expect(row.bigNumber).toEqual("1234567890")
-          })
-
-          it("does not use default value if value specified", async () => {
-            const row = await config.api.row.save(table._id!, {
-              bigNumber: "9876543210",
-            })
-            expect(row.bigNumber).toEqual("9876543210")
-          })
-        })
-
-        describe("bindings", () => {
           describe("string column", () => {
             beforeAll(async () => {
               table = await config.api.table.save(
@@ -706,18 +395,16 @@ datasourceDescribe(
                     description: {
                       name: "description",
                       type: FieldType.STRING,
-                      default: `{{ date now "YYYY-MM-DDTHH:mm:ss" }}`,
+                      default: "default description",
                     },
                   },
                 })
               )
             })
 
-            it("can use bindings in default values", async () => {
+            it("creates a new row with a default value successfully", async () => {
               const row = await config.api.row.save(table._id!, {})
-              expect(row.description).toMatch(
-                /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
-              )
+              expect(row.description).toEqual("default description")
             })
 
             it("does not use default value if value specified", async () => {
@@ -727,38 +414,18 @@ datasourceDescribe(
               expect(row.description).toEqual("specified description")
             })
 
-            it("can bind the current user", async () => {
-              const table = await config.api.table.save(
-                saveTableRequest({
-                  schema: {
-                    user: {
-                      name: "user",
-                      type: FieldType.STRING,
-                      default: `{{ [Current User]._id }}`,
-                    },
-                  },
-                })
-              )
-              const row = await config.api.row.save(table._id!, {})
-              expect(row.user).toEqual(config.getUser()._id)
+            it("uses the default value if value is null", async () => {
+              const row = await config.api.row.save(table._id!, {
+                description: null,
+              })
+              expect(row.description).toEqual("default description")
             })
 
-            it("cannot access current user password", async () => {
-              const table = await config.api.table.save(
-                saveTableRequest({
-                  schema: {
-                    user: {
-                      name: "user",
-                      type: FieldType.STRING,
-                      default: `{{ user.password }}`,
-                    },
-                  },
-                })
-              )
-              const row = await config.api.row.save(table._id!, {})
-              // For some reason it's null for internal tables, and undefined for
-              // external.
-              expect(row.user == null).toBe(true)
+            it("uses the default value if value is undefined", async () => {
+              const row = await config.api.row.save(table._id!, {
+                description: undefined,
+              })
+              expect(row.description).toEqual("default description")
             })
           })
 
@@ -770,19 +437,330 @@ datasourceDescribe(
                     age: {
                       name: "age",
                       type: FieldType.NUMBER,
-                      default: `{{ sum 10 10 5 }}`,
+                      default: "25",
                     },
                   },
                 })
               )
             })
 
-            it("can use bindings in default values", async () => {
+            it("creates a new row with a default value successfully", async () => {
               const row = await config.api.row.save(table._id!, {})
               expect(row.age).toEqual(25)
             })
 
-            describe("invalid default value", () => {
+            it("does not use default value if value specified", async () => {
+              const row = await config.api.row.save(table._id!, {
+                age: 30,
+              })
+              expect(row.age).toEqual(30)
+            })
+          })
+
+          describe("date column", () => {
+            it("creates a row with a default value successfully", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    date: {
+                      name: "date",
+                      type: FieldType.DATETIME,
+                      default: "2023-01-26T11:48:57.000Z",
+                    },
+                  },
+                })
+              )
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.date).toEqual("2023-01-26T11:48:57.000Z")
+            })
+
+            it("gives an error if the default value is invalid", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    date: {
+                      name: "date",
+                      type: FieldType.DATETIME,
+                      default: "invalid",
+                    },
+                  },
+                })
+              )
+              await config.api.row.save(
+                table._id!,
+                {},
+                {
+                  status: 400,
+                  body: {
+                    message: `Invalid default value for field 'date' - Invalid date value: "invalid"`,
+                  },
+                }
+              )
+            })
+          })
+
+          describe("options column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    status: {
+                      name: "status",
+                      type: FieldType.OPTIONS,
+                      default: "requested",
+                      constraints: {
+                        inclusion: ["requested", "approved"],
+                      },
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.status).toEqual("requested")
+            })
+
+            it("does not use default value if value specified", async () => {
+              const row = await config.api.row.save(table._id!, {
+                status: "approved",
+              })
+              expect(row.status).toEqual("approved")
+            })
+          })
+
+          describe("array column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    food: {
+                      name: "food",
+                      type: FieldType.ARRAY,
+                      default: ["apple", "orange"],
+                      constraints: {
+                        type: JsonFieldSubType.ARRAY,
+                        inclusion: ["apple", "orange", "banana"],
+                      },
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.food).toEqual(["apple", "orange"])
+            })
+
+            it("creates a new row with a default value when given an empty list", async () => {
+              const row = await config.api.row.save(table._id!, { food: [] })
+              expect(row.food).toEqual(["apple", "orange"])
+            })
+
+            it("does not use default value if value specified", async () => {
+              const row = await config.api.row.save(table._id!, {
+                food: ["orange"],
+              })
+              expect(row.food).toEqual(["orange"])
+            })
+
+            it("resets back to its default value when empty", async () => {
+              let row = await config.api.row.save(table._id!, {
+                food: ["orange"],
+              })
+              row = await config.api.row.save(table._id!, { ...row, food: [] })
+              expect(row.food).toEqual(["apple", "orange"])
+            })
+          })
+
+          describe("user column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    user: {
+                      name: "user",
+                      type: FieldType.BB_REFERENCE_SINGLE,
+                      subtype: BBReferenceFieldSubType.USER,
+                      default: "{{ [Current User]._id }}",
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.user._id).toEqual(config.getUser()._id)
+            })
+
+            it("does not use default value if value specified", async () => {
+              const id = `us_${utils.newid()}`
+              await config.createUser({ _id: id })
+              const row = await config.api.row.save(table._id!, {
+                user: id,
+              })
+              expect(row.user._id).toEqual(id)
+            })
+          })
+
+          describe("multi-user column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    users: {
+                      name: "users",
+                      type: FieldType.BB_REFERENCE,
+                      subtype: BBReferenceFieldSubType.USER,
+                      default: ["{{ [Current User]._id }}"],
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.users).toHaveLength(1)
+              expect(row.users[0]._id).toEqual(config.getUser()._id)
+            })
+
+            it("does not use default value if value specified", async () => {
+              const id = `us_${utils.newid()}`
+              await config.createUser({ _id: id })
+              const row = await config.api.row.save(table._id!, {
+                users: [id],
+              })
+              expect(row.users).toHaveLength(1)
+              expect(row.users[0]._id).toEqual(id)
+            })
+          })
+
+          describe("boolean column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    active: {
+                      name: "active",
+                      type: FieldType.BOOLEAN,
+                      default: "true",
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.active).toEqual(true)
+            })
+
+            it("does not use default value if value specified", async () => {
+              const row = await config.api.row.save(table._id!, {
+                active: false,
+              })
+              expect(row.active).toEqual(false)
+            })
+          })
+
+          describe("bigint column", () => {
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    bigNumber: {
+                      name: "bigNumber",
+                      type: FieldType.BIGINT,
+                      default: "1234567890",
+                    },
+                  },
+                })
+              )
+            })
+
+            it("creates a new row with a default value successfully", async () => {
+              const row = await config.api.row.save(table._id!, {})
+              expect(row.bigNumber).toEqual("1234567890")
+            })
+
+            it("does not use default value if value specified", async () => {
+              const row = await config.api.row.save(table._id!, {
+                bigNumber: "9876543210",
+              })
+              expect(row.bigNumber).toEqual("9876543210")
+            })
+          })
+
+          describe("bindings", () => {
+            describe("string column", () => {
+              beforeAll(async () => {
+                table = await config.api.table.save(
+                  saveTableRequest({
+                    schema: {
+                      description: {
+                        name: "description",
+                        type: FieldType.STRING,
+                        default: `{{ date now "YYYY-MM-DDTHH:mm:ss" }}`,
+                      },
+                    },
+                  })
+                )
+              })
+
+              it("can use bindings in default values", async () => {
+                const row = await config.api.row.save(table._id!, {})
+                expect(row.description).toMatch(
+                  /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+                )
+              })
+
+              it("does not use default value if value specified", async () => {
+                const row = await config.api.row.save(table._id!, {
+                  description: "specified description",
+                })
+                expect(row.description).toEqual("specified description")
+              })
+
+              it("can bind the current user", async () => {
+                const table = await config.api.table.save(
+                  saveTableRequest({
+                    schema: {
+                      user: {
+                        name: "user",
+                        type: FieldType.STRING,
+                        default: `{{ [Current User]._id }}`,
+                      },
+                    },
+                  })
+                )
+                const row = await config.api.row.save(table._id!, {})
+                expect(row.user).toEqual(config.getUser()._id)
+              })
+
+              it("cannot access current user password", async () => {
+                const table = await config.api.table.save(
+                  saveTableRequest({
+                    schema: {
+                      user: {
+                        name: "user",
+                        type: FieldType.STRING,
+                        default: `{{ user.password }}`,
+                      },
+                    },
+                  })
+                )
+                const row = await config.api.row.save(table._id!, {})
+                // For some reason it's null for internal tables, and undefined for
+                // external.
+                expect(row.user == null).toBe(true)
+              })
+            })
+
+            describe("number column", () => {
               beforeAll(async () => {
                 table = await config.api.table.save(
                   saveTableRequest({
@@ -790,1030 +768,946 @@ datasourceDescribe(
                       age: {
                         name: "age",
                         type: FieldType.NUMBER,
-                        default: `{{ capitalize "invalid" }}`,
+                        default: `{{ sum 10 10 5 }}`,
                       },
                     },
                   })
                 )
               })
 
-              it("throws an error when invalid default value", async () => {
-                await config.api.row.save(
-                  table._id!,
-                  {},
-                  {
-                    status: 400,
-                    body: {
-                      message:
-                        "Invalid default value for field 'age' - Invalid number value \"Invalid\"",
-                    },
-                  }
-                )
+              it("can use bindings in default values", async () => {
+                const row = await config.api.row.save(table._id!, {})
+                expect(row.age).toEqual(25)
+              })
+
+              describe("invalid default value", () => {
+                beforeAll(async () => {
+                  table = await config.api.table.save(
+                    saveTableRequest({
+                      schema: {
+                        age: {
+                          name: "age",
+                          type: FieldType.NUMBER,
+                          default: `{{ capitalize "invalid" }}`,
+                        },
+                      },
+                    })
+                  )
+                })
+
+                it("throws an error when invalid default value", async () => {
+                  await config.api.row.save(
+                    table._id!,
+                    {},
+                    {
+                      status: 400,
+                      body: {
+                        message:
+                          "Invalid default value for field 'age' - Invalid number value \"Invalid\"",
+                      },
+                    }
+                  )
+                })
               })
             })
           })
         })
-      })
 
-      describe("relations to same table", () => {
-        let relatedRows: Row[]
+        describe("relations to same table", () => {
+          let relatedRows: Row[]
 
-        beforeAll(async () => {
-          const relatedTable = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-              },
-            })
-          )
-          const relatedTableId = relatedTable._id!
-          table = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-                related1: {
-                  type: FieldType.LINK,
-                  name: "related1",
-                  fieldName: "main1",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
+          beforeAll(async () => {
+            const relatedTable = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
                 },
-                related2: {
-                  type: FieldType.LINK,
-                  name: "related2",
-                  fieldName: "main2",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-              },
-            })
-          )
-          relatedRows = await Promise.all([
-            config.api.row.save(relatedTableId, { name: "foo" }),
-            config.api.row.save(relatedTableId, { name: "bar" }),
-            config.api.row.save(relatedTableId, { name: "baz" }),
-            config.api.row.save(relatedTableId, { name: "boo" }),
-          ])
-        })
-
-        it("can create rows with both relationships", async () => {
-          const row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [relatedRows[0]._id!],
-            related2: [relatedRows[1]._id!],
-          })
-
-          expect(row).toEqual(
-            expect.objectContaining({
-              name: "test",
-              related1: [
-                {
-                  _id: relatedRows[0]._id,
-                  primaryDisplay: relatedRows[0].name,
-                },
-              ],
-              related2: [
-                {
-                  _id: relatedRows[1]._id,
-                  primaryDisplay: relatedRows[1].name,
-                },
-              ],
-            })
-          )
-        })
-
-        it("can create rows with no relationships", async () => {
-          const row = await config.api.row.save(table._id!, {
-            name: "test",
-          })
-
-          expect(row.related1).toBeUndefined()
-          expect(row.related2).toBeUndefined()
-        })
-
-        it("can create rows with only one relationships field", async () => {
-          const row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [],
-            related2: [relatedRows[1]._id!],
-          })
-
-          expect(row).toEqual(
-            expect.objectContaining({
-              name: "test",
-              related2: [
-                {
-                  _id: relatedRows[1]._id,
-                  primaryDisplay: relatedRows[1].name,
-                },
-              ],
-            })
-          )
-          expect(row.related1).toBeUndefined()
-        })
-      })
-    })
-
-    describe("get", () => {
-      it("reads an existing row successfully", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-
-        const res = await config.api.row.get(table._id!, existing._id!)
-
-        expect(res).toEqual({
-          ...existing,
-          ...defaultRowFields,
-        })
-      })
-
-      it("returns 404 when row does not exist", async () => {
-        const table = await config.api.table.save(defaultTable())
-        await config.api.row.save(table._id!, {})
-        await config.api.row.get(table._id!, "1234567", {
-          status: 404,
-        })
-      })
-
-      isInternal &&
-        it("can search row from user table", async () => {
-          const res = await config.api.row.get(
-            InternalTables.USER_METADATA,
-            config.userMetadataId!
-          )
-
-          expect(res).toEqual({
-            ...config.getUser(),
-            _id: config.userMetadataId!,
-            _rev: expect.any(String),
-            roles: undefined,
-            roleId: "ADMIN",
-            tableId: InternalTables.USER_METADATA,
-          })
-        })
-    })
-
-    describe("fetch", () => {
-      it("fetches all rows for given tableId", async () => {
-        const table = await config.api.table.save(defaultTable())
-        const rows = await Promise.all([
-          config.api.row.save(table._id!, {}),
-          config.api.row.save(table._id!, {}),
-        ])
-
-        const res = await config.api.row.fetch(table._id!)
-        expect(res.map(r => r._id)).toEqual(
-          expect.arrayContaining(rows.map(r => r._id))
-        )
-      })
-
-      it("returns 404 when table does not exist", async () => {
-        await config.api.row.fetch("1234567", { status: 404 })
-      })
-    })
-
-    describe("update", () => {
-      it("updates an existing row successfully", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.save(table._id!, {
-          _id: existing._id,
-          _rev: existing._rev,
-          name: "Updated Name",
-        })
-
-        expect(res.name).toEqual("Updated Name")
-        await assertRowUsage(rowUsage)
-      })
-
-      !isInternal &&
-        it("can update a row on an external table with a primary key", async () => {
-          const tableName = uuid.v4().substring(0, 10)
-          await client!.schema.createTable(tableName, table => {
-            table.increments("id").primary()
-            table.string("name")
-          })
-
-          const res = await config.api.datasource.fetchSchema({
-            datasourceId: datasource!._id!,
-          })
-          const table = res.datasource.entities![tableName]
-
-          const row = await config.api.row.save(table._id!, {
-            id: 1,
-            name: "Row 1",
-          })
-
-          const updatedRow = await config.api.row.save(table._id!, {
-            _id: row._id!,
-            name: "Row 1 Updated",
-          })
-
-          expect(updatedRow.name).toEqual("Row 1 Updated")
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows).toHaveLength(1)
-        })
-
-      describe("relations to same table", () => {
-        let relatedRows: Row[]
-
-        beforeAll(async () => {
-          const relatedTable = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-              },
-            })
-          )
-          const relatedTableId = relatedTable._id!
-          table = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-                related1: {
-                  type: FieldType.LINK,
-                  name: "related1",
-                  fieldName: "main1",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-                related2: {
-                  type: FieldType.LINK,
-                  name: "related2",
-                  fieldName: "main2",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-              },
-            })
-          )
-          relatedRows = await Promise.all([
-            config.api.row.save(relatedTableId, { name: "foo" }),
-            config.api.row.save(relatedTableId, { name: "bar" }),
-            config.api.row.save(relatedTableId, { name: "baz" }),
-            config.api.row.save(relatedTableId, { name: "boo" }),
-          ])
-        })
-
-        it("can edit rows with both relationships", async () => {
-          let row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [relatedRows[0]._id!],
-            related2: [relatedRows[1]._id!],
-          })
-
-          row = await config.api.row.save(table._id!, {
-            ...row,
-            related1: [relatedRows[0]._id!, relatedRows[1]._id!],
-            related2: [relatedRows[2]._id!],
-          })
-
-          expect(row).toEqual(
-            expect.objectContaining({
-              name: "test",
-              related1: expect.arrayContaining([
-                {
-                  _id: relatedRows[0]._id,
-                  primaryDisplay: relatedRows[0].name,
-                },
-                {
-                  _id: relatedRows[1]._id,
-                  primaryDisplay: relatedRows[1].name,
-                },
-              ]),
-              related2: [
-                {
-                  _id: relatedRows[2]._id,
-                  primaryDisplay: relatedRows[2].name,
-                },
-              ],
-            })
-          )
-        })
-
-        it("can drop existing relationship", async () => {
-          let row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [relatedRows[0]._id!],
-            related2: [relatedRows[1]._id!],
-          })
-
-          row = await config.api.row.save(table._id!, {
-            ...row,
-            related1: [],
-            related2: [relatedRows[2]._id!],
-          })
-
-          expect(row).toEqual(
-            expect.objectContaining({
-              name: "test",
-              related2: [
-                {
-                  _id: relatedRows[2]._id,
-                  primaryDisplay: relatedRows[2].name,
-                },
-              ],
-            })
-          )
-          expect(row.related1).toBeUndefined()
-        })
-
-        it("can drop both relationships", async () => {
-          let row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [relatedRows[0]._id!],
-            related2: [relatedRows[1]._id!],
-          })
-
-          row = await config.api.row.save(table._id!, {
-            ...row,
-            related1: [],
-            related2: [],
-          })
-
-          expect(row).toEqual(
-            expect.objectContaining({
-              name: "test",
-            })
-          )
-          expect(row.related1).toBeUndefined()
-          expect(row.related2).toBeUndefined()
-        })
-      })
-    })
-
-    describe("patch", () => {
-      let otherTable: Table
-
-      beforeAll(async () => {
-        table = await config.api.table.save(defaultTable())
-        otherTable = await config.api.table.save(
-          defaultTable({
-            schema: {
-              relationship: {
-                name: "relationship",
-                relationshipType: RelationshipType.ONE_TO_MANY,
-                type: FieldType.LINK,
-                tableId: table._id!,
-                fieldName: "relationship",
-              },
-            },
-          })
-        )
-      })
-
-      it("should update only the fields that are supplied", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-
-        const rowUsage = await getRowUsage()
-
-        const row = await config.api.row.patch(table._id!, {
-          _id: existing._id!,
-          _rev: existing._rev!,
-          tableId: table._id!,
-          name: "Updated Name",
-        })
-
-        expect(row.name).toEqual("Updated Name")
-        expect(row.description).toEqual(existing.description)
-
-        const savedRow = await config.api.row.get(table._id!, row._id!)
-
-        expect(savedRow.description).toEqual(existing.description)
-        expect(savedRow.name).toEqual("Updated Name")
-        await assertRowUsage(rowUsage)
-      })
-
-      it("should update only the fields that are supplied and emit the correct oldRow", async () => {
-        let beforeRow = await config.api.row.save(table._id!, {
-          name: "test",
-          description: "test",
-        })
-        const opts = {
-          name: "row:update",
-          matchFn: (event: UpdatedRowEventEmitter) =>
-            event.row._id === beforeRow._id,
-        }
-        const event = await waitForEvent(opts, async () => {
-          await config.api.row.patch(table._id!, {
-            _id: beforeRow._id!,
-            _rev: beforeRow._rev!,
-            tableId: table._id!,
-            name: "Updated Name",
-          })
-        })
-
-        expect(event.oldRow).toBeDefined()
-        expect(event.oldRow.name).toEqual("test")
-        expect(event.row.name).toEqual("Updated Name")
-        expect(event.oldRow.description).toEqual(beforeRow.description)
-        expect(event.row.description).toEqual(beforeRow.description)
-      })
-
-      it("should throw an error when given improper types", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        await config.api.row.patch(
-          table._id!,
-          {
-            _id: existing._id!,
-            _rev: existing._rev!,
-            tableId: table._id!,
-            name: 1,
-          },
-          { status: 400 }
-        )
-
-        await assertRowUsage(rowUsage)
-      })
-
-      it("should not overwrite links if those links are not set", async () => {
-        let linkField: FieldSchema = {
-          type: FieldType.LINK,
-          name: "",
-          fieldName: "",
-          constraints: {
-            type: "array",
-            presence: false,
-          },
-          relationshipType: RelationshipType.ONE_TO_MANY,
-          tableId: InternalTable.USER_METADATA,
-        }
-
-        let table = await config.api.table.save({
-          name: "TestTable",
-          type: "table",
-          sourceType: TableSourceType.INTERNAL,
-          sourceId: INTERNAL_TABLE_SOURCE_ID,
-          schema: {
-            user1: { ...linkField, name: "user1", fieldName: "user1" },
-            user2: { ...linkField, name: "user2", fieldName: "user2" },
-          },
-        })
-
-        let user1 = await config.createUser()
-        let user2 = await config.createUser()
-
-        let row = await config.api.row.save(table._id!, {
-          user1: [{ _id: user1._id }],
-          user2: [{ _id: user2._id }],
-        })
-
-        let getResp = await config.api.row.get(table._id!, row._id!)
-        expect(getResp.user1[0]._id).toEqual(user1._id)
-        expect(getResp.user2[0]._id).toEqual(user2._id)
-
-        let patchResp = await config.api.row.patch(table._id!, {
-          _id: row._id!,
-          _rev: row._rev!,
-          tableId: table._id!,
-          user1: [{ _id: user2._id }],
-        })
-        expect(patchResp.user1[0]._id).toEqual(user2._id)
-        expect(patchResp.user2[0]._id).toEqual(user2._id)
-
-        getResp = await config.api.row.get(table._id!, row._id!)
-        expect(getResp.user1[0]._id).toEqual(user2._id)
-        expect(getResp.user2[0]._id).toEqual(user2._id)
-      })
-
-      it("should be able to remove a relationship from many side", async () => {
-        const row = await config.api.row.save(otherTable._id!, {
-          name: "test",
-          description: "test",
-        })
-        const row2 = await config.api.row.save(otherTable._id!, {
-          name: "test",
-          description: "test",
-        })
-        const { _id } = await config.api.row.save(table._id!, {
-          relationship: [{ _id: row._id }, { _id: row2._id }],
-        })
-        const relatedRow = await config.api.row.get(table._id!, _id!, {
-          status: 200,
-        })
-        expect(relatedRow.relationship.length).toEqual(2)
-        await config.api.row.save(table._id!, {
-          ...relatedRow,
-          relationship: [{ _id: row._id }],
-        })
-        const afterRelatedRow = await config.api.row.get(table._id!, _id!, {
-          status: 200,
-        })
-        expect(afterRelatedRow.relationship.length).toEqual(1)
-        expect(afterRelatedRow.relationship[0]._id).toEqual(row._id)
-      })
-
-      it("should be able to update relationships when both columns are same name", async () => {
-        let row = await config.api.row.save(table._id!, {
-          name: "test",
-          description: "test",
-        })
-        let row2 = await config.api.row.save(otherTable._id!, {
-          name: "test",
-          description: "test",
-          relationship: [row._id],
-        })
-        row = await config.api.row.get(table._id!, row._id!)
-        expect(row.relationship.length).toBe(1)
-        const resp = await config.api.row.patch(table._id!, {
-          _id: row._id!,
-          _rev: row._rev!,
-          tableId: row.tableId!,
-          name: "test2",
-          relationship: [row2._id],
-        })
-        expect(resp.relationship.length).toBe(1)
-      })
-
-      !isInternal &&
-        // MSSQL needs a setting called IDENTITY_INSERT to be set to ON to allow writing
-        // to identity columns. This is not something Budibase does currently.
-        !isMSSQL &&
-        it("should support updating fields that are part of a composite key", async () => {
-          const tableRequest = saveTableRequest({
-            primary: ["number", "string"],
-            schema: {
-              string: {
-                type: FieldType.STRING,
-                name: "string",
-              },
-              number: {
-                type: FieldType.NUMBER,
-                name: "number",
-              },
-            },
-          })
-
-          delete tableRequest.schema.id
-
-          const table = await config.api.table.save(tableRequest)
-
-          const stringValue = generator.word()
-
-          // MySQL and MariaDB auto-increment fields have a minimum value of 1. If
-          // you try to save a row with a value of 0 it will use 1 instead.
-          const naturalValue = generator.integer({ min: 1, max: 1000 })
-
-          const existing = await config.api.row.save(table._id!, {
-            string: stringValue,
-            number: naturalValue,
-          })
-
-          expect(existing._id).toEqual(
-            `%5B${naturalValue}%2C'${stringValue}'%5D`
-          )
-
-          const row = await config.api.row.patch(table._id!, {
-            _id: existing._id!,
-            _rev: existing._rev!,
-            tableId: table._id!,
-            string: stringValue,
-            number: 1500,
-          })
-
-          expect(row._id).toEqual(`%5B${"1500"}%2C'${stringValue}'%5D`)
-        })
-    })
-
-    describe("destroy", () => {
-      beforeAll(async () => {
-        table = await config.api.table.save(defaultTable())
-      })
-
-      it("should be able to delete a row", async () => {
-        const createdRow = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.bulkDelete(table._id!, {
-          rows: [createdRow],
-        })
-        expect(res[0]._id).toEqual(createdRow._id)
-        await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
-      })
-
-      it("should be able to delete a row with ID only", async () => {
-        const createdRow = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.bulkDelete(table._id!, {
-          rows: [createdRow._id!],
-        })
-        expect(res[0]._id).toEqual(createdRow._id)
-        expect(res[0].tableId).toEqual(table._id!)
-        await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
-      })
-
-      it("should be able to bulk delete rows, including a row that doesn't exist", async () => {
-        const createdRow = await config.api.row.save(table._id!, {})
-        const createdRow2 = await config.api.row.save(table._id!, {})
-
-        const res = await config.api.row.bulkDelete(table._id!, {
-          rows: [createdRow, createdRow2, { _id: "9999999" }],
-        })
-
-        expect(res.map(r => r._id)).toEqual(
-          expect.arrayContaining([createdRow._id, createdRow2._id])
-        )
-        expect(res.length).toEqual(2)
-      })
-
-      describe("relations to same table", () => {
-        let relatedRows: Row[]
-
-        beforeAll(async () => {
-          const relatedTable = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-              },
-            })
-          )
-          const relatedTableId = relatedTable._id!
-          table = await config.api.table.save(
-            defaultTable({
-              schema: {
-                name: { name: "name", type: FieldType.STRING },
-                related1: {
-                  type: FieldType.LINK,
-                  name: "related1",
-                  fieldName: "main1",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-                related2: {
-                  type: FieldType.LINK,
-                  name: "related2",
-                  fieldName: "main2",
-                  tableId: relatedTableId,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-              },
-            })
-          )
-          relatedRows = await Promise.all([
-            config.api.row.save(relatedTableId, { name: "foo" }),
-            config.api.row.save(relatedTableId, { name: "bar" }),
-            config.api.row.save(relatedTableId, { name: "baz" }),
-            config.api.row.save(relatedTableId, { name: "boo" }),
-          ])
-        })
-
-        it("can delete rows with both relationships", async () => {
-          const row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [relatedRows[0]._id!],
-            related2: [relatedRows[1]._id!],
-          })
-
-          await config.api.row.delete(table._id!, { _id: row._id! })
-
-          await config.api.row.get(table._id!, row._id!, { status: 404 })
-        })
-
-        it("can delete rows with empty relationships", async () => {
-          const row = await config.api.row.save(table._id!, {
-            name: "test",
-            related1: [],
-            related2: [],
-          })
-
-          await config.api.row.delete(table._id!, { _id: row._id! })
-
-          await config.api.row.get(table._id!, row._id!, { status: 404 })
-        })
-      })
-    })
-
-    describe("validate", () => {
-      beforeAll(async () => {
-        table = await config.api.table.save(defaultTable())
-      })
-
-      it("should return no errors on valid row", async () => {
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.validate(table._id!, { name: "ivan" })
-
-        expect(res.valid).toBe(true)
-        expect(Object.keys(res.errors)).toEqual([])
-        await assertRowUsage(rowUsage)
-      })
-
-      it("should errors on invalid row", async () => {
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.validate(table._id!, { name: 1 })
-
-        if (isInternal) {
-          expect(res.valid).toBe(false)
-          expect(Object.keys(res.errors)).toEqual(["name"])
-        } else {
-          // Validation for external is not implemented, so it will always return valid
-          expect(res.valid).toBe(true)
-          expect(Object.keys(res.errors)).toEqual([])
-        }
-        await assertRowUsage(rowUsage)
-      })
-    })
-
-    describe("bulkDelete", () => {
-      beforeAll(async () => {
-        table = await config.api.table.save(defaultTable())
-      })
-
-      it("should be able to delete a bulk set of rows", async () => {
-        const row1 = await config.api.row.save(table._id!, {})
-        const row2 = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.bulkDelete(table._id!, {
-          rows: [row1, row2],
-        })
-
-        expect(res.length).toEqual(2)
-        await config.api.row.get(table._id!, row1._id!, { status: 404 })
-        await assertRowUsage(isInternal ? rowUsage - 2 : rowUsage)
-      })
-
-      it("should be able to delete a variety of row set types", async () => {
-        const [row1, row2, row3] = await Promise.all([
-          config.api.row.save(table._id!, {}),
-          config.api.row.save(table._id!, {}),
-          config.api.row.save(table._id!, {}),
-        ])
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.bulkDelete(table._id!, {
-          rows: [row1, row2._id!, { _id: row3._id }],
-        })
-
-        expect(res.length).toEqual(3)
-        await config.api.row.get(table._id!, row1._id!, { status: 404 })
-        await assertRowUsage(isInternal ? rowUsage - 3 : rowUsage)
-      })
-
-      it("should accept a valid row object and delete the row", async () => {
-        const row1 = await config.api.row.save(table._id!, {})
-        const rowUsage = await getRowUsage()
-
-        const res = await config.api.row.delete(table._id!, row1 as DeleteRow)
-
-        expect(res.id).toEqual(row1._id)
-        await config.api.row.get(table._id!, row1._id!, { status: 404 })
-        await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
-      })
-
-      it.each([{ not: "valid" }, { rows: 123 }, "invalid"])(
-        "should ignore malformed/invalid delete request: %s",
-        async (request: any) => {
-          const rowUsage = await getRowUsage()
-
-          await config.api.row.delete(table._id!, request, {
-            status: 400,
-            body: {
-              message: "Invalid delete rows request",
-            },
-          })
-
-          await assertRowUsage(rowUsage)
-        }
-      )
-    })
-
-    describe("bulkImport", () => {
-      isInternal &&
-        it("should update Auto ID field after bulk import", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              primary: ["autoId"],
-              schema: {
-                autoId: {
-                  name: "autoId",
-                  type: FieldType.NUMBER,
-                  subtype: AutoFieldSubType.AUTO_ID,
-                  autocolumn: true,
-                  constraints: {
-                    type: "number",
-                    presence: false,
+              })
+            )
+            const relatedTableId = relatedTable._id!
+            table = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
+                  related1: {
+                    type: FieldType.LINK,
+                    name: "related1",
+                    fieldName: "main1",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
+                  },
+                  related2: {
+                    type: FieldType.LINK,
+                    name: "related2",
+                    fieldName: "main2",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
                   },
                 },
-              },
-            })
-          )
-
-          let row = await config.api.row.save(table._id!, {})
-          expect(row.autoId).toEqual(1)
-
-          await config.api.row.bulkImport(table._id!, {
-            rows: [{ autoId: 2 }],
+              })
+            )
+            relatedRows = await Promise.all([
+              config.api.row.save(relatedTableId, { name: "foo" }),
+              config.api.row.save(relatedTableId, { name: "bar" }),
+              config.api.row.save(relatedTableId, { name: "baz" }),
+              config.api.row.save(relatedTableId, { name: "boo" }),
+            ])
           })
 
-          row = await config.api.row.save(table._id!, {})
-          expect(row.autoId).toEqual(3)
+          it("can create rows with both relationships", async () => {
+            const row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [relatedRows[0]._id!],
+              related2: [relatedRows[1]._id!],
+            })
+
+            expect(row).toEqual(
+              expect.objectContaining({
+                name: "test",
+                related1: [
+                  {
+                    _id: relatedRows[0]._id,
+                    primaryDisplay: relatedRows[0].name,
+                  },
+                ],
+                related2: [
+                  {
+                    _id: relatedRows[1]._id,
+                    primaryDisplay: relatedRows[1].name,
+                  },
+                ],
+              })
+            )
+          })
+
+          it("can create rows with no relationships", async () => {
+            const row = await config.api.row.save(table._id!, {
+              name: "test",
+            })
+
+            expect(row.related1).toBeUndefined()
+            expect(row.related2).toBeUndefined()
+          })
+
+          it("can create rows with only one relationships field", async () => {
+            const row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [],
+              related2: [relatedRows[1]._id!],
+            })
+
+            expect(row).toEqual(
+              expect.objectContaining({
+                name: "test",
+                related2: [
+                  {
+                    _id: relatedRows[1]._id,
+                    primaryDisplay: relatedRows[1].name,
+                  },
+                ],
+              })
+            )
+            expect(row.related1).toBeUndefined()
+          })
+        })
+      })
+
+      describe("get", () => {
+        it("reads an existing row successfully", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+
+          const res = await config.api.row.get(table._id!, existing._id!)
+
+          expect(res).toEqual({
+            ...existing,
+            ...defaultRowFields,
+          })
         })
 
-      isInternal &&
-        it("should reject bulkImporting relationship fields", async () => {
-          const table1 = await config.api.table.save(saveTableRequest())
-          const table2 = await config.api.table.save(
-            saveTableRequest({
+        it("returns 404 when row does not exist", async () => {
+          const table = await config.api.table.save(defaultTable())
+          await config.api.row.save(table._id!, {})
+          await config.api.row.get(table._id!, "1234567", {
+            status: 404,
+          })
+        })
+
+        isInternal &&
+          it("can search row from user table", async () => {
+            const res = await config.api.row.get(
+              InternalTables.USER_METADATA,
+              config.userMetadataId!
+            )
+
+            expect(res).toEqual({
+              ...config.getUser(),
+              _id: config.userMetadataId!,
+              _rev: expect.any(String),
+              roles: undefined,
+              roleId: "ADMIN",
+              tableId: InternalTables.USER_METADATA,
+            })
+          })
+      })
+
+      describe("fetch", () => {
+        it("fetches all rows for given tableId", async () => {
+          const table = await config.api.table.save(defaultTable())
+          const rows = await Promise.all([
+            config.api.row.save(table._id!, {}),
+            config.api.row.save(table._id!, {}),
+          ])
+
+          const res = await config.api.row.fetch(table._id!)
+          expect(res.map(r => r._id)).toEqual(
+            expect.arrayContaining(rows.map(r => r._id))
+          )
+        })
+
+        it("returns 404 when table does not exist", async () => {
+          await config.api.row.fetch("1234567", { status: 404 })
+        })
+      })
+
+      describe("update", () => {
+        it("updates an existing row successfully", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.save(table._id!, {
+            _id: existing._id,
+            _rev: existing._rev,
+            name: "Updated Name",
+          })
+
+          expect(res.name).toEqual("Updated Name")
+          await assertRowUsage(rowUsage)
+        })
+
+        !isInternal &&
+          it("can update a row on an external table with a primary key", async () => {
+            const tableName = uuid.v4().substring(0, 10)
+            await client!.schema.createTable(tableName, table => {
+              table.increments("id").primary()
+              table.string("name")
+            })
+
+            const res = await config.api.datasource.fetchSchema({
+              datasourceId: datasource!._id!,
+            })
+            const table = res.datasource.entities![tableName]
+
+            const row = await config.api.row.save(table._id!, {
+              id: 1,
+              name: "Row 1",
+            })
+
+            const updatedRow = await config.api.row.save(table._id!, {
+              _id: row._id!,
+              name: "Row 1 Updated",
+            })
+
+            expect(updatedRow.name).toEqual("Row 1 Updated")
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows).toHaveLength(1)
+          })
+
+        describe("relations to same table", () => {
+          let relatedRows: Row[]
+
+          beforeAll(async () => {
+            const relatedTable = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
+                },
+              })
+            )
+            const relatedTableId = relatedTable._id!
+            table = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
+                  related1: {
+                    type: FieldType.LINK,
+                    name: "related1",
+                    fieldName: "main1",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
+                  },
+                  related2: {
+                    type: FieldType.LINK,
+                    name: "related2",
+                    fieldName: "main2",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
+                  },
+                },
+              })
+            )
+            relatedRows = await Promise.all([
+              config.api.row.save(relatedTableId, { name: "foo" }),
+              config.api.row.save(relatedTableId, { name: "bar" }),
+              config.api.row.save(relatedTableId, { name: "baz" }),
+              config.api.row.save(relatedTableId, { name: "boo" }),
+            ])
+          })
+
+          it("can edit rows with both relationships", async () => {
+            let row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [relatedRows[0]._id!],
+              related2: [relatedRows[1]._id!],
+            })
+
+            row = await config.api.row.save(table._id!, {
+              ...row,
+              related1: [relatedRows[0]._id!, relatedRows[1]._id!],
+              related2: [relatedRows[2]._id!],
+            })
+
+            expect(row).toEqual(
+              expect.objectContaining({
+                name: "test",
+                related1: expect.arrayContaining([
+                  {
+                    _id: relatedRows[0]._id,
+                    primaryDisplay: relatedRows[0].name,
+                  },
+                  {
+                    _id: relatedRows[1]._id,
+                    primaryDisplay: relatedRows[1].name,
+                  },
+                ]),
+                related2: [
+                  {
+                    _id: relatedRows[2]._id,
+                    primaryDisplay: relatedRows[2].name,
+                  },
+                ],
+              })
+            )
+          })
+
+          it("can drop existing relationship", async () => {
+            let row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [relatedRows[0]._id!],
+              related2: [relatedRows[1]._id!],
+            })
+
+            row = await config.api.row.save(table._id!, {
+              ...row,
+              related1: [],
+              related2: [relatedRows[2]._id!],
+            })
+
+            expect(row).toEqual(
+              expect.objectContaining({
+                name: "test",
+                related2: [
+                  {
+                    _id: relatedRows[2]._id,
+                    primaryDisplay: relatedRows[2].name,
+                  },
+                ],
+              })
+            )
+            expect(row.related1).toBeUndefined()
+          })
+
+          it("can drop both relationships", async () => {
+            let row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [relatedRows[0]._id!],
+              related2: [relatedRows[1]._id!],
+            })
+
+            row = await config.api.row.save(table._id!, {
+              ...row,
+              related1: [],
+              related2: [],
+            })
+
+            expect(row).toEqual(
+              expect.objectContaining({
+                name: "test",
+              })
+            )
+            expect(row.related1).toBeUndefined()
+            expect(row.related2).toBeUndefined()
+          })
+        })
+      })
+
+      describe("patch", () => {
+        let otherTable: Table
+
+        beforeAll(async () => {
+          table = await config.api.table.save(defaultTable())
+          otherTable = await config.api.table.save(
+            defaultTable({
               schema: {
                 relationship: {
                   name: "relationship",
-                  type: FieldType.LINK,
-                  tableId: table1._id!,
                   relationshipType: RelationshipType.ONE_TO_MANY,
+                  type: FieldType.LINK,
+                  tableId: table._id!,
                   fieldName: "relationship",
                 },
               },
             })
           )
-
-          const table1Row1 = await config.api.row.save(table1._id!, {})
-          await config.api.row.bulkImport(
-            table2._id!,
-            {
-              rows: [{ relationship: [table1Row1._id!] }],
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Can\'t bulk import relationship fields for internal databases, found value in field "relationship"',
-              },
-            }
-          )
         })
 
-      it("should be able to bulkImport rows", async () => {
-        const table = await config.api.table.save(
-          saveTableRequest({
+        it("should update only the fields that are supplied", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+
+          const rowUsage = await getRowUsage()
+
+          const row = await config.api.row.patch(table._id!, {
+            _id: existing._id!,
+            _rev: existing._rev!,
+            tableId: table._id!,
+            name: "Updated Name",
+          })
+
+          expect(row.name).toEqual("Updated Name")
+          expect(row.description).toEqual(existing.description)
+
+          const savedRow = await config.api.row.get(table._id!, row._id!)
+
+          expect(savedRow.description).toEqual(existing.description)
+          expect(savedRow.name).toEqual("Updated Name")
+          await assertRowUsage(rowUsage)
+        })
+
+        it("should update only the fields that are supplied and emit the correct oldRow", async () => {
+          let beforeRow = await config.api.row.save(table._id!, {
+            name: "test",
+            description: "test",
+          })
+          const opts = {
+            name: "row:update",
+            matchFn: (event: UpdatedRowEventEmitter) =>
+              event.row._id === beforeRow._id,
+          }
+          const event = await waitForEvent(opts, async () => {
+            await config.api.row.patch(table._id!, {
+              _id: beforeRow._id!,
+              _rev: beforeRow._rev!,
+              tableId: table._id!,
+              name: "Updated Name",
+            })
+          })
+
+          expect(event.oldRow).toBeDefined()
+          expect(event.oldRow.name).toEqual("test")
+          expect(event.row.name).toEqual("Updated Name")
+          expect(event.oldRow.description).toEqual(beforeRow.description)
+          expect(event.row.description).toEqual(beforeRow.description)
+        })
+
+        it("should throw an error when given improper types", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+          const rowUsage = await getRowUsage()
+
+          await config.api.row.patch(
+            table._id!,
+            {
+              _id: existing._id!,
+              _rev: existing._rev!,
+              tableId: table._id!,
+              name: 1,
+            },
+            { status: 400 }
+          )
+
+          await assertRowUsage(rowUsage)
+        })
+
+        it("should not overwrite links if those links are not set", async () => {
+          let linkField: FieldSchema = {
+            type: FieldType.LINK,
+            name: "",
+            fieldName: "",
+            constraints: {
+              type: "array",
+              presence: false,
+            },
+            relationshipType: RelationshipType.ONE_TO_MANY,
+            tableId: InternalTable.USER_METADATA,
+          }
+
+          let table = await config.api.table.save({
+            name: "TestTable",
+            type: "table",
+            sourceType: TableSourceType.INTERNAL,
+            sourceId: INTERNAL_TABLE_SOURCE_ID,
             schema: {
-              name: {
-                type: FieldType.STRING,
-                name: "name",
-              },
-              description: {
-                type: FieldType.STRING,
-                name: "description",
-              },
+              user1: { ...linkField, name: "user1", fieldName: "user1" },
+              user2: { ...linkField, name: "user2", fieldName: "user2" },
             },
           })
-        )
 
-        const rowUsage = await getRowUsage()
+          let user1 = await config.createUser()
+          let user2 = await config.createUser()
 
-        await config.api.row.bulkImport(table._id!, {
-          rows: [
-            {
-              name: "Row 1",
-              description: "Row 1 description",
-            },
-            {
-              name: "Row 2",
-              description: "Row 2 description",
-            },
-          ],
+          let row = await config.api.row.save(table._id!, {
+            user1: [{ _id: user1._id }],
+            user2: [{ _id: user2._id }],
+          })
+
+          let getResp = await config.api.row.get(table._id!, row._id!)
+          expect(getResp.user1[0]._id).toEqual(user1._id)
+          expect(getResp.user2[0]._id).toEqual(user2._id)
+
+          let patchResp = await config.api.row.patch(table._id!, {
+            _id: row._id!,
+            _rev: row._rev!,
+            tableId: table._id!,
+            user1: [{ _id: user2._id }],
+          })
+          expect(patchResp.user1[0]._id).toEqual(user2._id)
+          expect(patchResp.user2[0]._id).toEqual(user2._id)
+
+          getResp = await config.api.row.get(table._id!, row._id!)
+          expect(getResp.user1[0]._id).toEqual(user2._id)
+          expect(getResp.user2[0]._id).toEqual(user2._id)
         })
 
-        const rows = await config.api.row.fetch(table._id!)
-        expect(rows.length).toEqual(2)
+        it("should be able to remove a relationship from many side", async () => {
+          const row = await config.api.row.save(otherTable._id!, {
+            name: "test",
+            description: "test",
+          })
+          const row2 = await config.api.row.save(otherTable._id!, {
+            name: "test",
+            description: "test",
+          })
+          const { _id } = await config.api.row.save(table._id!, {
+            relationship: [{ _id: row._id }, { _id: row2._id }],
+          })
+          const relatedRow = await config.api.row.get(table._id!, _id!, {
+            status: 200,
+          })
+          expect(relatedRow.relationship.length).toEqual(2)
+          await config.api.row.save(table._id!, {
+            ...relatedRow,
+            relationship: [{ _id: row._id }],
+          })
+          const afterRelatedRow = await config.api.row.get(table._id!, _id!, {
+            status: 200,
+          })
+          expect(afterRelatedRow.relationship.length).toEqual(1)
+          expect(afterRelatedRow.relationship[0]._id).toEqual(row._id)
+        })
 
-        rows.sort((a, b) => a.name.localeCompare(b.name))
-        expect(rows[0].name).toEqual("Row 1")
-        expect(rows[0].description).toEqual("Row 1 description")
-        expect(rows[1].name).toEqual("Row 2")
-        expect(rows[1].description).toEqual("Row 2 description")
+        it("should be able to update relationships when both columns are same name", async () => {
+          let row = await config.api.row.save(table._id!, {
+            name: "test",
+            description: "test",
+          })
+          let row2 = await config.api.row.save(otherTable._id!, {
+            name: "test",
+            description: "test",
+            relationship: [row._id],
+          })
+          row = await config.api.row.get(table._id!, row._id!)
+          expect(row.relationship.length).toBe(1)
+          const resp = await config.api.row.patch(table._id!, {
+            _id: row._id!,
+            _rev: row._rev!,
+            tableId: row.tableId!,
+            name: "test2",
+            relationship: [row2._id],
+          })
+          expect(resp.relationship.length).toBe(1)
+        })
 
-        await assertRowUsage(isInternal ? rowUsage + 2 : rowUsage)
+        it("should be able to keep linked data when updating from views that trims links from the main table", async () => {
+          let row = await config.api.row.save(table._id!, {
+            name: "main",
+            description: "main description",
+          })
+          const row2 = await config.api.row.save(otherTable._id!, {
+            name: "link",
+            description: "link description",
+            relationship: [row._id],
+          })
+
+          const view = await config.api.viewV2.create({
+            tableId: table._id!,
+            name: "view",
+            schema: {
+              name: { visible: true },
+            },
+          })
+          const resp = await config.api.row.patch(view.id, {
+            _id: row._id!,
+            _rev: row._rev!,
+            tableId: row.tableId!,
+            name: "test2",
+            relationship: [row2._id],
+          })
+          expect(resp.relationship).toBeUndefined()
+
+          const updatedRow = await config.api.row.get(table._id!, row._id!)
+          expect(updatedRow.relationship.length).toBe(1)
+        })
+
+        it("should be able to keep linked data when updating from views that trims links from the foreign table", async () => {
+          let row = await config.api.row.save(table._id!, {
+            name: "main",
+            description: "main description",
+          })
+          const row2 = await config.api.row.save(otherTable._id!, {
+            name: "link",
+            description: "link description",
+            relationship: [row._id],
+          })
+
+          const view = await config.api.viewV2.create({
+            tableId: otherTable._id!,
+            name: "view",
+          })
+          await config.api.row.patch(view.id, {
+            _id: row2._id!,
+            _rev: row2._rev!,
+            tableId: row2.tableId!,
+          })
+
+          const updatedRow = await config.api.row.get(table._id!, row._id!)
+          expect(updatedRow.relationship.length).toBe(1)
+        })
+
+        !isInternal &&
+          // MSSQL needs a setting called IDENTITY_INSERT to be set to ON to allow writing
+          // to identity columns. This is not something Budibase does currently.
+          !isMSSQL &&
+          it("should support updating fields that are part of a composite key", async () => {
+            const tableRequest = saveTableRequest({
+              primary: ["number", "string"],
+              schema: {
+                string: {
+                  type: FieldType.STRING,
+                  name: "string",
+                },
+                number: {
+                  type: FieldType.NUMBER,
+                  name: "number",
+                },
+              },
+            })
+
+            delete tableRequest.schema.id
+
+            const table = await config.api.table.save(tableRequest)
+
+            const stringValue = generator.word()
+
+            // MySQL and MariaDB auto-increment fields have a minimum value of 1. If
+            // you try to save a row with a value of 0 it will use 1 instead.
+            const naturalValue = generator.integer({ min: 1, max: 1000 })
+
+            const existing = await config.api.row.save(table._id!, {
+              string: stringValue,
+              number: naturalValue,
+            })
+
+            expect(existing._id).toEqual(
+              `%5B${naturalValue}%2C'${stringValue}'%5D`
+            )
+
+            const row = await config.api.row.patch(table._id!, {
+              _id: existing._id!,
+              _rev: existing._rev!,
+              tableId: table._id!,
+              string: stringValue,
+              number: 1500,
+            })
+
+            expect(row._id).toEqual(`%5B${"1500"}%2C'${stringValue}'%5D`)
+          })
       })
 
-      isInternal &&
-        it("should be able to update existing rows on bulkImport", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                name: {
-                  type: FieldType.STRING,
-                  name: "name",
-                },
-                description: {
-                  type: FieldType.STRING,
-                  name: "description",
-                },
-              },
-            })
-          )
-
-          const existingRow = await config.api.row.save(table._id!, {
-            name: "Existing row",
-            description: "Existing description",
-          })
-
-          const rowUsage = await getRowUsage()
-
-          await config.api.row.bulkImport(table._id!, {
-            rows: [
-              {
-                name: "Row 1",
-                description: "Row 1 description",
-              },
-              { ...existingRow, name: "Updated existing row" },
-              {
-                name: "Row 2",
-                description: "Row 2 description",
-              },
-            ],
-            identifierFields: ["_id"],
-          })
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows.length).toEqual(3)
-
-          rows.sort((a, b) => a.name.localeCompare(b.name))
-          expect(rows[0].name).toEqual("Row 1")
-          expect(rows[0].description).toEqual("Row 1 description")
-          expect(rows[1].name).toEqual("Row 2")
-          expect(rows[1].description).toEqual("Row 2 description")
-          expect(rows[2].name).toEqual("Updated existing row")
-          expect(rows[2].description).toEqual("Existing description")
-
-          await assertRowUsage(rowUsage + 2)
+      describe("destroy", () => {
+        beforeAll(async () => {
+          table = await config.api.table.save(defaultTable())
         })
 
-      isInternal &&
-        it("should create new rows if not identifierFields are provided", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                name: {
-                  type: FieldType.STRING,
-                  name: "name",
-                },
-                description: {
-                  type: FieldType.STRING,
-                  name: "description",
-                },
-              },
-            })
-          )
-
-          const existingRow = await config.api.row.save(table._id!, {
-            name: "Existing row",
-            description: "Existing description",
-          })
-
+        it("should be able to delete a row", async () => {
+          const createdRow = await config.api.row.save(table._id!, {})
           const rowUsage = await getRowUsage()
 
-          await config.api.row.bulkImport(table._id!, {
-            rows: [
-              {
-                name: "Row 1",
-                description: "Row 1 description",
-              },
-              { ...existingRow, name: "Updated existing row" },
-              {
-                name: "Row 2",
-                description: "Row 2 description",
-              },
-            ],
+          const res = await config.api.row.bulkDelete(table._id!, {
+            rows: [createdRow],
           })
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows.length).toEqual(4)
-
-          rows.sort((a, b) => a.name.localeCompare(b.name))
-          expect(rows[0].name).toEqual("Existing row")
-          expect(rows[0].description).toEqual("Existing description")
-          expect(rows[1].name).toEqual("Row 1")
-          expect(rows[1].description).toEqual("Row 1 description")
-          expect(rows[2].name).toEqual("Row 2")
-          expect(rows[2].description).toEqual("Row 2 description")
-          expect(rows[3].name).toEqual("Updated existing row")
-          expect(rows[3].description).toEqual("Existing description")
-
-          await assertRowUsage(rowUsage + 3)
+          expect(res[0]._id).toEqual(createdRow._id)
+          await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
         })
 
-      // Upserting isn't yet supported in MSSQL / Oracle, see:
-      //   https://github.com/knex/knex/pull/6050
-      !isMSSQL &&
-        !isOracle &&
-        it("should be able to update existing rows with bulkImport", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              primary: ["userId"],
-              schema: {
-                userId: {
-                  type: FieldType.NUMBER,
-                  name: "userId",
-                  constraints: {
-                    presence: true,
+        it("should be able to delete a row with ID only", async () => {
+          const createdRow = await config.api.row.save(table._id!, {})
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.bulkDelete(table._id!, {
+            rows: [createdRow._id!],
+          })
+          expect(res[0]._id).toEqual(createdRow._id)
+          expect(res[0].tableId).toEqual(table._id!)
+          await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
+        })
+
+        it("should be able to bulk delete rows, including a row that doesn't exist", async () => {
+          const createdRow = await config.api.row.save(table._id!, {})
+          const createdRow2 = await config.api.row.save(table._id!, {})
+
+          const res = await config.api.row.bulkDelete(table._id!, {
+            rows: [createdRow, createdRow2, { _id: "9999999" }],
+          })
+
+          expect(res.map(r => r._id)).toEqual(
+            expect.arrayContaining([createdRow._id, createdRow2._id])
+          )
+          expect(res.length).toEqual(2)
+        })
+
+        describe("relations to same table", () => {
+          let relatedRows: Row[]
+
+          beforeAll(async () => {
+            const relatedTable = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
+                },
+              })
+            )
+            const relatedTableId = relatedTable._id!
+            table = await config.api.table.save(
+              defaultTable({
+                schema: {
+                  name: { name: "name", type: FieldType.STRING },
+                  related1: {
+                    type: FieldType.LINK,
+                    name: "related1",
+                    fieldName: "main1",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
+                  },
+                  related2: {
+                    type: FieldType.LINK,
+                    name: "related2",
+                    fieldName: "main2",
+                    tableId: relatedTableId,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
                   },
                 },
+              })
+            )
+            relatedRows = await Promise.all([
+              config.api.row.save(relatedTableId, { name: "foo" }),
+              config.api.row.save(relatedTableId, { name: "bar" }),
+              config.api.row.save(relatedTableId, { name: "baz" }),
+              config.api.row.save(relatedTableId, { name: "boo" }),
+            ])
+          })
+
+          it("can delete rows with both relationships", async () => {
+            const row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [relatedRows[0]._id!],
+              related2: [relatedRows[1]._id!],
+            })
+
+            await config.api.row.delete(table._id!, { _id: row._id! })
+
+            await config.api.row.get(table._id!, row._id!, { status: 404 })
+          })
+
+          it("can delete rows with empty relationships", async () => {
+            const row = await config.api.row.save(table._id!, {
+              name: "test",
+              related1: [],
+              related2: [],
+            })
+
+            await config.api.row.delete(table._id!, { _id: row._id! })
+
+            await config.api.row.get(table._id!, row._id!, { status: 404 })
+          })
+        })
+      })
+
+      describe("validate", () => {
+        beforeAll(async () => {
+          table = await config.api.table.save(defaultTable())
+        })
+
+        it("should return no errors on valid row", async () => {
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.validate(table._id!, {
+            name: "ivan",
+          })
+
+          expect(res.valid).toBe(true)
+          expect(Object.keys(res.errors)).toEqual([])
+          await assertRowUsage(rowUsage)
+        })
+
+        it("should errors on invalid row", async () => {
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.validate(table._id!, { name: 1 })
+
+          if (isInternal) {
+            expect(res.valid).toBe(false)
+            expect(Object.keys(res.errors)).toEqual(["name"])
+          } else {
+            // Validation for external is not implemented, so it will always return valid
+            expect(res.valid).toBe(true)
+            expect(Object.keys(res.errors)).toEqual([])
+          }
+          await assertRowUsage(rowUsage)
+        })
+      })
+
+      describe("bulkDelete", () => {
+        beforeAll(async () => {
+          table = await config.api.table.save(defaultTable())
+        })
+
+        it("should be able to delete a bulk set of rows", async () => {
+          const row1 = await config.api.row.save(table._id!, {})
+          const row2 = await config.api.row.save(table._id!, {})
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.bulkDelete(table._id!, {
+            rows: [row1, row2],
+          })
+
+          expect(res.length).toEqual(2)
+          await config.api.row.get(table._id!, row1._id!, { status: 404 })
+          await assertRowUsage(isInternal ? rowUsage - 2 : rowUsage)
+        })
+
+        it("should be able to delete a variety of row set types", async () => {
+          const [row1, row2, row3] = await Promise.all([
+            config.api.row.save(table._id!, {}),
+            config.api.row.save(table._id!, {}),
+            config.api.row.save(table._id!, {}),
+          ])
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.bulkDelete(table._id!, {
+            rows: [row1, row2._id!, { _id: row3._id }],
+          })
+
+          expect(res.length).toEqual(3)
+          await config.api.row.get(table._id!, row1._id!, { status: 404 })
+          await assertRowUsage(isInternal ? rowUsage - 3 : rowUsage)
+        })
+
+        it("should accept a valid row object and delete the row", async () => {
+          const row1 = await config.api.row.save(table._id!, {})
+          const rowUsage = await getRowUsage()
+
+          const res = await config.api.row.delete(table._id!, row1 as DeleteRow)
+
+          expect(res.id).toEqual(row1._id)
+          await config.api.row.get(table._id!, row1._id!, { status: 404 })
+          await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
+        })
+
+        it.each([{ not: "valid" }, { rows: 123 }, "invalid"])(
+          "should ignore malformed/invalid delete request: %s",
+          async (request: any) => {
+            const rowUsage = await getRowUsage()
+
+            await config.api.row.delete(table._id!, request, {
+              status: 400,
+              body: {
+                message: "Invalid delete rows request",
+              },
+            })
+
+            await assertRowUsage(rowUsage)
+          }
+        )
+      })
+
+      describe("bulkImport", () => {
+        isInternal &&
+          it("should update Auto ID field after bulk import", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
+                primary: ["autoId"],
+                schema: {
+                  autoId: {
+                    name: "autoId",
+                    type: FieldType.NUMBER,
+                    subtype: AutoFieldSubType.AUTO_ID,
+                    autocolumn: true,
+                    constraints: {
+                      type: "number",
+                      presence: false,
+                    },
+                  },
+                },
+              })
+            )
+
+            let row = await config.api.row.save(table._id!, {})
+            expect(row.autoId).toEqual(1)
+
+            await config.api.row.bulkImport(table._id!, {
+              rows: [{ autoId: 2 }],
+            })
+
+            row = await config.api.row.save(table._id!, {})
+            expect(row.autoId).toEqual(3)
+          })
+
+        isInternal &&
+          it("should reject bulkImporting relationship fields", async () => {
+            const table1 = await config.api.table.save(saveTableRequest())
+            const table2 = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  relationship: {
+                    name: "relationship",
+                    type: FieldType.LINK,
+                    tableId: table1._id!,
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    fieldName: "relationship",
+                  },
+                },
+              })
+            )
+
+            const table1Row1 = await config.api.row.save(table1._id!, {})
+            await config.api.row.bulkImport(
+              table2._id!,
+              {
+                rows: [{ relationship: [table1Row1._id!] }],
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Can\'t bulk import relationship fields for internal databases, found value in field "relationship"',
+                },
+              }
+            )
+          })
+
+        it("should be able to bulkImport rows", async () => {
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
                 name: {
                   type: FieldType.STRING,
                   name: "name",
@@ -1826,156 +1720,17 @@ datasourceDescribe(
             })
           )
 
-          const row1 = await config.api.row.save(table._id!, {
-            userId: 1,
-            name: "Row 1",
-            description: "Row 1 description",
-          })
-
-          const row2 = await config.api.row.save(table._id!, {
-            userId: 2,
-            name: "Row 2",
-            description: "Row 2 description",
-          })
+          const rowUsage = await getRowUsage()
 
           await config.api.row.bulkImport(table._id!, {
-            identifierFields: ["userId"],
             rows: [
               {
-                userId: row1.userId,
-                name: "Row 1 updated",
-                description: "Row 1 description updated",
+                name: "Row 1",
+                description: "Row 1 description",
               },
               {
-                userId: row2.userId,
-                name: "Row 2 updated",
-                description: "Row 2 description updated",
-              },
-              {
-                userId: 3,
-                name: "Row 3",
-                description: "Row 3 description",
-              },
-            ],
-          })
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows.length).toEqual(3)
-
-          rows.sort((a, b) => a.name.localeCompare(b.name))
-          expect(rows[0].name).toEqual("Row 1 updated")
-          expect(rows[0].description).toEqual("Row 1 description updated")
-          expect(rows[1].name).toEqual("Row 2 updated")
-          expect(rows[1].description).toEqual("Row 2 description updated")
-          expect(rows[2].name).toEqual("Row 3")
-          expect(rows[2].description).toEqual("Row 3 description")
-        })
-
-      // Upserting isn't yet supported in MSSQL or Oracle, see:
-      //   https://github.com/knex/knex/pull/6050
-      !isMSSQL &&
-        !isOracle &&
-        !isInternal &&
-        it("should be able to update existing rows with composite primary keys with bulkImport", async () => {
-          const tableName = uuid.v4()
-          await client?.schema.createTable(tableName, table => {
-            table.integer("companyId")
-            table.integer("userId")
-            table.string("name")
-            table.string("description")
-            table.primary(["companyId", "userId"])
-          })
-
-          const resp = await config.api.datasource.fetchSchema({
-            datasourceId: datasource!._id!,
-          })
-          const table = resp.datasource.entities![tableName]
-
-          const row1 = await config.api.row.save(table._id!, {
-            companyId: 1,
-            userId: 1,
-            name: "Row 1",
-            description: "Row 1 description",
-          })
-
-          const row2 = await config.api.row.save(table._id!, {
-            companyId: 1,
-            userId: 2,
-            name: "Row 2",
-            description: "Row 2 description",
-          })
-
-          await config.api.row.bulkImport(table._id!, {
-            identifierFields: ["companyId", "userId"],
-            rows: [
-              {
-                companyId: 1,
-                userId: row1.userId,
-                name: "Row 1 updated",
-                description: "Row 1 description updated",
-              },
-              {
-                companyId: 1,
-                userId: row2.userId,
-                name: "Row 2 updated",
-                description: "Row 2 description updated",
-              },
-              {
-                companyId: 1,
-                userId: 3,
-                name: "Row 3",
-                description: "Row 3 description",
-              },
-            ],
-          })
-
-          const rows = await config.api.row.fetch(table._id!)
-          expect(rows.length).toEqual(3)
-
-          rows.sort((a, b) => a.name.localeCompare(b.name))
-          expect(rows[0].name).toEqual("Row 1 updated")
-          expect(rows[0].description).toEqual("Row 1 description updated")
-          expect(rows[1].name).toEqual("Row 2 updated")
-          expect(rows[1].description).toEqual("Row 2 description updated")
-          expect(rows[2].name).toEqual("Row 3")
-          expect(rows[2].description).toEqual("Row 3 description")
-        })
-
-      // Upserting isn't yet supported in MSSQL/Oracle, see:
-      //   https://github.com/knex/knex/pull/6050
-      !isMSSQL &&
-        !isOracle &&
-        !isInternal &&
-        it("should be able to update existing rows an autoID primary key", async () => {
-          const tableName = uuid.v4()
-          await client!.schema.createTable(tableName, table => {
-            table.increments("userId").primary()
-            table.string("name")
-          })
-
-          const resp = await config.api.datasource.fetchSchema({
-            datasourceId: datasource!._id!,
-          })
-          const table = resp.datasource.entities![tableName]
-
-          const row1 = await config.api.row.save(table._id!, {
-            name: "Clare",
-          })
-
-          const row2 = await config.api.row.save(table._id!, {
-            name: "Jeff",
-          })
-
-          await config.api.row.bulkImport(table._id!, {
-            identifierFields: ["userId"],
-            rows: [
-              {
-                userId: row1.userId,
-                name: "Clare updated",
-              },
-              {
-                userId: row2.userId,
-                name: "Jeff updated",
+                name: "Row 2",
+                description: "Row 2 description",
               },
             ],
           })
@@ -1984,1397 +1739,1769 @@ datasourceDescribe(
           expect(rows.length).toEqual(2)
 
           rows.sort((a, b) => a.name.localeCompare(b.name))
-          expect(rows[0].name).toEqual("Clare updated")
-          expect(rows[1].name).toEqual("Jeff updated")
+          expect(rows[0].name).toEqual("Row 1")
+          expect(rows[0].description).toEqual("Row 1 description")
+          expect(rows[1].name).toEqual("Row 2")
+          expect(rows[1].description).toEqual("Row 2 description")
+
+          await assertRowUsage(isInternal ? rowUsage + 2 : rowUsage)
         })
-    })
 
-    describe("enrich", () => {
-      beforeAll(async () => {
-        table = await config.api.table.save(defaultTable())
-      })
-
-      it("should allow enriching some linked rows", async () => {
-        const { linkedTable, firstRow, secondRow } = await tenancy.doInTenant(
-          config.getTenantId(),
-          async () => {
-            const linkedTable = await config.api.table.save(
-              defaultTable({
+        isInternal &&
+          it("should be able to update existing rows on bulkImport", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
                 schema: {
-                  link: {
-                    name: "link",
-                    fieldName: "link",
-                    type: FieldType.LINK,
-                    relationshipType: RelationshipType.ONE_TO_MANY,
-                    tableId: table._id!,
+                  name: {
+                    type: FieldType.STRING,
+                    name: "name",
+                  },
+                  description: {
+                    type: FieldType.STRING,
+                    name: "description",
                   },
                 },
               })
             )
-            const firstRow = await config.api.row.save(table._id!, {
-              name: "Test Contact",
-              description: "original description",
+
+            const existingRow = await config.api.row.save(table._id!, {
+              name: "Existing row",
+              description: "Existing description",
             })
-            const secondRow = await config.api.row.save(linkedTable._id!, {
-              name: "Test 2",
-              description: "og desc",
-              link: [{ _id: firstRow._id }],
+
+            const rowUsage = await getRowUsage()
+
+            await config.api.row.bulkImport(table._id!, {
+              rows: [
+                {
+                  name: "Row 1",
+                  description: "Row 1 description",
+                },
+                { ...existingRow, name: "Updated existing row" },
+                {
+                  name: "Row 2",
+                  description: "Row 2 description",
+                },
+              ],
+              identifierFields: ["_id"],
             })
-            return { linkedTable, firstRow, secondRow }
-          }
-        )
-        const rowUsage = await getRowUsage()
 
-        // test basic enrichment
-        const resBasic = await config.api.row.get(
-          linkedTable._id!,
-          secondRow._id!
-        )
-        expect(resBasic.link.length).toBe(1)
-        expect(resBasic.link[0]).toEqual({
-          _id: firstRow._id,
-          primaryDisplay: firstRow.name,
-        })
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows.length).toEqual(3)
 
-        // test full enrichment
-        const resEnriched = await config.api.row.getEnriched(
-          linkedTable._id!,
-          secondRow._id!
-        )
-        expect(resEnriched.link.length).toBe(1)
-        expect(resEnriched.link[0]._id).toBe(firstRow._id)
-        expect(resEnriched.link[0].name).toBe("Test Contact")
-        expect(resEnriched.link[0].description).toBe("original description")
-        await assertRowUsage(rowUsage)
-      })
-    })
+            rows.sort((a, b) => a.name.localeCompare(b.name))
+            expect(rows[0].name).toEqual("Row 1")
+            expect(rows[0].description).toEqual("Row 1 description")
+            expect(rows[1].name).toEqual("Row 2")
+            expect(rows[1].description).toEqual("Row 2 description")
+            expect(rows[2].name).toEqual("Updated existing row")
+            expect(rows[2].description).toEqual("Existing description")
 
-    isInternal &&
-      describe("attachments and signatures", () => {
-        const coreAttachmentEnrichment = async (
-          schema: TableSchema,
-          field: string,
-          attachmentCfg: string | string[]
-        ) => {
-          const testTable = await config.api.table.save(
-            defaultTable({
-              schema,
-            })
-          )
-          const attachmentToStoreKey = (attachmentId: string) => {
-            return {
-              key: `${config.getAppId()}/attachments/${attachmentId}`,
-            }
-          }
-          const draftRow = {
-            name: "test",
-            description: "test",
-            [field]:
-              typeof attachmentCfg === "string"
-                ? attachmentToStoreKey(attachmentCfg)
-                : attachmentCfg.map(attachmentToStoreKey),
-            tableId: testTable._id,
-          }
-          const row = await config.api.row.save(testTable._id!, draftRow)
-
-          await withEnv({ SELF_HOSTED: "true" }, async () => {
-            return context.doInAppContext(config.getAppId(), async () => {
-              const enriched: Row[] = await outputProcessing(testTable, [row])
-              const [targetRow] = enriched
-              const attachmentEntries = Array.isArray(targetRow[field])
-                ? targetRow[field]
-                : [targetRow[field]]
-
-              for (const entry of attachmentEntries) {
-                const attachmentId = entry.key.split("/").pop()
-                expect(entry.url.split("?")[0]).toBe(
-                  `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}`
-                )
-              }
-            })
+            await assertRowUsage(rowUsage + 2)
           })
-        }
 
-        it("should allow enriching single attachment rows", async () => {
-          await coreAttachmentEnrichment(
-            {
-              attachment: {
-                type: FieldType.ATTACHMENT_SINGLE,
-                name: "attachment",
-                constraints: { presence: false },
+        isInternal &&
+          it("should create new rows if not identifierFields are provided", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  name: {
+                    type: FieldType.STRING,
+                    name: "name",
+                  },
+                  description: {
+                    type: FieldType.STRING,
+                    name: "description",
+                  },
+                },
+              })
+            )
+
+            const existingRow = await config.api.row.save(table._id!, {
+              name: "Existing row",
+              description: "Existing description",
+            })
+
+            const rowUsage = await getRowUsage()
+
+            await config.api.row.bulkImport(table._id!, {
+              rows: [
+                {
+                  name: "Row 1",
+                  description: "Row 1 description",
+                },
+                { ...existingRow, name: "Updated existing row" },
+                {
+                  name: "Row 2",
+                  description: "Row 2 description",
+                },
+              ],
+            })
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows.length).toEqual(4)
+
+            rows.sort((a, b) => a.name.localeCompare(b.name))
+            expect(rows[0].name).toEqual("Existing row")
+            expect(rows[0].description).toEqual("Existing description")
+            expect(rows[1].name).toEqual("Row 1")
+            expect(rows[1].description).toEqual("Row 1 description")
+            expect(rows[2].name).toEqual("Row 2")
+            expect(rows[2].description).toEqual("Row 2 description")
+            expect(rows[3].name).toEqual("Updated existing row")
+            expect(rows[3].description).toEqual("Existing description")
+
+            await assertRowUsage(rowUsage + 3)
+          })
+
+        // Upserting isn't yet supported in MSSQL / Oracle, see:
+        //   https://github.com/knex/knex/pull/6050
+        !isMSSQL &&
+          !isOracle &&
+          it("should be able to update existing rows with bulkImport", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
+                primary: ["userId"],
+                schema: {
+                  userId: {
+                    type: FieldType.NUMBER,
+                    name: "userId",
+                    constraints: {
+                      presence: true,
+                    },
+                  },
+                  name: {
+                    type: FieldType.STRING,
+                    name: "name",
+                  },
+                  description: {
+                    type: FieldType.STRING,
+                    name: "description",
+                  },
+                },
+              })
+            )
+
+            const row1 = await config.api.row.save(table._id!, {
+              userId: 1,
+              name: "Row 1",
+              description: "Row 1 description",
+            })
+
+            const row2 = await config.api.row.save(table._id!, {
+              userId: 2,
+              name: "Row 2",
+              description: "Row 2 description",
+            })
+
+            await config.api.row.bulkImport(table._id!, {
+              identifierFields: ["userId"],
+              rows: [
+                {
+                  userId: row1.userId,
+                  name: "Row 1 updated",
+                  description: "Row 1 description updated",
+                },
+                {
+                  userId: row2.userId,
+                  name: "Row 2 updated",
+                  description: "Row 2 description updated",
+                },
+                {
+                  userId: 3,
+                  name: "Row 3",
+                  description: "Row 3 description",
+                },
+              ],
+            })
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows.length).toEqual(3)
+
+            rows.sort((a, b) => a.name.localeCompare(b.name))
+            expect(rows[0].name).toEqual("Row 1 updated")
+            expect(rows[0].description).toEqual("Row 1 description updated")
+            expect(rows[1].name).toEqual("Row 2 updated")
+            expect(rows[1].description).toEqual("Row 2 description updated")
+            expect(rows[2].name).toEqual("Row 3")
+            expect(rows[2].description).toEqual("Row 3 description")
+          })
+
+        // Upserting isn't yet supported in MSSQL or Oracle, see:
+        //   https://github.com/knex/knex/pull/6050
+        !isMSSQL &&
+          !isOracle &&
+          !isInternal &&
+          it("should be able to update existing rows with composite primary keys with bulkImport", async () => {
+            const tableName = uuid.v4()
+            await client?.schema.createTable(tableName, table => {
+              table.integer("companyId")
+              table.integer("userId")
+              table.string("name")
+              table.string("description")
+              table.primary(["companyId", "userId"])
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource!._id!,
+            })
+            const table = resp.datasource.entities![tableName]
+
+            const row1 = await config.api.row.save(table._id!, {
+              companyId: 1,
+              userId: 1,
+              name: "Row 1",
+              description: "Row 1 description",
+            })
+
+            const row2 = await config.api.row.save(table._id!, {
+              companyId: 1,
+              userId: 2,
+              name: "Row 2",
+              description: "Row 2 description",
+            })
+
+            await config.api.row.bulkImport(table._id!, {
+              identifierFields: ["companyId", "userId"],
+              rows: [
+                {
+                  companyId: 1,
+                  userId: row1.userId,
+                  name: "Row 1 updated",
+                  description: "Row 1 description updated",
+                },
+                {
+                  companyId: 1,
+                  userId: row2.userId,
+                  name: "Row 2 updated",
+                  description: "Row 2 description updated",
+                },
+                {
+                  companyId: 1,
+                  userId: 3,
+                  name: "Row 3",
+                  description: "Row 3 description",
+                },
+              ],
+            })
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows.length).toEqual(3)
+
+            rows.sort((a, b) => a.name.localeCompare(b.name))
+            expect(rows[0].name).toEqual("Row 1 updated")
+            expect(rows[0].description).toEqual("Row 1 description updated")
+            expect(rows[1].name).toEqual("Row 2 updated")
+            expect(rows[1].description).toEqual("Row 2 description updated")
+            expect(rows[2].name).toEqual("Row 3")
+            expect(rows[2].description).toEqual("Row 3 description")
+          })
+
+        // Upserting isn't yet supported in MSSQL/Oracle, see:
+        //   https://github.com/knex/knex/pull/6050
+        !isMSSQL &&
+          !isOracle &&
+          !isInternal &&
+          it("should be able to update existing rows an autoID primary key", async () => {
+            const tableName = uuid.v4()
+            await client!.schema.createTable(tableName, table => {
+              table.increments("userId").primary()
+              table.string("name")
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource!._id!,
+            })
+            const table = resp.datasource.entities![tableName]
+
+            const row1 = await config.api.row.save(table._id!, {
+              name: "Clare",
+            })
+
+            const row2 = await config.api.row.save(table._id!, {
+              name: "Jeff",
+            })
+
+            await config.api.row.bulkImport(table._id!, {
+              identifierFields: ["userId"],
+              rows: [
+                {
+                  userId: row1.userId,
+                  name: "Clare updated",
+                },
+                {
+                  userId: row2.userId,
+                  name: "Jeff updated",
+                },
+              ],
+            })
+
+            const rows = await config.api.row.fetch(table._id!)
+            expect(rows.length).toEqual(2)
+
+            rows.sort((a, b) => a.name.localeCompare(b.name))
+            expect(rows[0].name).toEqual("Clare updated")
+            expect(rows[1].name).toEqual("Jeff updated")
+          })
+
+        it("should reject bulkImport date only fields with wrong format", async () => {
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                date: {
+                  type: FieldType.DATETIME,
+                  dateOnly: true,
+                  name: "date",
+                },
               },
+            })
+          )
+
+          await config.api.row.bulkImport(
+            table._id!,
+            {
+              rows: [
+                {
+                  date: "01.02.2024",
+                },
+              ],
             },
-            "attachment",
-            `${uuid.v4()}.csv`
+            {
+              status: 400,
+              body: {
+                message:
+                  'Invalid format for field "date": "01.02.2024". Date-only fields must be in the format "YYYY-MM-DD".',
+              },
+            }
           )
         })
 
-        it("should allow enriching attachment list rows", async () => {
-          await coreAttachmentEnrichment(
-            {
-              attachments: {
-                type: FieldType.ATTACHMENTS,
-                name: "attachments",
-                constraints: { type: "array", presence: false },
+        it("should reject bulkImport date time fields with wrong format", async () => {
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                date: {
+                  type: FieldType.DATETIME,
+                  name: "date",
+                },
               },
+            })
+          )
+
+          await config.api.row.bulkImport(
+            table._id!,
+            {
+              rows: [
+                {
+                  date: "01.02.2024",
+                },
+              ],
             },
-            "attachments",
-            [`${uuid.v4()}.csv`]
+            {
+              status: 400,
+              body: {
+                message:
+                  'Invalid format for field "date": "01.02.2024". Datetime fields must be in ISO format, e.g. "YYYY-MM-DDTHH:MM:SSZ".',
+              },
+            }
           )
         })
 
-        it("should allow enriching signature rows", async () => {
-          await coreAttachmentEnrichment(
-            {
-              signature: {
-                type: FieldType.SIGNATURE_SINGLE,
-                name: "signature",
-                constraints: { presence: false },
+        it("should reject bulkImport time fields with wrong format", async () => {
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                time: {
+                  type: FieldType.DATETIME,
+                  timeOnly: true,
+                  name: "time",
+                },
               },
+            })
+          )
+
+          await config.api.row.bulkImport(
+            table._id!,
+            {
+              rows: [
+                {
+                  time: "3pm",
+                },
+              ],
             },
-            "signature",
-            `${uuid.v4()}.png`
+            {
+              status: 400,
+              body: {
+                message:
+                  'Invalid format for field "time": "3pm". Time-only fields must be in the format "HH:MM:SS".',
+              },
+            }
           )
         })
       })
 
-    describe("exportRows", () => {
-      beforeEach(async () => {
-        table = await config.api.table.save(defaultTable())
+      describe("enrich", () => {
+        beforeAll(async () => {
+          table = await config.api.table.save(defaultTable())
+        })
+
+        it("should allow enriching some linked rows", async () => {
+          const { linkedTable, firstRow, secondRow } = await tenancy.doInTenant(
+            config.getTenantId(),
+            async () => {
+              const linkedTable = await config.api.table.save(
+                defaultTable({
+                  schema: {
+                    link: {
+                      name: "link",
+                      fieldName: "link",
+                      type: FieldType.LINK,
+                      relationshipType: RelationshipType.ONE_TO_MANY,
+                      tableId: table._id!,
+                    },
+                  },
+                })
+              )
+              const firstRow = await config.api.row.save(table._id!, {
+                name: "Test Contact",
+                description: "original description",
+              })
+              const secondRow = await config.api.row.save(linkedTable._id!, {
+                name: "Test 2",
+                description: "og desc",
+                link: [{ _id: firstRow._id }],
+              })
+              return { linkedTable, firstRow, secondRow }
+            }
+          )
+          const rowUsage = await getRowUsage()
+
+          // test basic enrichment
+          const resBasic = await config.api.row.get(
+            linkedTable._id!,
+            secondRow._id!
+          )
+          expect(resBasic.link.length).toBe(1)
+          expect(resBasic.link[0]).toEqual({
+            _id: firstRow._id,
+            primaryDisplay: firstRow.name,
+          })
+
+          // test full enrichment
+          const resEnriched = await config.api.row.getEnriched(
+            linkedTable._id!,
+            secondRow._id!
+          )
+          expect(resEnriched.link.length).toBe(1)
+          expect(resEnriched.link[0]._id).toBe(firstRow._id)
+          expect(resEnriched.link[0].name).toBe("Test Contact")
+          expect(resEnriched.link[0].description).toBe("original description")
+          await assertRowUsage(rowUsage)
+        })
       })
 
       isInternal &&
-        it("should not export internal couchdb fields", async () => {
-          const existing = await config.api.row.save(table._id!, {
-            name: generator.guid(),
-            description: generator.paragraph(),
+        describe("attachments and signatures", () => {
+          const coreAttachmentEnrichment = async (
+            schema: TableSchema,
+            field: string,
+            attachmentCfg: string | string[]
+          ) => {
+            const testTable = await config.api.table.save(
+              defaultTable({
+                schema,
+              })
+            )
+            const attachmentToStoreKey = (attachmentId: string) => {
+              return {
+                key: `${config.getAppId()}/attachments/${attachmentId}`,
+              }
+            }
+            const draftRow = {
+              name: "test",
+              description: "test",
+              [field]:
+                typeof attachmentCfg === "string"
+                  ? attachmentToStoreKey(attachmentCfg)
+                  : attachmentCfg.map(attachmentToStoreKey),
+              tableId: testTable._id,
+            }
+            const row = await config.api.row.save(testTable._id!, draftRow)
+
+            await withEnv({ SELF_HOSTED: "true" }, async () => {
+              return context.doInAppContext(config.getAppId(), async () => {
+                const enriched: Row[] = await outputProcessing(testTable, [row])
+                const [targetRow] = enriched
+                const attachmentEntries = Array.isArray(targetRow[field])
+                  ? targetRow[field]
+                  : [targetRow[field]]
+
+                for (const entry of attachmentEntries) {
+                  const attachmentId = entry.key.split("/").pop()
+                  expect(entry.url.split("?")[0]).toBe(
+                    `/files/signed/prod-budi-app-assets/${config.getProdAppId()}/attachments/${attachmentId}`
+                  )
+                }
+              })
+            })
+          }
+
+          it("should allow enriching single attachment rows", async () => {
+            await coreAttachmentEnrichment(
+              {
+                attachment: {
+                  type: FieldType.ATTACHMENT_SINGLE,
+                  name: "attachment",
+                  constraints: { presence: false },
+                },
+              },
+              "attachment",
+              `${uuid.v4()}.csv`
+            )
           })
-          const res = await config.api.row.exportRows(table._id!, {
-            rows: [existing._id!],
+
+          it("should allow enriching attachment list rows", async () => {
+            await coreAttachmentEnrichment(
+              {
+                attachments: {
+                  type: FieldType.ATTACHMENTS,
+                  name: "attachments",
+                  constraints: { type: "array", presence: false },
+                },
+              },
+              "attachments",
+              [`${uuid.v4()}.csv`]
+            )
           })
+
+          it("should allow enriching signature rows", async () => {
+            await coreAttachmentEnrichment(
+              {
+                signature: {
+                  type: FieldType.SIGNATURE_SINGLE,
+                  name: "signature",
+                  constraints: { presence: false },
+                },
+              },
+              "signature",
+              `${uuid.v4()}.png`
+            )
+          })
+        })
+
+      describe("exportRows", () => {
+        beforeEach(async () => {
+          table = await config.api.table.save(defaultTable())
+        })
+
+        isInternal &&
+          it("should not export internal couchdb fields", async () => {
+            const existing = await config.api.row.save(table._id!, {
+              name: generator.guid(),
+              description: generator.paragraph(),
+            })
+            const res = await config.api.row.exportRows(table._id!, {
+              rows: [existing._id!],
+            })
+            const results = JSON.parse(res)
+            expect(results.length).toEqual(1)
+            const row = results[0]
+
+            expect(Object.keys(row)).toEqual(["_id", "name", "description"])
+          })
+
+        !isInternal &&
+          it("should allow exporting all columns", async () => {
+            const existing = await config.api.row.save(table._id!, {})
+            const res = await config.api.row.exportRows(table._id!, {
+              rows: [existing._id!],
+            })
+            const results = JSON.parse(res)
+            expect(results.length).toEqual(1)
+            const row = results[0]
+
+            // Ensure all original columns were exported
+            expect(Object.keys(row).length).toBe(Object.keys(existing).length)
+            Object.keys(existing).forEach(key => {
+              expect(row[key]).toEqual(existing[key])
+            })
+          })
+
+        it("should allow exporting without filtering", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+          const res = await config.api.row.exportRows(table._id!)
           const results = JSON.parse(res)
           expect(results.length).toEqual(1)
           const row = results[0]
 
-          expect(Object.keys(row)).toEqual(["_id", "name", "description"])
+          expect(row._id).toEqual(existing._id)
         })
 
-      !isInternal &&
-        it("should allow exporting all columns", async () => {
+        it("should allow exporting only certain columns", async () => {
           const existing = await config.api.row.save(table._id!, {})
           const res = await config.api.row.exportRows(table._id!, {
             rows: [existing._id!],
+            columns: ["_id"],
           })
           const results = JSON.parse(res)
           expect(results.length).toEqual(1)
           const row = results[0]
 
-          // Ensure all original columns were exported
-          expect(Object.keys(row).length).toBe(Object.keys(existing).length)
-          Object.keys(existing).forEach(key => {
-            expect(row[key]).toEqual(existing[key])
-          })
+          // Ensure only the _id column was exported
+          expect(Object.keys(row).length).toEqual(1)
+          expect(row._id).toEqual(existing._id)
         })
 
-      it("should allow exporting without filtering", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        const res = await config.api.row.exportRows(table._id!)
-        const results = JSON.parse(res)
-        expect(results.length).toEqual(1)
-        const row = results[0]
-
-        expect(row._id).toEqual(existing._id)
-      })
-
-      it("should allow exporting only certain columns", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        const res = await config.api.row.exportRows(table._id!, {
-          rows: [existing._id!],
-          columns: ["_id"],
-        })
-        const results = JSON.parse(res)
-        expect(results.length).toEqual(1)
-        const row = results[0]
-
-        // Ensure only the _id column was exported
-        expect(Object.keys(row).length).toEqual(1)
-        expect(row._id).toEqual(existing._id)
-      })
-
-      it("should handle single quotes in row filtering", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        const res = await config.api.row.exportRows(table._id!, {
-          rows: [`['${existing._id!}']`],
-        })
-        const results = JSON.parse(res)
-        expect(results.length).toEqual(1)
-        const row = results[0]
-        expect(row._id).toEqual(existing._id)
-      })
-
-      it("should return an error if no table is found", async () => {
-        const existing = await config.api.row.save(table._id!, {})
-        await config.api.row.exportRows(
-          "1234567",
-          { rows: [existing._id!] },
-          RowExportFormat.JSON,
-          { status: 404 }
-        )
-      })
-
-      // MSSQL needs a setting called IDENTITY_INSERT to be set to ON to allow writing
-      // to identity columns. This is not something Budibase does currently.
-      !isMSSQL &&
-        it("should handle filtering by composite primary keys", async () => {
-          const tableRequest = saveTableRequest({
-            primary: ["number", "string"],
-            schema: {
-              string: {
-                type: FieldType.STRING,
-                name: "string",
-              },
-              number: {
-                type: FieldType.NUMBER,
-                name: "number",
-              },
-            },
-          })
-          delete tableRequest.schema.id
-
-          const table = await config.api.table.save(tableRequest)
-          const toCreate = generator
-            .unique(() => generator.integer({ min: 0, max: 10000 }), 10)
-            .map(number => ({ number, string: generator.word({ length: 30 }) }))
-
-          const rows = await Promise.all(
-            toCreate.map(d => config.api.row.save(table._id!, d))
-          )
-
+        it("should handle single quotes in row filtering", async () => {
+          const existing = await config.api.row.save(table._id!, {})
           const res = await config.api.row.exportRows(table._id!, {
-            rows: _.sampleSize(rows, 3).map(r => r._id!),
+            rows: [`['${existing._id!}']`],
           })
           const results = JSON.parse(res)
-          expect(results.length).toEqual(3)
+          expect(results.length).toEqual(1)
+          const row = results[0]
+          expect(row._id).toEqual(existing._id)
         })
 
-      describe("should allow exporting all column types", () => {
-        let tableId: string
-        let expectedRowData: Row
-
-        beforeAll(async () => {
-          const fullSchema = setup.structures.fullSchemaWithoutLinks({
-            allRequired: true,
-          })
-
-          const table = await config.api.table.save(
-            saveTableRequest({
-              ...setup.structures.basicTable(),
-              schema: fullSchema,
-              primary: ["string"],
-            })
+        it("should return an error if no table is found", async () => {
+          const existing = await config.api.row.save(table._id!, {})
+          await config.api.row.exportRows(
+            "1234567",
+            { rows: [existing._id!] },
+            RowExportFormat.JSON,
+            { status: 404 }
           )
-          tableId = table._id!
-
-          const rowValues: Record<keyof typeof fullSchema, any> = {
-            [FieldType.STRING]: generator.guid(),
-            [FieldType.LONGFORM]: generator.paragraph(),
-            [FieldType.OPTIONS]: "option 2",
-            [FieldType.ARRAY]: ["options 2", "options 4"],
-            [FieldType.NUMBER]: generator.natural(),
-            [FieldType.BOOLEAN]: generator.bool(),
-            [FieldType.DATETIME]: generator.date().toISOString(),
-            [FieldType.ATTACHMENTS]: [setup.structures.basicAttachment()],
-            [FieldType.ATTACHMENT_SINGLE]: setup.structures.basicAttachment(),
-            [FieldType.FORMULA]: undefined, // generated field
-            [FieldType.AUTO]: undefined, // generated field
-            [FieldType.AI]: "LLM Output",
-            [FieldType.JSON]: { name: generator.guid() },
-            [FieldType.INTERNAL]: generator.guid(),
-            [FieldType.BARCODEQR]: generator.guid(),
-            [FieldType.SIGNATURE_SINGLE]: setup.structures.basicAttachment(),
-            [FieldType.BIGINT]: generator.integer().toString(),
-            [FieldType.BB_REFERENCE]: [{ _id: config.getUser()._id }],
-            [FieldType.BB_REFERENCE_SINGLE]: { _id: config.getUser()._id },
-          }
-          const row = await config.api.row.save(table._id!, rowValues)
-          expectedRowData = {
-            _id: row._id,
-            [FieldType.STRING]: rowValues[FieldType.STRING],
-            [FieldType.LONGFORM]: rowValues[FieldType.LONGFORM],
-            [FieldType.OPTIONS]: rowValues[FieldType.OPTIONS],
-            [FieldType.ARRAY]: rowValues[FieldType.ARRAY],
-            [FieldType.NUMBER]: rowValues[FieldType.NUMBER],
-            [FieldType.BOOLEAN]: rowValues[FieldType.BOOLEAN],
-            [FieldType.DATETIME]: rowValues[FieldType.DATETIME],
-            [FieldType.ATTACHMENTS]: rowValues[FieldType.ATTACHMENTS].map(
-              (a: any) =>
-                expect.objectContaining({
-                  ...a,
-                  url: expect.any(String),
-                })
-            ),
-            [FieldType.ATTACHMENT_SINGLE]: expect.objectContaining({
-              ...rowValues[FieldType.ATTACHMENT_SINGLE],
-              url: expect.any(String),
-            }),
-            [FieldType.FORMULA]: fullSchema[FieldType.FORMULA].formula,
-            [FieldType.AUTO]: expect.any(Number),
-            [FieldType.AI]: expect.any(String),
-            [FieldType.JSON]: rowValues[FieldType.JSON],
-            [FieldType.INTERNAL]: rowValues[FieldType.INTERNAL],
-            [FieldType.BARCODEQR]: rowValues[FieldType.BARCODEQR],
-            [FieldType.SIGNATURE_SINGLE]: expect.objectContaining({
-              ...rowValues[FieldType.SIGNATURE_SINGLE],
-              url: expect.any(String),
-            }),
-            [FieldType.BIGINT]: rowValues[FieldType.BIGINT],
-            [FieldType.BB_REFERENCE]: rowValues[FieldType.BB_REFERENCE].map(
-              expect.objectContaining
-            ),
-            [FieldType.BB_REFERENCE_SINGLE]: expect.objectContaining(
-              rowValues[FieldType.BB_REFERENCE_SINGLE]
-            ),
-          }
         })
 
-        it("as csv", async () => {
-          const exportedValue = await config.api.row.exportRows(
-            tableId,
-            { query: {} },
-            RowExportFormat.CSV
-          )
-
-          const jsonResult = await config.api.table.csvToJson({
-            csvString: exportedValue,
-          })
-
-          const stringified = (value: string) =>
-            JSON.stringify(value).replace(/"/g, "'")
-
-          const matchingObject = (
-            key: string,
-            value: any,
-            isArray: boolean
-          ) => {
-            const objectMatcher = `{'${key}':'${value[key]}'.*?}`
-            if (isArray) {
-              return expect.stringMatching(
-                new RegExp(`^\\[${objectMatcher}\\]$`)
-              )
-            }
-            return expect.stringMatching(new RegExp(`^${objectMatcher}$`))
-          }
-
-          expect(jsonResult).toEqual([
-            {
-              ...expectedRowData,
-              auto: expect.any(String),
-              array: stringified(expectedRowData["array"]),
-              attachment: matchingObject(
-                "key",
-                expectedRowData["attachment"][0].sample,
-                true
-              ),
-              attachment_single: matchingObject(
-                "key",
-                expectedRowData["attachment_single"].sample,
-                false
-              ),
-              boolean: stringified(expectedRowData["boolean"]),
-              json: stringified(expectedRowData["json"]),
-              number: stringified(expectedRowData["number"]),
-              signature_single: matchingObject(
-                "key",
-                expectedRowData["signature_single"].sample,
-                false
-              ),
-              bb_reference: matchingObject(
-                "_id",
-                expectedRowData["bb_reference"][0].sample,
-                true
-              ),
-              bb_reference_single: matchingObject(
-                "_id",
-                expectedRowData["bb_reference_single"].sample,
-                false
-              ),
-              ai: "LLM Output",
-            },
-          ])
-        })
-
-        it("as json", async () => {
-          const exportedValue = await config.api.row.exportRows(
-            tableId,
-            { query: {} },
-            RowExportFormat.JSON
-          )
-
-          const json = JSON.parse(exportedValue)
-          expect(json).toEqual([expectedRowData])
-        })
-
-        it("as json with schema", async () => {
-          const exportedValue = await config.api.row.exportRows(
-            tableId,
-            { query: {} },
-            RowExportFormat.JSON_WITH_SCHEMA
-          )
-
-          const json = JSON.parse(exportedValue)
-          expect(json).toEqual({
-            schema: expect.any(Object),
-            rows: [expectedRowData],
-          })
-        })
-
-        it("can handle csv-special characters in strings", async () => {
-          const badString = 'test":, wow", "test": "wow"'
-          const table = await config.api.table.save(
-            saveTableRequest({
+        // MSSQL needs a setting called IDENTITY_INSERT to be set to ON to allow writing
+        // to identity columns. This is not something Budibase does currently.
+        !isMSSQL &&
+          it("should handle filtering by composite primary keys", async () => {
+            const tableRequest = saveTableRequest({
+              primary: ["number", "string"],
               schema: {
                 string: {
                   type: FieldType.STRING,
                   name: "string",
                 },
+                number: {
+                  type: FieldType.NUMBER,
+                  name: "number",
+                },
               },
             })
-          )
+            delete tableRequest.schema.id
 
-          await config.api.row.save(table._id!, { string: badString })
+            const table = await config.api.table.save(tableRequest)
+            const toCreate = generator
+              .unique(() => generator.integer({ min: 0, max: 10000 }), 10)
+              .map(number => ({
+                number,
+                string: generator.word({ length: 30 }),
+              }))
 
-          const exportedValue = await config.api.row.exportRows(
-            table._id!,
-            { query: {} },
-            RowExportFormat.CSV
-          )
+            const rows = await Promise.all(
+              toCreate.map(d => config.api.row.save(table._id!, d))
+            )
 
-          const json = await config.api.table.csvToJson(
-            {
+            const res = await config.api.row.exportRows(table._id!, {
+              rows: _.sampleSize(rows, 3).map(r => r._id!),
+            })
+            const results = JSON.parse(res)
+            expect(results.length).toEqual(3)
+          })
+
+        describe("should allow exporting all column types", () => {
+          let tableId: string
+          let expectedRowData: Row
+
+          beforeAll(async () => {
+            const fullSchema = setup.structures.fullSchemaWithoutLinks({
+              allRequired: true,
+            })
+
+            const table = await config.api.table.save(
+              saveTableRequest({
+                ...setup.structures.basicTable(),
+                schema: fullSchema,
+                primary: ["string"],
+              })
+            )
+            tableId = table._id!
+
+            const rowValues: Record<keyof typeof fullSchema, any> = {
+              [FieldType.STRING]: generator.guid(),
+              [FieldType.LONGFORM]: generator.paragraph(),
+              [FieldType.OPTIONS]: "option 2",
+              [FieldType.ARRAY]: ["options 2", "options 4"],
+              [FieldType.NUMBER]: generator.natural(),
+              [FieldType.BOOLEAN]: generator.bool(),
+              [FieldType.DATETIME]: generator.date().toISOString().slice(0, 10),
+              [FieldType.ATTACHMENTS]: [setup.structures.basicAttachment()],
+              [FieldType.ATTACHMENT_SINGLE]: setup.structures.basicAttachment(),
+              [FieldType.FORMULA]: undefined, // generated field
+              [FieldType.AUTO]: undefined, // generated field
+              [FieldType.AI]: "LLM Output",
+              [FieldType.JSON]: { name: generator.guid() },
+              [FieldType.INTERNAL]: generator.guid(),
+              [FieldType.BARCODEQR]: generator.guid(),
+              [FieldType.SIGNATURE_SINGLE]: setup.structures.basicAttachment(),
+              [FieldType.BIGINT]: generator.integer().toString(),
+              [FieldType.BB_REFERENCE]: [{ _id: config.getUser()._id }],
+              [FieldType.BB_REFERENCE_SINGLE]: { _id: config.getUser()._id },
+            }
+            const row = await config.api.row.save(table._id!, rowValues)
+            expectedRowData = {
+              _id: row._id,
+              [FieldType.STRING]: rowValues[FieldType.STRING],
+              [FieldType.LONGFORM]: rowValues[FieldType.LONGFORM],
+              [FieldType.OPTIONS]: rowValues[FieldType.OPTIONS],
+              [FieldType.ARRAY]: rowValues[FieldType.ARRAY],
+              [FieldType.NUMBER]: rowValues[FieldType.NUMBER],
+              [FieldType.BOOLEAN]: rowValues[FieldType.BOOLEAN],
+              [FieldType.DATETIME]: rowValues[FieldType.DATETIME],
+              [FieldType.ATTACHMENTS]: rowValues[FieldType.ATTACHMENTS].map(
+                (a: any) =>
+                  expect.objectContaining({
+                    ...a,
+                    url: expect.any(String),
+                  })
+              ),
+              [FieldType.ATTACHMENT_SINGLE]: expect.objectContaining({
+                ...rowValues[FieldType.ATTACHMENT_SINGLE],
+                url: expect.any(String),
+              }),
+              [FieldType.FORMULA]: fullSchema[FieldType.FORMULA].formula,
+              [FieldType.AUTO]: expect.any(Number),
+              [FieldType.AI]: expect.any(String),
+              [FieldType.JSON]: rowValues[FieldType.JSON],
+              [FieldType.INTERNAL]: rowValues[FieldType.INTERNAL],
+              [FieldType.BARCODEQR]: rowValues[FieldType.BARCODEQR],
+              [FieldType.SIGNATURE_SINGLE]: expect.objectContaining({
+                ...rowValues[FieldType.SIGNATURE_SINGLE],
+                url: expect.any(String),
+              }),
+              [FieldType.BIGINT]: rowValues[FieldType.BIGINT],
+              [FieldType.BB_REFERENCE]: rowValues[FieldType.BB_REFERENCE].map(
+                expect.objectContaining
+              ),
+              [FieldType.BB_REFERENCE_SINGLE]: expect.objectContaining(
+                rowValues[FieldType.BB_REFERENCE_SINGLE]
+              ),
+            }
+          })
+
+          it("as csv", async () => {
+            const exportedValue = await config.api.row.exportRows(
+              tableId,
+              { query: {} },
+              RowExportFormat.CSV
+            )
+
+            const jsonResult = await config.api.table.csvToJson({
               csvString: exportedValue,
+            })
+
+            const stringified = (value: string) =>
+              JSON.stringify(value).replace(/"/g, "'")
+
+            const matchingObject = (
+              key: string,
+              value: any,
+              isArray: boolean
+            ) => {
+              const objectMatcher = `{'${key}':'${value[key]}'.*?}`
+              if (isArray) {
+                return expect.stringMatching(
+                  new RegExp(`^\\[${objectMatcher}\\]$`)
+                )
+              }
+              return expect.stringMatching(new RegExp(`^${objectMatcher}$`))
+            }
+
+            expect(jsonResult).toEqual([
+              {
+                ...expectedRowData,
+                auto: expect.any(String),
+                array: stringified(expectedRowData["array"]),
+                attachment: matchingObject(
+                  "key",
+                  expectedRowData["attachment"][0].sample,
+                  true
+                ),
+                attachment_single: matchingObject(
+                  "key",
+                  expectedRowData["attachment_single"].sample,
+                  false
+                ),
+                boolean: stringified(expectedRowData["boolean"]),
+                json: stringified(expectedRowData["json"]),
+                number: stringified(expectedRowData["number"]),
+                signature_single: matchingObject(
+                  "key",
+                  expectedRowData["signature_single"].sample,
+                  false
+                ),
+                bb_reference: matchingObject(
+                  "_id",
+                  expectedRowData["bb_reference"][0].sample,
+                  true
+                ),
+                bb_reference_single: matchingObject(
+                  "_id",
+                  expectedRowData["bb_reference_single"].sample,
+                  false
+                ),
+                ai: "LLM Output",
+              },
+            ])
+          })
+
+          it("as json", async () => {
+            const exportedValue = await config.api.row.exportRows(
+              tableId,
+              { query: {} },
+              RowExportFormat.JSON
+            )
+
+            const json = JSON.parse(exportedValue)
+            expect(json).toEqual([expectedRowData])
+          })
+
+          it("as json with schema", async () => {
+            const exportedValue = await config.api.row.exportRows(
+              tableId,
+              { query: {} },
+              RowExportFormat.JSON_WITH_SCHEMA
+            )
+
+            const json = JSON.parse(exportedValue)
+            expect(json).toEqual({
+              schema: expect.any(Object),
+              rows: [expectedRowData],
+            })
+          })
+
+          it("can handle csv-special characters in strings", async () => {
+            const badString = 'test":, wow", "test": "wow"'
+            const table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  string: {
+                    type: FieldType.STRING,
+                    name: "string",
+                  },
+                },
+              })
+            )
+
+            await config.api.row.save(table._id!, { string: badString })
+
+            const exportedValue = await config.api.row.exportRows(
+              table._id!,
+              { query: {} },
+              RowExportFormat.CSV
+            )
+
+            const json = await config.api.table.csvToJson(
+              {
+                csvString: exportedValue,
+              },
+              {
+                status: 200,
+              }
+            )
+
+            expect(json).toHaveLength(1)
+            expect(json[0].string).toEqual(badString)
+          })
+
+          it("exported data can be re-imported", async () => {
+            // export all
+            const exportedValue = await config.api.row.exportRows(
+              tableId,
+              { query: {} },
+              RowExportFormat.CSV
+            )
+
+            // import all twice
+            const rows = await config.api.table.csvToJson({
+              csvString: exportedValue,
+            })
+            await config.api.row.bulkImport(tableId, {
+              rows,
+            })
+            await config.api.row.bulkImport(tableId, {
+              rows,
+            })
+
+            const { rows: allRows } = await config.api.row.search(tableId)
+
+            const expectedRow = {
+              ...expectedRowData,
+              _id: expect.any(String),
+              _rev: expect.any(String),
+              type: "row",
+              tableId: tableId,
+              createdAt: new Date().toISOString(),
+              updatedAt: new Date().toISOString(),
+            }
+            expect(allRows).toEqual([expectedRow, expectedRow, expectedRow])
+          })
+        })
+      })
+
+      let o2mTable: Table
+      let m2mTable: Table
+      beforeAll(async () => {
+        o2mTable = await config.api.table.save(defaultTable())
+        m2mTable = await config.api.table.save(defaultTable())
+      })
+
+      describe.each([
+        [
+          "relationship fields",
+          (): Record<string, FieldSchema> => ({
+            user: {
+              name: "user",
+              relationshipType: RelationshipType.ONE_TO_MANY,
+              type: FieldType.LINK,
+              tableId: o2mTable._id!,
+              fieldName: "fk_o2m",
+            },
+            users: {
+              name: "users",
+              relationshipType: RelationshipType.MANY_TO_MANY,
+              type: FieldType.LINK,
+              tableId: m2mTable._id!,
+              fieldName: "fk_m2m",
+            },
+          }),
+          (tableId: string) =>
+            config.api.row.save(tableId, {
+              name: uuid.v4(),
+              description: generator.paragraph(),
+              tableId,
+            }),
+          (row: Row) => ({
+            _id: row._id,
+            primaryDisplay: row.name,
+          }),
+        ],
+        [
+          "bb reference fields",
+          (): Record<string, FieldSchema> => ({
+            user: {
+              name: "user",
+              type: FieldType.BB_REFERENCE,
+              subtype: BBReferenceFieldSubType.USER,
+            },
+            users: {
+              name: "users",
+              type: FieldType.BB_REFERENCE,
+              subtype: BBReferenceFieldSubType.USERS,
+            },
+          }),
+          () => config.createUser(),
+          (row: Row) => ({
+            _id: row._id,
+            primaryDisplay: row.email,
+            email: row.email,
+            firstName: row.firstName,
+            lastName: row.lastName,
+          }),
+        ],
+      ])("links - %s", (__, relSchema, dataGenerator, resultMapper) => {
+        let tableId: string
+        let o2mData: Row[]
+        let m2mData: Row[]
+
+        beforeAll(async () => {
+          const table = await config.api.table.save(
+            defaultTable({ schema: relSchema() })
+          )
+          tableId = table._id!
+
+          o2mData = [
+            await dataGenerator(o2mTable._id!),
+            await dataGenerator(o2mTable._id!),
+            await dataGenerator(o2mTable._id!),
+            await dataGenerator(o2mTable._id!),
+          ]
+
+          m2mData = [
+            await dataGenerator(m2mTable._id!),
+            await dataGenerator(m2mTable._id!),
+            await dataGenerator(m2mTable._id!),
+            await dataGenerator(m2mTable._id!),
+          ]
+        })
+
+        it("can save a row when relationship fields are empty", async () => {
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+          })
+
+          expect(row).toEqual({
+            _id: expect.any(String),
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            type: isInternal ? "row" : undefined,
+            name: "foo",
+            description: "bar",
+            tableId,
+            createdAt: isInternal ? new Date().toISOString() : undefined,
+            updatedAt: isInternal ? new Date().toISOString() : undefined,
+          })
+        })
+
+        it("can save a row with a single relationship field", async () => {
+          const user = _.sample(o2mData)!
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+            user: [user],
+          })
+
+          expect(row).toEqual({
+            name: "foo",
+            description: "bar",
+            tableId,
+            user: [user].map(u => resultMapper(u)),
+            _id: expect.any(String),
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            type: isInternal ? "row" : undefined,
+            [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user.id,
+            createdAt: isInternal ? new Date().toISOString() : undefined,
+            updatedAt: isInternal ? new Date().toISOString() : undefined,
+          })
+        })
+
+        it("can save a row with a multiple relationship field", async () => {
+          const selectedUsers = _.sampleSize(m2mData, 2)
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+            users: selectedUsers,
+          })
+
+          expect(row).toEqual({
+            name: "foo",
+            description: "bar",
+            tableId,
+            users: expect.arrayContaining(
+              selectedUsers.map(u => resultMapper(u))
+            ),
+            _id: expect.any(String),
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            type: isInternal ? "row" : undefined,
+            createdAt: isInternal ? new Date().toISOString() : undefined,
+            updatedAt: isInternal ? new Date().toISOString() : undefined,
+          })
+        })
+
+        it("can retrieve rows with no populated relationships", async () => {
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+          })
+
+          const retrieved = await config.api.row.get(tableId, row._id!)
+          expect(retrieved).toEqual({
+            name: "foo",
+            description: "bar",
+            tableId,
+            user: undefined,
+            users: undefined,
+            _id: row._id,
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            ...defaultRowFields,
+          })
+        })
+
+        it("can retrieve rows with populated relationships", async () => {
+          const user1 = _.sample(o2mData)!
+          const [user2, user3] = _.sampleSize(m2mData, 2)
+
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+            users: [user2, user3],
+            user: [user1],
+          })
+
+          const retrieved = await config.api.row.get(tableId, row._id!)
+          expect(retrieved).toEqual({
+            name: "foo",
+            description: "bar",
+            tableId,
+            user: expect.arrayContaining([user1].map(u => resultMapper(u))),
+            users: expect.arrayContaining(
+              [user2, user3].map(u => resultMapper(u))
+            ),
+            _id: row._id,
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user1.id,
+            ...defaultRowFields,
+          })
+        })
+
+        it("can update an existing populated row", async () => {
+          const user = _.sample(o2mData)!
+          const [users1, users2, users3] = _.sampleSize(m2mData, 3)
+
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+            users: [users1, users2],
+          })
+
+          const updatedRow = await config.api.row.save(tableId, {
+            ...row,
+            user: [user],
+            users: [users3, users1],
+          })
+          expect(updatedRow).toEqual({
+            name: "foo",
+            description: "bar",
+            tableId,
+            user: expect.arrayContaining([user].map(u => resultMapper(u))),
+            users: expect.arrayContaining(
+              [users3, users1].map(u => resultMapper(u))
+            ),
+            _id: row._id,
+            _rev: expect.any(String),
+            id: isInternal ? undefined : expect.any(Number),
+            type: isInternal ? "row" : undefined,
+            [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user.id,
+            createdAt: isInternal ? new Date().toISOString() : undefined,
+            updatedAt: isInternal ? new Date().toISOString() : undefined,
+          })
+        })
+
+        it("can wipe an existing populated relationships in row", async () => {
+          const [user1, user2] = _.sampleSize(m2mData, 2)
+          const row = await config.api.row.save(tableId, {
+            name: "foo",
+            description: "bar",
+            users: [user1, user2],
+          })
+
+          const updatedRow = await config.api.row.save(tableId, {
+            ...row,
+            user: null,
+            users: null,
+          })
+          expect(updatedRow.user).toBeUndefined()
+          expect(updatedRow.users).toBeUndefined()
+        })
+
+        it("fetch all will populate the relationships", async () => {
+          const [user1] = _.sampleSize(o2mData, 1)
+          const [users1, users2, users3] = _.sampleSize(m2mData, 3)
+
+          const rows = [
+            {
+              name: generator.name(),
+              description: generator.name(),
+              users: [users1, users2],
             },
             {
-              status: 200,
+              name: generator.name(),
+              description: generator.name(),
+              user: [user1],
+              users: [users1, users3],
+            },
+            {
+              name: generator.name(),
+              description: generator.name(),
+              users: [users3],
+            },
+          ]
+
+          await config.api.row.save(tableId, rows[0])
+          await config.api.row.save(tableId, rows[1])
+          await config.api.row.save(tableId, rows[2])
+
+          const res = await config.api.row.fetch(tableId)
+
+          expect(res).toEqual(
+            expect.arrayContaining(
+              rows.map(r => ({
+                name: r.name,
+                description: r.description,
+                tableId,
+                user: r.user?.map(u => resultMapper(u)),
+                users: r.users?.length
+                  ? expect.arrayContaining(r.users?.map(u => resultMapper(u)))
+                  : undefined,
+                _id: expect.any(String),
+                _rev: expect.any(String),
+                id: isInternal ? undefined : expect.any(Number),
+                [`fk_${o2mTable.name}_fk_o2m`]:
+                  isInternal || !r.user?.length ? undefined : r.user[0].id,
+                ...defaultRowFields,
+              }))
+            )
+          )
+        })
+
+        it("search all will populate the relationships", async () => {
+          const [user1] = _.sampleSize(o2mData, 1)
+          const [users1, users2, users3] = _.sampleSize(m2mData, 3)
+
+          const rows = [
+            {
+              name: generator.name(),
+              description: generator.name(),
+              users: [users1, users2],
+            },
+            {
+              name: generator.name(),
+              description: generator.name(),
+              user: [user1],
+              users: [users1, users3],
+            },
+            {
+              name: generator.name(),
+              description: generator.name(),
+              users: [users3],
+            },
+          ]
+
+          await config.api.row.save(tableId, rows[0])
+          await config.api.row.save(tableId, rows[1])
+          await config.api.row.save(tableId, rows[2])
+
+          const res = await config.api.row.search(tableId)
+
+          expect(res).toEqual({
+            rows: expect.arrayContaining(
+              rows.map(r => ({
+                name: r.name,
+                description: r.description,
+                tableId,
+                user: r.user?.map(u => resultMapper(u)),
+                users: r.users?.length
+                  ? expect.arrayContaining(r.users?.map(u => resultMapper(u)))
+                  : undefined,
+                _id: expect.any(String),
+                _rev: expect.any(String),
+                id: isInternal ? undefined : expect.any(Number),
+                [`fk_${o2mTable.name}_fk_o2m`]:
+                  isInternal || !r.user?.length ? undefined : r.user[0].id,
+                ...defaultRowFields,
+              }))
+            ),
+            ...(isInternal
+              ? {}
+              : {
+                  hasNextPage: false,
+                }),
+          })
+        })
+      })
+
+      // Upserting isn't yet supported in MSSQL or Oracle, see:
+      //   https://github.com/knex/knex/pull/6050
+      !isMSSQL &&
+        !isOracle &&
+        describe("relationships", () => {
+          let tableId: string
+          let viewId: string
+
+          let auxData: Row[] = []
+
+          beforeAll(async () => {
+            const aux2Table = await config.api.table.save(saveTableRequest())
+            const aux2Data = await config.api.row.save(aux2Table._id!, {})
+
+            const auxTable = await config.api.table.save(
+              saveTableRequest({
+                primaryDisplay: "name",
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    constraints: { presence: true },
+                  },
+                  age: {
+                    name: "age",
+                    type: FieldType.NUMBER,
+                    constraints: { presence: true },
+                  },
+                  address: {
+                    name: "address",
+                    type: FieldType.STRING,
+                    constraints: { presence: true },
+                    visible: false,
+                  },
+                  link: {
+                    name: "link",
+                    type: FieldType.LINK,
+                    tableId: aux2Table._id!,
+                    relationshipType: RelationshipType.MANY_TO_MANY,
+                    fieldName: "fk_aux",
+                    constraints: { presence: true },
+                  },
+                  formula: {
+                    name: "formula",
+                    type: FieldType.FORMULA,
+                    formula: "{{ any }}",
+                    constraints: { presence: true },
+                  },
+                },
+              })
+            )
+            const auxTableId = auxTable._id!
+
+            for (const name of generator.unique(() => generator.name(), 10)) {
+              auxData.push(
+                await config.api.row.save(auxTableId, {
+                  name,
+                  age: generator.age(),
+                  address: generator.address(),
+                  link: [aux2Data],
+                })
+              )
+            }
+
+            const table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  title: {
+                    name: "title",
+                    type: FieldType.STRING,
+                    constraints: { presence: true },
+                  },
+                  relWithNoSchema: {
+                    name: "relWithNoSchema",
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    type: FieldType.LINK,
+                    tableId: auxTableId,
+                    fieldName: "fk_relWithNoSchema",
+                    constraints: { presence: true },
+                  },
+                  relWithEmptySchema: {
+                    name: "relWithEmptySchema",
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    type: FieldType.LINK,
+                    tableId: auxTableId,
+                    fieldName: "fk_relWithEmptySchema",
+                    constraints: { presence: true },
+                  },
+                  relWithFullSchema: {
+                    name: "relWithFullSchema",
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    type: FieldType.LINK,
+                    tableId: auxTableId,
+                    fieldName: "fk_relWithFullSchema",
+                    constraints: { presence: true },
+                  },
+                  relWithHalfSchema: {
+                    name: "relWithHalfSchema",
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    type: FieldType.LINK,
+                    tableId: auxTableId,
+                    fieldName: "fk_relWithHalfSchema",
+                    constraints: { presence: true },
+                  },
+                  relWithIllegalSchema: {
+                    name: "relWithIllegalSchema",
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                    type: FieldType.LINK,
+                    tableId: auxTableId,
+                    fieldName: "fk_relWithIllegalSchema",
+                    constraints: { presence: true },
+                  },
+                },
+              })
+            )
+            tableId = table._id!
+            const view = await config.api.viewV2.create({
+              name: generator.guid(),
+              tableId,
+              schema: {
+                title: {
+                  visible: true,
+                },
+                relWithNoSchema: {
+                  visible: true,
+                },
+                relWithEmptySchema: {
+                  visible: true,
+                  columns: {},
+                },
+                relWithFullSchema: {
+                  visible: true,
+                  columns: Object.keys(auxTable.schema).reduce<
+                    Record<string, RelationSchemaField>
+                  >((acc, c) => ({ ...acc, [c]: { visible: true } }), {}),
+                },
+                relWithHalfSchema: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true },
+                    age: { visible: false, readonly: true },
+                  },
+                },
+                relWithIllegalSchema: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true },
+                    address: { visible: true },
+                    unexisting: { visible: true },
+                  },
+                },
+              },
+            })
+
+            viewId = view.id
+          })
+
+          const testScenarios: [string, (row: Row) => Promise<Row> | Row][] = [
+            ["get row", (row: Row) => config.api.row.get(viewId, row._id!)],
+            [
+              "from view search",
+              async (row: Row) => {
+                const { rows } = await config.api.viewV2.search(viewId)
+                return rows.find(r => r._id === row._id!)
+              },
+            ],
+            ["from original saved row", (row: Row) => row],
+            [
+              "from updated row",
+              (row: Row) => config.api.row.save(viewId, row),
+            ],
+          ]
+
+          it.each(testScenarios)(
+            "can retrieve rows with populated relationships (via %s)",
+            async (__, retrieveDelegate) => {
+              const otherRows = _.sampleSize(auxData, 5)
+
+              const row = await config.api.row.save(viewId, {
+                title: generator.word(),
+                relWithNoSchema: [otherRows[0]],
+                relWithEmptySchema: [otherRows[1]],
+                relWithFullSchema: [otherRows[2]],
+                relWithHalfSchema: [otherRows[3]],
+                relWithIllegalSchema: [otherRows[4]],
+              })
+
+              const retrieved = await retrieveDelegate(row)
+
+              expect(retrieved).toEqual(
+                expect.objectContaining({
+                  title: row.title,
+                  relWithNoSchema: [
+                    {
+                      _id: otherRows[0]._id,
+                      primaryDisplay: otherRows[0].name,
+                    },
+                  ],
+                  relWithEmptySchema: [
+                    {
+                      _id: otherRows[1]._id,
+                      primaryDisplay: otherRows[1].name,
+                    },
+                  ],
+                  relWithFullSchema: [
+                    {
+                      _id: otherRows[2]._id,
+                      primaryDisplay: otherRows[2].name,
+                      name: otherRows[2].name,
+                      age: otherRows[2].age,
+                      id: otherRows[2].id,
+                    },
+                  ],
+                  relWithHalfSchema: [
+                    {
+                      _id: otherRows[3]._id,
+                      primaryDisplay: otherRows[3].name,
+                      name: otherRows[3].name,
+                    },
+                  ],
+                  relWithIllegalSchema: [
+                    {
+                      _id: otherRows[4]._id,
+                      primaryDisplay: otherRows[4].name,
+                      name: otherRows[4].name,
+                    },
+                  ],
+                })
+              )
             }
           )
 
-          expect(json).toHaveLength(1)
-          expect(json[0].string).toEqual(badString)
-        })
-
-        it("exported data can be re-imported", async () => {
-          // export all
-          const exportedValue = await config.api.row.exportRows(
-            tableId,
-            { query: {} },
-            RowExportFormat.CSV
-          )
-
-          // import all twice
-          const rows = await config.api.table.csvToJson({
-            csvString: exportedValue,
-          })
-          await config.api.row.bulkImport(tableId, {
-            rows,
-          })
-          await config.api.row.bulkImport(tableId, {
-            rows,
-          })
-
-          const { rows: allRows } = await config.api.row.search(tableId)
-
-          const expectedRow = {
-            ...expectedRowData,
-            _id: expect.any(String),
-            _rev: expect.any(String),
-            type: "row",
-            tableId: tableId,
-            createdAt: new Date().toISOString(),
-            updatedAt: new Date().toISOString(),
-          }
-          expect(allRows).toEqual([expectedRow, expectedRow, expectedRow])
-        })
-      })
-    })
-
-    let o2mTable: Table
-    let m2mTable: Table
-    beforeAll(async () => {
-      o2mTable = await config.api.table.save(defaultTable())
-      m2mTable = await config.api.table.save(defaultTable())
-    })
-
-    describe.each([
-      [
-        "relationship fields",
-        (): Record<string, FieldSchema> => ({
-          user: {
-            name: "user",
-            relationshipType: RelationshipType.ONE_TO_MANY,
-            type: FieldType.LINK,
-            tableId: o2mTable._id!,
-            fieldName: "fk_o2m",
-          },
-          users: {
-            name: "users",
-            relationshipType: RelationshipType.MANY_TO_MANY,
-            type: FieldType.LINK,
-            tableId: m2mTable._id!,
-            fieldName: "fk_m2m",
-          },
-        }),
-        (tableId: string) =>
-          config.api.row.save(tableId, {
-            name: uuid.v4(),
-            description: generator.paragraph(),
-            tableId,
-          }),
-        (row: Row) => ({
-          _id: row._id,
-          primaryDisplay: row.name,
-        }),
-      ],
-      [
-        "bb reference fields",
-        (): Record<string, FieldSchema> => ({
-          user: {
-            name: "user",
-            type: FieldType.BB_REFERENCE,
-            subtype: BBReferenceFieldSubType.USER,
-          },
-          users: {
-            name: "users",
-            type: FieldType.BB_REFERENCE,
-            subtype: BBReferenceFieldSubType.USERS,
-          },
-        }),
-        () => config.createUser(),
-        (row: Row) => ({
-          _id: row._id,
-          primaryDisplay: row.email,
-          email: row.email,
-          firstName: row.firstName,
-          lastName: row.lastName,
-        }),
-      ],
-    ])("links - %s", (__, relSchema, dataGenerator, resultMapper) => {
-      let tableId: string
-      let o2mData: Row[]
-      let m2mData: Row[]
-
-      beforeAll(async () => {
-        const table = await config.api.table.save(
-          defaultTable({ schema: relSchema() })
-        )
-        tableId = table._id!
-
-        o2mData = [
-          await dataGenerator(o2mTable._id!),
-          await dataGenerator(o2mTable._id!),
-          await dataGenerator(o2mTable._id!),
-          await dataGenerator(o2mTable._id!),
-        ]
-
-        m2mData = [
-          await dataGenerator(m2mTable._id!),
-          await dataGenerator(m2mTable._id!),
-          await dataGenerator(m2mTable._id!),
-          await dataGenerator(m2mTable._id!),
-        ]
-      })
-
-      it("can save a row when relationship fields are empty", async () => {
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-        })
-
-        expect(row).toEqual({
-          _id: expect.any(String),
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          type: isInternal ? "row" : undefined,
-          name: "foo",
-          description: "bar",
-          tableId,
-        })
-      })
-
-      it("can save a row with a single relationship field", async () => {
-        const user = _.sample(o2mData)!
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-          user: [user],
-        })
-
-        expect(row).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          user: [user].map(u => resultMapper(u)),
-          _id: expect.any(String),
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          type: isInternal ? "row" : undefined,
-          [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user.id,
-        })
-      })
-
-      it("can save a row with a multiple relationship field", async () => {
-        const selectedUsers = _.sampleSize(m2mData, 2)
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-          users: selectedUsers,
-        })
-
-        expect(row).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          users: expect.arrayContaining(
-            selectedUsers.map(u => resultMapper(u))
-          ),
-          _id: expect.any(String),
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          type: isInternal ? "row" : undefined,
-        })
-      })
-
-      it("can retrieve rows with no populated relationships", async () => {
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-        })
-
-        const retrieved = await config.api.row.get(tableId, row._id!)
-        expect(retrieved).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          user: undefined,
-          users: undefined,
-          _id: row._id,
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          ...defaultRowFields,
-        })
-      })
-
-      it("can retrieve rows with populated relationships", async () => {
-        const user1 = _.sample(o2mData)!
-        const [user2, user3] = _.sampleSize(m2mData, 2)
-
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-          users: [user2, user3],
-          user: [user1],
-        })
-
-        const retrieved = await config.api.row.get(tableId, row._id!)
-        expect(retrieved).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          user: expect.arrayContaining([user1].map(u => resultMapper(u))),
-          users: expect.arrayContaining(
-            [user2, user3].map(u => resultMapper(u))
-          ),
-          _id: row._id,
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user1.id,
-          ...defaultRowFields,
-        })
-      })
-
-      it("can update an existing populated row", async () => {
-        const user = _.sample(o2mData)!
-        const [users1, users2, users3] = _.sampleSize(m2mData, 3)
-
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-          users: [users1, users2],
-        })
-
-        const updatedRow = await config.api.row.save(tableId, {
-          ...row,
-          user: [user],
-          users: [users3, users1],
-        })
-        expect(updatedRow).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          user: expect.arrayContaining([user].map(u => resultMapper(u))),
-          users: expect.arrayContaining(
-            [users3, users1].map(u => resultMapper(u))
-          ),
-          _id: row._id,
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          type: isInternal ? "row" : undefined,
-          [`fk_${o2mTable.name}_fk_o2m`]: isInternal ? undefined : user.id,
-        })
-      })
-
-      it("can wipe an existing populated relationships in row", async () => {
-        const [user1, user2] = _.sampleSize(m2mData, 2)
-        const row = await config.api.row.save(tableId, {
-          name: "foo",
-          description: "bar",
-          users: [user1, user2],
-        })
-
-        const updatedRow = await config.api.row.save(tableId, {
-          ...row,
-          user: null,
-          users: null,
-        })
-        expect(updatedRow).toEqual({
-          name: "foo",
-          description: "bar",
-          tableId,
-          _id: row._id,
-          _rev: expect.any(String),
-          id: isInternal ? undefined : expect.any(Number),
-          type: isInternal ? "row" : undefined,
-        })
-      })
-
-      it("fetch all will populate the relationships", async () => {
-        const [user1] = _.sampleSize(o2mData, 1)
-        const [users1, users2, users3] = _.sampleSize(m2mData, 3)
-
-        const rows = [
-          {
-            name: generator.name(),
-            description: generator.name(),
-            users: [users1, users2],
-          },
-          {
-            name: generator.name(),
-            description: generator.name(),
-            user: [user1],
-            users: [users1, users3],
-          },
-          {
-            name: generator.name(),
-            description: generator.name(),
-            users: [users3],
-          },
-        ]
-
-        await config.api.row.save(tableId, rows[0])
-        await config.api.row.save(tableId, rows[1])
-        await config.api.row.save(tableId, rows[2])
-
-        const res = await config.api.row.fetch(tableId)
-
-        expect(res).toEqual(
-          expect.arrayContaining(
-            rows.map(r => ({
-              name: r.name,
-              description: r.description,
-              tableId,
-              user: r.user?.map(u => resultMapper(u)),
-              users: r.users?.length
-                ? expect.arrayContaining(r.users?.map(u => resultMapper(u)))
-                : undefined,
-              _id: expect.any(String),
-              _rev: expect.any(String),
-              id: isInternal ? undefined : expect.any(Number),
-              [`fk_${o2mTable.name}_fk_o2m`]:
-                isInternal || !r.user?.length ? undefined : r.user[0].id,
-              ...defaultRowFields,
-            }))
-          )
-        )
-      })
-
-      it("search all will populate the relationships", async () => {
-        const [user1] = _.sampleSize(o2mData, 1)
-        const [users1, users2, users3] = _.sampleSize(m2mData, 3)
-
-        const rows = [
-          {
-            name: generator.name(),
-            description: generator.name(),
-            users: [users1, users2],
-          },
-          {
-            name: generator.name(),
-            description: generator.name(),
-            user: [user1],
-            users: [users1, users3],
-          },
-          {
-            name: generator.name(),
-            description: generator.name(),
-            users: [users3],
-          },
-        ]
-
-        await config.api.row.save(tableId, rows[0])
-        await config.api.row.save(tableId, rows[1])
-        await config.api.row.save(tableId, rows[2])
-
-        const res = await config.api.row.search(tableId)
-
-        expect(res).toEqual({
-          rows: expect.arrayContaining(
-            rows.map(r => ({
-              name: r.name,
-              description: r.description,
-              tableId,
-              user: r.user?.map(u => resultMapper(u)),
-              users: r.users?.length
-                ? expect.arrayContaining(r.users?.map(u => resultMapper(u)))
-                : undefined,
-              _id: expect.any(String),
-              _rev: expect.any(String),
-              id: isInternal ? undefined : expect.any(Number),
-              [`fk_${o2mTable.name}_fk_o2m`]:
-                isInternal || !r.user?.length ? undefined : r.user[0].id,
-              ...defaultRowFields,
-            }))
-          ),
-          ...(isInternal
-            ? {}
-            : {
-                hasNextPage: false,
-              }),
-        })
-      })
-    })
-
-    // Upserting isn't yet supported in MSSQL or Oracle, see:
-    //   https://github.com/knex/knex/pull/6050
-    !isMSSQL &&
-      !isOracle &&
-      describe("relationships", () => {
-        let tableId: string
-        let viewId: string
-
-        let auxData: Row[] = []
-
-        beforeAll(async () => {
-          const aux2Table = await config.api.table.save(saveTableRequest())
-          const aux2Data = await config.api.row.save(aux2Table._id!, {})
-
-          const auxTable = await config.api.table.save(
-            saveTableRequest({
-              primaryDisplay: "name",
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  constraints: { presence: true },
-                },
-                age: {
-                  name: "age",
-                  type: FieldType.NUMBER,
-                  constraints: { presence: true },
-                },
-                address: {
-                  name: "address",
-                  type: FieldType.STRING,
-                  constraints: { presence: true },
-                  visible: false,
-                },
-                link: {
-                  name: "link",
-                  type: FieldType.LINK,
-                  tableId: aux2Table._id!,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                  fieldName: "fk_aux",
-                  constraints: { presence: true },
-                },
-                formula: {
-                  name: "formula",
-                  type: FieldType.FORMULA,
-                  formula: "{{ any }}",
-                  constraints: { presence: true },
-                },
+          it.each([
+            [
+              "from table fetch",
+              async (row: Row) => {
+                const rows = await config.api.row.fetch(tableId)
+                return rows.find(r => r._id === row._id!)
               },
-            })
-          )
-          const auxTableId = auxTable._id!
+            ],
+            [
+              "from table search",
+              async (row: Row) => {
+                const { rows } = await config.api.row.search(tableId)
+                return rows.find(r => r._id === row._id!)
+              },
+            ],
+          ])(
+            "does not enrich when fetching from the table (via %s)",
+            async (__, retrieveDelegate) => {
+              const otherRows = _.sampleSize(auxData, 5)
 
-          for (const name of generator.unique(() => generator.name(), 10)) {
-            auxData.push(
-              await config.api.row.save(auxTableId, {
-                name,
-                age: generator.age(),
-                address: generator.address(),
-                link: [aux2Data],
+              const row = await config.api.row.save(viewId, {
+                title: generator.word(),
+                relWithNoSchema: [otherRows[0]],
+                relWithEmptySchema: [otherRows[1]],
+                relWithFullSchema: [otherRows[2]],
+                relWithHalfSchema: [otherRows[3]],
+                relWithIllegalSchema: [otherRows[4]],
+              })
+
+              const retrieved = await retrieveDelegate(row)
+
+              expect(retrieved).toEqual(
+                expect.objectContaining({
+                  title: row.title,
+                  relWithNoSchema: [
+                    {
+                      _id: otherRows[0]._id,
+                      primaryDisplay: otherRows[0].name,
+                    },
+                  ],
+                  relWithEmptySchema: [
+                    {
+                      _id: otherRows[1]._id,
+                      primaryDisplay: otherRows[1].name,
+                    },
+                  ],
+                  relWithFullSchema: [
+                    {
+                      _id: otherRows[2]._id,
+                      primaryDisplay: otherRows[2].name,
+                    },
+                  ],
+                  relWithHalfSchema: [
+                    {
+                      _id: otherRows[3]._id,
+                      primaryDisplay: otherRows[3].name,
+                    },
+                  ],
+                  relWithIllegalSchema: [
+                    {
+                      _id: otherRows[4]._id,
+                      primaryDisplay: otherRows[4].name,
+                    },
+                  ],
+                })
+              )
+            }
+          )
+        })
+
+      isInternal &&
+        describe("AI fields", () => {
+          let table: Table
+          let envCleanup: () => void
+
+          beforeAll(async () => {
+            mocks.licenses.useBudibaseAI()
+            mocks.licenses.useAICustomConfigs()
+            envCleanup = setEnv({
+              OPENAI_API_KEY: "sk-abcdefghijklmnopqrstuvwxyz1234567890abcd",
+            })
+
+            mockChatGPTResponse("Mock LLM Response")
+
+            table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  ai: {
+                    name: "ai",
+                    type: FieldType.AI,
+                    operation: AIOperationEnum.PROMPT,
+                    prompt: "Convert the following to German: '{{ product }}'",
+                  },
+                  product: {
+                    name: "product",
+                    type: FieldType.STRING,
+                  },
+                },
               })
             )
-          }
 
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                title: {
-                  name: "title",
-                  type: FieldType.STRING,
-                  constraints: { presence: true },
-                },
-                relWithNoSchema: {
-                  name: "relWithNoSchema",
-                  relationshipType: RelationshipType.ONE_TO_MANY,
-                  type: FieldType.LINK,
-                  tableId: auxTableId,
-                  fieldName: "fk_relWithNoSchema",
-                  constraints: { presence: true },
-                },
-                relWithEmptySchema: {
-                  name: "relWithEmptySchema",
-                  relationshipType: RelationshipType.ONE_TO_MANY,
-                  type: FieldType.LINK,
-                  tableId: auxTableId,
-                  fieldName: "fk_relWithEmptySchema",
-                  constraints: { presence: true },
-                },
-                relWithFullSchema: {
-                  name: "relWithFullSchema",
-                  relationshipType: RelationshipType.ONE_TO_MANY,
-                  type: FieldType.LINK,
-                  tableId: auxTableId,
-                  fieldName: "fk_relWithFullSchema",
-                  constraints: { presence: true },
-                },
-                relWithHalfSchema: {
-                  name: "relWithHalfSchema",
-                  relationshipType: RelationshipType.ONE_TO_MANY,
-                  type: FieldType.LINK,
-                  tableId: auxTableId,
-                  fieldName: "fk_relWithHalfSchema",
-                  constraints: { presence: true },
-                },
-                relWithIllegalSchema: {
-                  name: "relWithIllegalSchema",
-                  relationshipType: RelationshipType.ONE_TO_MANY,
-                  type: FieldType.LINK,
-                  tableId: auxTableId,
-                  fieldName: "fk_relWithIllegalSchema",
-                  constraints: { presence: true },
-                },
-              },
+            await config.api.row.save(table._id!, {
+              product: generator.word(),
             })
-          )
-          tableId = table._id!
-          const view = await config.api.viewV2.create({
-            name: generator.guid(),
-            tableId,
-            schema: {
-              title: {
-                visible: true,
-              },
-              relWithNoSchema: {
-                visible: true,
-              },
-              relWithEmptySchema: {
-                visible: true,
-                columns: {},
-              },
-              relWithFullSchema: {
-                visible: true,
-                columns: Object.keys(auxTable.schema).reduce<
-                  Record<string, RelationSchemaField>
-                >((acc, c) => ({ ...acc, [c]: { visible: true } }), {}),
-              },
-              relWithHalfSchema: {
-                visible: true,
-                columns: {
-                  name: { visible: true },
-                  age: { visible: false, readonly: true },
-                },
-              },
-              relWithIllegalSchema: {
-                visible: true,
-                columns: {
-                  name: { visible: true },
-                  address: { visible: true },
-                  unexisting: { visible: true },
-                },
-              },
-            },
           })
 
-          viewId = view.id
+          afterAll(() => {
+            nock.cleanAll()
+            envCleanup()
+            mocks.licenses.useCloudFree()
+          })
+
+          it("should be able to save a row with an AI column", async () => {
+            const { rows } = await config.api.row.search(table._id!)
+            expect(rows.length).toBe(1)
+            expect(rows[0].ai).toEqual("Mock LLM Response")
+          })
+
+          it("should be able to update a row with an AI column", async () => {
+            const { rows } = await config.api.row.search(table._id!)
+            expect(rows.length).toBe(1)
+            await config.api.row.save(table._id!, {
+              product: generator.word(),
+              ...rows[0],
+            })
+            expect(rows.length).toBe(1)
+            expect(rows[0].ai).toEqual("Mock LLM Response")
+          })
         })
 
-        const testScenarios: [string, (row: Row) => Promise<Row> | Row][] = [
-          ["get row", (row: Row) => config.api.row.get(viewId, row._id!)],
-          [
-            "from view search",
-            async (row: Row) => {
-              const { rows } = await config.api.viewV2.search(viewId)
-              return rows.find(r => r._id === row._id!)
-            },
-          ],
-          ["from original saved row", (row: Row) => row],
-          ["from updated row", (row: Row) => config.api.row.save(viewId, row)],
-        ]
-
-        it.each(testScenarios)(
-          "can retrieve rows with populated relationships (via %s)",
-          async (__, retrieveDelegate) => {
-            const otherRows = _.sampleSize(auxData, 5)
-
-            const row = await config.api.row.save(viewId, {
-              title: generator.word(),
-              relWithNoSchema: [otherRows[0]],
-              relWithEmptySchema: [otherRows[1]],
-              relWithFullSchema: [otherRows[2]],
-              relWithHalfSchema: [otherRows[3]],
-              relWithIllegalSchema: [otherRows[4]],
-            })
-
-            const retrieved = await retrieveDelegate(row)
-
-            expect(retrieved).toEqual(
-              expect.objectContaining({
-                title: row.title,
-                relWithNoSchema: [
-                  {
-                    _id: otherRows[0]._id,
-                    primaryDisplay: otherRows[0].name,
-                  },
-                ],
-                relWithEmptySchema: [
-                  {
-                    _id: otherRows[1]._id,
-                    primaryDisplay: otherRows[1].name,
-                  },
-                ],
-                relWithFullSchema: [
-                  {
-                    _id: otherRows[2]._id,
-                    primaryDisplay: otherRows[2].name,
-                    name: otherRows[2].name,
-                    age: otherRows[2].age,
-                    id: otherRows[2].id,
-                  },
-                ],
-                relWithHalfSchema: [
-                  {
-                    _id: otherRows[3]._id,
-                    primaryDisplay: otherRows[3].name,
-                    name: otherRows[3].name,
-                  },
-                ],
-                relWithIllegalSchema: [
-                  {
-                    _id: otherRows[4]._id,
-                    primaryDisplay: otherRows[4].name,
-                    name: otherRows[4].name,
-                  },
-                ],
-              })
-            )
-          }
-        )
-
-        it.each([
-          [
-            "from table fetch",
-            async (row: Row) => {
-              const rows = await config.api.row.fetch(tableId)
-              return rows.find(r => r._id === row._id!)
-            },
-          ],
-          [
-            "from table search",
-            async (row: Row) => {
-              const { rows } = await config.api.row.search(tableId)
-              return rows.find(r => r._id === row._id!)
-            },
-          ],
-        ])(
-          "does not enrich when fetching from the table (via %s)",
-          async (__, retrieveDelegate) => {
-            const otherRows = _.sampleSize(auxData, 5)
-
-            const row = await config.api.row.save(viewId, {
-              title: generator.word(),
-              relWithNoSchema: [otherRows[0]],
-              relWithEmptySchema: [otherRows[1]],
-              relWithFullSchema: [otherRows[2]],
-              relWithHalfSchema: [otherRows[3]],
-              relWithIllegalSchema: [otherRows[4]],
-            })
-
-            const retrieved = await retrieveDelegate(row)
-
-            expect(retrieved).toEqual(
-              expect.objectContaining({
-                title: row.title,
-                relWithNoSchema: [
-                  {
-                    _id: otherRows[0]._id,
-                    primaryDisplay: otherRows[0].name,
-                  },
-                ],
-                relWithEmptySchema: [
-                  {
-                    _id: otherRows[1]._id,
-                    primaryDisplay: otherRows[1].name,
-                  },
-                ],
-                relWithFullSchema: [
-                  {
-                    _id: otherRows[2]._id,
-                    primaryDisplay: otherRows[2].name,
-                  },
-                ],
-                relWithHalfSchema: [
-                  {
-                    _id: otherRows[3]._id,
-                    primaryDisplay: otherRows[3].name,
-                  },
-                ],
-                relWithIllegalSchema: [
-                  {
-                    _id: otherRows[4]._id,
-                    primaryDisplay: otherRows[4].name,
-                  },
-                ],
-              })
-            )
-          }
-        )
-      })
-
-    isInternal &&
-      describe("AI fields", () => {
+      describe("Formula fields", () => {
         let table: Table
+        let otherTable: Table
+        let relatedRow: Row, mainRow: Row
 
         beforeAll(async () => {
-          mocks.licenses.useBudibaseAI()
-          mocks.licenses.useAICustomConfigs()
+          otherTable = await config.api.table.save(defaultTable())
           table = await config.api.table.save(
             saveTableRequest({
               schema: {
-                ai: {
-                  name: "ai",
-                  type: FieldType.AI,
-                  operation: AIOperationEnum.PROMPT,
-                  prompt: "Convert the following to German: '{{ product }}'",
-                },
-                product: {
-                  name: "product",
-                  type: FieldType.STRING,
-                },
-              },
-            })
-          )
-
-          await config.api.row.save(table._id!, {
-            product: generator.word(),
-          })
-        })
-
-        afterAll(() => {
-          jest.unmock("@budibase/pro")
-        })
-
-        it("should be able to save a row with an AI column", async () => {
-          const { rows } = await config.api.row.search(table._id!)
-          expect(rows.length).toBe(1)
-          expect(rows[0].ai).toEqual("Mock LLM Response")
-        })
-
-        it("should be able to update a row with an AI column", async () => {
-          const { rows } = await config.api.row.search(table._id!)
-          expect(rows.length).toBe(1)
-          await config.api.row.save(table._id!, {
-            product: generator.word(),
-            ...rows[0],
-          })
-          expect(rows.length).toBe(1)
-          expect(rows[0].ai).toEqual("Mock LLM Response")
-        })
-      })
-
-    describe("Formula fields", () => {
-      let table: Table
-      let otherTable: Table
-      let relatedRow: Row, mainRow: Row
-
-      beforeAll(async () => {
-        otherTable = await config.api.table.save(defaultTable())
-        table = await config.api.table.save(
-          saveTableRequest({
-            schema: {
-              links: {
-                name: "links",
-                fieldName: "links",
-                type: FieldType.LINK,
-                tableId: otherTable._id!,
-                relationshipType: RelationshipType.ONE_TO_MANY,
-              },
-              formula: {
-                name: "formula",
-                type: FieldType.FORMULA,
-                formula: "{{ links.0.name }}",
-                formulaType: FormulaType.DYNAMIC,
-              },
-            },
-          })
-        )
-
-        relatedRow = await config.api.row.save(otherTable._id!, {
-          name: generator.word(),
-          description: generator.paragraph(),
-        })
-        mainRow = await config.api.row.save(table._id!, {
-          name: generator.word(),
-          description: generator.paragraph(),
-          tableId: table._id!,
-          links: [relatedRow._id],
-        })
-      })
-
-      async function updateFormulaColumn(
-        formula: string,
-        opts?: { responseType?: FormulaResponseType; formulaType?: FormulaType }
-      ) {
-        table = await config.api.table.save({
-          ...table,
-          schema: {
-            ...table.schema,
-            formula: {
-              name: "formula",
-              type: FieldType.FORMULA,
-              formula: formula,
-              responseType: opts?.responseType,
-              formulaType: opts?.formulaType || FormulaType.DYNAMIC,
-            },
-          },
-        })
-      }
-
-      it("should be able to search for rows containing formulas", async () => {
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows.length).toBe(1)
-        expect(rows[0].links.length).toBe(1)
-        const row = rows[0]
-        expect(row.formula).toBe(relatedRow.name)
-      })
-
-      it("should coerce - number response type", async () => {
-        await updateFormulaColumn(encodeJS("return 1"), {
-          responseType: FieldType.NUMBER,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows[0].formula).toBe(1)
-      })
-
-      it("should coerce - boolean response type", async () => {
-        await updateFormulaColumn(encodeJS("return true"), {
-          responseType: FieldType.BOOLEAN,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows[0].formula).toBe(true)
-      })
-
-      it("should coerce - datetime response type", async () => {
-        await updateFormulaColumn(encodeJS("return new Date()"), {
-          responseType: FieldType.DATETIME,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(isDate(rows[0].formula)).toBe(true)
-      })
-
-      it("should coerce - datetime with invalid value", async () => {
-        await updateFormulaColumn(encodeJS("return 'a'"), {
-          responseType: FieldType.DATETIME,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows[0].formula).toBeUndefined()
-      })
-
-      it("should coerce handlebars", async () => {
-        await updateFormulaColumn("{{ add 1 1 }}", {
-          responseType: FieldType.NUMBER,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows[0].formula).toBe(2)
-      })
-
-      it("should coerce handlebars to string (default)", async () => {
-        await updateFormulaColumn("{{ add 1 1 }}", {
-          responseType: FieldType.STRING,
-        })
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows[0].formula).toBe("2")
-      })
-
-      isInternal &&
-        it("should coerce a static handlebars formula", async () => {
-          await updateFormulaColumn(encodeJS("return 1"), {
-            responseType: FieldType.NUMBER,
-            formulaType: FormulaType.STATIC,
-          })
-          // save the row to store the static value
-          await config.api.row.save(table._id!, mainRow)
-          const { rows } = await config.api.row.search(table._id!)
-          expect(rows[0].formula).toBe(1)
-        })
-    })
-
-    describe("Formula JS protection", () => {
-      it("should time out JS execution if a single cell takes too long", async () => {
-        await withEnv({ JS_PER_INVOCATION_TIMEOUT_MS: 40 }, async () => {
-          const js = encodeJS(
-            `
-              let i = 0;
-              while (true) {
-                i++;
-              }
-              return i;
-            `
-          )
-
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                text: {
-                  name: "text",
-                  type: FieldType.STRING,
+                links: {
+                  name: "links",
+                  fieldName: "links",
+                  type: FieldType.LINK,
+                  tableId: otherTable._id!,
+                  relationshipType: RelationshipType.ONE_TO_MANY,
                 },
                 formula: {
                   name: "formula",
                   type: FieldType.FORMULA,
-                  formula: js,
+                  formula: "{{ links.0.name }}",
                   formulaType: FormulaType.DYNAMIC,
                 },
               },
             })
           )
 
-          await config.api.row.save(table._id!, { text: "foo" })
-          const { rows } = await config.api.row.search(table._id!)
-          expect(rows).toHaveLength(1)
-          const row = rows[0]
-          expect(row.text).toBe("foo")
-          expect(row.formula).toBe("Timed out while executing JS")
+          relatedRow = await config.api.row.save(otherTable._id!, {
+            name: generator.word(),
+            description: generator.paragraph(),
+          })
+          mainRow = await config.api.row.save(table._id!, {
+            name: generator.word(),
+            description: generator.paragraph(),
+            tableId: table._id!,
+            links: [relatedRow._id],
+          })
         })
+
+        async function updateFormulaColumn(
+          formula: string,
+          opts?: {
+            responseType?: FormulaResponseType
+            formulaType?: FormulaType
+          }
+        ) {
+          table = await config.api.table.save({
+            ...table,
+            schema: {
+              ...table.schema,
+              formula: {
+                name: "formula",
+                type: FieldType.FORMULA,
+                formula,
+                responseType: opts?.responseType,
+                formulaType: opts?.formulaType || FormulaType.DYNAMIC,
+              },
+            },
+          })
+        }
+
+        it("should be able to search for rows containing formulas", async () => {
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows.length).toBe(1)
+          expect(rows[0].links.length).toBe(1)
+          const row = rows[0]
+          expect(row.formula).toBe(relatedRow.name)
+        })
+
+        it("should coerce - number response type", async () => {
+          await updateFormulaColumn(encodeJS("return 1"), {
+            responseType: FieldType.NUMBER,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows[0].formula).toBe(1)
+        })
+
+        it("should coerce - boolean response type", async () => {
+          await updateFormulaColumn(encodeJS("return true"), {
+            responseType: FieldType.BOOLEAN,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows[0].formula).toBe(true)
+        })
+
+        it("should coerce - datetime response type", async () => {
+          await updateFormulaColumn(encodeJS("return new Date()"), {
+            responseType: FieldType.DATETIME,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(isDate(rows[0].formula)).toBe(true)
+        })
+
+        it("should coerce - datetime with invalid value", async () => {
+          await updateFormulaColumn(encodeJS("return 'a'"), {
+            responseType: FieldType.DATETIME,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows[0].formula).toBeUndefined()
+        })
+
+        it("should coerce handlebars", async () => {
+          await updateFormulaColumn("{{ add 1 1 }}", {
+            responseType: FieldType.NUMBER,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows[0].formula).toBe(2)
+        })
+
+        it("should coerce handlebars to string (default)", async () => {
+          await updateFormulaColumn("{{ add 1 1 }}", {
+            responseType: FieldType.STRING,
+          })
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows[0].formula).toBe("2")
+        })
+
+        isInternal &&
+          it("should coerce a static handlebars formula", async () => {
+            await updateFormulaColumn(encodeJS("return 1"), {
+              responseType: FieldType.NUMBER,
+              formulaType: FormulaType.STATIC,
+            })
+            // save the row to store the static value
+            await config.api.row.save(table._id!, mainRow)
+            const { rows } = await config.api.row.search(table._id!)
+            expect(rows[0].formula).toBe(1)
+          })
       })
 
-      it("should time out JS execution if a multiple cells take too long", async () => {
-        await withEnv(
-          {
-            JS_PER_INVOCATION_TIMEOUT_MS: 40,
-            JS_PER_REQUEST_TIMEOUT_MS: 80,
-          },
-          async () => {
+      describe("Formula JS protection", () => {
+        it("should time out JS execution if a single cell takes too long", async () => {
+          await withEnv({ JS_PER_INVOCATION_TIMEOUT_MS: 40 }, async () => {
             const js = encodeJS(
               `
               let i = 0;
@@ -3402,84 +3529,237 @@ datasourceDescribe(
               })
             )
 
-            for (let i = 0; i < 10; i++) {
-              await config.api.row.save(table._id!, { text: "foo" })
-            }
+            await config.api.row.save(table._id!, { text: "foo" })
+            const { rows } = await config.api.row.search(table._id!)
+            expect(rows).toHaveLength(1)
+            const row = rows[0]
+            expect(row.text).toBe("foo")
+            expect(row.formula).toBe("Timed out while executing JS")
+          })
+        })
 
-            // Run this test 3 times to make sure that there's no cross-request
-            // pollution of the execution time tracking.
-            for (let reqs = 0; reqs < 3; reqs++) {
-              const { rows } = await config.api.row.search(table._id!)
-              expect(rows).toHaveLength(10)
+        it("should time out JS execution if a multiple cells take too long", async () => {
+          await withEnv(
+            {
+              JS_PER_INVOCATION_TIMEOUT_MS: 40,
+              JS_PER_REQUEST_TIMEOUT_MS: 80,
+            },
+            async () => {
+              const js = encodeJS(
+                `
+              let i = 0;
+              while (true) {
+                i++;
+              }
+              return i;
+            `
+              )
 
-              let i = 0
-              for (; i < 10; i++) {
-                const row = rows[i]
-                if (row.formula !== JsTimeoutError.message) {
-                  break
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    text: {
+                      name: "text",
+                      type: FieldType.STRING,
+                    },
+                    formula: {
+                      name: "formula",
+                      type: FieldType.FORMULA,
+                      formula: js,
+                      formulaType: FormulaType.DYNAMIC,
+                    },
+                  },
+                })
+              )
+
+              for (let i = 0; i < 10; i++) {
+                await config.api.row.save(table._id!, { text: "foo" })
+              }
+
+              // Run this test 3 times to make sure that there's no cross-request
+              // pollution of the execution time tracking.
+              for (let reqs = 0; reqs < 3; reqs++) {
+                const { rows } = await config.api.row.search(table._id!)
+                expect(rows).toHaveLength(10)
+
+                let i = 0
+                for (; i < 10; i++) {
+                  const row = rows[i]
+                  if (row.formula !== JsTimeoutError.message) {
+                    break
+                  }
+                }
+
+                // Given the execution times are not deterministic, we can't be sure
+                // of the exact number of rows that were executed before the timeout
+                // but it should absolutely be at least 1.
+                expect(i).toBeGreaterThan(0)
+                expect(i).toBeLessThan(5)
+
+                for (; i < 10; i++) {
+                  const row = rows[i]
+                  expect(row.text).toBe("foo")
+                  expect(row.formula).toStartWith("CPU time limit exceeded ")
                 }
               }
-
-              // Given the execution times are not deterministic, we can't be sure
-              // of the exact number of rows that were executed before the timeout
-              // but it should absolutely be at least 1.
-              expect(i).toBeGreaterThan(0)
-              expect(i).toBeLessThan(5)
-
-              for (; i < 10; i++) {
-                const row = rows[i]
-                expect(row.text).toBe("foo")
-                expect(row.formula).toStartWith("CPU time limit exceeded ")
-              }
             }
+          )
+        })
+
+        it("should not carry over context between formulas", async () => {
+          const js = encodeJS(`return $("[text]");`)
+          const table = await config.api.table.save(
+            saveTableRequest({
+              schema: {
+                text: {
+                  name: "text",
+                  type: FieldType.STRING,
+                },
+                formula: {
+                  name: "formula",
+                  type: FieldType.FORMULA,
+                  formula: js,
+                  formulaType: FormulaType.DYNAMIC,
+                },
+              },
+            })
+          )
+
+          for (let i = 0; i < 10; i++) {
+            await config.api.row.save(table._id!, { text: `foo${i}` })
           }
-        )
+
+          const { rows } = await config.api.row.search(table._id!)
+          expect(rows).toHaveLength(10)
+
+          const formulaValues = rows.map(r => r.formula)
+          expect(formulaValues).toEqual(
+            expect.arrayContaining([
+              "foo0",
+              "foo1",
+              "foo2",
+              "foo3",
+              "foo4",
+              "foo5",
+              "foo6",
+              "foo7",
+              "foo8",
+              "foo9",
+            ])
+          )
+        })
       })
 
-      it("should not carry over context between formulas", async () => {
-        const js = encodeJS(`return $("[text]");`)
-        const table = await config.api.table.save(
-          saveTableRequest({
-            schema: {
-              text: {
-                name: "text",
-                type: FieldType.STRING,
-              },
-              formula: {
-                name: "formula",
-                type: FieldType.FORMULA,
-                formula: js,
-                formulaType: FormulaType.DYNAMIC,
-              },
-            },
+      if (isInternal || isMSSQL) {
+        describe("Fields with spaces", () => {
+          let table: Table
+          let otherTable: Table
+          let relatedRow: Row
+
+          beforeAll(async () => {
+            otherTable = await config.api.table.save(defaultTable())
+            table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  links: {
+                    name: "links",
+                    fieldName: "links",
+                    type: FieldType.LINK,
+                    tableId: otherTable._id!,
+                    relationshipType: RelationshipType.ONE_TO_MANY,
+                  },
+                  "nameWithSpace ": {
+                    name: "nameWithSpace ",
+                    type: FieldType.STRING,
+                  },
+                },
+              })
+            )
+            relatedRow = await config.api.row.save(otherTable._id!, {
+              name: generator.word(),
+              description: generator.paragraph(),
+            })
+            await config.api.row.save(table._id!, {
+              "nameWithSpace ": generator.word(),
+              tableId: table._id!,
+              links: [relatedRow._id],
+            })
           })
-        )
 
-        for (let i = 0; i < 10; i++) {
-          await config.api.row.save(table._id!, { text: `foo${i}` })
-        }
+          it("Successfully returns rows that have spaces in their field names", async () => {
+            const { rows } = await config.api.row.search(table._id!)
+            expect(rows.length).toBe(1)
+            const row = rows[0]
+            expect(row["nameWithSpace "]).toBeDefined()
+          })
+        })
+      }
 
-        const { rows } = await config.api.row.search(table._id!)
-        expect(rows).toHaveLength(10)
+      if (!isInternal && !isOracle) {
+        describe("bigint ids", () => {
+          let table1: Table, table2: Table
+          let table1Name: string, table2Name: string
 
-        const formulaValues = rows.map(r => r.formula)
-        expect(formulaValues).toEqual(
-          expect.arrayContaining([
-            "foo0",
-            "foo1",
-            "foo2",
-            "foo3",
-            "foo4",
-            "foo5",
-            "foo6",
-            "foo7",
-            "foo8",
-            "foo9",
-          ])
-        )
-      })
-    })
-  }
-)
+          beforeAll(async () => {
+            table1Name = `table1-${generator.guid().substring(0, 5)}`
+            await client!.schema.createTable(table1Name, table => {
+              table.bigInteger("table1Id").primary()
+            })
 
-// todo: remove me
+            table2Name = `table2-${generator.guid().substring(0, 5)}`
+            await client!.schema.createTable(table2Name, table => {
+              table.bigInteger("table2Id").primary()
+              table
+                .bigInteger("table1Ref")
+                .references("table1Id")
+                .inTable(table1Name)
+            })
+
+            const resp = await config.api.datasource.fetchSchema({
+              datasourceId: datasource!._id!,
+            })
+
+            const tables = Object.values(resp.datasource.entities || {})
+            table1 = tables.find(t => t.name === table1Name)!
+            table2 = tables.find(t => t.name === table2Name)!
+
+            await config.api.datasource.addExistingRelationship({
+              one: {
+                tableId: table2._id!,
+                relationshipName: "one",
+                foreignKey: "table1Ref",
+              },
+              many: {
+                tableId: table1._id!,
+                relationshipName: "many",
+                primaryKey: "table1Id",
+              },
+            })
+          })
+
+          it("should be able to fetch rows with related bigint ids", async () => {
+            const row = await config.api.row.save(table1._id!, {
+              table1Id: "1",
+            })
+            await config.api.row.save(table2._id!, {
+              table2Id: "2",
+              table1Ref: row.table1Id,
+            })
+
+            let resp = await config.api.row.search(table1._id!)
+            expect(resp.rows).toHaveLength(1)
+            expect(resp.rows[0]._id).toBe("%5B'1'%5D")
+            expect(resp.rows[0].many).toHaveLength(1)
+            expect(resp.rows[0].many[0]._id).toBe("%5B'2'%5D")
+
+            resp = await config.api.row.search(table2._id!)
+            expect(resp.rows).toHaveLength(1)
+            expect(resp.rows[0]._id).toBe("%5B'2'%5D")
+            expect(resp.rows[0].one).toHaveLength(1)
+            expect(resp.rows[0].one[0]._id).toBe("%5B'1'%5D")
+          })
+        })
+      }
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/rowAction.spec.ts b/packages/server/src/api/routes/tests/rowAction.spec.ts
index 58d7509798..76046c06ea 100644
--- a/packages/server/src/api/routes/tests/rowAction.spec.ts
+++ b/packages/server/src/api/routes/tests/rowAction.spec.ts
@@ -977,63 +977,69 @@ describe("/rowsActions", () => {
   })
 })
 
-datasourceDescribe(
-  { name: "row actions (%s)", only: [DatabaseName.SQS, DatabaseName.POSTGRES] },
-  ({ config, dsProvider, isInternal }) => {
-    let datasource: Datasource | undefined
+const descriptions = datasourceDescribe({
+  only: [DatabaseName.SQS, DatabaseName.POSTGRES],
+})
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource
-    })
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "row actions ($dbName)",
+    ({ config, dsProvider, isInternal }) => {
+      let datasource: Datasource | undefined
 
-    async function getTable(): Promise<Table> {
-      if (isInternal) {
-        await config.api.application.addSampleData(config.getAppId())
-        const tables = await config.api.table.fetch()
-        return tables.find(t => t.sourceId === DEFAULT_BB_DATASOURCE_ID)!
-      } else {
-        const table = await config.api.table.save(
-          setup.structures.tableForDatasource(datasource!)
-        )
-        return table
-      }
-    }
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource
+      })
 
-    it("should delete all the row actions (and automations) for its tables when a datasource is deleted", async () => {
-      async function getRowActionsFromDb(tableId: string) {
-        return await context.doInAppContext(config.getAppId(), async () => {
-          const db = context.getAppDB()
-          const tableDoc = await db.tryGet<TableRowActions>(
-            generateRowActionsID(tableId)
+      async function getTable(): Promise<Table> {
+        if (isInternal) {
+          await config.api.application.addSampleData(config.getAppId())
+          const tables = await config.api.table.fetch()
+          return tables.find(t => t.sourceId === DEFAULT_BB_DATASOURCE_ID)!
+        } else {
+          const table = await config.api.table.save(
+            setup.structures.tableForDatasource(datasource!)
           )
-          return tableDoc
-        })
+          return table
+        }
       }
 
-      const table = await getTable()
-      const tableId = table._id!
+      it("should delete all the row actions (and automations) for its tables when a datasource is deleted", async () => {
+        async function getRowActionsFromDb(tableId: string) {
+          return await context.doInAppContext(config.getAppId(), async () => {
+            const db = context.getAppDB()
+            const tableDoc = await db.tryGet<TableRowActions>(
+              generateRowActionsID(tableId)
+            )
+            return tableDoc
+          })
+        }
 
-      await config.api.rowAction.save(tableId, {
-        name: generator.guid(),
+        const table = await getTable()
+        const tableId = table._id!
+
+        await config.api.rowAction.save(tableId, {
+          name: generator.guid(),
+        })
+        await config.api.rowAction.save(tableId, {
+          name: generator.guid(),
+        })
+
+        const { actions } = (await getRowActionsFromDb(tableId))!
+        expect(Object.entries(actions)).toHaveLength(2)
+
+        const { automations } = await config.api.automation.fetch()
+        expect(automations).toHaveLength(2)
+
+        const datasource = await config.api.datasource.get(table.sourceId)
+        await config.api.datasource.delete(datasource)
+
+        const automationsResp = await config.api.automation.fetch()
+        expect(automationsResp.automations).toHaveLength(0)
+
+        expect(await getRowActionsFromDb(tableId)).toBeUndefined()
       })
-      await config.api.rowAction.save(tableId, {
-        name: generator.guid(),
-      })
-
-      const { actions } = (await getRowActionsFromDb(tableId))!
-      expect(Object.entries(actions)).toHaveLength(2)
-
-      const { automations } = await config.api.automation.fetch()
-      expect(automations).toHaveLength(2)
-
-      const datasource = await config.api.datasource.get(table.sourceId)
-      await config.api.datasource.delete(datasource)
-
-      const automationsResp = await config.api.automation.fetch()
-      expect(automationsResp.automations).toHaveLength(0)
-
-      expect(await getRowActionsFromDb(tableId)).toBeUndefined()
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/search.spec.ts b/packages/server/src/api/routes/tests/search.spec.ts
index fe13e5311f..c3b274d5f4 100644
--- a/packages/server/src/api/routes/tests/search.spec.ts
+++ b/packages/server/src/api/routes/tests/search.spec.ts
@@ -24,6 +24,7 @@ import {
   JsonFieldSubType,
   LogicalOperator,
   RelationshipType,
+  RequiredKeys,
   Row,
   RowSearchParams,
   SearchFilters,
@@ -51,7 +52,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: async () => ({
-        initialised: true,
+        llm: {},
         run: jest.fn(() => `Mock LLM Response`),
         buildPromptFromAIOperation: jest.fn(),
       }),
@@ -59,3676 +60,4038 @@ jest.mock("@budibase/pro", () => ({
   },
 }))
 
-datasourceDescribe(
-  {
-    name: "search (%s)",
-    exclude: [DatabaseName.MONGODB],
-  },
-  ({ config, dsProvider, isInternal, isOracle, isSql }) => {
-    let datasource: Datasource | undefined
-    let client: Knex | undefined
-    let tableOrViewId: string
-    let rows: Row[]
+const descriptions = datasourceDescribe({ exclude: [DatabaseName.MONGODB] })
 
-    async function basicRelationshipTables(type: RelationshipType) {
-      const relatedTable = await createTable({
-        name: { name: "name", type: FieldType.STRING },
-      })
-      const tableId = await createTable({
-        name: { name: "name", type: FieldType.STRING },
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "search ($dbName)",
+    ({ config, dsProvider, isInternal, isOracle, isSql }) => {
+      let datasource: Datasource | undefined
+      let client: Knex | undefined
+      let tableOrViewId: string
+      let rows: Row[]
+
+      async function basicRelationshipTables(
+        type: RelationshipType,
+        opts?: {
+          tableName?: string
+          primaryColumn?: string
+          otherColumn?: string
+        }
+      ) {
+        const relatedTable = await createTable({
+          name: { name: opts?.tableName || "name", type: FieldType.STRING },
+        })
+
+        const columnName = opts?.primaryColumn || "productCat"
         //@ts-ignore - API accepts this structure, will build out rest of definition
-        productCat: {
-          type: FieldType.LINK,
-          relationshipType: type,
-          name: "productCat",
-          fieldName: "product",
-          tableId: relatedTable,
-          constraints: {
-            type: "array",
+        const tableId = await createTable({
+          name: { name: opts?.tableName || "name", type: FieldType.STRING },
+          [columnName]: {
+            type: FieldType.LINK,
+            relationshipType: type,
+            name: columnName,
+            fieldName: opts?.otherColumn || "product",
+            tableId: relatedTable,
+            constraints: {
+              type: "array",
+            },
           },
-        },
-      })
-      return {
-        relatedTable: await config.api.table.get(relatedTable),
-        tableId,
+        })
+        return {
+          relatedTable: await config.api.table.get(relatedTable),
+          tableId,
+        }
       }
-    }
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource
-      client = ds.client
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource
+        client = ds.client
 
-      config.app = await config.api.application.update(config.getAppId(), {
-        snippets: [
-          {
-            name: "WeeksAgo",
-            code: `
+        config.app = await config.api.application.update(config.getAppId(), {
+          snippets: [
+            {
+              name: "WeeksAgo",
+              code: `
               return function (weeks) {
                 const currentTime = new Date(${Date.now()});
                 currentTime.setDate(currentTime.getDate()-(7 * (weeks || 1)));
                 return currentTime.toISOString();
               }
             `,
-          },
-        ],
-      })
-    })
-
-    async function createTable(schema?: TableSchema) {
-      const table = await config.api.table.save(
-        tableForDatasource(datasource, { schema })
-      )
-      return table._id!
-    }
-
-    async function createView(tableId: string, schema?: ViewV2Schema) {
-      const view = await config.api.viewV2.create({
-        tableId: tableId,
-        name: generator.guid(),
-        schema,
-      })
-      return view.id
-    }
-
-    async function createRows(arr: Record<string, any>[]) {
-      // Shuffling to avoid false positives given a fixed order
-      for (const row of _.shuffle(arr)) {
-        await config.api.row.save(tableOrViewId, row)
-      }
-      rows = await config.api.row.fetch(tableOrViewId)
-    }
-
-    async function getTable(tableOrViewId: string): Promise<Table> {
-      if (docIds.isViewId(tableOrViewId)) {
-        const view = await config.api.viewV2.get(tableOrViewId)
-        return await config.api.table.get(view.tableId)
-      } else {
-        return await config.api.table.get(tableOrViewId)
-      }
-    }
-
-    async function assertTableExists(nameOrTable: string | Table) {
-      const name =
-        typeof nameOrTable === "string" ? nameOrTable : nameOrTable.name
-      expect(await client!.schema.hasTable(name)).toBeTrue()
-    }
-
-    async function assertTableNumRows(
-      nameOrTable: string | Table,
-      numRows: number
-    ) {
-      const name =
-        typeof nameOrTable === "string" ? nameOrTable : nameOrTable.name
-      const row = await client!.from(name).count()
-      const count = parseInt(Object.values(row[0])[0] as string)
-      expect(count).toEqual(numRows)
-    }
-
-    describe.each([true, false])("in-memory: %s", isInMemory => {
-      // We only run the in-memory tests during the SQS (isInternal) run
-      if (isInMemory && !isInternal) {
-        return
-      }
-
-      type CreateFn = (schema?: TableSchema) => Promise<string>
-      let tableOrView: [string, CreateFn][] = [["table", createTable]]
-
-      if (!isInMemory) {
-        tableOrView.push([
-          "view",
-          async (schema?: TableSchema) => {
-            const tableId = await createTable(schema)
-            const viewId = await createView(
-              tableId,
-              Object.keys(schema || {}).reduce<ViewV2Schema>(
-                (viewSchema, fieldName) => {
-                  const field = schema![fieldName]
-                  viewSchema[fieldName] = {
-                    visible: field.visible ?? true,
-                    readonly: false,
-                  }
-                  return viewSchema
-                },
-                {}
-              )
-            )
-            return viewId
-          },
-        ])
-      }
-
-      describe.each(tableOrView)("from %s", (sourceType, createTableOrView) => {
-        const isView = sourceType === "view"
-
-        class SearchAssertion {
-          constructor(private readonly query: SearchRowRequest) {}
-
-          private async performSearch(): Promise<SearchResponse<Row>> {
-            if (isInMemory) {
-              return dataFilters.search(_.cloneDeep(rows), {
-                ...this.query,
-              })
-            } else {
-              return config.api.row.search(tableOrViewId, this.query)
-            }
-          }
-
-          // We originally used _.isMatch to compare rows, but found that when
-          // comparing arrays it would return true if the source array was a subset of
-          // the target array. This would sometimes create false matches. This
-          // function is a more strict version of _.isMatch that only returns true if
-          // the source array is an exact match of the target.
-          //
-          // _.isMatch("100", "1") also returns true which is not what we want.
-          private isMatch<T extends Record<string, any>>(
-            expected: T,
-            found: T
-          ) {
-            if (!expected) {
-              throw new Error("Expected is undefined")
-            }
-            if (!found) {
-              return false
-            }
-
-            for (const key of Object.keys(expected)) {
-              if (Array.isArray(expected[key])) {
-                if (!Array.isArray(found[key])) {
-                  return false
-                }
-                if (expected[key].length !== found[key].length) {
-                  return false
-                }
-                if (!_.isMatch(found[key], expected[key])) {
-                  return false
-                }
-              } else if (typeof expected[key] === "object") {
-                if (!this.isMatch(expected[key], found[key])) {
-                  return false
-                }
-              } else {
-                if (expected[key] !== found[key]) {
-                  return false
-                }
-              }
-            }
-            return true
-          }
-
-          // This function exists to ensure that the same row is not matched twice.
-          // When a row gets matched, we make sure to remove it from the list of rows
-          // we're matching against.
-          private popRow<T extends { [key: string]: any }>(
-            expectedRow: T,
-            foundRows: T[]
-          ): NonNullable<T> {
-            const row = foundRows.find(row => this.isMatch(expectedRow, row))
-            if (!row) {
-              const fields = Object.keys(expectedRow)
-              // To make the error message more readable, we only include the fields
-              // that are present in the expected row.
-              const searchedObjects = foundRows.map(row => _.pick(row, fields))
-              throw new Error(
-                `Failed to find row:\n\n${JSON.stringify(
-                  expectedRow,
-                  null,
-                  2
-                )}\n\nin\n\n${JSON.stringify(searchedObjects, null, 2)}`
-              )
-            }
-
-            foundRows.splice(foundRows.indexOf(row), 1)
-            return row
-          }
-
-          // Asserts that the query returns rows matching exactly the set of rows
-          // passed in. The order of the rows matters. Rows returned in an order
-          // different to the one passed in will cause the assertion to fail.  Extra
-          // rows returned by the query will also cause the assertion to fail.
-          async toMatchExactly(expectedRows: any[]) {
-            const response = await this.performSearch()
-            const cloned = cloneDeep(response)
-            const foundRows = response.rows
-
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect(foundRows).toHaveLength(expectedRows.length)
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect([...foundRows]).toEqual(
-              expectedRows.map((expectedRow: any) =>
-                expect.objectContaining(this.popRow(expectedRow, foundRows))
-              )
-            )
-            return cloned
-          }
-
-          // Asserts that the query returns rows matching exactly the set of rows
-          // passed in. The order of the rows is not important, but extra rows will
-          // cause the assertion to fail.
-          async toContainExactly(expectedRows: any[]) {
-            const response = await this.performSearch()
-            const cloned = cloneDeep(response)
-            const foundRows = response.rows
-
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect(foundRows).toHaveLength(expectedRows.length)
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect([...foundRows]).toEqual(
-              expect.arrayContaining(
-                expectedRows.map((expectedRow: any) =>
-                  expect.objectContaining(this.popRow(expectedRow, foundRows))
-                )
-              )
-            )
-            return cloned
-          }
-
-          // Asserts that the query returns some property values - this cannot be used
-          // to check row values, however this shouldn't be important for checking properties
-          // typing for this has to be any, Jest doesn't expose types for matchers like expect.any(...)
-          async toMatch(properties: Record<string, any>) {
-            const response = await this.performSearch()
-            const cloned = cloneDeep(response)
-            const keys = Object.keys(properties) as Array<
-              keyof SearchResponse<Row>
-            >
-            for (let key of keys) {
-              // eslint-disable-next-line jest/no-standalone-expect
-              expect(response[key]).toBeDefined()
-              if (properties[key]) {
-                // eslint-disable-next-line jest/no-standalone-expect
-                expect(response[key]).toEqual(properties[key])
-              }
-            }
-            return cloned
-          }
-
-          // Asserts that the query doesn't return a property, e.g. pagination parameters.
-          async toNotHaveProperty(properties: (keyof SearchResponse<Row>)[]) {
-            const response = await this.performSearch()
-            const cloned = cloneDeep(response)
-            for (let property of properties) {
-              // eslint-disable-next-line jest/no-standalone-expect
-              expect(response[property]).toBeUndefined()
-            }
-            return cloned
-          }
-
-          // Asserts that the query returns rows matching the set of rows passed in.
-          // The order of the rows is not important. Extra rows will not cause the
-          // assertion to fail.
-          async toContain(expectedRows: any[]) {
-            const response = await this.performSearch()
-            const cloned = cloneDeep(response)
-            const foundRows = response.rows
-
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect([...foundRows]).toEqual(
-              expect.arrayContaining(
-                expectedRows.map((expectedRow: any) =>
-                  expect.objectContaining(this.popRow(expectedRow, foundRows))
-                )
-              )
-            )
-            return cloned
-          }
-
-          async toFindNothing() {
-            await this.toContainExactly([])
-          }
-
-          async toHaveLength(length: number) {
-            const { rows: foundRows } = await this.performSearch()
-
-            // eslint-disable-next-line jest/no-standalone-expect
-            expect(foundRows).toHaveLength(length)
-          }
-        }
-
-        function expectSearch(query: SearchRowRequest) {
-          return new SearchAssertion(query)
-        }
-
-        function expectQuery(query: SearchFilters) {
-          return expectSearch({ query })
-        }
-
-        describe("boolean", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              isTrue: { name: "isTrue", type: FieldType.BOOLEAN },
-            })
-            await createRows([{ isTrue: true }, { isTrue: false }])
-          })
-
-          describe("equal", () => {
-            it("successfully finds true row", async () => {
-              await expectQuery({ equal: { isTrue: true } }).toMatchExactly([
-                { isTrue: true },
-              ])
-            })
-
-            it("successfully finds false row", async () => {
-              await expectQuery({ equal: { isTrue: false } }).toMatchExactly([
-                { isTrue: false },
-              ])
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds false row", async () => {
-              await expectQuery({
-                notEqual: { isTrue: true },
-              }).toContainExactly([{ isTrue: false }])
-            })
-
-            it("successfully finds true row", async () => {
-              await expectQuery({
-                notEqual: { isTrue: false },
-              }).toContainExactly([{ isTrue: true }])
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds true row", async () => {
-              await expectQuery({ oneOf: { isTrue: [true] } }).toContainExactly(
-                [{ isTrue: true }]
-              )
-            })
-
-            it("successfully finds false row", async () => {
-              await expectQuery({
-                oneOf: { isTrue: [false] },
-              }).toContainExactly([{ isTrue: false }])
-            })
-          })
-
-          describe("sort", () => {
-            it("sorts ascending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "isTrue",
-                sortOrder: SortOrder.ASCENDING,
-              }).toMatchExactly([{ isTrue: false }, { isTrue: true }])
-            })
-
-            it("sorts descending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "isTrue",
-                sortOrder: SortOrder.DESCENDING,
-              }).toMatchExactly([{ isTrue: true }, { isTrue: false }])
-            })
-          })
+            },
+          ],
         })
+      })
 
-        !isInMemory &&
-          describe("bindings", () => {
-            let globalUsers: any = []
+      async function createTable(schema?: TableSchema) {
+        const table = await config.api.table.save(
+          tableForDatasource(datasource, { schema })
+        )
+        return table._id!
+      }
 
-            const serverTime = new Date()
+      async function createView(tableId: string, schema?: ViewV2Schema) {
+        const view = await config.api.viewV2.create({
+          tableId: tableId,
+          name: generator.guid(),
+          schema,
+        })
+        return view.id
+      }
 
-            // In MariaDB and MySQL we only store dates to second precision, so we need
-            // to remove milliseconds from the server time to ensure searches work as
-            // expected.
-            serverTime.setMilliseconds(0)
+      async function createRows(arr: Record<string, any>[]) {
+        // Shuffling to avoid false positives given a fixed order
+        for (const row of _.shuffle(arr)) {
+          await config.api.row.save(tableOrViewId, row)
+        }
+        rows = await config.api.row.fetch(tableOrViewId)
+      }
 
-            const future = new Date(
-              serverTime.getTime() + 1000 * 60 * 60 * 24 * 30
-            )
+      async function getTable(tableOrViewId: string): Promise<Table> {
+        if (docIds.isViewId(tableOrViewId)) {
+          const view = await config.api.viewV2.get(tableOrViewId)
+          return await config.api.table.get(view.tableId)
+        } else {
+          return await config.api.table.get(tableOrViewId)
+        }
+      }
 
-            const rows = (currentUser: User) => {
-              return [
-                { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-                { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-                {
-                  name: currentUser.firstName,
-                  appointment: future.toISOString(),
-                },
-                { name: "serverDate", appointment: serverTime.toISOString() },
-                {
-                  name: "single user, session user",
-                  single_user: currentUser,
-                },
-                {
-                  name: "single user",
-                  single_user: globalUsers[0],
-                },
-                {
-                  name: "deprecated single user, session user",
-                  deprecated_single_user: [currentUser],
-                },
-                {
-                  name: "deprecated single user",
-                  deprecated_single_user: [globalUsers[0]],
-                },
-                {
-                  name: "multi user",
-                  multi_user: globalUsers,
-                },
-                {
-                  name: "multi user with session user",
-                  multi_user: [...globalUsers, currentUser],
-                },
-                {
-                  name: "deprecated multi user",
-                  deprecated_multi_user: globalUsers,
-                },
-                {
-                  name: "deprecated multi user with session user",
-                  deprecated_multi_user: [...globalUsers, currentUser],
-                },
-              ]
+      async function assertTableExists(nameOrTable: string | Table) {
+        const name =
+          typeof nameOrTable === "string" ? nameOrTable : nameOrTable.name
+        expect(await client!.schema.hasTable(name)).toBeTrue()
+      }
+
+      async function assertTableNumRows(
+        nameOrTable: string | Table,
+        numRows: number
+      ) {
+        const name =
+          typeof nameOrTable === "string" ? nameOrTable : nameOrTable.name
+        const row = await client!.from(name).count()
+        const count = parseInt(Object.values(row[0])[0] as string)
+        expect(count).toEqual(numRows)
+      }
+
+      describe.each([true, false])("in-memory: %s", isInMemory => {
+        // We only run the in-memory tests during the SQS (isInternal) run
+        if (isInMemory && !isInternal) {
+          return
+        }
+
+        type CreateFn = (schema?: TableSchema) => Promise<string>
+        let tableOrView: [string, CreateFn][] = [["table", createTable]]
+
+        if (!isInMemory) {
+          tableOrView.push([
+            "view",
+            async (schema?: TableSchema) => {
+              const tableId = await createTable(schema)
+              const viewId = await createView(
+                tableId,
+                Object.keys(schema || {}).reduce<ViewV2Schema>(
+                  (viewSchema, fieldName) => {
+                    const field = schema![fieldName]
+                    viewSchema[fieldName] = {
+                      visible: field.visible ?? true,
+                      readonly: false,
+                    }
+                    return viewSchema
+                  },
+                  {}
+                )
+              )
+              return viewId
+            },
+          ])
+        }
+
+        describe.each(tableOrView)(
+          "from %s",
+          (sourceType, createTableOrView) => {
+            const isView = sourceType === "view"
+
+            class SearchAssertion {
+              constructor(private readonly query: SearchRowRequest) {}
+
+              private async performSearch(): Promise<SearchResponse<Row>> {
+                if (isInMemory) {
+                  const inMemoryQuery: RequiredKeys<
+                    Omit<RowSearchParams, "tableId">
+                  > = {
+                    sort: this.query.sort ?? undefined,
+                    query: { ...this.query.query },
+                    paginate: this.query.paginate,
+                    bookmark: this.query.bookmark ?? undefined,
+                    limit: this.query.limit,
+                    sortOrder: this.query.sortOrder,
+                    sortType: this.query.sortType ?? undefined,
+                    version: this.query.version,
+                    disableEscaping: this.query.disableEscaping,
+                    countRows: this.query.countRows,
+                    viewId: undefined,
+                    fields: undefined,
+                    indexer: undefined,
+                    rows: undefined,
+                  }
+                  return dataFilters.search(_.cloneDeep(rows), inMemoryQuery)
+                } else {
+                  return config.api.row.search(tableOrViewId, this.query)
+                }
+              }
+
+              // We originally used _.isMatch to compare rows, but found that when
+              // comparing arrays it would return true if the source array was a subset of
+              // the target array. This would sometimes create false matches. This
+              // function is a more strict version of _.isMatch that only returns true if
+              // the source array is an exact match of the target.
+              //
+              // _.isMatch("100", "1") also returns true which is not what we want.
+              private isMatch<T extends Record<string, any>>(
+                expected: T,
+                found: T
+              ) {
+                if (!expected) {
+                  throw new Error("Expected is undefined")
+                }
+                if (!found) {
+                  return false
+                }
+
+                for (const key of Object.keys(expected)) {
+                  if (Array.isArray(expected[key])) {
+                    if (!Array.isArray(found[key])) {
+                      return false
+                    }
+                    if (expected[key].length !== found[key].length) {
+                      return false
+                    }
+                    if (!_.isMatch(found[key], expected[key])) {
+                      return false
+                    }
+                  } else if (typeof expected[key] === "object") {
+                    if (!this.isMatch(expected[key], found[key])) {
+                      return false
+                    }
+                  } else {
+                    if (expected[key] !== found[key]) {
+                      return false
+                    }
+                  }
+                }
+                return true
+              }
+
+              // This function exists to ensure that the same row is not matched twice.
+              // When a row gets matched, we make sure to remove it from the list of rows
+              // we're matching against.
+              private popRow<T extends { [key: string]: any }>(
+                expectedRow: T,
+                foundRows: T[]
+              ): NonNullable<T> {
+                const row = foundRows.find(row =>
+                  this.isMatch(expectedRow, row)
+                )
+                if (!row) {
+                  const fields = Object.keys(expectedRow)
+                  // To make the error message more readable, we only include the fields
+                  // that are present in the expected row.
+                  const searchedObjects = foundRows.map(row =>
+                    _.pick(row, fields)
+                  )
+                  throw new Error(
+                    `Failed to find row:\n\n${JSON.stringify(
+                      expectedRow,
+                      null,
+                      2
+                    )}\n\nin\n\n${JSON.stringify(searchedObjects, null, 2)}`
+                  )
+                }
+
+                foundRows.splice(foundRows.indexOf(row), 1)
+                return row
+              }
+
+              // Asserts that the query returns rows matching exactly the set of rows
+              // passed in. The order of the rows matters. Rows returned in an order
+              // different to the one passed in will cause the assertion to fail.  Extra
+              // rows returned by the query will also cause the assertion to fail.
+              async toMatchExactly(expectedRows: any[]) {
+                const response = await this.performSearch()
+                const cloned = cloneDeep(response)
+                const foundRows = response.rows
+
+                expect(foundRows).toHaveLength(expectedRows.length)
+                expect([...foundRows]).toEqual(
+                  expectedRows.map((expectedRow: any) =>
+                    expect.objectContaining(this.popRow(expectedRow, foundRows))
+                  )
+                )
+                return cloned
+              }
+
+              // Asserts that the query returns rows matching exactly the set of rows
+              // passed in. The order of the rows is not important, but extra rows will
+              // cause the assertion to fail.
+              async toContainExactly(expectedRows: any[]) {
+                const response = await this.performSearch()
+                const cloned = cloneDeep(response)
+                const foundRows = response.rows
+
+                expect(foundRows).toHaveLength(expectedRows.length)
+                expect([...foundRows]).toEqual(
+                  expect.arrayContaining(
+                    expectedRows.map((expectedRow: any) =>
+                      expect.objectContaining(
+                        this.popRow(expectedRow, foundRows)
+                      )
+                    )
+                  )
+                )
+                return cloned
+              }
+
+              // Asserts that the query returns some property values - this cannot be used
+              // to check row values, however this shouldn't be important for checking properties
+              // typing for this has to be any, Jest doesn't expose types for matchers like expect.any(...)
+              async toMatch(properties: Record<string, any>) {
+                const response = await this.performSearch()
+                const cloned = cloneDeep(response)
+                const keys = Object.keys(properties) as Array<
+                  keyof SearchResponse<Row>
+                >
+                for (let key of keys) {
+                  expect(response[key]).toBeDefined()
+                  if (properties[key]) {
+                    expect(response[key]).toEqual(properties[key])
+                  }
+                }
+                return cloned
+              }
+
+              // Asserts that the query doesn't return a property, e.g. pagination parameters.
+              async toNotHaveProperty(
+                properties: (keyof SearchResponse<Row>)[]
+              ) {
+                const response = await this.performSearch()
+                const cloned = cloneDeep(response)
+                for (let property of properties) {
+                  expect(response[property]).toBeUndefined()
+                }
+                return cloned
+              }
+
+              // Asserts that the query returns rows matching the set of rows passed in.
+              // The order of the rows is not important. Extra rows will not cause the
+              // assertion to fail.
+              async toContain(expectedRows: any[]) {
+                const response = await this.performSearch()
+                const cloned = cloneDeep(response)
+                const foundRows = response.rows
+
+                expect([...foundRows]).toEqual(
+                  expect.arrayContaining(
+                    expectedRows.map((expectedRow: any) =>
+                      expect.objectContaining(
+                        this.popRow(expectedRow, foundRows)
+                      )
+                    )
+                  )
+                )
+                return cloned
+              }
+
+              async toFindNothing() {
+                await this.toContainExactly([])
+              }
+
+              async toHaveLength(length: number) {
+                const { rows: foundRows } = await this.performSearch()
+
+                expect(foundRows).toHaveLength(length)
+              }
             }
 
-            beforeAll(async () => {
-              // Set up some global users
-              globalUsers = await Promise.all(
-                Array(2)
-                  .fill(0)
-                  .map(async () => {
-                    const globalUser = await config.globalUser()
-                    const userMedataId = globalUser._id
-                      ? dbCore.generateUserMetadataID(globalUser._id)
-                      : null
-                    return {
-                      _id: globalUser._id,
-                      _meta: userMedataId,
-                    }
-                  })
-              )
+            function expectSearch(query: SearchRowRequest) {
+              return new SearchAssertion(query)
+            }
 
-              tableOrViewId = await createTableOrView({
-                name: { name: "name", type: FieldType.STRING },
-                appointment: { name: "appointment", type: FieldType.DATETIME },
-                single_user: {
-                  name: "single_user",
-                  type: FieldType.BB_REFERENCE_SINGLE,
-                  subtype: BBReferenceFieldSubType.USER,
-                },
-                deprecated_single_user: {
-                  name: "deprecated_single_user",
-                  type: FieldType.BB_REFERENCE,
-                  subtype: BBReferenceFieldSubType.USER,
-                },
-                multi_user: {
-                  name: "multi_user",
-                  type: FieldType.BB_REFERENCE,
-                  subtype: BBReferenceFieldSubType.USER,
-                  constraints: {
-                    type: "array",
-                  },
-                },
-                deprecated_multi_user: {
-                  name: "deprecated_multi_user",
-                  type: FieldType.BB_REFERENCE,
-                  subtype: BBReferenceFieldSubType.USERS,
-                  constraints: {
-                    type: "array",
-                  },
-                },
-              })
-              await createRows(rows(config.getUser()))
-            })
+            function expectQuery(query: SearchFilters) {
+              return expectSearch({ query })
+            }
 
-            // !! Current User is auto generated per run
-            it("should return all rows matching the session user firstname", async () => {
-              await expectQuery({
-                equal: { name: "{{ [user].firstName }}" },
-              }).toContainExactly([
-                {
-                  name: config.getUser().firstName,
-                  appointment: future.toISOString(),
-                },
-              ])
-            })
-
-            it("should return all rows matching the session user firstname when logical operator used", async () => {
-              await expectQuery({
-                $and: {
-                  conditions: [{ equal: { name: "{{ [user].firstName }}" } }],
-                },
-              }).toContainExactly([
-                {
-                  name: config.getUser().firstName,
-                  appointment: future.toISOString(),
-                },
-              ])
-            })
-
-            it("should parse the date binding and return all rows after the resolved value", async () => {
-              await tk.withFreeze(serverTime, async () => {
-                await expectQuery({
-                  range: {
-                    appointment: {
-                      low: "{{ [now] }}",
-                      high: "9999-00-00T00:00:00.000Z",
-                    },
-                  },
-                }).toContainExactly([
-                  {
-                    name: config.getUser().firstName,
-                    appointment: future.toISOString(),
-                  },
-                  { name: "serverDate", appointment: serverTime.toISOString() },
-                ])
-              })
-            })
-
-            it("should parse the date binding and return all rows before the resolved value", async () => {
-              await expectQuery({
-                range: {
-                  appointment: {
-                    low: "0000-00-00T00:00:00.000Z",
-                    high: "{{ [now] }}",
-                  },
-                },
-              }).toContainExactly([
-                { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-                { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-                { name: "serverDate", appointment: serverTime.toISOString() },
-              ])
-            })
-
-            it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
-              const jsBinding = "return snippets.WeeksAgo();"
-              const encodedBinding = encodeJSBinding(jsBinding)
-
-              await expectQuery({
-                range: {
-                  appointment: {
-                    low: "0000-00-00T00:00:00.000Z",
-                    high: encodedBinding,
-                  },
-                },
-              }).toContainExactly([
-                { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-                { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-              ])
-            })
-
-            it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
-              const jsBinding = `const currentTime = new Date(${Date.now()})\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();`
-              const encodedBinding = encodeJSBinding(jsBinding)
-
-              await expectQuery({
-                range: {
-                  appointment: {
-                    low: "0000-00-00T00:00:00.000Z",
-                    high: encodedBinding,
-                  },
-                },
-              }).toContainExactly([
-                { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
-                { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
-              ])
-            })
-
-            it("should match a single user row by the session user id", async () => {
-              await expectQuery({
-                equal: { single_user: "{{ [user]._id }}" },
-              }).toContainExactly([
-                {
-                  name: "single user, session user",
-                  single_user: { _id: config.getUser()._id },
-                },
-              ])
-            })
-
-            it("should match a deprecated single user row by the session user id", async () => {
-              await expectQuery({
-                equal: { deprecated_single_user: "{{ [user]._id }}" },
-              }).toContainExactly([
-                {
-                  name: "deprecated single user, session user",
-                  deprecated_single_user: [{ _id: config.getUser()._id }],
-                },
-              ])
-            })
-
-            it("should match the session user id in a multi user field", async () => {
-              const allUsers = [...globalUsers, config.getUser()].map(
-                (user: any) => {
-                  return { _id: user._id }
-                }
-              )
-
-              await expectQuery({
-                contains: { multi_user: ["{{ [user]._id }}"] },
-              }).toContainExactly([
-                {
-                  name: "multi user with session user",
-                  multi_user: allUsers,
-                },
-              ])
-            })
-
-            it("should match the session user id in a deprecated multi user field", async () => {
-              const allUsers = [...globalUsers, config.getUser()].map(
-                (user: any) => {
-                  return { _id: user._id }
-                }
-              )
-
-              await expectQuery({
-                contains: { deprecated_multi_user: ["{{ [user]._id }}"] },
-              }).toContainExactly([
-                {
-                  name: "deprecated multi user with session user",
-                  deprecated_multi_user: allUsers,
-                },
-              ])
-            })
-
-            it("should not match the session user id in a multi user field", async () => {
-              await expectQuery({
-                notContains: { multi_user: ["{{ [user]._id }}"] },
-                notEmpty: { multi_user: true },
-              }).toContainExactly([
-                {
-                  name: "multi user",
-                  multi_user: globalUsers.map((user: any) => {
-                    return { _id: user._id }
-                  }),
-                },
-              ])
-            })
-
-            it("should not match the session user id in a deprecated multi user field", async () => {
-              await expectQuery({
-                notContains: { deprecated_multi_user: ["{{ [user]._id }}"] },
-                notEmpty: { deprecated_multi_user: true },
-              }).toContainExactly([
-                {
-                  name: "deprecated multi user",
-                  deprecated_multi_user: globalUsers.map((user: any) => {
-                    return { _id: user._id }
-                  }),
-                },
-              ])
-            })
-
-            it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
-              await expectQuery({
-                oneOf: {
-                  single_user: [
-                    "{{ default [user]._id '_empty_' }}",
-                    globalUsers[0]._id,
-                  ],
-                },
-              }).toContainExactly([
-                {
-                  name: "single user, session user",
-                  single_user: { _id: config.getUser()._id },
-                },
-                {
-                  name: "single user",
-                  single_user: { _id: globalUsers[0]._id },
-                },
-              ])
-            })
-
-            it("should match the session user id and a user table row id using helpers, user binding and a static user id. (deprecated single user)", async () => {
-              await expectQuery({
-                oneOf: {
-                  deprecated_single_user: [
-                    "{{ default [user]._id '_empty_' }}",
-                    globalUsers[0]._id,
-                  ],
-                },
-              }).toContainExactly([
-                {
-                  name: "deprecated single user, session user",
-                  deprecated_single_user: [{ _id: config.getUser()._id }],
-                },
-                {
-                  name: "deprecated single user",
-                  deprecated_single_user: [{ _id: globalUsers[0]._id }],
-                },
-              ])
-            })
-
-            it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
-              await expectQuery({
-                oneOf: {
-                  single_user: [
-                    "{{ default [user]._idx '_empty_' }}",
-                    globalUsers[0]._id,
-                  ],
-                },
-              }).toContainExactly([
-                {
-                  name: "single user",
-                  single_user: { _id: globalUsers[0]._id },
-                },
-              ])
-            })
-
-            it("should resolve 'default' helper to '_empty_' when binding resolves to nothing (deprecated single user)", async () => {
-              await expectQuery({
-                oneOf: {
-                  deprecated_single_user: [
-                    "{{ default [user]._idx '_empty_' }}",
-                    globalUsers[0]._id,
-                  ],
-                },
-              }).toContainExactly([
-                {
-                  name: "deprecated single user",
-                  deprecated_single_user: [{ _id: globalUsers[0]._id }],
-                },
-              ])
-            })
-          })
-
-        const stringTypes = [FieldType.STRING, FieldType.LONGFORM] as const
-        describe.each(stringTypes)("%s", type => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              name: { name: "name", type },
-            })
-            await createRows([{ name: "foo" }, { name: "bar" }])
-          })
-
-          describe("misc", () => {
-            it("should return all if no query is passed", async () => {
-              await expectSearch({} as RowSearchParams).toContainExactly([
-                { name: "foo" },
-                { name: "bar" },
-              ])
-            })
-
-            it("should return all if empty query is passed", async () => {
-              await expectQuery({}).toContainExactly([
-                { name: "foo" },
-                { name: "bar" },
-              ])
-            })
-
-            it("should return all if onEmptyFilter is RETURN_ALL", async () => {
-              await expectQuery({
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            // onEmptyFilter cannot be sent to view searches
-            !isView &&
-              it("should return nothing if onEmptyFilter is RETURN_NONE", async () => {
-                await expectQuery({
-                  onEmptyFilter: EmptyFilterOption.RETURN_NONE,
-                }).toFindNothing()
+            describe("boolean", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  isTrue: { name: "isTrue", type: FieldType.BOOLEAN },
+                })
+                await createRows([{ isTrue: true }, { isTrue: false }])
               })
 
-            it("should respect limit", async () => {
-              await expectSearch({
-                limit: 1,
-                paginate: true,
-                query: {},
-              }).toHaveLength(1)
-            })
-          })
-
-          describe("equal", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ equal: { name: "foo" } }).toContainExactly([
-                { name: "foo" },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ equal: { name: "none" } }).toFindNothing()
-            })
-
-            it("works as an or condition", async () => {
-              await expectQuery({
-                allOr: true,
-                equal: { name: "foo" },
-                oneOf: { name: ["bar"] },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            it("can have multiple values for same column", async () => {
-              await expectQuery({
-                allOr: true,
-                equal: { "1:name": "foo", "2:name": "bar" },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ notEqual: { name: "foo" } }).toContainExactly(
-                [{ name: "bar" }]
-              )
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ notEqual: { name: "bar" } }).toContainExactly(
-                [{ name: "foo" }]
-              )
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ oneOf: { name: ["foo"] } }).toContainExactly([
-                { name: "foo" },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ oneOf: { name: ["none"] } }).toFindNothing()
-            })
-
-            it("can have multiple values for same column", async () => {
-              await expectQuery({
-                oneOf: {
-                  name: ["foo", "bar"],
-                },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            it("splits comma separated strings", async () => {
-              await expectQuery({
-                oneOf: {
-                  // @ts-ignore
-                  name: "foo,bar",
-                },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            it("trims whitespace", async () => {
-              await expectQuery({
-                oneOf: {
-                  // @ts-ignore
-                  name: "foo, bar",
-                },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            it("empty arrays returns all when onEmptyFilter is set to return 'all'", async () => {
-              await expectQuery({
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-                oneOf: { name: [] },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            // onEmptyFilter cannot be sent to view searches
-            !isView &&
-              it("empty arrays returns all when onEmptyFilter is set to return 'none'", async () => {
-                await expectQuery({
-                  onEmptyFilter: EmptyFilterOption.RETURN_NONE,
-                  oneOf: { name: [] },
-                }).toContainExactly([])
-              })
-          })
-
-          describe("fuzzy", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ fuzzy: { name: "oo" } }).toContainExactly([
-                { name: "foo" },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ fuzzy: { name: "none" } }).toFindNothing()
-            })
-          })
-
-          describe("string", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ string: { name: "fo" } }).toContainExactly([
-                { name: "foo" },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ string: { name: "none" } }).toFindNothing()
-            })
-
-            it("is case-insensitive", async () => {
-              await expectQuery({ string: { name: "FO" } }).toContainExactly([
-                { name: "foo" },
-              ])
-            })
-          })
-
-          describe("range", () => {
-            it("successfully finds multiple rows", async () => {
-              await expectQuery({
-                range: { name: { low: "a", high: "z" } },
-              }).toContainExactly([{ name: "bar" }, { name: "foo" }])
-            })
-
-            it("successfully finds a row with a high bound", async () => {
-              await expectQuery({
-                range: { name: { low: "a", high: "c" } },
-              }).toContainExactly([{ name: "bar" }])
-            })
-
-            it("successfully finds a row with a low bound", async () => {
-              await expectQuery({
-                range: { name: { low: "f", high: "z" } },
-              }).toContainExactly([{ name: "foo" }])
-            })
-
-            it("successfully finds no rows", async () => {
-              await expectQuery({
-                range: { name: { low: "g", high: "h" } },
-              }).toFindNothing()
-            })
-
-            it("ignores low if it's an empty object", async () => {
-              await expectQuery({
-                // @ts-ignore
-                range: { name: { low: {}, high: "z" } },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            it("ignores high if it's an empty object", async () => {
-              await expectQuery({
-                // @ts-ignore
-                range: { name: { low: "a", high: {} } },
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-          })
-
-          describe("empty", () => {
-            it("finds no empty rows", async () => {
-              await expectQuery({ empty: { name: null } }).toFindNothing()
-            })
-
-            it("should not be affected by when filter empty behaviour", async () => {
-              await expectQuery({
-                empty: { name: null },
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              }).toFindNothing()
-            })
-          })
-
-          describe("notEmpty", () => {
-            it("finds all non-empty rows", async () => {
-              await expectQuery({ notEmpty: { name: null } }).toContainExactly([
-                { name: "foo" },
-                { name: "bar" },
-              ])
-            })
-
-            it("should not be affected by when filter empty behaviour", async () => {
-              await expectQuery({
-                notEmpty: { name: null },
-                onEmptyFilter: EmptyFilterOption.RETURN_NONE,
-              }).toContainExactly([{ name: "foo" }, { name: "bar" }])
-            })
-          })
-
-          describe("sort", () => {
-            it("sorts ascending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "name",
-                sortOrder: SortOrder.ASCENDING,
-              }).toMatchExactly([{ name: "bar" }, { name: "foo" }])
-            })
-
-            it("sorts descending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "name",
-                sortOrder: SortOrder.DESCENDING,
-              }).toMatchExactly([{ name: "foo" }, { name: "bar" }])
-            })
-
-            describe("sortType STRING", () => {
-              it("sorts ascending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "name",
-                  sortType: SortType.STRING,
-                  sortOrder: SortOrder.ASCENDING,
-                }).toMatchExactly([{ name: "bar" }, { name: "foo" }])
-              })
-
-              it("sorts descending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "name",
-                  sortType: SortType.STRING,
-                  sortOrder: SortOrder.DESCENDING,
-                }).toMatchExactly([{ name: "foo" }, { name: "bar" }])
-              })
-            })
-
-            !isInternal &&
-              !isInMemory &&
-              // This test was added because we automatically add in a sort by the
-              // primary key, and we used to do this unconditionally which caused
-              // problems because it was possible for the primary key to appear twice
-              // in the resulting SQL ORDER BY clause, resulting in an SQL error.
-              // We now check first to make sure that the primary key isn't already
-              // in the sort before adding it.
-              describe("sort on primary key", () => {
-                beforeAll(async () => {
-                  const tableName = structures.uuid().substring(0, 10)
-                  await client!.schema.createTable(tableName, t => {
-                    t.string("name").primary()
-                  })
-                  const resp = await config.api.datasource.fetchSchema({
-                    datasourceId: datasource!._id!,
-                  })
-
-                  tableOrViewId = resp.datasource.entities![tableName]._id!
-
-                  await createRows([{ name: "foo" }, { name: "bar" }])
+              describe("equal", () => {
+                it("successfully finds true row", async () => {
+                  await expectQuery({ equal: { isTrue: true } }).toMatchExactly(
+                    [{ isTrue: true }]
+                  )
                 })
 
-                it("should be able to sort by a primary key column ascending", async () =>
-                  expectSearch({
-                    query: {},
-                    sort: "name",
-                    sortOrder: SortOrder.ASCENDING,
-                  }).toMatchExactly([{ name: "bar" }, { name: "foo" }]))
-
-                it("should be able to sort by a primary key column descending", async () =>
-                  expectSearch({
-                    query: {},
-                    sort: "name",
-                    sortOrder: SortOrder.DESCENDING,
-                  }).toMatchExactly([{ name: "foo" }, { name: "bar" }]))
-              })
-          })
-        })
-
-        describe("numbers", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              age: { name: "age", type: FieldType.NUMBER },
-            })
-            await createRows([{ age: 1 }, { age: 10 }])
-          })
-
-          describe("equal", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ equal: { age: 1 } }).toContainExactly([
-                { age: 1 },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ equal: { age: 2 } }).toFindNothing()
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ notEqual: { age: 1 } }).toContainExactly([
-                { age: 10 },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ notEqual: { age: 10 } }).toContainExactly([
-                { age: 1 },
-              ])
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ oneOf: { age: [1] } }).toContainExactly([
-                { age: 1 },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ oneOf: { age: [2] } }).toFindNothing()
-            })
-
-            it("can convert from a string", async () => {
-              await expectQuery({
-                oneOf: {
-                  // @ts-ignore
-                  age: "1",
-                },
-              }).toContainExactly([{ age: 1 }])
-            })
-
-            it("can find multiple values for same column", async () => {
-              await expectQuery({
-                oneOf: {
-                  // @ts-ignore
-                  age: "1,10",
-                },
-              }).toContainExactly([{ age: 1 }, { age: 10 }])
-            })
-          })
-
-          describe("range", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                range: { age: { low: 1, high: 5 } },
-              }).toContainExactly([{ age: 1 }])
-            })
-
-            it("successfully finds multiple rows", async () => {
-              await expectQuery({
-                range: { age: { low: 1, high: 10 } },
-              }).toContainExactly([{ age: 1 }, { age: 10 }])
-            })
-
-            it("successfully finds a row with a high bound", async () => {
-              await expectQuery({
-                range: { age: { low: 5, high: 10 } },
-              }).toContainExactly([{ age: 10 }])
-            })
-
-            it("successfully finds no rows", async () => {
-              await expectQuery({
-                range: { age: { low: 5, high: 9 } },
-              }).toFindNothing()
-            })
-
-            it("greater than equal to", async () => {
-              await expectQuery({
-                range: {
-                  age: { low: 10, high: Number.MAX_SAFE_INTEGER },
-                },
-              }).toContainExactly([{ age: 10 }])
-            })
-
-            it("greater than", async () => {
-              await expectQuery({
-                range: {
-                  age: { low: 5, high: Number.MAX_SAFE_INTEGER },
-                },
-              }).toContainExactly([{ age: 10 }])
-            })
-
-            it("less than equal to", async () => {
-              await expectQuery({
-                range: {
-                  age: { high: 1, low: Number.MIN_SAFE_INTEGER },
-                },
-              }).toContainExactly([{ age: 1 }])
-            })
-
-            it("less than", async () => {
-              await expectQuery({
-                range: {
-                  age: { high: 5, low: Number.MIN_SAFE_INTEGER },
-                },
-              }).toContainExactly([{ age: 1 }])
-            })
-          })
-
-          describe("sort", () => {
-            it("sorts ascending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "age",
-                sortOrder: SortOrder.ASCENDING,
-              }).toMatchExactly([{ age: 1 }, { age: 10 }])
-            })
-
-            it("sorts descending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "age",
-                sortOrder: SortOrder.DESCENDING,
-              }).toMatchExactly([{ age: 10 }, { age: 1 }])
-            })
-          })
-
-          describe("sortType NUMBER", () => {
-            it("sorts ascending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "age",
-                sortType: SortType.NUMBER,
-                sortOrder: SortOrder.ASCENDING,
-              }).toMatchExactly([{ age: 1 }, { age: 10 }])
-            })
-
-            it("sorts descending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "age",
-                sortType: SortType.NUMBER,
-                sortOrder: SortOrder.DESCENDING,
-              }).toMatchExactly([{ age: 10 }, { age: 1 }])
-            })
-          })
-        })
-
-        describe("dates", () => {
-          const JAN_1ST = "2020-01-01T00:00:00.000Z"
-          const JAN_2ND = "2020-01-02T00:00:00.000Z"
-          const JAN_5TH = "2020-01-05T00:00:00.000Z"
-          const JAN_9TH = "2020-01-09T00:00:00.000Z"
-          const JAN_10TH = "2020-01-10T00:00:00.000Z"
-
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              dob: { name: "dob", type: FieldType.DATETIME },
-            })
-
-            await createRows([{ dob: JAN_1ST }, { dob: JAN_10TH }])
-          })
-
-          describe("equal", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ equal: { dob: JAN_1ST } }).toContainExactly([
-                { dob: JAN_1ST },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ equal: { dob: JAN_2ND } }).toFindNothing()
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                notEqual: { dob: JAN_1ST },
-              }).toContainExactly([{ dob: JAN_10TH }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                notEqual: { dob: JAN_10TH },
-              }).toContainExactly([{ dob: JAN_1ST }])
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ oneOf: { dob: [JAN_1ST] } }).toContainExactly(
-                [{ dob: JAN_1ST }]
-              )
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ oneOf: { dob: [JAN_2ND] } }).toFindNothing()
-            })
-          })
-
-          describe("range", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                range: { dob: { low: JAN_1ST, high: JAN_5TH } },
-              }).toContainExactly([{ dob: JAN_1ST }])
-            })
-
-            it("successfully finds multiple rows", async () => {
-              await expectQuery({
-                range: { dob: { low: JAN_1ST, high: JAN_10TH } },
-              }).toContainExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
-            })
-
-            it("successfully finds a row with a high bound", async () => {
-              await expectQuery({
-                range: { dob: { low: JAN_5TH, high: JAN_10TH } },
-              }).toContainExactly([{ dob: JAN_10TH }])
-            })
-
-            it("successfully finds no rows", async () => {
-              await expectQuery({
-                range: { dob: { low: JAN_5TH, high: JAN_9TH } },
-              }).toFindNothing()
-            })
-
-            it("greater than equal to", async () => {
-              await expectQuery({
-                range: {
-                  dob: { low: JAN_10TH, high: MAX_VALID_DATE.toISOString() },
-                },
-              }).toContainExactly([{ dob: JAN_10TH }])
-            })
-
-            it("greater than", async () => {
-              await expectQuery({
-                range: {
-                  dob: { low: JAN_5TH, high: MAX_VALID_DATE.toISOString() },
-                },
-              }).toContainExactly([{ dob: JAN_10TH }])
-            })
-
-            it("less than equal to", async () => {
-              await expectQuery({
-                range: {
-                  dob: { high: JAN_1ST, low: MIN_VALID_DATE.toISOString() },
-                },
-              }).toContainExactly([{ dob: JAN_1ST }])
-            })
-
-            it("less than", async () => {
-              await expectQuery({
-                range: {
-                  dob: { high: JAN_5TH, low: MIN_VALID_DATE.toISOString() },
-                },
-              }).toContainExactly([{ dob: JAN_1ST }])
-            })
-          })
-
-          describe("sort", () => {
-            it("sorts ascending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "dob",
-                sortOrder: SortOrder.ASCENDING,
-              }).toMatchExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
-            })
-
-            it("sorts descending", async () => {
-              await expectSearch({
-                query: {},
-                sort: "dob",
-                sortOrder: SortOrder.DESCENDING,
-              }).toMatchExactly([{ dob: JAN_10TH }, { dob: JAN_1ST }])
-            })
-
-            describe("sortType STRING", () => {
-              it("sorts ascending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "dob",
-                  sortType: SortType.STRING,
-                  sortOrder: SortOrder.ASCENDING,
-                }).toMatchExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
+                it("successfully finds false row", async () => {
+                  await expectQuery({
+                    equal: { isTrue: false },
+                  }).toMatchExactly([{ isTrue: false }])
+                })
               })
 
-              it("sorts descending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "dob",
-                  sortType: SortType.STRING,
-                  sortOrder: SortOrder.DESCENDING,
-                }).toMatchExactly([{ dob: JAN_10TH }, { dob: JAN_1ST }])
-              })
-            })
-          })
-        })
+              describe("notEqual", () => {
+                it("successfully finds false row", async () => {
+                  await expectQuery({
+                    notEqual: { isTrue: true },
+                  }).toContainExactly([{ isTrue: false }])
+                })
 
-        !isInternal &&
-          describe("datetime - time only", () => {
-            const T_1000 = "10:00:00"
-            const T_1045 = "10:45:00"
-            const T_1200 = "12:00:00"
-            const T_1530 = "15:30:00"
-            const T_0000 = "00:00:00"
-
-            const UNEXISTING_TIME = "10:01:00"
-
-            const NULL_TIME__ID = `null_time__id`
-
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                timeid: { name: "timeid", type: FieldType.STRING },
-                time: {
-                  name: "time",
-                  type: FieldType.DATETIME,
-                  timeOnly: true,
-                },
+                it("successfully finds true row", async () => {
+                  await expectQuery({
+                    notEqual: { isTrue: false },
+                  }).toContainExactly([{ isTrue: true }])
+                })
               })
 
-              await createRows([
-                { timeid: NULL_TIME__ID, time: null },
-                { time: T_1000 },
-                { time: T_1045 },
-                { time: T_1200 },
-                { time: T_1530 },
-                { time: T_0000 },
-              ])
-            })
+              describe("oneOf", () => {
+                it("successfully finds true row", async () => {
+                  await expectQuery({
+                    oneOf: { isTrue: [true] },
+                  }).toContainExactly([{ isTrue: true }])
+                })
 
-            describe("equal", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({ equal: { time: T_1000 } }).toContainExactly(
-                  [{ time: "10:00:00" }]
-                )
+                it("successfully finds false row", async () => {
+                  await expectQuery({
+                    oneOf: { isTrue: [false] },
+                  }).toContainExactly([{ isTrue: false }])
+                })
               })
 
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({
-                  equal: { time: UNEXISTING_TIME },
-                }).toFindNothing()
-              })
-            })
-
-            describe("notEqual", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({
-                  notEqual: { time: T_1000 },
-                }).toContainExactly([
-                  { timeid: NULL_TIME__ID },
-                  { time: "10:45:00" },
-                  { time: "12:00:00" },
-                  { time: "15:30:00" },
-                  { time: "00:00:00" },
-                ])
-              })
-
-              it("return all when requesting non-existing", async () => {
-                await expectQuery({
-                  notEqual: { time: UNEXISTING_TIME },
-                }).toContainExactly([
-                  { timeid: NULL_TIME__ID },
-                  { time: "10:00:00" },
-                  { time: "10:45:00" },
-                  { time: "12:00:00" },
-                  { time: "15:30:00" },
-                  { time: "00:00:00" },
-                ])
-              })
-            })
-
-            describe("oneOf", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({
-                  oneOf: { time: [T_1000] },
-                }).toContainExactly([{ time: "10:00:00" }])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({
-                  oneOf: { time: [UNEXISTING_TIME] },
-                }).toFindNothing()
-              })
-            })
-
-            describe("range", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({
-                  range: { time: { low: T_1045, high: T_1045 } },
-                }).toContainExactly([{ time: "10:45:00" }])
-              })
-
-              it("successfully finds multiple rows", async () => {
-                await expectQuery({
-                  range: { time: { low: T_1045, high: T_1530 } },
-                }).toContainExactly([
-                  { time: "10:45:00" },
-                  { time: "12:00:00" },
-                  { time: "15:30:00" },
-                ])
-              })
-
-              it("successfully finds no rows", async () => {
-                await expectQuery({
-                  range: {
-                    time: { low: UNEXISTING_TIME, high: UNEXISTING_TIME },
-                  },
-                }).toFindNothing()
-              })
-            })
-
-            describe("sort", () => {
-              it("sorts ascending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "time",
-                  sortOrder: SortOrder.ASCENDING,
-                }).toMatchExactly([
-                  { timeid: NULL_TIME__ID },
-                  { time: "00:00:00" },
-                  { time: "10:00:00" },
-                  { time: "10:45:00" },
-                  { time: "12:00:00" },
-                  { time: "15:30:00" },
-                ])
-              })
-
-              it("sorts descending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "time",
-                  sortOrder: SortOrder.DESCENDING,
-                }).toMatchExactly([
-                  { time: "15:30:00" },
-                  { time: "12:00:00" },
-                  { time: "10:45:00" },
-                  { time: "10:00:00" },
-                  { time: "00:00:00" },
-                  { timeid: NULL_TIME__ID },
-                ])
-              })
-
-              describe("sortType STRING", () => {
+              describe("sort", () => {
                 it("sorts ascending", async () => {
                   await expectSearch({
                     query: {},
-                    sort: "time",
-                    sortType: SortType.STRING,
+                    sort: "isTrue",
                     sortOrder: SortOrder.ASCENDING,
-                  }).toMatchExactly([
-                    { timeid: NULL_TIME__ID },
-                    { time: "00:00:00" },
-                    { time: "10:00:00" },
-                    { time: "10:45:00" },
-                    { time: "12:00:00" },
-                    { time: "15:30:00" },
-                  ])
+                  }).toMatchExactly([{ isTrue: false }, { isTrue: true }])
                 })
 
                 it("sorts descending", async () => {
                   await expectSearch({
                     query: {},
-                    sort: "time",
-                    sortType: SortType.STRING,
+                    sort: "isTrue",
                     sortOrder: SortOrder.DESCENDING,
-                  }).toMatchExactly([
-                    { time: "15:30:00" },
-                    { time: "12:00:00" },
-                    { time: "10:45:00" },
-                    { time: "10:00:00" },
-                    { time: "00:00:00" },
-                    { timeid: NULL_TIME__ID },
-                  ])
+                  }).toMatchExactly([{ isTrue: true }, { isTrue: false }])
                 })
               })
             })
-          })
 
-        isInternal &&
-          !isInMemory &&
-          describe("AI Column", () => {
-            const UNEXISTING_AI_COLUMN = "Real LLM Response"
+            !isInMemory &&
+              describe("bindings", () => {
+                let globalUsers: any = []
 
-            beforeAll(async () => {
-              mocks.licenses.useBudibaseAI()
-              mocks.licenses.useAICustomConfigs()
+                const serverTime = new Date()
 
-              tableOrViewId = await createTableOrView({
-                product: { name: "product", type: FieldType.STRING },
-                ai: {
-                  name: "AI",
-                  type: FieldType.AI,
-                  operation: AIOperationEnum.PROMPT,
-                  prompt: "Translate '{{ product }}' into German",
-                },
-              })
+                // In MariaDB and MySQL we only store dates to second precision, so we need
+                // to remove milliseconds from the server time to ensure searches work as
+                // expected.
+                serverTime.setMilliseconds(0)
 
-              await createRows([
-                { product: "Big Mac" },
-                { product: "McCrispy" },
-              ])
-            })
-
-            describe("equal", () => {
-              it("successfully finds rows based on AI column", async () => {
-                await expectQuery({
-                  equal: { ai: "Mock LLM Response" },
-                }).toContainExactly([
-                  { product: "Big Mac" },
-                  { product: "McCrispy" },
-                ])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({
-                  equal: { ai: UNEXISTING_AI_COLUMN },
-                }).toFindNothing()
-              })
-            })
-
-            describe("notEqual", () => {
-              it("Returns nothing when searching notEqual on the mock AI response", async () => {
-                await expectQuery({
-                  notEqual: { ai: "Mock LLM Response" },
-                }).toContainExactly([])
-              })
-
-              it("return all when requesting non-existing response", async () => {
-                await expectQuery({
-                  notEqual: { ai: "Real LLM Response" },
-                }).toContainExactly([
-                  { product: "Big Mac" },
-                  { product: "McCrispy" },
-                ])
-              })
-            })
-
-            describe("oneOf", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({
-                  oneOf: { ai: ["Mock LLM Response", "Other LLM Response"] },
-                }).toContainExactly([
-                  { product: "Big Mac" },
-                  { product: "McCrispy" },
-                ])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({
-                  oneOf: { ai: ["Whopper"] },
-                }).toFindNothing()
-              })
-            })
-          })
-
-        describe("arrays", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              numbers: {
-                name: "numbers",
-                type: FieldType.ARRAY,
-                constraints: {
-                  type: JsonFieldSubType.ARRAY,
-                  inclusion: ["one", "two", "three"],
-                },
-              },
-            })
-            await createRows([
-              { numbers: ["one", "two"] },
-              { numbers: ["three"] },
-            ])
-          })
-
-          describe("contains", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                contains: { numbers: ["one"] },
-              }).toContainExactly([{ numbers: ["one", "two"] }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                contains: { numbers: ["none"] },
-              }).toFindNothing()
-            })
-
-            it("fails to find row containing all", async () => {
-              await expectQuery({
-                contains: { numbers: ["one", "two", "three"] },
-              }).toFindNothing()
-            })
-
-            it("finds all with empty list", async () => {
-              await expectQuery({ contains: { numbers: [] } }).toContainExactly(
-                [{ numbers: ["one", "two"] }, { numbers: ["three"] }]
-              )
-            })
-          })
-
-          describe("notContains", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                notContains: { numbers: ["one"] },
-              }).toContainExactly([{ numbers: ["three"] }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                notContains: { numbers: ["one", "two", "three"] },
-              }).toContainExactly([
-                { numbers: ["one", "two"] },
-                { numbers: ["three"] },
-              ])
-            })
-
-            // Not sure if this is correct behaviour but changing it would be a
-            // breaking change.
-            it("finds all with empty list", async () => {
-              await expectQuery({
-                notContains: { numbers: [] },
-              }).toContainExactly([
-                { numbers: ["one", "two"] },
-                { numbers: ["three"] },
-              ])
-            })
-          })
-
-          describe("containsAny", () => {
-            it("successfully finds rows", async () => {
-              await expectQuery({
-                containsAny: { numbers: ["one", "two", "three"] },
-              }).toContainExactly([
-                { numbers: ["one", "two"] },
-                { numbers: ["three"] },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                containsAny: { numbers: ["none"] },
-              }).toFindNothing()
-            })
-
-            it("finds all with empty list", async () => {
-              await expectQuery({
-                containsAny: { numbers: [] },
-              }).toContainExactly([
-                { numbers: ["one", "two"] },
-                { numbers: ["three"] },
-              ])
-            })
-          })
-        })
-
-        describe("bigints", () => {
-          const SMALL = "1"
-          const MEDIUM = "10000000"
-
-          // Our bigints are int64s in most datasources.
-          let BIG = "9223372036854775807"
-
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              num: { name: "num", type: FieldType.BIGINT },
-            })
-            await createRows([{ num: SMALL }, { num: MEDIUM }, { num: BIG }])
-          })
-
-          describe("equal", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ equal: { num: SMALL } }).toContainExactly([
-                { num: SMALL },
-              ])
-            })
-
-            it("successfully finds a big value", async () => {
-              await expectQuery({ equal: { num: BIG } }).toContainExactly([
-                { num: BIG },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ equal: { num: "2" } }).toFindNothing()
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ notEqual: { num: SMALL } }).toContainExactly([
-                { num: MEDIUM },
-                { num: BIG },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ notEqual: { num: 10 } }).toContainExactly([
-                { num: SMALL },
-                { num: MEDIUM },
-                { num: BIG },
-              ])
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({ oneOf: { num: [SMALL] } }).toContainExactly([
-                { num: SMALL },
-              ])
-            })
-
-            it("successfully finds all rows", async () => {
-              await expectQuery({
-                oneOf: { num: [SMALL, MEDIUM, BIG] },
-              }).toContainExactly([
-                { num: SMALL },
-                { num: MEDIUM },
-                { num: BIG },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ oneOf: { num: [2] } }).toFindNothing()
-            })
-          })
-
-          describe("range", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                range: { num: { low: SMALL, high: "5" } },
-              }).toContainExactly([{ num: SMALL }])
-            })
-
-            it("successfully finds multiple rows", async () => {
-              await expectQuery({
-                range: { num: { low: SMALL, high: MEDIUM } },
-              }).toContainExactly([{ num: SMALL }, { num: MEDIUM }])
-            })
-
-            it("successfully finds a row with a high bound", async () => {
-              await expectQuery({
-                range: { num: { low: MEDIUM, high: BIG } },
-              }).toContainExactly([{ num: MEDIUM }, { num: BIG }])
-            })
-
-            it("successfully finds no rows", async () => {
-              await expectQuery({
-                range: { num: { low: "5", high: "5" } },
-              }).toFindNothing()
-            })
-
-            it("can search using just a low value", async () => {
-              await expectQuery({
-                range: { num: { low: MEDIUM } },
-              }).toContainExactly([{ num: MEDIUM }, { num: BIG }])
-            })
-
-            it("can search using just a high value", async () => {
-              await expectQuery({
-                range: { num: { high: MEDIUM } },
-              }).toContainExactly([{ num: SMALL }, { num: MEDIUM }])
-            })
-          })
-        })
-
-        isInternal &&
-          describe("auto", () => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                auto: {
-                  name: "auto",
-                  type: FieldType.AUTO,
-                  autocolumn: true,
-                  subtype: AutoFieldSubType.AUTO_ID,
-                },
-              })
-              await createRows(new Array(10).fill({}))
-            })
-
-            describe("equal", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({ equal: { auto: 1 } }).toContainExactly([
-                  { auto: 1 },
-                ])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({ equal: { auto: 0 } }).toFindNothing()
-              })
-            })
-
-            describe("not equal", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({ notEqual: { auto: 1 } }).toContainExactly([
-                  { auto: 2 },
-                  { auto: 3 },
-                  { auto: 4 },
-                  { auto: 5 },
-                  { auto: 6 },
-                  { auto: 7 },
-                  { auto: 8 },
-                  { auto: 9 },
-                  { auto: 10 },
-                ])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({ notEqual: { auto: 0 } }).toContainExactly([
-                  { auto: 1 },
-                  { auto: 2 },
-                  { auto: 3 },
-                  { auto: 4 },
-                  { auto: 5 },
-                  { auto: 6 },
-                  { auto: 7 },
-                  { auto: 8 },
-                  { auto: 9 },
-                  { auto: 10 },
-                ])
-              })
-            })
-
-            describe("oneOf", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({ oneOf: { auto: [1] } }).toContainExactly([
-                  { auto: 1 },
-                ])
-              })
-
-              it("fails to find nonexistent row", async () => {
-                await expectQuery({ oneOf: { auto: [0] } }).toFindNothing()
-              })
-            })
-
-            describe("range", () => {
-              it("successfully finds a row", async () => {
-                await expectQuery({
-                  range: { auto: { low: 1, high: 1 } },
-                }).toContainExactly([{ auto: 1 }])
-              })
-
-              it("successfully finds multiple rows", async () => {
-                await expectQuery({
-                  range: { auto: { low: 1, high: 2 } },
-                }).toContainExactly([{ auto: 1 }, { auto: 2 }])
-              })
-
-              it("successfully finds a row with a high bound", async () => {
-                await expectQuery({
-                  range: { auto: { low: 2, high: 2 } },
-                }).toContainExactly([{ auto: 2 }])
-              })
-
-              it("successfully finds no rows", async () => {
-                await expectQuery({
-                  range: { auto: { low: 0, high: 0 } },
-                }).toFindNothing()
-              })
-
-              it("can search using just a low value", async () => {
-                await expectQuery({
-                  range: { auto: { low: 9 } },
-                }).toContainExactly([{ auto: 9 }, { auto: 10 }])
-              })
-
-              it("can search using just a high value", async () => {
-                await expectQuery({
-                  range: { auto: { high: 2 } },
-                }).toContainExactly([{ auto: 1 }, { auto: 2 }])
-              })
-            })
-
-            describe("sort", () => {
-              it("sorts ascending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "auto",
-                  sortOrder: SortOrder.ASCENDING,
-                  sortType: SortType.NUMBER,
-                }).toMatchExactly([
-                  { auto: 1 },
-                  { auto: 2 },
-                  { auto: 3 },
-                  { auto: 4 },
-                  { auto: 5 },
-                  { auto: 6 },
-                  { auto: 7 },
-                  { auto: 8 },
-                  { auto: 9 },
-                  { auto: 10 },
-                ])
-              })
-
-              it("sorts descending", async () => {
-                await expectSearch({
-                  query: {},
-                  sort: "auto",
-                  sortOrder: SortOrder.DESCENDING,
-                  sortType: SortType.NUMBER,
-                }).toMatchExactly([
-                  { auto: 10 },
-                  { auto: 9 },
-                  { auto: 8 },
-                  { auto: 7 },
-                  { auto: 6 },
-                  { auto: 5 },
-                  { auto: 4 },
-                  { auto: 3 },
-                  { auto: 2 },
-                  { auto: 1 },
-                ])
-              })
-
-              // This is important for pagination. The order of results must always
-              // be stable or pagination will break. We don't want the user to need
-              // to specify an order for pagination to work.
-              it("is stable without a sort specified", async () => {
-                let { rows: fullRowList } = await config.api.row.search(
-                  tableOrViewId,
-                  {
-                    tableId: tableOrViewId,
-                    query: {},
-                  }
+                const future = new Date(
+                  serverTime.getTime() + 1000 * 60 * 60 * 24 * 30
                 )
 
-                // repeat the search many times to check the first row is always the same
-                let bookmark: string | number | undefined,
-                  hasNextPage: boolean | undefined = true,
-                  rowCount: number = 0
-                do {
-                  const response = await config.api.row.search(tableOrViewId, {
-                    tableId: tableOrViewId,
+                const rows = (currentUser: User) => {
+                  return [
+                    { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+                    { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+                    {
+                      name: currentUser.firstName,
+                      appointment: future.toISOString(),
+                    },
+                    {
+                      name: "serverDate",
+                      appointment: serverTime.toISOString(),
+                    },
+                    {
+                      name: "single user, session user",
+                      single_user: currentUser,
+                    },
+                    {
+                      name: "single user",
+                      single_user: globalUsers[0],
+                    },
+                    {
+                      name: "deprecated single user, session user",
+                      deprecated_single_user: [currentUser],
+                    },
+                    {
+                      name: "deprecated single user",
+                      deprecated_single_user: [globalUsers[0]],
+                    },
+                    {
+                      name: "multi user",
+                      multi_user: globalUsers,
+                    },
+                    {
+                      name: "multi user with session user",
+                      multi_user: [...globalUsers, currentUser],
+                    },
+                    {
+                      name: "deprecated multi user",
+                      deprecated_multi_user: globalUsers,
+                    },
+                    {
+                      name: "deprecated multi user with session user",
+                      deprecated_multi_user: [...globalUsers, currentUser],
+                    },
+                  ]
+                }
+
+                beforeAll(async () => {
+                  // Set up some global users
+                  globalUsers = await Promise.all(
+                    Array(2)
+                      .fill(0)
+                      .map(async () => {
+                        const globalUser = await config.globalUser()
+                        const userMedataId = globalUser._id
+                          ? dbCore.generateUserMetadataID(globalUser._id)
+                          : null
+                        return {
+                          _id: globalUser._id,
+                          _meta: userMedataId,
+                        }
+                      })
+                  )
+
+                  tableOrViewId = await createTableOrView({
+                    name: { name: "name", type: FieldType.STRING },
+                    appointment: {
+                      name: "appointment",
+                      type: FieldType.DATETIME,
+                    },
+                    single_user: {
+                      name: "single_user",
+                      type: FieldType.BB_REFERENCE_SINGLE,
+                      subtype: BBReferenceFieldSubType.USER,
+                    },
+                    deprecated_single_user: {
+                      name: "deprecated_single_user",
+                      type: FieldType.BB_REFERENCE,
+                      subtype: BBReferenceFieldSubType.USER,
+                    },
+                    multi_user: {
+                      name: "multi_user",
+                      type: FieldType.BB_REFERENCE,
+                      subtype: BBReferenceFieldSubType.USER,
+                      constraints: {
+                        type: "array",
+                      },
+                    },
+                    deprecated_multi_user: {
+                      name: "deprecated_multi_user",
+                      type: FieldType.BB_REFERENCE,
+                      subtype: BBReferenceFieldSubType.USERS,
+                      constraints: {
+                        type: "array",
+                      },
+                    },
+                  })
+                  await createRows(rows(config.getUser()))
+                })
+
+                // !! Current User is auto generated per run
+                it("should return all rows matching the session user firstname", async () => {
+                  await expectQuery({
+                    equal: { name: "{{ [user].firstName }}" },
+                  }).toContainExactly([
+                    {
+                      name: config.getUser().firstName,
+                      appointment: future.toISOString(),
+                    },
+                  ])
+                })
+
+                it("should return all rows matching the session user firstname when logical operator used", async () => {
+                  await expectQuery({
+                    $and: {
+                      conditions: [
+                        { equal: { name: "{{ [user].firstName }}" } },
+                      ],
+                    },
+                  }).toContainExactly([
+                    {
+                      name: config.getUser().firstName,
+                      appointment: future.toISOString(),
+                    },
+                  ])
+                })
+
+                it("should parse the date binding and return all rows after the resolved value", async () => {
+                  await tk.withFreeze(serverTime, async () => {
+                    await expectQuery({
+                      range: {
+                        appointment: {
+                          low: "{{ [now] }}",
+                          high: "9999-00-00T00:00:00.000Z",
+                        },
+                      },
+                    }).toContainExactly([
+                      {
+                        name: config.getUser().firstName,
+                        appointment: future.toISOString(),
+                      },
+                      {
+                        name: "serverDate",
+                        appointment: serverTime.toISOString(),
+                      },
+                    ])
+                  })
+                })
+
+                it("should parse the date binding and return all rows before the resolved value", async () => {
+                  await expectQuery({
+                    range: {
+                      appointment: {
+                        low: "0000-00-00T00:00:00.000Z",
+                        high: "{{ [now] }}",
+                      },
+                    },
+                  }).toContainExactly([
+                    { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+                    { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+                    {
+                      name: "serverDate",
+                      appointment: serverTime.toISOString(),
+                    },
+                  ])
+                })
+
+                it("should parse the encoded js snippet. Return rows with appointments up to 1 week in the past", async () => {
+                  const jsBinding = "return snippets.WeeksAgo();"
+                  const encodedBinding = encodeJSBinding(jsBinding)
+
+                  await expectQuery({
+                    range: {
+                      appointment: {
+                        low: "0000-00-00T00:00:00.000Z",
+                        high: encodedBinding,
+                      },
+                    },
+                  }).toContainExactly([
+                    { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+                    { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+                  ])
+                })
+
+                it("should parse the encoded js binding. Return rows with appointments 2 weeks in the past", async () => {
+                  const jsBinding = `const currentTime = new Date(${Date.now()})\ncurrentTime.setDate(currentTime.getDate()-14);\nreturn currentTime.toISOString();`
+                  const encodedBinding = encodeJSBinding(jsBinding)
+
+                  await expectQuery({
+                    range: {
+                      appointment: {
+                        low: "0000-00-00T00:00:00.000Z",
+                        high: encodedBinding,
+                      },
+                    },
+                  }).toContainExactly([
+                    { name: "foo", appointment: "1982-01-05T00:00:00.000Z" },
+                    { name: "bar", appointment: "1995-05-06T00:00:00.000Z" },
+                  ])
+                })
+
+                it("should match a single user row by the session user id", async () => {
+                  await expectQuery({
+                    equal: { single_user: "{{ [user]._id }}" },
+                  }).toContainExactly([
+                    {
+                      name: "single user, session user",
+                      single_user: { _id: config.getUser()._id },
+                    },
+                  ])
+                })
+
+                it("should match a deprecated single user row by the session user id", async () => {
+                  await expectQuery({
+                    equal: { deprecated_single_user: "{{ [user]._id }}" },
+                  }).toContainExactly([
+                    {
+                      name: "deprecated single user, session user",
+                      deprecated_single_user: [{ _id: config.getUser()._id }],
+                    },
+                  ])
+                })
+
+                it("should match the session user id in a multi user field", async () => {
+                  const allUsers = [...globalUsers, config.getUser()].map(
+                    (user: any) => {
+                      return { _id: user._id }
+                    }
+                  )
+
+                  await expectQuery({
+                    contains: { multi_user: ["{{ [user]._id }}"] },
+                  }).toContainExactly([
+                    {
+                      name: "multi user with session user",
+                      multi_user: allUsers,
+                    },
+                  ])
+                })
+
+                it("should match the session user id in a deprecated multi user field", async () => {
+                  const allUsers = [...globalUsers, config.getUser()].map(
+                    (user: any) => {
+                      return { _id: user._id }
+                    }
+                  )
+
+                  await expectQuery({
+                    contains: { deprecated_multi_user: ["{{ [user]._id }}"] },
+                  }).toContainExactly([
+                    {
+                      name: "deprecated multi user with session user",
+                      deprecated_multi_user: allUsers,
+                    },
+                  ])
+                })
+
+                it("should not match the session user id in a multi user field", async () => {
+                  await expectQuery({
+                    notContains: { multi_user: ["{{ [user]._id }}"] },
+                    notEmpty: { multi_user: true },
+                  }).toContainExactly([
+                    {
+                      name: "multi user",
+                      multi_user: globalUsers.map((user: any) => {
+                        return { _id: user._id }
+                      }),
+                    },
+                  ])
+                })
+
+                it("should not match the session user id in a deprecated multi user field", async () => {
+                  await expectQuery({
+                    notContains: {
+                      deprecated_multi_user: ["{{ [user]._id }}"],
+                    },
+                    notEmpty: { deprecated_multi_user: true },
+                  }).toContainExactly([
+                    {
+                      name: "deprecated multi user",
+                      deprecated_multi_user: globalUsers.map((user: any) => {
+                        return { _id: user._id }
+                      }),
+                    },
+                  ])
+                })
+
+                it("should match the session user id and a user table row id using helpers, user binding and a static user id.", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      single_user: [
+                        "{{ default [user]._id '_empty_' }}",
+                        globalUsers[0]._id,
+                      ],
+                    },
+                  }).toContainExactly([
+                    {
+                      name: "single user, session user",
+                      single_user: { _id: config.getUser()._id },
+                    },
+                    {
+                      name: "single user",
+                      single_user: { _id: globalUsers[0]._id },
+                    },
+                  ])
+                })
+
+                it("should match the session user id and a user table row id using helpers, user binding and a static user id. (deprecated single user)", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      deprecated_single_user: [
+                        "{{ default [user]._id '_empty_' }}",
+                        globalUsers[0]._id,
+                      ],
+                    },
+                  }).toContainExactly([
+                    {
+                      name: "deprecated single user, session user",
+                      deprecated_single_user: [{ _id: config.getUser()._id }],
+                    },
+                    {
+                      name: "deprecated single user",
+                      deprecated_single_user: [{ _id: globalUsers[0]._id }],
+                    },
+                  ])
+                })
+
+                it("should resolve 'default' helper to '_empty_' when binding resolves to nothing", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      single_user: [
+                        "{{ default [user]._idx '_empty_' }}",
+                        globalUsers[0]._id,
+                      ],
+                    },
+                  }).toContainExactly([
+                    {
+                      name: "single user",
+                      single_user: { _id: globalUsers[0]._id },
+                    },
+                  ])
+                })
+
+                it("should resolve 'default' helper to '_empty_' when binding resolves to nothing (deprecated single user)", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      deprecated_single_user: [
+                        "{{ default [user]._idx '_empty_' }}",
+                        globalUsers[0]._id,
+                      ],
+                    },
+                  }).toContainExactly([
+                    {
+                      name: "deprecated single user",
+                      deprecated_single_user: [{ _id: globalUsers[0]._id }],
+                    },
+                  ])
+                })
+              })
+
+            const stringTypes = [FieldType.STRING, FieldType.LONGFORM] as const
+            describe.each(stringTypes)("%s", type => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  name: { name: "name", type },
+                })
+                await createRows([{ name: "foo" }, { name: "bar" }])
+              })
+
+              describe("misc", () => {
+                it("should return all if no query is passed", async () => {
+                  await expectSearch({} as RowSearchParams).toContainExactly([
+                    { name: "foo" },
+                    { name: "bar" },
+                  ])
+                })
+
+                it("should return all if empty query is passed", async () => {
+                  await expectQuery({}).toContainExactly([
+                    { name: "foo" },
+                    { name: "bar" },
+                  ])
+                })
+
+                it("should return all if onEmptyFilter is RETURN_ALL", async () => {
+                  await expectQuery({
+                    onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                // onEmptyFilter cannot be sent to view searches
+                !isView &&
+                  it("should return nothing if onEmptyFilter is RETURN_NONE", async () => {
+                    await expectQuery({
+                      onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                    }).toFindNothing()
+                  })
+
+                it("should respect limit", async () => {
+                  await expectSearch({
                     limit: 1,
                     paginate: true,
                     query: {},
-                    bookmark,
-                  })
-                  bookmark = response.bookmark
-                  hasNextPage = response.hasNextPage
-                  expect(response.rows.length).toEqual(1)
-                  const foundRow = response.rows[0]
-                  expect(foundRow).toEqual(fullRowList[rowCount++])
-                } while (hasNextPage)
+                  }).toHaveLength(1)
+                })
               })
-            })
 
-            describe("pagination", () => {
-              it("should paginate through all rows", async () => {
-                // @ts-ignore
-                let bookmark: string | number = undefined
-                let rows: Row[] = []
+              describe("equal", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    equal: { name: "foo" },
+                  }).toContainExactly([{ name: "foo" }])
+                })
 
-                // eslint-disable-next-line no-constant-condition
-                while (true) {
-                  const response = await config.api.row.search(tableOrViewId, {
-                    tableId: tableOrViewId,
-                    limit: 3,
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ equal: { name: "none" } }).toFindNothing()
+                })
+
+                it("works as an or condition", async () => {
+                  await expectQuery({
+                    allOr: true,
+                    equal: { name: "foo" },
+                    oneOf: { name: ["bar"] },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("can have multiple values for same column", async () => {
+                  await expectQuery({
+                    allOr: true,
+                    equal: { "1:name": "foo", "2:name": "bar" },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+              })
+
+              describe("notEqual", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notEqual: { name: "foo" },
+                  }).toContainExactly([{ name: "bar" }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    notEqual: { name: "bar" },
+                  }).toContainExactly([{ name: "foo" }])
+                })
+              })
+
+              describe("oneOf", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    oneOf: { name: ["foo"] },
+                  }).toContainExactly([{ name: "foo" }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    oneOf: { name: ["none"] },
+                  }).toFindNothing()
+                })
+
+                it("can have multiple values for same column", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      name: ["foo", "bar"],
+                    },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("splits comma separated strings", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      // @ts-ignore
+                      name: "foo,bar",
+                    },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("trims whitespace", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      // @ts-ignore
+                      name: "foo, bar",
+                    },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("empty arrays returns all when onEmptyFilter is set to return 'all'", async () => {
+                  await expectQuery({
+                    onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                    oneOf: { name: [] },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                // onEmptyFilter cannot be sent to view searches
+                !isView &&
+                  it("empty arrays returns all when onEmptyFilter is set to return 'none'", async () => {
+                    await expectQuery({
+                      onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                      oneOf: { name: [] },
+                    }).toContainExactly([])
+                  })
+              })
+
+              describe("fuzzy", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({ fuzzy: { name: "oo" } }).toContainExactly(
+                    [{ name: "foo" }]
+                  )
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ fuzzy: { name: "none" } }).toFindNothing()
+                })
+              })
+
+              describe("string", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    string: { name: "fo" },
+                  }).toContainExactly([{ name: "foo" }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    string: { name: "none" },
+                  }).toFindNothing()
+                })
+
+                it("is case-insensitive", async () => {
+                  await expectQuery({
+                    string: { name: "FO" },
+                  }).toContainExactly([{ name: "foo" }])
+                })
+              })
+
+              describe("range", () => {
+                it("successfully finds multiple rows", async () => {
+                  await expectQuery({
+                    range: { name: { low: "a", high: "z" } },
+                  }).toContainExactly([{ name: "bar" }, { name: "foo" }])
+                })
+
+                it("successfully finds a row with a high bound", async () => {
+                  await expectQuery({
+                    range: { name: { low: "a", high: "c" } },
+                  }).toContainExactly([{ name: "bar" }])
+                })
+
+                it("successfully finds a row with a low bound", async () => {
+                  await expectQuery({
+                    range: { name: { low: "f", high: "z" } },
+                  }).toContainExactly([{ name: "foo" }])
+                })
+
+                it("successfully finds no rows", async () => {
+                  await expectQuery({
+                    range: { name: { low: "g", high: "h" } },
+                  }).toFindNothing()
+                })
+
+                it("ignores low if it's an empty object", async () => {
+                  await expectQuery({
+                    // @ts-ignore
+                    range: { name: { low: {}, high: "z" } },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("ignores high if it's an empty object", async () => {
+                  await expectQuery({
+                    // @ts-ignore
+                    range: { name: { low: "a", high: {} } },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+              })
+
+              describe("empty", () => {
+                it("finds no empty rows", async () => {
+                  await expectQuery({ empty: { name: null } }).toFindNothing()
+                })
+
+                it("should not be affected by when filter empty behaviour", async () => {
+                  await expectQuery({
+                    empty: { name: null },
+                    onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                  }).toFindNothing()
+                })
+              })
+
+              describe("notEmpty", () => {
+                it("finds all non-empty rows", async () => {
+                  await expectQuery({
+                    notEmpty: { name: null },
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                it("should not be affected by when filter empty behaviour", async () => {
+                  await expectQuery({
+                    notEmpty: { name: null },
+                    onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                  }).toContainExactly([{ name: "foo" }, { name: "bar" }])
+                })
+              })
+
+              describe("sort", () => {
+                it("sorts ascending", async () => {
+                  await expectSearch({
                     query: {},
-                    bookmark,
-                    paginate: true,
+                    sort: "name",
+                    sortOrder: SortOrder.ASCENDING,
+                  }).toMatchExactly([{ name: "bar" }, { name: "foo" }])
+                })
+
+                it("sorts descending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "name",
+                    sortOrder: SortOrder.DESCENDING,
+                  }).toMatchExactly([{ name: "foo" }, { name: "bar" }])
+                })
+
+                describe("sortType STRING", () => {
+                  it("sorts ascending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "name",
+                      sortType: SortType.STRING,
+                      sortOrder: SortOrder.ASCENDING,
+                    }).toMatchExactly([{ name: "bar" }, { name: "foo" }])
                   })
 
-                  rows.push(...response.rows)
+                  it("sorts descending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "name",
+                      sortType: SortType.STRING,
+                      sortOrder: SortOrder.DESCENDING,
+                    }).toMatchExactly([{ name: "foo" }, { name: "bar" }])
+                  })
+                })
 
-                  if (!response.bookmark || !response.hasNextPage) {
-                    break
-                  }
-                  bookmark = response.bookmark
+                !isInternal &&
+                  !isInMemory &&
+                  // This test was added because we automatically add in a sort by the
+                  // primary key, and we used to do this unconditionally which caused
+                  // problems because it was possible for the primary key to appear twice
+                  // in the resulting SQL ORDER BY clause, resulting in an SQL error.
+                  // We now check first to make sure that the primary key isn't already
+                  // in the sort before adding it.
+                  describe("sort on primary key", () => {
+                    beforeAll(async () => {
+                      const tableName = structures.uuid().substring(0, 10)
+                      await client!.schema.createTable(tableName, t => {
+                        t.string("name").primary()
+                      })
+                      const resp = await config.api.datasource.fetchSchema({
+                        datasourceId: datasource!._id!,
+                      })
+
+                      tableOrViewId = resp.datasource.entities![tableName]._id!
+
+                      await createRows([{ name: "foo" }, { name: "bar" }])
+                    })
+
+                    it("should be able to sort by a primary key column ascending", async () =>
+                      expectSearch({
+                        query: {},
+                        sort: "name",
+                        sortOrder: SortOrder.ASCENDING,
+                      }).toMatchExactly([{ name: "bar" }, { name: "foo" }]))
+
+                    it("should be able to sort by a primary key column descending", async () =>
+                      expectSearch({
+                        query: {},
+                        sort: "name",
+                        sortOrder: SortOrder.DESCENDING,
+                      }).toMatchExactly([{ name: "foo" }, { name: "bar" }]))
+                  })
+              })
+            })
+
+            describe("numbers", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  age: { name: "age", type: FieldType.NUMBER },
+                })
+                await createRows([{ age: 1 }, { age: 10 }])
+              })
+
+              describe("equal", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({ equal: { age: 1 } }).toContainExactly([
+                    { age: 1 },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ equal: { age: 2 } }).toFindNothing()
+                })
+              })
+
+              describe("notEqual", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({ notEqual: { age: 1 } }).toContainExactly([
+                    { age: 10 },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ notEqual: { age: 10 } }).toContainExactly(
+                    [{ age: 1 }]
+                  )
+                })
+              })
+
+              describe("oneOf", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({ oneOf: { age: [1] } }).toContainExactly([
+                    { age: 1 },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ oneOf: { age: [2] } }).toFindNothing()
+                })
+
+                it("can convert from a string", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      // @ts-ignore
+                      age: "1",
+                    },
+                  }).toContainExactly([{ age: 1 }])
+                })
+
+                it("can find multiple values for same column", async () => {
+                  await expectQuery({
+                    oneOf: {
+                      // @ts-ignore
+                      age: "1,10",
+                    },
+                  }).toContainExactly([{ age: 1 }, { age: 10 }])
+                })
+              })
+
+              describe("range", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    range: { age: { low: 1, high: 5 } },
+                  }).toContainExactly([{ age: 1 }])
+                })
+
+                it("successfully finds multiple rows", async () => {
+                  await expectQuery({
+                    range: { age: { low: 1, high: 10 } },
+                  }).toContainExactly([{ age: 1 }, { age: 10 }])
+                })
+
+                it("successfully finds a row with a high bound", async () => {
+                  await expectQuery({
+                    range: { age: { low: 5, high: 10 } },
+                  }).toContainExactly([{ age: 10 }])
+                })
+
+                it("successfully finds no rows", async () => {
+                  await expectQuery({
+                    range: { age: { low: 5, high: 9 } },
+                  }).toFindNothing()
+                })
+
+                it("greater than equal to", async () => {
+                  await expectQuery({
+                    range: {
+                      age: { low: 10, high: Number.MAX_SAFE_INTEGER },
+                    },
+                  }).toContainExactly([{ age: 10 }])
+                })
+
+                it("greater than", async () => {
+                  await expectQuery({
+                    range: {
+                      age: { low: 5, high: Number.MAX_SAFE_INTEGER },
+                    },
+                  }).toContainExactly([{ age: 10 }])
+                })
+
+                it("less than equal to", async () => {
+                  await expectQuery({
+                    range: {
+                      age: { high: 1, low: Number.MIN_SAFE_INTEGER },
+                    },
+                  }).toContainExactly([{ age: 1 }])
+                })
+
+                it("less than", async () => {
+                  await expectQuery({
+                    range: {
+                      age: { high: 5, low: Number.MIN_SAFE_INTEGER },
+                    },
+                  }).toContainExactly([{ age: 1 }])
+                })
+              })
+
+              describe("sort", () => {
+                it("sorts ascending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "age",
+                    sortOrder: SortOrder.ASCENDING,
+                  }).toMatchExactly([{ age: 1 }, { age: 10 }])
+                })
+
+                it("sorts descending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "age",
+                    sortOrder: SortOrder.DESCENDING,
+                  }).toMatchExactly([{ age: 10 }, { age: 1 }])
+                })
+              })
+
+              describe("sortType NUMBER", () => {
+                it("sorts ascending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "age",
+                    sortType: SortType.NUMBER,
+                    sortOrder: SortOrder.ASCENDING,
+                  }).toMatchExactly([{ age: 1 }, { age: 10 }])
+                })
+
+                it("sorts descending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "age",
+                    sortType: SortType.NUMBER,
+                    sortOrder: SortOrder.DESCENDING,
+                  }).toMatchExactly([{ age: 10 }, { age: 1 }])
+                })
+              })
+            })
+
+            describe("dates", () => {
+              const JAN_1ST = "2020-01-01T00:00:00.000Z"
+              const JAN_2ND = "2020-01-02T00:00:00.000Z"
+              const JAN_5TH = "2020-01-05T00:00:00.000Z"
+              const JAN_9TH = "2020-01-09T00:00:00.000Z"
+              const JAN_10TH = "2020-01-10T00:00:00.000Z"
+
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  dob: { name: "dob", type: FieldType.DATETIME },
+                })
+
+                await createRows([{ dob: JAN_1ST }, { dob: JAN_10TH }])
+              })
+
+              describe("equal", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    equal: { dob: JAN_1ST },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ equal: { dob: JAN_2ND } }).toFindNothing()
+                })
+              })
+
+              describe("notEqual", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notEqual: { dob: JAN_1ST },
+                  }).toContainExactly([{ dob: JAN_10TH }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    notEqual: { dob: JAN_10TH },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+              })
+
+              describe("oneOf", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    oneOf: { dob: [JAN_1ST] },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    oneOf: { dob: [JAN_2ND] },
+                  }).toFindNothing()
+                })
+              })
+
+              describe("range", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    range: { dob: { low: JAN_1ST, high: JAN_5TH } },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+
+                it("successfully finds multiple rows", async () => {
+                  await expectQuery({
+                    range: { dob: { low: JAN_1ST, high: JAN_10TH } },
+                  }).toContainExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
+                })
+
+                it("successfully finds a row with a high bound", async () => {
+                  await expectQuery({
+                    range: { dob: { low: JAN_5TH, high: JAN_10TH } },
+                  }).toContainExactly([{ dob: JAN_10TH }])
+                })
+
+                it("successfully finds no rows", async () => {
+                  await expectQuery({
+                    range: { dob: { low: JAN_5TH, high: JAN_9TH } },
+                  }).toFindNothing()
+                })
+
+                it("greater than equal to", async () => {
+                  await expectQuery({
+                    range: {
+                      dob: {
+                        low: JAN_10TH,
+                        high: MAX_VALID_DATE.toISOString(),
+                      },
+                    },
+                  }).toContainExactly([{ dob: JAN_10TH }])
+                })
+
+                it("greater than", async () => {
+                  await expectQuery({
+                    range: {
+                      dob: { low: JAN_5TH, high: MAX_VALID_DATE.toISOString() },
+                    },
+                  }).toContainExactly([{ dob: JAN_10TH }])
+                })
+
+                it("less than equal to", async () => {
+                  await expectQuery({
+                    range: {
+                      dob: { high: JAN_1ST, low: MIN_VALID_DATE.toISOString() },
+                    },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+
+                it("less than", async () => {
+                  await expectQuery({
+                    range: {
+                      dob: { high: JAN_5TH, low: MIN_VALID_DATE.toISOString() },
+                    },
+                  }).toContainExactly([{ dob: JAN_1ST }])
+                })
+              })
+
+              describe("sort", () => {
+                it("sorts ascending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "dob",
+                    sortOrder: SortOrder.ASCENDING,
+                  }).toMatchExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
+                })
+
+                it("sorts descending", async () => {
+                  await expectSearch({
+                    query: {},
+                    sort: "dob",
+                    sortOrder: SortOrder.DESCENDING,
+                  }).toMatchExactly([{ dob: JAN_10TH }, { dob: JAN_1ST }])
+                })
+
+                describe("sortType STRING", () => {
+                  it("sorts ascending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "dob",
+                      sortType: SortType.STRING,
+                      sortOrder: SortOrder.ASCENDING,
+                    }).toMatchExactly([{ dob: JAN_1ST }, { dob: JAN_10TH }])
+                  })
+
+                  it("sorts descending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "dob",
+                      sortType: SortType.STRING,
+                      sortOrder: SortOrder.DESCENDING,
+                    }).toMatchExactly([{ dob: JAN_10TH }, { dob: JAN_1ST }])
+                  })
+                })
+              })
+            })
+
+            !isInternal &&
+              describe("datetime - time only", () => {
+                const T_1000 = "10:00:00"
+                const T_1045 = "10:45:00"
+                const T_1200 = "12:00:00"
+                const T_1530 = "15:30:00"
+                const T_0000 = "00:00:00"
+
+                const UNEXISTING_TIME = "10:01:00"
+
+                const NULL_TIME__ID = `null_time__id`
+
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    timeid: { name: "timeid", type: FieldType.STRING },
+                    time: {
+                      name: "time",
+                      type: FieldType.DATETIME,
+                      timeOnly: true,
+                    },
+                  })
+
+                  await createRows([
+                    { timeid: NULL_TIME__ID, time: null },
+                    { time: T_1000 },
+                    { time: T_1045 },
+                    { time: T_1200 },
+                    { time: T_1530 },
+                    { time: T_0000 },
+                  ])
+                })
+
+                describe("equal", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      equal: { time: T_1000 },
+                    }).toContainExactly([{ time: "10:00:00" }])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({
+                      equal: { time: UNEXISTING_TIME },
+                    }).toFindNothing()
+                  })
+                })
+
+                describe("notEqual", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      notEqual: { time: T_1000 },
+                    }).toContainExactly([
+                      { timeid: NULL_TIME__ID },
+                      { time: "10:45:00" },
+                      { time: "12:00:00" },
+                      { time: "15:30:00" },
+                      { time: "00:00:00" },
+                    ])
+                  })
+
+                  it("return all when requesting non-existing", async () => {
+                    await expectQuery({
+                      notEqual: { time: UNEXISTING_TIME },
+                    }).toContainExactly([
+                      { timeid: NULL_TIME__ID },
+                      { time: "10:00:00" },
+                      { time: "10:45:00" },
+                      { time: "12:00:00" },
+                      { time: "15:30:00" },
+                      { time: "00:00:00" },
+                    ])
+                  })
+                })
+
+                describe("oneOf", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      oneOf: { time: [T_1000] },
+                    }).toContainExactly([{ time: "10:00:00" }])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({
+                      oneOf: { time: [UNEXISTING_TIME] },
+                    }).toFindNothing()
+                  })
+                })
+
+                describe("range", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      range: { time: { low: T_1045, high: T_1045 } },
+                    }).toContainExactly([{ time: "10:45:00" }])
+                  })
+
+                  it("successfully finds multiple rows", async () => {
+                    await expectQuery({
+                      range: { time: { low: T_1045, high: T_1530 } },
+                    }).toContainExactly([
+                      { time: "10:45:00" },
+                      { time: "12:00:00" },
+                      { time: "15:30:00" },
+                    ])
+                  })
+
+                  it("successfully finds no rows", async () => {
+                    await expectQuery({
+                      range: {
+                        time: { low: UNEXISTING_TIME, high: UNEXISTING_TIME },
+                      },
+                    }).toFindNothing()
+                  })
+                })
+
+                describe("sort", () => {
+                  it("sorts ascending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "time",
+                      sortOrder: SortOrder.ASCENDING,
+                    }).toMatchExactly([
+                      { timeid: NULL_TIME__ID },
+                      { time: "00:00:00" },
+                      { time: "10:00:00" },
+                      { time: "10:45:00" },
+                      { time: "12:00:00" },
+                      { time: "15:30:00" },
+                    ])
+                  })
+
+                  it("sorts descending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "time",
+                      sortOrder: SortOrder.DESCENDING,
+                    }).toMatchExactly([
+                      { time: "15:30:00" },
+                      { time: "12:00:00" },
+                      { time: "10:45:00" },
+                      { time: "10:00:00" },
+                      { time: "00:00:00" },
+                      { timeid: NULL_TIME__ID },
+                    ])
+                  })
+
+                  describe("sortType STRING", () => {
+                    it("sorts ascending", async () => {
+                      await expectSearch({
+                        query: {},
+                        sort: "time",
+                        sortType: SortType.STRING,
+                        sortOrder: SortOrder.ASCENDING,
+                      }).toMatchExactly([
+                        { timeid: NULL_TIME__ID },
+                        { time: "00:00:00" },
+                        { time: "10:00:00" },
+                        { time: "10:45:00" },
+                        { time: "12:00:00" },
+                        { time: "15:30:00" },
+                      ])
+                    })
+
+                    it("sorts descending", async () => {
+                      await expectSearch({
+                        query: {},
+                        sort: "time",
+                        sortType: SortType.STRING,
+                        sortOrder: SortOrder.DESCENDING,
+                      }).toMatchExactly([
+                        { time: "15:30:00" },
+                        { time: "12:00:00" },
+                        { time: "10:45:00" },
+                        { time: "10:00:00" },
+                        { time: "00:00:00" },
+                        { timeid: NULL_TIME__ID },
+                      ])
+                    })
+                  })
+                })
+              })
+
+            describe("datetime - date only", () => {
+              describe.each([true, false])(
+                "saved with timestamp: %s",
+                saveWithTimestamp => {
+                  describe.each([true, false])(
+                    "search with timestamp: %s",
+                    searchWithTimestamp => {
+                      const SAVE_SUFFIX = saveWithTimestamp
+                        ? "T00:00:00.000Z"
+                        : ""
+                      const SEARCH_SUFFIX = searchWithTimestamp
+                        ? "T00:00:00.000Z"
+                        : ""
+
+                      const JAN_1ST = `2020-01-01`
+                      const JAN_10TH = `2020-01-10`
+                      const JAN_30TH = `2020-01-30`
+                      const UNEXISTING_DATE = `2020-01-03`
+                      const NULL_DATE__ID = `null_date__id`
+
+                      beforeAll(async () => {
+                        tableOrViewId = await createTableOrView({
+                          dateid: {
+                            name: "dateid",
+                            type: FieldType.STRING,
+                          },
+                          date: {
+                            name: "date",
+                            type: FieldType.DATETIME,
+                            dateOnly: true,
+                          },
+                        })
+
+                        await createRows([
+                          { dateid: NULL_DATE__ID, date: null },
+                          { date: `${JAN_1ST}${SAVE_SUFFIX}` },
+                          { date: `${JAN_10TH}${SAVE_SUFFIX}` },
+                        ])
+                      })
+
+                      describe("equal", () => {
+                        it("successfully finds a row", async () => {
+                          await expectQuery({
+                            equal: { date: `${JAN_1ST}${SEARCH_SUFFIX}` },
+                          }).toContainExactly([{ date: JAN_1ST }])
+                        })
+
+                        it("successfully finds an ISO8601 row", async () => {
+                          await expectQuery({
+                            equal: { date: `${JAN_10TH}${SEARCH_SUFFIX}` },
+                          }).toContainExactly([{ date: JAN_10TH }])
+                        })
+
+                        it("finds a row with ISO8601 timestamp", async () => {
+                          await expectQuery({
+                            equal: { date: `${JAN_1ST}${SEARCH_SUFFIX}` },
+                          }).toContainExactly([{ date: JAN_1ST }])
+                        })
+
+                        it("fails to find nonexistent row", async () => {
+                          await expectQuery({
+                            equal: {
+                              date: `${UNEXISTING_DATE}${SEARCH_SUFFIX}`,
+                            },
+                          }).toFindNothing()
+                        })
+                      })
+
+                      describe("notEqual", () => {
+                        it("successfully finds a row", async () => {
+                          await expectQuery({
+                            notEqual: {
+                              date: `${JAN_1ST}${SEARCH_SUFFIX}`,
+                            },
+                          }).toContainExactly([
+                            { date: JAN_10TH },
+                            { dateid: NULL_DATE__ID },
+                          ])
+                        })
+
+                        it("fails to find nonexistent row", async () => {
+                          await expectQuery({
+                            notEqual: {
+                              date: `${JAN_30TH}${SEARCH_SUFFIX}`,
+                            },
+                          }).toContainExactly([
+                            { date: JAN_1ST },
+                            { date: JAN_10TH },
+                            { dateid: NULL_DATE__ID },
+                          ])
+                        })
+                      })
+
+                      describe("oneOf", () => {
+                        it("successfully finds a row", async () => {
+                          await expectQuery({
+                            oneOf: { date: [`${JAN_1ST}${SEARCH_SUFFIX}`] },
+                          }).toContainExactly([{ date: JAN_1ST }])
+                        })
+
+                        it("fails to find nonexistent row", async () => {
+                          await expectQuery({
+                            oneOf: {
+                              date: [`${UNEXISTING_DATE}${SEARCH_SUFFIX}`],
+                            },
+                          }).toFindNothing()
+                        })
+                      })
+
+                      describe("range", () => {
+                        it("successfully finds a row", async () => {
+                          await expectQuery({
+                            range: {
+                              date: {
+                                low: `${JAN_1ST}${SEARCH_SUFFIX}`,
+                                high: `${JAN_1ST}${SEARCH_SUFFIX}`,
+                              },
+                            },
+                          }).toContainExactly([{ date: JAN_1ST }])
+                        })
+
+                        it("successfully finds multiple rows", async () => {
+                          await expectQuery({
+                            range: {
+                              date: {
+                                low: `${JAN_1ST}${SEARCH_SUFFIX}`,
+                                high: `${JAN_10TH}${SEARCH_SUFFIX}`,
+                              },
+                            },
+                          }).toContainExactly([
+                            { date: JAN_1ST },
+                            { date: JAN_10TH },
+                          ])
+                        })
+
+                        it("successfully finds no rows", async () => {
+                          await expectQuery({
+                            range: {
+                              date: {
+                                low: `${JAN_30TH}${SEARCH_SUFFIX}`,
+                                high: `${JAN_30TH}${SEARCH_SUFFIX}`,
+                              },
+                            },
+                          }).toFindNothing()
+                        })
+                      })
+
+                      describe("sort", () => {
+                        it("sorts ascending", async () => {
+                          await expectSearch({
+                            query: {},
+                            sort: "date",
+                            sortOrder: SortOrder.ASCENDING,
+                          }).toMatchExactly([
+                            { dateid: NULL_DATE__ID },
+                            { date: JAN_1ST },
+                            { date: JAN_10TH },
+                          ])
+                        })
+
+                        it("sorts descending", async () => {
+                          await expectSearch({
+                            query: {},
+                            sort: "date",
+                            sortOrder: SortOrder.DESCENDING,
+                          }).toMatchExactly([
+                            { date: JAN_10TH },
+                            { date: JAN_1ST },
+                            { dateid: NULL_DATE__ID },
+                          ])
+                        })
+
+                        describe("sortType STRING", () => {
+                          it("sorts ascending", async () => {
+                            await expectSearch({
+                              query: {},
+                              sort: "date",
+                              sortType: SortType.STRING,
+                              sortOrder: SortOrder.ASCENDING,
+                            }).toMatchExactly([
+                              { dateid: NULL_DATE__ID },
+                              { date: JAN_1ST },
+                              { date: JAN_10TH },
+                            ])
+                          })
+
+                          it("sorts descending", async () => {
+                            await expectSearch({
+                              query: {},
+                              sort: "date",
+                              sortType: SortType.STRING,
+                              sortOrder: SortOrder.DESCENDING,
+                            }).toMatchExactly([
+                              { date: JAN_10TH },
+                              { date: JAN_1ST },
+                              { dateid: NULL_DATE__ID },
+                            ])
+                          })
+                        })
+                      })
+                    }
+                  )
                 }
-
-                const autoValues = rows
-                  .map(row => row.auto)
-                  .sort((a, b) => a - b)
-                expect(autoValues).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
-              })
-            })
-          })
-
-        describe("field name 1:name", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              "1:name": { name: "1:name", type: FieldType.STRING },
-            })
-            await createRows([{ "1:name": "bar" }, { "1:name": "foo" }])
-          })
-
-          it("successfully finds a row", async () => {
-            await expectQuery({
-              equal: { "1:1:name": "bar" },
-            }).toContainExactly([{ "1:name": "bar" }])
-          })
-
-          it("fails to find nonexistent row", async () => {
-            await expectQuery({ equal: { "1:1:name": "none" } }).toFindNothing()
-          })
-        })
-
-        isSql &&
-          describe("related formulas", () => {
-            beforeAll(async () => {
-              const arrayTable = await createTable({
-                name: { name: "name", type: FieldType.STRING },
-                array: {
-                  name: "array",
-                  type: FieldType.ARRAY,
-                  constraints: {
-                    type: JsonFieldSubType.ARRAY,
-                    inclusion: ["option 1", "option 2"],
-                  },
-                },
-              })
-              tableOrViewId = await createTableOrView({
-                relationship: {
-                  type: FieldType.LINK,
-                  relationshipType: RelationshipType.MANY_TO_ONE,
-                  name: "relationship",
-                  fieldName: "relate",
-                  tableId: arrayTable,
-                  constraints: {
-                    type: "array",
-                  },
-                },
-                formula: {
-                  type: FieldType.FORMULA,
-                  name: "formula",
-                  formula: encodeJSBinding(
-                    `let array = [];$("relationship").forEach(rel => array = array.concat(rel.array));return array.sort().join(",")`
-                  ),
-                },
-              })
-              const arrayRows = await Promise.all([
-                config.api.row.save(arrayTable, {
-                  name: "foo",
-                  array: ["option 1"],
-                }),
-                config.api.row.save(arrayTable, {
-                  name: "bar",
-                  array: ["option 2"],
-                }),
-              ])
-              await Promise.all([
-                config.api.row.save(tableOrViewId, {
-                  relationship: [arrayRows[0]._id, arrayRows[1]._id],
-                }),
-              ])
-            })
-
-            it("formula is correct with relationship arrays", async () => {
-              await expectQuery({}).toContain([
-                { formula: "option 1,option 2" },
-              ])
-            })
-          })
-
-        describe("user", () => {
-          let user1: User
-          let user2: User
-
-          beforeAll(async () => {
-            user1 = await config.createUser({ _id: `us_${utils.newid()}` })
-            user2 = await config.createUser({ _id: `us_${utils.newid()}` })
-
-            tableOrViewId = await createTableOrView({
-              user: {
-                name: "user",
-                type: FieldType.BB_REFERENCE_SINGLE,
-                subtype: BBReferenceFieldSubType.USER,
-              },
-            })
-
-            await createRows([{ user: user1 }, { user: user2 }, { user: null }])
-          })
-
-          describe("equal", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                equal: { user: user1._id },
-              }).toContainExactly([{ user: { _id: user1._id } }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({ equal: { user: "us_none" } }).toFindNothing()
-            })
-          })
-
-          describe("notEqual", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                notEqual: { user: user1._id },
-              }).toContainExactly([{ user: { _id: user2._id } }, {}])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                notEqual: { user: "us_none" },
-              }).toContainExactly([
-                { user: { _id: user1._id } },
-                { user: { _id: user2._id } },
-                {},
-              ])
-            })
-          })
-
-          describe("oneOf", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                oneOf: { user: [user1._id] },
-              }).toContainExactly([{ user: { _id: user1._id } }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                oneOf: { user: ["us_none"] },
-              }).toFindNothing()
-            })
-          })
-
-          describe("empty", () => {
-            it("finds empty rows", async () => {
-              await expectQuery({ empty: { user: null } }).toContainExactly([
-                {},
-              ])
-            })
-          })
-
-          describe("notEmpty", () => {
-            it("finds non-empty rows", async () => {
-              await expectQuery({ notEmpty: { user: null } }).toContainExactly([
-                { user: { _id: user1._id } },
-                { user: { _id: user2._id } },
-              ])
-            })
-          })
-        })
-
-        describe("multi user", () => {
-          let user1: User
-          let user2: User
-
-          beforeAll(async () => {
-            user1 = await config.createUser({ _id: `us_${utils.newid()}` })
-            user2 = await config.createUser({ _id: `us_${utils.newid()}` })
-
-            tableOrViewId = await createTableOrView({
-              users: {
-                name: "users",
-                type: FieldType.BB_REFERENCE,
-                subtype: BBReferenceFieldSubType.USER,
-                constraints: { type: "array" },
-              },
-              number: {
-                name: "number",
-                type: FieldType.NUMBER,
-              },
-            })
-
-            await createRows([
-              { number: 1, users: [user1] },
-              { number: 2, users: [user2] },
-              { number: 3, users: [user1, user2] },
-              { number: 4, users: [] },
-            ])
-          })
-
-          describe("contains", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                contains: { users: [user1._id] },
-              }).toContainExactly([
-                { users: [{ _id: user1._id }] },
-                { users: [{ _id: user1._id }, { _id: user2._id }] },
-              ])
-            })
-
-            it("successfully finds a row searching with a string", async () => {
-              await expectQuery({
-                // @ts-expect-error this test specifically goes against the type to
-                // test that we coerce the string to an array.
-                contains: { "1:users": user1._id },
-              }).toContainExactly([
-                { users: [{ _id: user1._id }] },
-                { users: [{ _id: user1._id }, { _id: user2._id }] },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                contains: { users: ["us_none"] },
-              }).toFindNothing()
-            })
-          })
-
-          describe("notContains", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                notContains: { users: [user1._id] },
-              }).toContainExactly([{ users: [{ _id: user2._id }] }, {}])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                notContains: { users: ["us_none"] },
-              }).toContainExactly([
-                { users: [{ _id: user1._id }] },
-                { users: [{ _id: user2._id }] },
-                { users: [{ _id: user1._id }, { _id: user2._id }] },
-                {},
-              ])
-            })
-          })
-
-          describe("containsAny", () => {
-            it("successfully finds rows", async () => {
-              await expectQuery({
-                containsAny: { users: [user1._id, user2._id] },
-              }).toContainExactly([
-                { users: [{ _id: user1._id }] },
-                { users: [{ _id: user2._id }] },
-                { users: [{ _id: user1._id }, { _id: user2._id }] },
-              ])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                containsAny: { users: ["us_none"] },
-              }).toFindNothing()
-            })
-          })
-
-          describe("multi-column equals", () => {
-            it("successfully finds a row", async () => {
-              await expectQuery({
-                equal: { number: 1 },
-                contains: { users: [user1._id] },
-              }).toContainExactly([{ users: [{ _id: user1._id }], number: 1 }])
-            })
-
-            it("fails to find nonexistent row", async () => {
-              await expectQuery({
-                equal: { number: 2 },
-                contains: { users: [user1._id] },
-              }).toFindNothing()
-            })
-          })
-        })
-
-        // It also can't work for in-memory searching because the related table name
-        // isn't available.
-        !isInMemory &&
-          describe.each([
-            RelationshipType.ONE_TO_MANY,
-            RelationshipType.MANY_TO_ONE,
-            RelationshipType.MANY_TO_MANY,
-          ])("relations (%s)", relationshipType => {
-            let productCategoryTable: Table, productCatRows: Row[]
-
-            beforeAll(async () => {
-              const { relatedTable, tableId } = await basicRelationshipTables(
-                relationshipType
               )
-              tableOrViewId = tableId
-              productCategoryTable = relatedTable
-
-              productCatRows = await Promise.all([
-                config.api.row.save(productCategoryTable._id!, { name: "foo" }),
-                config.api.row.save(productCategoryTable._id!, { name: "bar" }),
-              ])
-
-              await Promise.all([
-                config.api.row.save(tableOrViewId, {
-                  name: "foo",
-                  productCat: [productCatRows[0]._id],
-                }),
-                config.api.row.save(tableOrViewId, {
-                  name: "bar",
-                  productCat: [productCatRows[1]._id],
-                }),
-                config.api.row.save(tableOrViewId, {
-                  name: "baz",
-                  productCat: [],
-                }),
-              ])
             })
 
-            it("should be able to filter by relationship using column name", async () => {
-              await expectQuery({
-                equal: { ["productCat.name"]: "foo" },
-              }).toContainExactly([
-                { name: "foo", productCat: [{ _id: productCatRows[0]._id }] },
-              ])
-            })
+            isInternal &&
+              !isInMemory &&
+              describe("AI Column", () => {
+                const UNEXISTING_AI_COLUMN = "Real LLM Response"
 
-            it("should be able to filter by relationship using table name", async () => {
-              await expectQuery({
-                equal: { [`${productCategoryTable.name}.name`]: "foo" },
-              }).toContainExactly([
-                { name: "foo", productCat: [{ _id: productCatRows[0]._id }] },
-              ])
-            })
+                beforeAll(async () => {
+                  mocks.licenses.useBudibaseAI()
+                  mocks.licenses.useAICustomConfigs()
 
-            it("shouldn't return any relationship for last row", async () => {
-              await expectQuery({
-                equal: { ["name"]: "baz" },
-              }).toContainExactly([{ name: "baz", productCat: undefined }])
-            })
-
-            describe("logical filters", () => {
-              const logicalOperators = [LogicalOperator.AND, LogicalOperator.OR]
-
-              describe("$and", () => {
-                it("should allow single conditions", async () => {
-                  await expectQuery({
-                    $and: {
-                      conditions: [
-                        {
-                          equal: { ["productCat.name"]: "foo" },
-                        },
-                      ],
-                    },
-                  }).toContainExactly([
-                    {
-                      name: "foo",
-                      productCat: [{ _id: productCatRows[0]._id }],
+                  tableOrViewId = await createTableOrView({
+                    product: { name: "product", type: FieldType.STRING },
+                    ai: {
+                      name: "AI",
+                      type: FieldType.AI,
+                      operation: AIOperationEnum.PROMPT,
+                      prompt: "Translate '{{ product }}' into German",
                     },
+                  })
+
+                  await createRows([
+                    { product: "Big Mac" },
+                    { product: "McCrispy" },
                   ])
                 })
 
-                it("should allow exclusive conditions", async () => {
-                  await expectQuery({
-                    $and: {
-                      conditions: [
-                        {
-                          equal: { ["productCat.name"]: "foo" },
-                          notEqual: { ["productCat.name"]: "foo" },
-                        },
-                      ],
-                    },
-                  }).toContainExactly([])
+                describe("equal", () => {
+                  it("successfully finds rows based on AI column", async () => {
+                    await expectQuery({
+                      equal: { ai: "Mock LLM Response" },
+                    }).toContainExactly([
+                      { product: "Big Mac" },
+                      { product: "McCrispy" },
+                    ])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({
+                      equal: { ai: UNEXISTING_AI_COLUMN },
+                    }).toFindNothing()
+                  })
                 })
 
-                it.each([logicalOperators])(
-                  "should allow nested ands with single conditions (with %s as root)",
-                  async rootOperator => {
+                describe("notEqual", () => {
+                  it("Returns nothing when searching notEqual on the mock AI response", async () => {
                     await expectQuery({
-                      [rootOperator]: {
-                        conditions: [
-                          {
-                            $and: {
-                              conditions: [
-                                {
-                                  equal: { ["productCat.name"]: "foo" },
-                                },
-                              ],
-                            },
-                          },
-                        ],
+                      notEqual: { ai: "Mock LLM Response" },
+                    }).toContainExactly([])
+                  })
+
+                  it("return all when requesting non-existing response", async () => {
+                    await expectQuery({
+                      notEqual: { ai: "Real LLM Response" },
+                    }).toContainExactly([
+                      { product: "Big Mac" },
+                      { product: "McCrispy" },
+                    ])
+                  })
+                })
+
+                describe("oneOf", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      oneOf: {
+                        ai: ["Mock LLM Response", "Other LLM Response"],
                       },
                     }).toContainExactly([
-                      {
-                        name: "foo",
-                        productCat: [{ _id: productCatRows[0]._id }],
-                      },
+                      { product: "Big Mac" },
+                      { product: "McCrispy" },
                     ])
-                  }
-                )
+                  })
 
-                it.each([logicalOperators])(
-                  "should allow nested ands with exclusive conditions (with %s as root)",
-                  async rootOperator => {
+                  it("fails to find nonexistent row", async () => {
                     await expectQuery({
-                      [rootOperator]: {
-                        conditions: [
-                          {
-                            $and: {
-                              conditions: [
-                                {
-                                  equal: { ["productCat.name"]: "foo" },
-                                  notEqual: { ["productCat.name"]: "foo" },
-                                },
-                              ],
-                            },
-                          },
-                        ],
-                      },
-                    }).toContainExactly([])
-                  }
-                )
-
-                it.each([logicalOperators])(
-                  "should allow nested ands with multiple conditions (with %s as root)",
-                  async rootOperator => {
-                    await expectQuery({
-                      [rootOperator]: {
-                        conditions: [
-                          {
-                            $and: {
-                              conditions: [
-                                {
-                                  equal: { ["productCat.name"]: "foo" },
-                                },
-                              ],
-                            },
-                            notEqual: { ["productCat.name"]: "foo" },
-                          },
-                        ],
-                      },
-                    }).toContainExactly([])
-                  }
-                )
+                      oneOf: { ai: ["Whopper"] },
+                    }).toFindNothing()
+                  })
+                })
               })
 
-              describe("$ors", () => {
-                it("should allow single conditions", async () => {
+            describe("arrays", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  numbers: {
+                    name: "numbers",
+                    type: FieldType.ARRAY,
+                    constraints: {
+                      type: JsonFieldSubType.ARRAY,
+                      inclusion: ["one", "two", "three"],
+                    },
+                  },
+                })
+                await createRows([
+                  { numbers: ["one", "two"] },
+                  { numbers: ["three"] },
+                ])
+              })
+
+              describe("contains", () => {
+                it("successfully finds a row", async () => {
                   await expectQuery({
-                    $or: {
-                      conditions: [
-                        {
-                          equal: { ["productCat.name"]: "foo" },
-                        },
-                      ],
-                    },
+                    contains: { numbers: ["one"] },
+                  }).toContainExactly([{ numbers: ["one", "two"] }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    contains: { numbers: ["none"] },
+                  }).toFindNothing()
+                })
+
+                it("fails to find row containing all", async () => {
+                  await expectQuery({
+                    contains: { numbers: ["one", "two", "three"] },
+                  }).toFindNothing()
+                })
+
+                it("finds all with empty list", async () => {
+                  await expectQuery({
+                    contains: { numbers: [] },
                   }).toContainExactly([
-                    {
-                      name: "foo",
-                      productCat: [{ _id: productCatRows[0]._id }],
-                    },
+                    { numbers: ["one", "two"] },
+                    { numbers: ["three"] },
+                  ])
+                })
+              })
+
+              describe("notContains", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notContains: { numbers: ["one"] },
+                  }).toContainExactly([{ numbers: ["three"] }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    notContains: { numbers: ["one", "two", "three"] },
+                  }).toContainExactly([
+                    { numbers: ["one", "two"] },
+                    { numbers: ["three"] },
                   ])
                 })
 
-                it("should allow exclusive conditions", async () => {
+                // Not sure if this is correct behaviour but changing it would be a
+                // breaking change.
+                it("finds all with empty list", async () => {
                   await expectQuery({
-                    $or: {
-                      conditions: [
-                        {
-                          equal: { ["productCat.name"]: "foo" },
-                          notEqual: { ["productCat.name"]: "foo" },
-                        },
-                      ],
-                    },
+                    notContains: { numbers: [] },
                   }).toContainExactly([
-                    {
-                      name: "foo",
-                      productCat: [{ _id: productCatRows[0]._id }],
+                    { numbers: ["one", "two"] },
+                    { numbers: ["three"] },
+                  ])
+                })
+              })
+
+              describe("containsAny", () => {
+                it("successfully finds rows", async () => {
+                  await expectQuery({
+                    containsAny: { numbers: ["one", "two", "three"] },
+                  }).toContainExactly([
+                    { numbers: ["one", "two"] },
+                    { numbers: ["three"] },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    containsAny: { numbers: ["none"] },
+                  }).toFindNothing()
+                })
+
+                it("finds all with empty list", async () => {
+                  await expectQuery({
+                    containsAny: { numbers: [] },
+                  }).toContainExactly([
+                    { numbers: ["one", "two"] },
+                    { numbers: ["three"] },
+                  ])
+                })
+              })
+            })
+
+            describe("bigints", () => {
+              const SMALL = "1"
+              const MEDIUM = "10000000"
+
+              // Our bigints are int64s in most datasources.
+              let BIG = "9223372036854775807"
+
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  num: { name: "num", type: FieldType.BIGINT },
+                })
+                await createRows([
+                  { num: SMALL },
+                  { num: MEDIUM },
+                  { num: BIG },
+                ])
+              })
+
+              describe("equal", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({ equal: { num: SMALL } }).toContainExactly(
+                    [{ num: SMALL }]
+                  )
+                })
+
+                it("successfully finds a big value", async () => {
+                  await expectQuery({ equal: { num: BIG } }).toContainExactly([
+                    { num: BIG },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ equal: { num: "2" } }).toFindNothing()
+                })
+              })
+
+              describe("notEqual", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notEqual: { num: SMALL },
+                  }).toContainExactly([{ num: MEDIUM }, { num: BIG }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ notEqual: { num: 10 } }).toContainExactly(
+                    [{ num: SMALL }, { num: MEDIUM }, { num: BIG }]
+                  )
+                })
+              })
+
+              describe("oneOf", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    oneOf: { num: [SMALL] },
+                  }).toContainExactly([{ num: SMALL }])
+                })
+
+                it("successfully finds all rows", async () => {
+                  await expectQuery({
+                    oneOf: { num: [SMALL, MEDIUM, BIG] },
+                  }).toContainExactly([
+                    { num: SMALL },
+                    { num: MEDIUM },
+                    { num: BIG },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({ oneOf: { num: [2] } }).toFindNothing()
+                })
+              })
+
+              describe("range", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    range: { num: { low: SMALL, high: "5" } },
+                  }).toContainExactly([{ num: SMALL }])
+                })
+
+                it("successfully finds multiple rows", async () => {
+                  await expectQuery({
+                    range: { num: { low: SMALL, high: MEDIUM } },
+                  }).toContainExactly([{ num: SMALL }, { num: MEDIUM }])
+                })
+
+                it("successfully finds a row with a high bound", async () => {
+                  await expectQuery({
+                    range: { num: { low: MEDIUM, high: BIG } },
+                  }).toContainExactly([{ num: MEDIUM }, { num: BIG }])
+                })
+
+                it("successfully finds no rows", async () => {
+                  await expectQuery({
+                    range: { num: { low: "5", high: "5" } },
+                  }).toFindNothing()
+                })
+
+                it("can search using just a low value", async () => {
+                  await expectQuery({
+                    range: { num: { low: MEDIUM } },
+                  }).toContainExactly([{ num: MEDIUM }, { num: BIG }])
+                })
+
+                it("can search using just a high value", async () => {
+                  await expectQuery({
+                    range: { num: { high: MEDIUM } },
+                  }).toContainExactly([{ num: SMALL }, { num: MEDIUM }])
+                })
+              })
+            })
+
+            isInternal &&
+              describe("auto", () => {
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    auto: {
+                      name: "auto",
+                      type: FieldType.AUTO,
+                      autocolumn: true,
+                      subtype: AutoFieldSubType.AUTO_ID,
                     },
-                    {
+                  })
+                  await createRows(new Array(10).fill({}))
+                })
+
+                describe("equal", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({ equal: { auto: 1 } }).toContainExactly([
+                      { auto: 1 },
+                    ])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({ equal: { auto: 0 } }).toFindNothing()
+                  })
+                })
+
+                describe("not equal", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      notEqual: { auto: 1 },
+                    }).toContainExactly([
+                      { auto: 2 },
+                      { auto: 3 },
+                      { auto: 4 },
+                      { auto: 5 },
+                      { auto: 6 },
+                      { auto: 7 },
+                      { auto: 8 },
+                      { auto: 9 },
+                      { auto: 10 },
+                    ])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({
+                      notEqual: { auto: 0 },
+                    }).toContainExactly([
+                      { auto: 1 },
+                      { auto: 2 },
+                      { auto: 3 },
+                      { auto: 4 },
+                      { auto: 5 },
+                      { auto: 6 },
+                      { auto: 7 },
+                      { auto: 8 },
+                      { auto: 9 },
+                      { auto: 10 },
+                    ])
+                  })
+                })
+
+                describe("oneOf", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      oneOf: { auto: [1] },
+                    }).toContainExactly([{ auto: 1 }])
+                  })
+
+                  it("fails to find nonexistent row", async () => {
+                    await expectQuery({ oneOf: { auto: [0] } }).toFindNothing()
+                  })
+                })
+
+                describe("range", () => {
+                  it("successfully finds a row", async () => {
+                    await expectQuery({
+                      range: { auto: { low: 1, high: 1 } },
+                    }).toContainExactly([{ auto: 1 }])
+                  })
+
+                  it("successfully finds multiple rows", async () => {
+                    await expectQuery({
+                      range: { auto: { low: 1, high: 2 } },
+                    }).toContainExactly([{ auto: 1 }, { auto: 2 }])
+                  })
+
+                  it("successfully finds a row with a high bound", async () => {
+                    await expectQuery({
+                      range: { auto: { low: 2, high: 2 } },
+                    }).toContainExactly([{ auto: 2 }])
+                  })
+
+                  it("successfully finds no rows", async () => {
+                    await expectQuery({
+                      range: { auto: { low: 0, high: 0 } },
+                    }).toFindNothing()
+                  })
+
+                  it("can search using just a low value", async () => {
+                    await expectQuery({
+                      range: { auto: { low: 9 } },
+                    }).toContainExactly([{ auto: 9 }, { auto: 10 }])
+                  })
+
+                  it("can search using just a high value", async () => {
+                    await expectQuery({
+                      range: { auto: { high: 2 } },
+                    }).toContainExactly([{ auto: 1 }, { auto: 2 }])
+                  })
+                })
+
+                describe("sort", () => {
+                  it("sorts ascending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "auto",
+                      sortOrder: SortOrder.ASCENDING,
+                      sortType: SortType.NUMBER,
+                    }).toMatchExactly([
+                      { auto: 1 },
+                      { auto: 2 },
+                      { auto: 3 },
+                      { auto: 4 },
+                      { auto: 5 },
+                      { auto: 6 },
+                      { auto: 7 },
+                      { auto: 8 },
+                      { auto: 9 },
+                      { auto: 10 },
+                    ])
+                  })
+
+                  it("sorts descending", async () => {
+                    await expectSearch({
+                      query: {},
+                      sort: "auto",
+                      sortOrder: SortOrder.DESCENDING,
+                      sortType: SortType.NUMBER,
+                    }).toMatchExactly([
+                      { auto: 10 },
+                      { auto: 9 },
+                      { auto: 8 },
+                      { auto: 7 },
+                      { auto: 6 },
+                      { auto: 5 },
+                      { auto: 4 },
+                      { auto: 3 },
+                      { auto: 2 },
+                      { auto: 1 },
+                    ])
+                  })
+
+                  // This is important for pagination. The order of results must always
+                  // be stable or pagination will break. We don't want the user to need
+                  // to specify an order for pagination to work.
+                  it("is stable without a sort specified", async () => {
+                    let { rows: fullRowList } = await config.api.row.search(
+                      tableOrViewId,
+                      {
+                        tableId: tableOrViewId,
+                        query: {},
+                      }
+                    )
+
+                    // repeat the search many times to check the first row is always the same
+                    let bookmark: string | number | undefined,
+                      hasNextPage: boolean | undefined = true,
+                      rowCount = 0
+                    do {
+                      const response = await config.api.row.search(
+                        tableOrViewId,
+                        {
+                          tableId: tableOrViewId,
+                          limit: 1,
+                          paginate: true,
+                          query: {},
+                          bookmark,
+                        }
+                      )
+                      bookmark = response.bookmark
+                      hasNextPage = response.hasNextPage
+                      expect(response.rows.length).toEqual(1)
+                      const foundRow = response.rows[0]
+                      expect(foundRow).toEqual(fullRowList[rowCount++])
+                    } while (hasNextPage)
+                  })
+                })
+
+                describe("pagination", () => {
+                  it("should paginate through all rows", async () => {
+                    // @ts-ignore
+                    let bookmark: string | number = undefined
+                    let rows: Row[] = []
+
+                    while (true) {
+                      const response = await config.api.row.search(
+                        tableOrViewId,
+                        {
+                          tableId: tableOrViewId,
+                          limit: 3,
+                          query: {},
+                          bookmark,
+                          paginate: true,
+                        }
+                      )
+
+                      rows.push(...response.rows)
+
+                      if (!response.bookmark || !response.hasNextPage) {
+                        break
+                      }
+                      bookmark = response.bookmark
+                    }
+
+                    const autoValues = rows
+                      .map(row => row.auto)
+                      .sort((a, b) => a - b)
+                    expect(autoValues).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
+                  })
+                })
+              })
+
+            describe("field name 1:name", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  "1:name": { name: "1:name", type: FieldType.STRING },
+                })
+                await createRows([{ "1:name": "bar" }, { "1:name": "foo" }])
+              })
+
+              it("successfully finds a row", async () => {
+                await expectQuery({
+                  equal: { "1:1:name": "bar" },
+                }).toContainExactly([{ "1:name": "bar" }])
+              })
+
+              it("fails to find nonexistent row", async () => {
+                await expectQuery({
+                  equal: { "1:1:name": "none" },
+                }).toFindNothing()
+              })
+            })
+
+            isSql &&
+              describe("related formulas", () => {
+                beforeAll(async () => {
+                  const arrayTable = await createTable({
+                    name: { name: "name", type: FieldType.STRING },
+                    array: {
+                      name: "array",
+                      type: FieldType.ARRAY,
+                      constraints: {
+                        type: JsonFieldSubType.ARRAY,
+                        inclusion: ["option 1", "option 2"],
+                      },
+                    },
+                  })
+                  tableOrViewId = await createTableOrView({
+                    relationship: {
+                      type: FieldType.LINK,
+                      relationshipType: RelationshipType.MANY_TO_ONE,
+                      name: "relationship",
+                      fieldName: "relate",
+                      tableId: arrayTable,
+                      constraints: {
+                        type: "array",
+                      },
+                    },
+                    formula: {
+                      type: FieldType.FORMULA,
+                      name: "formula",
+                      formula: encodeJSBinding(
+                        `let array = [];$("relationship").forEach(rel => array = array.concat(rel.array));return array.sort().join(",")`
+                      ),
+                    },
+                  })
+                  const arrayRows = await Promise.all([
+                    config.api.row.save(arrayTable, {
+                      name: "foo",
+                      array: ["option 1"],
+                    }),
+                    config.api.row.save(arrayTable, {
                       name: "bar",
-                      productCat: [{ _id: productCatRows[1]._id }],
-                    },
-                    { name: "baz", productCat: undefined },
+                      array: ["option 2"],
+                    }),
+                  ])
+                  await Promise.all([
+                    config.api.row.save(tableOrViewId, {
+                      relationship: [arrayRows[0]._id, arrayRows[1]._id],
+                    }),
                   ])
                 })
 
-                it.each([logicalOperators])(
-                  "should allow nested ors with single conditions (with %s as root)",
-                  async rootOperator => {
-                    await expectQuery({
-                      [rootOperator]: {
-                        conditions: [
-                          {
-                            $or: {
-                              conditions: [
-                                {
-                                  equal: { ["productCat.name"]: "foo" },
-                                },
-                              ],
-                            },
-                          },
-                        ],
-                      },
-                    }).toContainExactly([
-                      {
-                        name: "foo",
-                        productCat: [{ _id: productCatRows[0]._id }],
-                      },
-                    ])
-                  }
-                )
+                it("formula is correct with relationship arrays", async () => {
+                  await expectQuery({}).toContain([
+                    { formula: "option 1,option 2" },
+                  ])
+                })
+              })
 
-                it.each([logicalOperators])(
-                  "should allow nested ors with exclusive conditions (with %s as root)",
-                  async rootOperator => {
-                    await expectQuery({
-                      [rootOperator]: {
-                        conditions: [
-                          {
-                            $or: {
-                              conditions: [
-                                {
-                                  equal: { ["productCat.name"]: "foo" },
-                                  notEqual: { ["productCat.name"]: "foo" },
-                                },
-                              ],
-                            },
-                          },
-                        ],
-                      },
-                    }).toContainExactly([
-                      {
-                        name: "foo",
-                        productCat: [{ _id: productCatRows[0]._id }],
-                      },
-                      {
-                        name: "bar",
-                        productCat: [{ _id: productCatRows[1]._id }],
-                      },
-                      { name: "baz", productCat: undefined },
-                    ])
-                  }
-                )
+            describe("user", () => {
+              let user1: User
+              let user2: User
 
-                it("should allow nested ors with multiple conditions", async () => {
+              beforeAll(async () => {
+                user1 = await config.createUser({ _id: `us_${utils.newid()}` })
+                user2 = await config.createUser({ _id: `us_${utils.newid()}` })
+
+                tableOrViewId = await createTableOrView({
+                  user: {
+                    name: "user",
+                    type: FieldType.BB_REFERENCE_SINGLE,
+                    subtype: BBReferenceFieldSubType.USER,
+                  },
+                })
+
+                await createRows([
+                  { user: user1 },
+                  { user: user2 },
+                  { user: null },
+                ])
+              })
+
+              describe("equal", () => {
+                it("successfully finds a row", async () => {
                   await expectQuery({
-                    $or: {
-                      conditions: [
+                    equal: { user: user1._id },
+                  }).toContainExactly([{ user: { _id: user1._id } }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    equal: { user: "us_none" },
+                  }).toFindNothing()
+                })
+              })
+
+              describe("notEqual", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notEqual: { user: user1._id },
+                  }).toContainExactly([{ user: { _id: user2._id } }, {}])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    notEqual: { user: "us_none" },
+                  }).toContainExactly([
+                    { user: { _id: user1._id } },
+                    { user: { _id: user2._id } },
+                    {},
+                  ])
+                })
+              })
+
+              describe("oneOf", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    oneOf: { user: [user1._id] },
+                  }).toContainExactly([{ user: { _id: user1._id } }])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    oneOf: { user: ["us_none"] },
+                  }).toFindNothing()
+                })
+              })
+
+              describe("empty", () => {
+                it("finds empty rows", async () => {
+                  await expectQuery({ empty: { user: null } }).toContainExactly(
+                    [{}]
+                  )
+                })
+              })
+
+              describe("notEmpty", () => {
+                it("finds non-empty rows", async () => {
+                  await expectQuery({
+                    notEmpty: { user: null },
+                  }).toContainExactly([
+                    { user: { _id: user1._id } },
+                    { user: { _id: user2._id } },
+                  ])
+                })
+              })
+            })
+
+            describe("multi user", () => {
+              let user1: User
+              let user2: User
+
+              beforeAll(async () => {
+                user1 = await config.createUser({ _id: `us_${utils.newid()}` })
+                user2 = await config.createUser({ _id: `us_${utils.newid()}` })
+
+                tableOrViewId = await createTableOrView({
+                  users: {
+                    name: "users",
+                    type: FieldType.BB_REFERENCE,
+                    subtype: BBReferenceFieldSubType.USER,
+                    constraints: { type: "array" },
+                  },
+                  number: {
+                    name: "number",
+                    type: FieldType.NUMBER,
+                  },
+                })
+
+                await createRows([
+                  { number: 1, users: [user1] },
+                  { number: 2, users: [user2] },
+                  { number: 3, users: [user1, user2] },
+                  { number: 4, users: [] },
+                ])
+              })
+
+              describe("contains", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    contains: { users: [user1._id] },
+                  }).toContainExactly([
+                    { users: [{ _id: user1._id }] },
+                    { users: [{ _id: user1._id }, { _id: user2._id }] },
+                  ])
+                })
+
+                it("successfully finds a row searching with a string", async () => {
+                  await expectQuery({
+                    // @ts-expect-error this test specifically goes against the type to
+                    // test that we coerce the string to an array.
+                    contains: { "1:users": user1._id },
+                  }).toContainExactly([
+                    { users: [{ _id: user1._id }] },
+                    { users: [{ _id: user1._id }, { _id: user2._id }] },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    contains: { users: ["us_none"] },
+                  }).toFindNothing()
+                })
+              })
+
+              describe("notContains", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    notContains: { users: [user1._id] },
+                  }).toContainExactly([{ users: [{ _id: user2._id }] }, {}])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    notContains: { users: ["us_none"] },
+                  }).toContainExactly([
+                    { users: [{ _id: user1._id }] },
+                    { users: [{ _id: user2._id }] },
+                    { users: [{ _id: user1._id }, { _id: user2._id }] },
+                    {},
+                  ])
+                })
+              })
+
+              describe("containsAny", () => {
+                it("successfully finds rows", async () => {
+                  await expectQuery({
+                    containsAny: { users: [user1._id, user2._id] },
+                  }).toContainExactly([
+                    { users: [{ _id: user1._id }] },
+                    { users: [{ _id: user2._id }] },
+                    { users: [{ _id: user1._id }, { _id: user2._id }] },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    containsAny: { users: ["us_none"] },
+                  }).toFindNothing()
+                })
+              })
+
+              describe("multi-column equals", () => {
+                it("successfully finds a row", async () => {
+                  await expectQuery({
+                    equal: { number: 1 },
+                    contains: { users: [user1._id] },
+                  }).toContainExactly([
+                    { users: [{ _id: user1._id }], number: 1 },
+                  ])
+                })
+
+                it("fails to find nonexistent row", async () => {
+                  await expectQuery({
+                    equal: { number: 2 },
+                    contains: { users: [user1._id] },
+                  }).toFindNothing()
+                })
+              })
+            })
+
+            // It also can't work for in-memory searching because the related table name
+            // isn't available.
+            !isInMemory &&
+              describe.each([
+                RelationshipType.ONE_TO_MANY,
+                RelationshipType.MANY_TO_ONE,
+                RelationshipType.MANY_TO_MANY,
+              ])("relations (%s)", relationshipType => {
+                let productCategoryTable: Table, productCatRows: Row[]
+
+                beforeAll(async () => {
+                  const { relatedTable, tableId } =
+                    await basicRelationshipTables(relationshipType)
+                  tableOrViewId = tableId
+                  productCategoryTable = relatedTable
+
+                  productCatRows = await Promise.all([
+                    config.api.row.save(productCategoryTable._id!, {
+                      name: "foo",
+                    }),
+                    config.api.row.save(productCategoryTable._id!, {
+                      name: "bar",
+                    }),
+                  ])
+
+                  await Promise.all([
+                    config.api.row.save(tableOrViewId, {
+                      name: "foo",
+                      productCat: [productCatRows[0]._id],
+                    }),
+                    config.api.row.save(tableOrViewId, {
+                      name: "bar",
+                      productCat: [productCatRows[1]._id],
+                    }),
+                    config.api.row.save(tableOrViewId, {
+                      name: "baz",
+                      productCat: [],
+                    }),
+                  ])
+                })
+
+                it("should be able to filter by relationship using column name", async () => {
+                  await expectQuery({
+                    equal: { ["productCat.name"]: "foo" },
+                  }).toContainExactly([
+                    {
+                      name: "foo",
+                      productCat: [{ _id: productCatRows[0]._id }],
+                    },
+                  ])
+                })
+
+                it("should be able to filter by relationship using table name", async () => {
+                  await expectQuery({
+                    equal: { [`${productCategoryTable.name}.name`]: "foo" },
+                  }).toContainExactly([
+                    {
+                      name: "foo",
+                      productCat: [{ _id: productCatRows[0]._id }],
+                    },
+                  ])
+                })
+
+                it("shouldn't return any relationship for last row", async () => {
+                  await expectQuery({
+                    equal: { ["name"]: "baz" },
+                  }).toContainExactly([{ name: "baz", productCat: undefined }])
+                })
+
+                describe("logical filters", () => {
+                  const logicalOperators = [
+                    LogicalOperator.AND,
+                    LogicalOperator.OR,
+                  ]
+
+                  describe("$and", () => {
+                    it("should allow single conditions", async () => {
+                      await expectQuery({
+                        $and: {
+                          conditions: [
+                            {
+                              equal: { ["productCat.name"]: "foo" },
+                            },
+                          ],
+                        },
+                      }).toContainExactly([
                         {
-                          $or: {
+                          name: "foo",
+                          productCat: [{ _id: productCatRows[0]._id }],
+                        },
+                      ])
+                    })
+
+                    it("should allow exclusive conditions", async () => {
+                      await expectQuery({
+                        $and: {
+                          conditions: [
+                            {
+                              equal: { ["productCat.name"]: "foo" },
+                              notEqual: { ["productCat.name"]: "foo" },
+                            },
+                          ],
+                        },
+                      }).toContainExactly([])
+                    })
+
+                    it.each([logicalOperators])(
+                      "should allow nested ands with single conditions (with %s as root)",
+                      async rootOperator => {
+                        await expectQuery({
+                          [rootOperator]: {
                             conditions: [
                               {
-                                equal: { ["productCat.name"]: "foo" },
+                                $and: {
+                                  conditions: [
+                                    {
+                                      equal: { ["productCat.name"]: "foo" },
+                                    },
+                                  ],
+                                },
                               },
                             ],
                           },
-                          notEqual: { ["productCat.name"]: "foo" },
+                        }).toContainExactly([
+                          {
+                            name: "foo",
+                            productCat: [{ _id: productCatRows[0]._id }],
+                          },
+                        ])
+                      }
+                    )
+
+                    it.each([logicalOperators])(
+                      "should allow nested ands with exclusive conditions (with %s as root)",
+                      async rootOperator => {
+                        await expectQuery({
+                          [rootOperator]: {
+                            conditions: [
+                              {
+                                $and: {
+                                  conditions: [
+                                    {
+                                      equal: { ["productCat.name"]: "foo" },
+                                      notEqual: { ["productCat.name"]: "foo" },
+                                    },
+                                  ],
+                                },
+                              },
+                            ],
+                          },
+                        }).toContainExactly([])
+                      }
+                    )
+
+                    it.each([logicalOperators])(
+                      "should allow nested ands with multiple conditions (with %s as root)",
+                      async rootOperator => {
+                        await expectQuery({
+                          [rootOperator]: {
+                            conditions: [
+                              {
+                                $and: {
+                                  conditions: [
+                                    {
+                                      equal: { ["productCat.name"]: "foo" },
+                                    },
+                                  ],
+                                },
+                                notEqual: { ["productCat.name"]: "foo" },
+                              },
+                            ],
+                          },
+                        }).toContainExactly([])
+                      }
+                    )
+                  })
+
+                  describe("$ors", () => {
+                    it("should allow single conditions", async () => {
+                      await expectQuery({
+                        $or: {
+                          conditions: [
+                            {
+                              equal: { ["productCat.name"]: "foo" },
+                            },
+                          ],
                         },
-                      ],
+                      }).toContainExactly([
+                        {
+                          name: "foo",
+                          productCat: [{ _id: productCatRows[0]._id }],
+                        },
+                      ])
+                    })
+
+                    it("should allow exclusive conditions", async () => {
+                      await expectQuery({
+                        $or: {
+                          conditions: [
+                            {
+                              equal: { ["productCat.name"]: "foo" },
+                              notEqual: { ["productCat.name"]: "foo" },
+                            },
+                          ],
+                        },
+                      }).toContainExactly([
+                        {
+                          name: "foo",
+                          productCat: [{ _id: productCatRows[0]._id }],
+                        },
+                        {
+                          name: "bar",
+                          productCat: [{ _id: productCatRows[1]._id }],
+                        },
+                        { name: "baz", productCat: undefined },
+                      ])
+                    })
+
+                    it.each([logicalOperators])(
+                      "should allow nested ors with single conditions (with %s as root)",
+                      async rootOperator => {
+                        await expectQuery({
+                          [rootOperator]: {
+                            conditions: [
+                              {
+                                $or: {
+                                  conditions: [
+                                    {
+                                      equal: { ["productCat.name"]: "foo" },
+                                    },
+                                  ],
+                                },
+                              },
+                            ],
+                          },
+                        }).toContainExactly([
+                          {
+                            name: "foo",
+                            productCat: [{ _id: productCatRows[0]._id }],
+                          },
+                        ])
+                      }
+                    )
+
+                    it.each([logicalOperators])(
+                      "should allow nested ors with exclusive conditions (with %s as root)",
+                      async rootOperator => {
+                        await expectQuery({
+                          [rootOperator]: {
+                            conditions: [
+                              {
+                                $or: {
+                                  conditions: [
+                                    {
+                                      equal: { ["productCat.name"]: "foo" },
+                                      notEqual: { ["productCat.name"]: "foo" },
+                                    },
+                                  ],
+                                },
+                              },
+                            ],
+                          },
+                        }).toContainExactly([
+                          {
+                            name: "foo",
+                            productCat: [{ _id: productCatRows[0]._id }],
+                          },
+                          {
+                            name: "bar",
+                            productCat: [{ _id: productCatRows[1]._id }],
+                          },
+                          { name: "baz", productCat: undefined },
+                        ])
+                      }
+                    )
+
+                    it("should allow nested ors with multiple conditions", async () => {
+                      await expectQuery({
+                        $or: {
+                          conditions: [
+                            {
+                              $or: {
+                                conditions: [
+                                  {
+                                    equal: { ["productCat.name"]: "foo" },
+                                  },
+                                ],
+                              },
+                              notEqual: { ["productCat.name"]: "foo" },
+                            },
+                          ],
+                        },
+                      }).toContainExactly([
+                        {
+                          name: "foo",
+                          productCat: [{ _id: productCatRows[0]._id }],
+                        },
+                        {
+                          name: "bar",
+                          productCat: [{ _id: productCatRows[1]._id }],
+                        },
+                        { name: "baz", productCat: undefined },
+                      ])
+                    })
+                  })
+                })
+              })
+
+            isSql &&
+              describe("relationship - table with spaces", () => {
+                let primaryTable: Table, row: Row
+
+                beforeAll(async () => {
+                  const { relatedTable, tableId } =
+                    await basicRelationshipTables(
+                      RelationshipType.ONE_TO_MANY,
+                      {
+                        tableName: "table with spaces",
+                        primaryColumn: "related",
+                        otherColumn: "related",
+                      }
+                    )
+                  tableOrViewId = tableId
+                  primaryTable = relatedTable
+
+                  row = await config.api.row.save(primaryTable._id!, {
+                    name: "foo",
+                  })
+
+                  await config.api.row.save(tableOrViewId, {
+                    name: "foo",
+                    related: [row._id],
+                  })
+                })
+
+                it("should be able to search by table name with spaces", async () => {
+                  await expectQuery({
+                    equal: {
+                      ["table with spaces.name"]: "foo",
+                    },
+                  }).toContain([{ name: "foo" }])
+                })
+              })
+
+            isSql &&
+              describe.each([
+                RelationshipType.MANY_TO_ONE,
+                RelationshipType.MANY_TO_MANY,
+              ])("big relations (%s)", relationshipType => {
+                beforeAll(async () => {
+                  const { relatedTable, tableId } =
+                    await basicRelationshipTables(relationshipType)
+                  tableOrViewId = tableId
+                  const mainRow = await config.api.row.save(tableOrViewId, {
+                    name: "foo",
+                  })
+                  for (let i = 0; i < 11; i++) {
+                    await config.api.row.save(relatedTable._id!, {
+                      name: i,
+                      product: [mainRow._id!],
+                    })
+                  }
+                })
+
+                it("can only pull 10 related rows", async () => {
+                  await withCoreEnv(
+                    { SQL_MAX_RELATED_ROWS: "10" },
+                    async () => {
+                      const response = await expectQuery({}).toContain([
+                        { name: "foo" },
+                      ])
+                      expect(response.rows[0].productCat).toBeArrayOfSize(10)
+                    }
+                  )
+                })
+
+                it("can pull max rows when env not set (defaults to 500)", async () => {
+                  const response = await expectQuery({}).toContain([
+                    { name: "foo" },
+                  ])
+                  expect(response.rows[0].productCat).toBeArrayOfSize(11)
+                })
+              })
+
+            isSql &&
+              describe("relations to same table", () => {
+                let relatedTable: string, relatedRows: Row[]
+
+                beforeAll(async () => {
+                  relatedTable = await createTable({
+                    name: { name: "name", type: FieldType.STRING },
+                  })
+                  tableOrViewId = await createTableOrView({
+                    name: { name: "name", type: FieldType.STRING },
+                    related1: {
+                      type: FieldType.LINK,
+                      name: "related1",
+                      fieldName: "main1",
+                      tableId: relatedTable,
+                      relationshipType: RelationshipType.MANY_TO_MANY,
+                    },
+                    related2: {
+                      type: FieldType.LINK,
+                      name: "related2",
+                      fieldName: "main2",
+                      tableId: relatedTable,
+                      relationshipType: RelationshipType.MANY_TO_MANY,
+                    },
+                  })
+                  relatedRows = await Promise.all([
+                    config.api.row.save(relatedTable, { name: "foo" }),
+                    config.api.row.save(relatedTable, { name: "bar" }),
+                    config.api.row.save(relatedTable, { name: "baz" }),
+                    config.api.row.save(relatedTable, { name: "boo" }),
+                  ])
+                  await Promise.all([
+                    config.api.row.save(tableOrViewId, {
+                      name: "test",
+                      related1: [relatedRows[0]._id!],
+                      related2: [relatedRows[1]._id!],
+                    }),
+                    config.api.row.save(tableOrViewId, {
+                      name: "test2",
+                      related1: [relatedRows[2]._id!],
+                      related2: [relatedRows[3]._id!],
+                    }),
+                    config.api.row.save(tableOrViewId, {
+                      name: "test3",
+                      related1: [relatedRows[1]._id],
+                      related2: [relatedRows[2]._id!],
+                    }),
+                  ])
+                })
+
+                it("should be able to relate to same table", async () => {
+                  await expectSearch({
+                    query: {},
+                  }).toContainExactly([
+                    {
+                      name: "test",
+                      related1: [{ _id: relatedRows[0]._id }],
+                      related2: [{ _id: relatedRows[1]._id }],
+                    },
+                    {
+                      name: "test2",
+                      related1: [{ _id: relatedRows[2]._id }],
+                      related2: [{ _id: relatedRows[3]._id }],
+                    },
+                    {
+                      name: "test3",
+                      related1: [{ _id: relatedRows[1]._id }],
+                      related2: [{ _id: relatedRows[2]._id }],
+                    },
+                  ])
+                })
+
+                it("should be able to filter via the first relation field with equal", async () => {
+                  await expectSearch({
+                    query: {
+                      equal: {
+                        ["related1.name"]: "baz",
+                      },
                     },
                   }).toContainExactly([
                     {
-                      name: "foo",
-                      productCat: [{ _id: productCatRows[0]._id }],
+                      name: "test2",
+                      related1: [{ _id: relatedRows[2]._id }],
                     },
+                  ])
+                })
+
+                it("should be able to filter via the second relation field with not equal", async () => {
+                  await expectSearch({
+                    query: {
+                      notEqual: {
+                        ["1:related2.name"]: "foo",
+                        ["2:related2.name"]: "baz",
+                        ["3:related2.name"]: "boo",
+                      },
+                    },
+                  }).toContainExactly([
                     {
-                      name: "bar",
-                      productCat: [{ _id: productCatRows[1]._id }],
+                      name: "test",
+                    },
+                  ])
+                })
+
+                it("should be able to filter on both fields", async () => {
+                  await expectSearch({
+                    query: {
+                      notEqual: {
+                        ["related1.name"]: "foo",
+                        ["related2.name"]: "baz",
+                      },
+                    },
+                  }).toContainExactly([
+                    {
+                      name: "test2",
                     },
-                    { name: "baz", productCat: undefined },
                   ])
                 })
               })
-            })
-          })
 
-        isSql &&
-          describe.each([
-            RelationshipType.MANY_TO_ONE,
-            RelationshipType.MANY_TO_MANY,
-          ])("big relations (%s)", relationshipType => {
-            beforeAll(async () => {
-              const { relatedTable, tableId } = await basicRelationshipTables(
-                relationshipType
-              )
-              tableOrViewId = tableId
-              const mainRow = await config.api.row.save(tableOrViewId, {
-                name: "foo",
-              })
-              for (let i = 0; i < 11; i++) {
-                await config.api.row.save(relatedTable._id!, {
-                  name: i,
-                  product: [mainRow._id!],
-                })
-              }
-            })
-
-            it("can only pull 10 related rows", async () => {
-              await withCoreEnv({ SQL_MAX_RELATED_ROWS: "10" }, async () => {
-                const response = await expectQuery({}).toContain([
-                  { name: "foo" },
-                ])
-                expect(response.rows[0].productCat).toBeArrayOfSize(10)
-              })
-            })
-
-            it("can pull max rows when env not set (defaults to 500)", async () => {
-              const response = await expectQuery({}).toContain([
-                { name: "foo" },
-              ])
-              expect(response.rows[0].productCat).toBeArrayOfSize(11)
-            })
-          })
-
-        isSql &&
-          describe("relations to same table", () => {
-            let relatedTable: string, relatedRows: Row[]
-
-            beforeAll(async () => {
-              relatedTable = await createTable({
-                name: { name: "name", type: FieldType.STRING },
-              })
-              tableOrViewId = await createTableOrView({
-                name: { name: "name", type: FieldType.STRING },
-                related1: {
-                  type: FieldType.LINK,
-                  name: "related1",
-                  fieldName: "main1",
-                  tableId: relatedTable,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-                related2: {
-                  type: FieldType.LINK,
-                  name: "related2",
-                  fieldName: "main2",
-                  tableId: relatedTable,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-              })
-              relatedRows = await Promise.all([
-                config.api.row.save(relatedTable, { name: "foo" }),
-                config.api.row.save(relatedTable, { name: "bar" }),
-                config.api.row.save(relatedTable, { name: "baz" }),
-                config.api.row.save(relatedTable, { name: "boo" }),
-              ])
-              await Promise.all([
-                config.api.row.save(tableOrViewId, {
-                  name: "test",
-                  related1: [relatedRows[0]._id!],
-                  related2: [relatedRows[1]._id!],
-                }),
-                config.api.row.save(tableOrViewId, {
-                  name: "test2",
-                  related1: [relatedRows[2]._id!],
-                  related2: [relatedRows[3]._id!],
-                }),
-                config.api.row.save(tableOrViewId, {
-                  name: "test3",
-                  related1: [relatedRows[1]._id],
-                  related2: [relatedRows[2]._id!],
-                }),
-              ])
-            })
-
-            it("should be able to relate to same table", async () => {
-              await expectSearch({
-                query: {},
-              }).toContainExactly([
-                {
-                  name: "test",
-                  related1: [{ _id: relatedRows[0]._id }],
-                  related2: [{ _id: relatedRows[1]._id }],
-                },
-                {
-                  name: "test2",
-                  related1: [{ _id: relatedRows[2]._id }],
-                  related2: [{ _id: relatedRows[3]._id }],
-                },
-                {
-                  name: "test3",
-                  related1: [{ _id: relatedRows[1]._id }],
-                  related2: [{ _id: relatedRows[2]._id }],
-                },
-              ])
-            })
-
-            it("should be able to filter via the first relation field with equal", async () => {
-              await expectSearch({
-                query: {
-                  equal: {
-                    ["related1.name"]: "baz",
-                  },
-                },
-              }).toContainExactly([
-                {
-                  name: "test2",
-                  related1: [{ _id: relatedRows[2]._id }],
-                },
-              ])
-            })
-
-            it("should be able to filter via the second relation field with not equal", async () => {
-              await expectSearch({
-                query: {
-                  notEqual: {
-                    ["1:related2.name"]: "foo",
-                    ["2:related2.name"]: "baz",
-                    ["3:related2.name"]: "boo",
-                  },
-                },
-              }).toContainExactly([
-                {
-                  name: "test",
-                },
-              ])
-            })
-
-            it("should be able to filter on both fields", async () => {
-              await expectSearch({
-                query: {
-                  notEqual: {
-                    ["related1.name"]: "foo",
-                    ["related2.name"]: "baz",
-                  },
-                },
-              }).toContainExactly([
-                {
-                  name: "test2",
-                },
-              ])
-            })
-          })
-
-        isInternal &&
-          describe("no column error backwards compat", () => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              })
-            })
-
-            it("shouldn't error when column doesn't exist", async () => {
-              await expectSearch({
-                query: {
-                  string: {
-                    "1:something": "a",
-                  },
-                },
-              }).toMatch({ rows: [] })
-            })
-          })
-
-        describe("row counting", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              name: {
-                name: "name",
-                type: FieldType.STRING,
-              },
-            })
-            await createRows([{ name: "a" }, { name: "b" }])
-          })
-
-          it("should be able to count rows when option set", async () => {
-            await expectSearch({
-              countRows: true,
-              query: {
-                notEmpty: {
-                  name: true,
-                },
-              },
-            }).toMatch({ totalRows: 2, rows: expect.any(Array) })
-          })
-
-          it("shouldn't count rows when option is not set", async () => {
-            await expectSearch({
-              countRows: false,
-              query: {
-                notEmpty: {
-                  name: true,
-                },
-              },
-            }).toNotHaveProperty(["totalRows"])
-          })
-        })
-
-        describe("Invalid column definitions", () => {
-          beforeAll(async () => {
-            // need to create an invalid table - means ignoring typescript
-            tableOrViewId = await createTableOrView({
-              // @ts-ignore
-              invalid: {
-                type: FieldType.STRING,
-              },
-              name: {
-                name: "name",
-                type: FieldType.STRING,
-              },
-            })
-            await createRows([
-              { name: "foo", invalid: "id1" },
-              { name: "bar", invalid: "id2" },
-            ])
-          })
-
-          it("can get rows with all table data", async () => {
-            await expectSearch({
-              query: {},
-            }).toContain([
-              { name: "foo", invalid: "id1" },
-              { name: "bar", invalid: "id2" },
-            ])
-          })
-        })
-
-        describe.each(["data_name_test", "name_data_test", "name_test_data_"])(
-          "special (%s) case",
-          column => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                [column]: {
-                  name: column,
-                  type: FieldType.STRING,
-                },
-              })
-              await createRows([{ [column]: "a" }, { [column]: "b" }])
-            })
-
-            it("should be able to query a column with data_ in it", async () => {
-              await expectSearch({
-                query: {
-                  equal: {
-                    [`1:${column}`]: "a",
-                  },
-                },
-              }).toContainExactly([{ [column]: "a" }])
-            })
-          }
-        )
-
-        isInternal &&
-          describe("sample data", () => {
-            beforeAll(async () => {
-              await config.api.application.addSampleData(config.appId!)
-              tableOrViewId = DEFAULT_EMPLOYEE_TABLE_SCHEMA._id!
-              rows = await config.api.row.fetch(tableOrViewId)
-            })
-
-            it("should be able to search sample data", async () => {
-              await expectSearch({
-                query: {},
-              }).toContain([
-                {
-                  "First Name": "Mandy",
-                },
-              ])
-            })
-          })
-
-        describe.each([
-          { low: "2024-07-03T00:00:00.000Z", high: "9999-00-00T00:00:00.000Z" },
-          { low: "2024-07-03T00:00:00.000Z", high: "9998-00-00T00:00:00.000Z" },
-          { low: "0000-00-00T00:00:00.000Z", high: "2024-07-04T00:00:00.000Z" },
-          { low: "0001-00-00T00:00:00.000Z", high: "2024-07-04T00:00:00.000Z" },
-        ])("date special cases", ({ low, high }) => {
-          const earlyDate = "2024-07-03T10:00:00.000Z",
-            laterDate = "2024-07-03T11:00:00.000Z"
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              date: {
-                name: "date",
-                type: FieldType.DATETIME,
-              },
-            })
-            await createRows([{ date: earlyDate }, { date: laterDate }])
-          })
-
-          it("should be able to handle a date search", async () => {
-            await expectSearch({
-              query: {
-                range: {
-                  "1:date": { low, high },
-                },
-              },
-            }).toContainExactly([{ date: earlyDate }, { date: laterDate }])
-          })
-        })
-
-        describe.each([
-          "名前", // Japanese for "name"
-          "Benutzer-ID", // German for "user ID", includes a hyphen
-          "numéro", // French for "number", includes an accent
-          "år", // Swedish for "year", includes a ring above
-          "naïve", // English word borrowed from French, includes an umlaut
-          "الاسم", // Arabic for "name"
-          "оплата", // Russian for "payment"
-          "पता", // Hindi for "address"
-          "用戶名", // Chinese for "username"
-          "çalışma_zamanı", // Turkish for "runtime", includes an underscore and a cedilla
-          "preço", // Portuguese for "price", includes a cedilla
-          "사용자명", // Korean for "username"
-          "usuario_ñoño", // Spanish, uses an underscore and includes "ñ"
-          "файл", // Bulgarian for "file"
-          "δεδομένα", // Greek for "data"
-          "geändert_am", // German for "modified on", includes an umlaut
-          "ব্যবহারকারীর_নাম", // Bengali for "user name", includes an underscore
-          "São_Paulo", // Portuguese, includes an underscore and a tilde
-          "età", // Italian for "age", includes an accent
-          "ชื่อผู้ใช้", // Thai for "username"
-        ])("non-ascii column name: %s", name => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              [name]: {
-                name,
-                type: FieldType.STRING,
-              },
-            })
-            await createRows([{ [name]: "a" }, { [name]: "b" }])
-          })
-
-          it("should be able to query a column with non-ascii characters", async () => {
-            await expectSearch({
-              query: {
-                equal: {
-                  [`1:${name}`]: "a",
-                },
-              },
-            }).toContainExactly([{ [name]: "a" }])
-          })
-        })
-
-        // This is currently not supported in external datasources, it produces SQL
-        // errors at time of writing. We supported it (potentially by accident) in
-        // Lucene, though, so we need to make sure it's supported in SQS as well. We
-        // found real cases in production of column names ending in a space.
-        isInternal &&
-          describe("space at end of column name", () => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                "name ": {
-                  name: "name ",
-                  type: FieldType.STRING,
-                },
-              })
-              await createRows([{ ["name "]: "foo" }, { ["name "]: "bar" }])
-            })
-
-            it("should be able to query a column that ends with a space", async () => {
-              await expectSearch({
-                query: {
-                  string: {
-                    "name ": "foo",
-                  },
-                },
-              }).toContainExactly([{ ["name "]: "foo" }])
-            })
-
-            it("should be able to query a column that ends with a space using numeric notation", async () => {
-              await expectSearch({
-                query: {
-                  string: {
-                    "1:name ": "foo",
-                  },
-                },
-              }).toContainExactly([{ ["name "]: "foo" }])
-            })
-          })
-
-        isInternal &&
-          describe("space at start of column name", () => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                " name": {
-                  name: " name",
-                  type: FieldType.STRING,
-                },
-              })
-              await createRows([{ [" name"]: "foo" }, { [" name"]: "bar" }])
-            })
-
-            it("should be able to query a column that starts with a space", async () => {
-              await expectSearch({
-                query: {
-                  string: {
-                    " name": "foo",
-                  },
-                },
-              }).toContainExactly([{ [" name"]: "foo" }])
-            })
-
-            it("should be able to query a column that starts with a space using numeric notation", async () => {
-              await expectSearch({
-                query: {
-                  string: {
-                    "1: name": "foo",
-                  },
-                },
-              }).toContainExactly([{ [" name"]: "foo" }])
-            })
-          })
-
-        isInternal &&
-          !isView &&
-          describe("duplicate columns", () => {
-            beforeAll(async () => {
-              tableOrViewId = await createTableOrView({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              })
-              await context.doInAppContext(config.getAppId(), async () => {
-                const db = context.getAppDB()
-                const tableDoc = await db.get<Table>(tableOrViewId)
-                tableDoc.schema.Name = {
-                  name: "Name",
-                  type: FieldType.STRING,
-                }
-                try {
-                  // remove the SQLite definitions so that they can be rebuilt as part of the search
-                  const sqliteDoc = await db.get(SQLITE_DESIGN_DOC_ID)
-                  await db.remove(sqliteDoc)
-                } catch (err) {
-                  // no-op
-                }
-              })
-              await createRows([{ name: "foo", Name: "bar" }])
-            })
-
-            it("should handle invalid duplicate column names", async () => {
-              await expectSearch({
-                query: {},
-              }).toContainExactly([{ name: "foo" }])
-            })
-          })
-
-        !isInMemory &&
-          describe("search by _id", () => {
-            let row: Row
-
-            beforeAll(async () => {
-              const toRelateTable = await createTable({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              })
-              tableOrViewId = await createTableOrView({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-                rel: {
-                  name: "rel",
-                  type: FieldType.LINK,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                  tableId: toRelateTable,
-                  fieldName: "rel",
-                },
-              })
-              const [row1, row2] = await Promise.all([
-                config.api.row.save(toRelateTable, { name: "tag 1" }),
-                config.api.row.save(toRelateTable, { name: "tag 2" }),
-              ])
-              row = await config.api.row.save(tableOrViewId, {
-                name: "product 1",
-                rel: [row1._id, row2._id],
-              })
-            })
-
-            it("can filter by the row ID with limit 1", async () => {
-              await expectSearch({
-                query: {
-                  equal: { _id: row._id },
-                },
-                limit: 1,
-              }).toContainExactly([row])
-            })
-          })
-
-        !isInternal &&
-          describe("search by composite key", () => {
-            beforeAll(async () => {
-              const table = await config.api.table.save(
-                tableForDatasource(datasource, {
-                  schema: {
-                    idColumn1: {
-                      name: "idColumn1",
-                      type: FieldType.NUMBER,
-                    },
-                    idColumn2: {
-                      name: "idColumn2",
-                      type: FieldType.NUMBER,
-                    },
-                  },
-                  primary: ["idColumn1", "idColumn2"],
-                })
-              )
-              tableOrViewId = table._id!
-              await createRows([{ idColumn1: 1, idColumn2: 2 }])
-            })
-
-            it("can filter by the row ID with limit 1", async () => {
-              await expectSearch({
-                query: {
-                  equal: { _id: generateRowIdField([1, 2]) },
-                },
-                limit: 1,
-              }).toContain([
-                {
-                  idColumn1: 1,
-                  idColumn2: 2,
-                },
-              ])
-            })
-          })
-
-        isSql &&
-          describe("primaryDisplay", () => {
-            beforeAll(async () => {
-              let toRelateTableId = await createTable({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              })
-              tableOrViewId = await createTableOrView({
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-                link: {
-                  name: "link",
-                  type: FieldType.LINK,
-                  relationshipType: RelationshipType.MANY_TO_ONE,
-                  tableId: toRelateTableId,
-                  fieldName: "link",
-                },
-              })
-
-              const toRelateTable = await config.api.table.get(toRelateTableId)
-              await config.api.table.save({
-                ...toRelateTable,
-                primaryDisplay: "link",
-              })
-              const relatedRows = await Promise.all([
-                config.api.row.save(toRelateTable._id!, { name: "related" }),
-              ])
-              await config.api.row.save(tableOrViewId, {
-                name: "test",
-                link: relatedRows.map(row => row._id),
-              })
-            })
-
-            it("should be able to query, primary display on related table shouldn't be used", async () => {
-              // this test makes sure that if a relationship has been specified as the primary display on a table
-              // it is ignored and another column is used instead
-              await expectQuery({}).toContain([
-                { name: "test", link: [{ primaryDisplay: "related" }] },
-              ])
-            })
-          })
-
-        describe("$and", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              age: { name: "age", type: FieldType.NUMBER },
-              name: { name: "name", type: FieldType.STRING },
-            })
-            await createRows([
-              { age: 1, name: "Jane" },
-              { age: 10, name: "Jack" },
-              { age: 7, name: "Hanna" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("successfully finds a row for one level condition", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  { equal: { age: 10 } },
-                  { equal: { name: "Jack" } },
-                ],
-              },
-            }).toContainExactly([{ age: 10, name: "Jack" }])
-          })
-
-          it("successfully finds a row for one level with multiple conditions", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  { equal: { age: 10 } },
-                  { equal: { name: "Jack" } },
-                ],
-              },
-            }).toContainExactly([{ age: 10, name: "Jack" }])
-          })
-
-          it("successfully finds multiple rows for one level with multiple conditions", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  { range: { age: { low: 1, high: 9 } } },
-                  { string: { name: "Ja" } },
-                ],
-              },
-            }).toContainExactly([
-              { age: 1, name: "Jane" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("successfully finds rows for nested filters", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  {
-                    $and: {
-                      conditions: [
-                        {
-                          range: { age: { low: 1, high: 10 } },
-                        },
-                        { string: { name: "Ja" } },
-                      ],
-                    },
-                    equal: { name: "Jane" },
-                  },
-                ],
-              },
-            }).toContainExactly([{ age: 1, name: "Jane" }])
-          })
-
-          it("returns nothing when filtering out all data", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  { equal: { age: 7 } },
-                  { equal: { name: "Jack" } },
-                ],
-              },
-            }).toFindNothing()
-          })
-
-          !isInMemory &&
-            it("validates conditions that are not objects", async () => {
-              await expect(
-                expectQuery({
-                  $and: {
-                    conditions: [
-                      { equal: { age: 10 } },
-                      "invalidCondition" as any,
-                    ],
-                  },
-                }).toFindNothing()
-              ).rejects.toThrow(
-                'Invalid body - "query.$and.conditions[1]" must be of type object'
-              )
-            })
-
-          !isInMemory &&
-            it("validates $and without conditions", async () => {
-              await expect(
-                expectQuery({
-                  $and: {
-                    conditions: [
-                      { equal: { age: 10 } },
-                      {
-                        $and: {
-                          conditions: undefined as any,
-                        },
-                      },
-                    ],
-                  },
-                }).toFindNothing()
-              ).rejects.toThrow(
-                'Invalid body - "query.$and.conditions[1].$and.conditions" is required'
-              )
-            })
-
-          // onEmptyFilter cannot be sent to view searches
-          !isView &&
-            it("returns no rows when onEmptyFilter set to none", async () => {
-              await expectSearch({
-                query: {
-                  onEmptyFilter: EmptyFilterOption.RETURN_NONE,
-                  $and: {
-                    conditions: [{ equal: { name: "" } }],
-                  },
-                },
-              }).toFindNothing()
-            })
-
-          it("returns all rows when onEmptyFilter set to all", async () => {
-            await expectSearch({
-              query: {
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-                $and: {
-                  conditions: [{ equal: { name: "" } }],
-                },
-              },
-            }).toHaveLength(4)
-          })
-        })
-
-        describe("$or", () => {
-          beforeAll(async () => {
-            tableOrViewId = await createTableOrView({
-              age: { name: "age", type: FieldType.NUMBER },
-              name: { name: "name", type: FieldType.STRING },
-            })
-            await createRows([
-              { age: 1, name: "Jane" },
-              { age: 10, name: "Jack" },
-              { age: 7, name: "Hanna" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("successfully finds a row for one level condition", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  { equal: { age: 7 } },
-                  { equal: { name: "Jack" } },
-                ],
-              },
-            }).toContainExactly([
-              { age: 10, name: "Jack" },
-              { age: 7, name: "Hanna" },
-            ])
-          })
-
-          it("successfully finds a row for one level with multiple conditions", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  { equal: { age: 7 } },
-                  { equal: { name: "Jack" } },
-                ],
-              },
-            }).toContainExactly([
-              { age: 10, name: "Jack" },
-              { age: 7, name: "Hanna" },
-            ])
-          })
-
-          it("successfully finds multiple rows for one level with multiple conditions", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  { range: { age: { low: 1, high: 9 } } },
-                  { string: { name: "Jan" } },
-                ],
-              },
-            }).toContainExactly([
-              { age: 1, name: "Jane" },
-              { age: 7, name: "Hanna" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("successfully finds rows for nested filters", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  {
-                    $or: {
-                      conditions: [
-                        {
-                          range: { age: { low: 1, high: 7 } },
-                        },
-                        { string: { name: "Jan" } },
-                      ],
-                    },
-                    equal: { name: "Jane" },
-                  },
-                ],
-              },
-            }).toContainExactly([
-              { age: 1, name: "Jane" },
-              { age: 7, name: "Hanna" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("returns nothing when filtering out all data", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  { equal: { age: 6 } },
-                  { equal: { name: "John" } },
-                ],
-              },
-            }).toFindNothing()
-          })
-
-          it("can nest $and under $or filters", async () => {
-            await expectQuery({
-              $or: {
-                conditions: [
-                  {
-                    $and: {
-                      conditions: [
-                        {
-                          range: { age: { low: 1, high: 8 } },
-                        },
-                        { equal: { name: "Jan" } },
-                      ],
-                    },
-                    equal: { name: "Jane" },
-                  },
-                ],
-              },
-            }).toContainExactly([
-              { age: 1, name: "Jane" },
-              { age: 8, name: "Jan" },
-            ])
-          })
-
-          it("can nest $or under $and filters", async () => {
-            await expectQuery({
-              $and: {
-                conditions: [
-                  {
-                    $or: {
-                      conditions: [
-                        {
-                          range: { age: { low: 1, high: 8 } },
-                        },
-                        { equal: { name: "Jan" } },
-                      ],
-                    },
-                    equal: { name: "Jane" },
-                  },
-                ],
-              },
-            }).toContainExactly([{ age: 1, name: "Jane" }])
-          })
-
-          // onEmptyFilter cannot be sent to view searches
-          !isView &&
-            it("returns no rows when onEmptyFilter set to none", async () => {
-              await expectSearch({
-                query: {
-                  onEmptyFilter: EmptyFilterOption.RETURN_NONE,
-                  $or: {
-                    conditions: [{ equal: { name: "" } }],
-                  },
-                },
-              }).toFindNothing()
-            })
-
-          it("returns all rows when onEmptyFilter set to all", async () => {
-            await expectSearch({
-              query: {
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-                $or: {
-                  conditions: [{ equal: { name: "" } }],
-                },
-              },
-            }).toHaveLength(4)
-          })
-        })
-
-        isSql &&
-          describe("max related columns", () => {
-            let relatedRows: Row[]
-
-            beforeAll(async () => {
-              const relatedSchema: TableSchema = {}
-              const row: Row = {}
-              for (let i = 0; i < 100; i++) {
-                const name = `column${i}`
-                relatedSchema[name] = { name, type: FieldType.NUMBER }
-                row[name] = i
-              }
-              const relatedTable = await createTable(relatedSchema)
-              tableOrViewId = await createTableOrView({
-                name: { name: "name", type: FieldType.STRING },
-                related1: {
-                  type: FieldType.LINK,
-                  name: "related1",
-                  fieldName: "main1",
-                  tableId: relatedTable,
-                  relationshipType: RelationshipType.MANY_TO_MANY,
-                },
-              })
-              relatedRows = await Promise.all([
-                config.api.row.save(relatedTable, row),
-              ])
-              await config.api.row.save(tableOrViewId, {
-                name: "foo",
-                related1: [relatedRows[0]._id],
-              })
-            })
-
-            it("retrieve the row with relationships", async () => {
-              await expectQuery({}).toContainExactly([
-                {
-                  name: "foo",
-                  related1: [{ _id: relatedRows[0]._id }],
-                },
-              ])
-            })
-          })
-
-        !isInternal &&
-          describe("SQL injection", () => {
-            const badStrings = [
-              "1; DROP TABLE %table_name%;",
-              "1; DELETE FROM %table_name%;",
-              "1; UPDATE %table_name% SET name = 'foo';",
-              "1; INSERT INTO %table_name% (name) VALUES ('foo');",
-              "' OR '1'='1' --",
-              "'; DROP TABLE %table_name%; --",
-              "' OR 1=1 --",
-              "' UNION SELECT null, null, null; --",
-              "' AND (SELECT COUNT(*) FROM %table_name%) > 0 --",
-              "\"; EXEC xp_cmdshell('dir'); --",
-              "\"' OR 'a'='a",
-              "OR 1=1;",
-              "'; SHUTDOWN --",
-            ]
-
-            describe.each(badStrings)("bad string: %s", badStringTemplate => {
-              // The SQL that knex generates when you try to use a double quote in a
-              // field name is always invalid and never works, so we skip it for these
-              // tests.
-              const skipFieldNameCheck =
-                isOracle && badStringTemplate.includes('"')
-
-              !skipFieldNameCheck &&
-                it("should not allow SQL injection as a field name", async () => {
-                  const tableOrViewId = await createTableOrView()
-                  const table = await getTable(tableOrViewId)
-                  const badString = badStringTemplate.replace(
-                    /%table_name%/g,
-                    table.name
-                  )
-
-                  await config.api.table.save({
-                    ...table,
-                    schema: {
-                      ...table.schema,
-                      [badString]: { name: badString, type: FieldType.STRING },
+            isInternal &&
+              describe("no column error backwards compat", () => {
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
                     },
                   })
-
-                  if (docIds.isViewId(tableOrViewId)) {
-                    const view = await config.api.viewV2.get(tableOrViewId)
-                    await config.api.viewV2.update({
-                      ...view,
-                      schema: {
-                        [badString]: { visible: true },
-                      },
-                    })
-                  }
-
-                  await config.api.row.save(tableOrViewId, {
-                    [badString]: "foo",
-                  })
-
-                  await assertTableExists(table)
-                  await assertTableNumRows(table, 1)
-
-                  const { rows } = await config.api.row.search(
-                    tableOrViewId,
-                    { query: {} },
-                    { status: 200 }
-                  )
-
-                  expect(rows).toHaveLength(1)
-
-                  await assertTableExists(table)
-                  await assertTableNumRows(table, 1)
                 })
 
-              it("should not allow SQL injection as a field value", async () => {
-                const tableOrViewId = await createTableOrView({
-                  foo: {
-                    name: "foo",
+                it("shouldn't error when column doesn't exist", async () => {
+                  await expectSearch({
+                    query: {
+                      string: {
+                        "1:something": "a",
+                      },
+                    },
+                  }).toMatch({ rows: [] })
+                })
+              })
+
+            describe("row counting", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  name: {
+                    name: "name",
                     type: FieldType.STRING,
                   },
                 })
-                const table = await getTable(tableOrViewId)
-                const badString = badStringTemplate.replace(
-                  /%table_name%/g,
-                  table.name
-                )
+                await createRows([{ name: "a" }, { name: "b" }])
+              })
 
-                await config.api.row.save(tableOrViewId, { foo: "foo" })
+              it("should be able to count rows when option set", async () => {
+                await expectSearch({
+                  countRows: true,
+                  query: {
+                    notEmpty: {
+                      name: true,
+                    },
+                  },
+                }).toMatch({ totalRows: 2, rows: expect.any(Array) })
+              })
 
-                await assertTableExists(table)
-                await assertTableNumRows(table, 1)
-
-                const { rows } = await config.api.row.search(
-                  tableOrViewId,
-                  { query: { equal: { foo: badString } } },
-                  { status: 200 }
-                )
-
-                expect(rows).toBeEmpty()
-                await assertTableExists(table)
-                await assertTableNumRows(table, 1)
+              it("shouldn't count rows when option is not set", async () => {
+                await expectSearch({
+                  countRows: false,
+                  query: {
+                    notEmpty: {
+                      name: true,
+                    },
+                  },
+                }).toNotHaveProperty(["totalRows"])
               })
             })
-          })
+
+            describe("Invalid column definitions", () => {
+              beforeAll(async () => {
+                // need to create an invalid table - means ignoring typescript
+                tableOrViewId = await createTableOrView({
+                  // @ts-ignore
+                  invalid: {
+                    type: FieldType.STRING,
+                  },
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                  },
+                })
+                await createRows([
+                  { name: "foo", invalid: "id1" },
+                  { name: "bar", invalid: "id2" },
+                ])
+              })
+
+              it("can get rows with all table data", async () => {
+                await expectSearch({
+                  query: {},
+                }).toContain([
+                  { name: "foo", invalid: "id1" },
+                  { name: "bar", invalid: "id2" },
+                ])
+              })
+            })
+
+            describe.each([
+              "data_name_test",
+              "name_data_test",
+              "name_test_data_",
+            ])("special (%s) case", column => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  [column]: {
+                    name: column,
+                    type: FieldType.STRING,
+                  },
+                })
+                await createRows([{ [column]: "a" }, { [column]: "b" }])
+              })
+
+              it("should be able to query a column with data_ in it", async () => {
+                await expectSearch({
+                  query: {
+                    equal: {
+                      [`1:${column}`]: "a",
+                    },
+                  },
+                }).toContainExactly([{ [column]: "a" }])
+              })
+            })
+
+            isInternal &&
+              describe("sample data", () => {
+                beforeAll(async () => {
+                  await config.api.application.addSampleData(config.appId!)
+                  tableOrViewId = DEFAULT_EMPLOYEE_TABLE_SCHEMA._id!
+                  rows = await config.api.row.fetch(tableOrViewId)
+                })
+
+                it("should be able to search sample data", async () => {
+                  await expectSearch({
+                    query: {},
+                  }).toContain([
+                    {
+                      "First Name": "Mandy",
+                    },
+                  ])
+                })
+              })
+
+            describe.each([
+              {
+                low: "2024-07-03T00:00:00.000Z",
+                high: "9999-00-00T00:00:00.000Z",
+              },
+              {
+                low: "2024-07-03T00:00:00.000Z",
+                high: "9998-00-00T00:00:00.000Z",
+              },
+              {
+                low: "0000-00-00T00:00:00.000Z",
+                high: "2024-07-04T00:00:00.000Z",
+              },
+              {
+                low: "0001-00-00T00:00:00.000Z",
+                high: "2024-07-04T00:00:00.000Z",
+              },
+            ])("date special cases", ({ low, high }) => {
+              const earlyDate = "2024-07-03T10:00:00.000Z",
+                laterDate = "2024-07-03T11:00:00.000Z"
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  date: {
+                    name: "date",
+                    type: FieldType.DATETIME,
+                  },
+                })
+                await createRows([{ date: earlyDate }, { date: laterDate }])
+              })
+
+              it("should be able to handle a date search", async () => {
+                await expectSearch({
+                  query: {
+                    range: {
+                      "1:date": { low, high },
+                    },
+                  },
+                }).toContainExactly([{ date: earlyDate }, { date: laterDate }])
+              })
+            })
+
+            describe.each([
+              "名前", // Japanese for "name"
+              "Benutzer-ID", // German for "user ID", includes a hyphen
+              "numéro", // French for "number", includes an accent
+              "år", // Swedish for "year", includes a ring above
+              "naïve", // English word borrowed from French, includes an umlaut
+              "الاسم", // Arabic for "name"
+              "оплата", // Russian for "payment"
+              "पता", // Hindi for "address"
+              "用戶名", // Chinese for "username"
+              "çalışma_zamanı", // Turkish for "runtime", includes an underscore and a cedilla
+              "preço", // Portuguese for "price", includes a cedilla
+              "사용자명", // Korean for "username"
+              "usuario_ñoño", // Spanish, uses an underscore and includes "ñ"
+              "файл", // Bulgarian for "file"
+              "δεδομένα", // Greek for "data"
+              "geändert_am", // German for "modified on", includes an umlaut
+              "ব্যবহারকারীর_নাম", // Bengali for "user name", includes an underscore
+              "São_Paulo", // Portuguese, includes an underscore and a tilde
+              "età", // Italian for "age", includes an accent
+              "ชื่อผู้ใช้", // Thai for "username"
+            ])("non-ascii column name: %s", name => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  [name]: {
+                    name,
+                    type: FieldType.STRING,
+                  },
+                })
+                await createRows([{ [name]: "a" }, { [name]: "b" }])
+              })
+
+              it("should be able to query a column with non-ascii characters", async () => {
+                await expectSearch({
+                  query: {
+                    equal: {
+                      [`1:${name}`]: "a",
+                    },
+                  },
+                }).toContainExactly([{ [name]: "a" }])
+              })
+            })
+
+            // This is currently not supported in external datasources, it produces SQL
+            // errors at time of writing. We supported it (potentially by accident) in
+            // Lucene, though, so we need to make sure it's supported in SQS as well. We
+            // found real cases in production of column names ending in a space.
+            isInternal &&
+              describe("space at end of column name", () => {
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    "name ": {
+                      name: "name ",
+                      type: FieldType.STRING,
+                    },
+                  })
+                  await createRows([{ ["name "]: "foo" }, { ["name "]: "bar" }])
+                })
+
+                it("should be able to query a column that ends with a space", async () => {
+                  await expectSearch({
+                    query: {
+                      string: {
+                        "name ": "foo",
+                      },
+                    },
+                  }).toContainExactly([{ ["name "]: "foo" }])
+                })
+
+                it("should be able to query a column that ends with a space using numeric notation", async () => {
+                  await expectSearch({
+                    query: {
+                      string: {
+                        "1:name ": "foo",
+                      },
+                    },
+                  }).toContainExactly([{ ["name "]: "foo" }])
+                })
+              })
+
+            isInternal &&
+              describe("space at start of column name", () => {
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    " name": {
+                      name: " name",
+                      type: FieldType.STRING,
+                    },
+                  })
+                  await createRows([{ [" name"]: "foo" }, { [" name"]: "bar" }])
+                })
+
+                it("should be able to query a column that starts with a space", async () => {
+                  await expectSearch({
+                    query: {
+                      string: {
+                        " name": "foo",
+                      },
+                    },
+                  }).toContainExactly([{ [" name"]: "foo" }])
+                })
+
+                it("should be able to query a column that starts with a space using numeric notation", async () => {
+                  await expectSearch({
+                    query: {
+                      string: {
+                        "1: name": "foo",
+                      },
+                    },
+                  }).toContainExactly([{ [" name"]: "foo" }])
+                })
+              })
+
+            isInternal &&
+              !isView &&
+              describe("duplicate columns", () => {
+                beforeAll(async () => {
+                  tableOrViewId = await createTableOrView({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  })
+                  await context.doInAppContext(config.getAppId(), async () => {
+                    const db = context.getAppDB()
+                    const tableDoc = await db.get<Table>(tableOrViewId)
+                    tableDoc.schema.Name = {
+                      name: "Name",
+                      type: FieldType.STRING,
+                    }
+                    try {
+                      // remove the SQLite definitions so that they can be rebuilt as part of the search
+                      const sqliteDoc = await db.get(SQLITE_DESIGN_DOC_ID)
+                      await db.remove(sqliteDoc)
+                    } catch (err) {
+                      // no-op
+                    }
+                  })
+                  await createRows([{ name: "foo", Name: "bar" }])
+                })
+
+                it("should handle invalid duplicate column names", async () => {
+                  await expectSearch({
+                    query: {},
+                  }).toContainExactly([{ name: "foo" }])
+                })
+              })
+
+            !isInMemory &&
+              describe("search by _id", () => {
+                let row: Row
+
+                beforeAll(async () => {
+                  const toRelateTable = await createTable({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  })
+                  tableOrViewId = await createTableOrView({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                    rel: {
+                      name: "rel",
+                      type: FieldType.LINK,
+                      relationshipType: RelationshipType.MANY_TO_MANY,
+                      tableId: toRelateTable,
+                      fieldName: "rel",
+                    },
+                  })
+                  const [row1, row2] = await Promise.all([
+                    config.api.row.save(toRelateTable, { name: "tag 1" }),
+                    config.api.row.save(toRelateTable, { name: "tag 2" }),
+                  ])
+                  row = await config.api.row.save(tableOrViewId, {
+                    name: "product 1",
+                    rel: [row1._id, row2._id],
+                  })
+                })
+
+                it("can filter by the row ID with limit 1", async () => {
+                  await expectSearch({
+                    query: {
+                      equal: { _id: row._id },
+                    },
+                    limit: 1,
+                  }).toContainExactly([row])
+                })
+              })
+
+            !isInternal &&
+              describe("search by composite key", () => {
+                beforeAll(async () => {
+                  const table = await config.api.table.save(
+                    tableForDatasource(datasource, {
+                      schema: {
+                        idColumn1: {
+                          name: "idColumn1",
+                          type: FieldType.NUMBER,
+                        },
+                        idColumn2: {
+                          name: "idColumn2",
+                          type: FieldType.NUMBER,
+                        },
+                      },
+                      primary: ["idColumn1", "idColumn2"],
+                    })
+                  )
+                  tableOrViewId = table._id!
+                  await createRows([{ idColumn1: 1, idColumn2: 2 }])
+                })
+
+                it("can filter by the row ID with limit 1", async () => {
+                  await expectSearch({
+                    query: {
+                      equal: { _id: generateRowIdField([1, 2]) },
+                    },
+                    limit: 1,
+                  }).toContain([
+                    {
+                      idColumn1: 1,
+                      idColumn2: 2,
+                    },
+                  ])
+                })
+              })
+
+            isSql &&
+              describe("primaryDisplay", () => {
+                beforeAll(async () => {
+                  let toRelateTableId = await createTable({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  })
+                  tableOrViewId = await createTableOrView({
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                    link: {
+                      name: "link",
+                      type: FieldType.LINK,
+                      relationshipType: RelationshipType.MANY_TO_ONE,
+                      tableId: toRelateTableId,
+                      fieldName: "main",
+                    },
+                  })
+
+                  const toRelateTable = await config.api.table.get(
+                    toRelateTableId
+                  )
+                  await config.api.table.save({
+                    ...toRelateTable,
+                    primaryDisplay: "name",
+                  })
+                  const relatedRows = await Promise.all([
+                    config.api.row.save(toRelateTable._id!, {
+                      name: "related",
+                    }),
+                  ])
+                  await config.api.row.save(tableOrViewId, {
+                    name: "test",
+                    link: relatedRows.map(row => row._id),
+                  })
+                })
+
+                it("should be able to query, primary display on related table shouldn't be used", async () => {
+                  // this test makes sure that if a relationship has been specified as the primary display on a table
+                  // it is ignored and another column is used instead
+                  await expectQuery({}).toContain([
+                    { name: "test", link: [{ primaryDisplay: "related" }] },
+                  ])
+                })
+              })
+
+            describe("$and", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  age: { name: "age", type: FieldType.NUMBER },
+                  name: { name: "name", type: FieldType.STRING },
+                })
+                await createRows([
+                  { age: 1, name: "Jane" },
+                  { age: 10, name: "Jack" },
+                  { age: 7, name: "Hanna" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("successfully finds a row for one level condition", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      { equal: { age: 10 } },
+                      { equal: { name: "Jack" } },
+                    ],
+                  },
+                }).toContainExactly([{ age: 10, name: "Jack" }])
+              })
+
+              it("successfully finds a row for one level with multiple conditions", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      { equal: { age: 10 } },
+                      { equal: { name: "Jack" } },
+                    ],
+                  },
+                }).toContainExactly([{ age: 10, name: "Jack" }])
+              })
+
+              it("successfully finds multiple rows for one level with multiple conditions", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      { range: { age: { low: 1, high: 9 } } },
+                      { string: { name: "Ja" } },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 1, name: "Jane" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("successfully finds rows for nested filters", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      {
+                        $and: {
+                          conditions: [
+                            {
+                              range: { age: { low: 1, high: 10 } },
+                            },
+                            { string: { name: "Ja" } },
+                          ],
+                        },
+                        equal: { name: "Jane" },
+                      },
+                    ],
+                  },
+                }).toContainExactly([{ age: 1, name: "Jane" }])
+              })
+
+              it("returns nothing when filtering out all data", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      { equal: { age: 7 } },
+                      { equal: { name: "Jack" } },
+                    ],
+                  },
+                }).toFindNothing()
+              })
+
+              !isInMemory &&
+                it("validates conditions that are not objects", async () => {
+                  await expect(
+                    expectQuery({
+                      $and: {
+                        conditions: [
+                          { equal: { age: 10 } },
+                          "invalidCondition" as any,
+                        ],
+                      },
+                    }).toFindNothing()
+                  ).rejects.toThrow(
+                    'Invalid body - "query.$and.conditions[1]" must be of type object'
+                  )
+                })
+
+              !isInMemory &&
+                it("validates $and without conditions", async () => {
+                  await expect(
+                    expectQuery({
+                      $and: {
+                        conditions: [
+                          { equal: { age: 10 } },
+                          {
+                            $and: {
+                              conditions: undefined as any,
+                            },
+                          },
+                        ],
+                      },
+                    }).toFindNothing()
+                  ).rejects.toThrow(
+                    'Invalid body - "query.$and.conditions[1].$and.conditions" is required'
+                  )
+                })
+
+              // onEmptyFilter cannot be sent to view searches
+              !isView &&
+                it("returns no rows when onEmptyFilter set to none", async () => {
+                  await expectSearch({
+                    query: {
+                      onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                      $and: {
+                        conditions: [{ equal: { name: "" } }],
+                      },
+                    },
+                  }).toFindNothing()
+                })
+
+              it("returns all rows when onEmptyFilter set to all", async () => {
+                await expectSearch({
+                  query: {
+                    onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                    $and: {
+                      conditions: [{ equal: { name: "" } }],
+                    },
+                  },
+                }).toHaveLength(4)
+              })
+            })
+
+            describe("$or", () => {
+              beforeAll(async () => {
+                tableOrViewId = await createTableOrView({
+                  age: { name: "age", type: FieldType.NUMBER },
+                  name: { name: "name", type: FieldType.STRING },
+                })
+                await createRows([
+                  { age: 1, name: "Jane" },
+                  { age: 10, name: "Jack" },
+                  { age: 7, name: "Hanna" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("successfully finds a row for one level condition", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      { equal: { age: 7 } },
+                      { equal: { name: "Jack" } },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 10, name: "Jack" },
+                  { age: 7, name: "Hanna" },
+                ])
+              })
+
+              it("successfully finds a row for one level with multiple conditions", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      { equal: { age: 7 } },
+                      { equal: { name: "Jack" } },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 10, name: "Jack" },
+                  { age: 7, name: "Hanna" },
+                ])
+              })
+
+              it("successfully finds multiple rows for one level with multiple conditions", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      { range: { age: { low: 1, high: 9 } } },
+                      { string: { name: "Jan" } },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 1, name: "Jane" },
+                  { age: 7, name: "Hanna" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("successfully finds rows for nested filters", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      {
+                        $or: {
+                          conditions: [
+                            {
+                              range: { age: { low: 1, high: 7 } },
+                            },
+                            { string: { name: "Jan" } },
+                          ],
+                        },
+                        equal: { name: "Jane" },
+                      },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 1, name: "Jane" },
+                  { age: 7, name: "Hanna" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("returns nothing when filtering out all data", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      { equal: { age: 6 } },
+                      { equal: { name: "John" } },
+                    ],
+                  },
+                }).toFindNothing()
+              })
+
+              it("can nest $and under $or filters", async () => {
+                await expectQuery({
+                  $or: {
+                    conditions: [
+                      {
+                        $and: {
+                          conditions: [
+                            {
+                              range: { age: { low: 1, high: 8 } },
+                            },
+                            { equal: { name: "Jan" } },
+                          ],
+                        },
+                        equal: { name: "Jane" },
+                      },
+                    ],
+                  },
+                }).toContainExactly([
+                  { age: 1, name: "Jane" },
+                  { age: 8, name: "Jan" },
+                ])
+              })
+
+              it("can nest $or under $and filters", async () => {
+                await expectQuery({
+                  $and: {
+                    conditions: [
+                      {
+                        $or: {
+                          conditions: [
+                            {
+                              range: { age: { low: 1, high: 8 } },
+                            },
+                            { equal: { name: "Jan" } },
+                          ],
+                        },
+                        equal: { name: "Jane" },
+                      },
+                    ],
+                  },
+                }).toContainExactly([{ age: 1, name: "Jane" }])
+              })
+
+              // onEmptyFilter cannot be sent to view searches
+              !isView &&
+                it("returns no rows when onEmptyFilter set to none", async () => {
+                  await expectSearch({
+                    query: {
+                      onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                      $or: {
+                        conditions: [{ equal: { name: "" } }],
+                      },
+                    },
+                  }).toFindNothing()
+                })
+
+              it("returns all rows when onEmptyFilter set to all", async () => {
+                await expectSearch({
+                  query: {
+                    onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                    $or: {
+                      conditions: [{ equal: { name: "" } }],
+                    },
+                  },
+                }).toHaveLength(4)
+              })
+            })
+
+            isSql &&
+              describe("max related columns", () => {
+                let relatedRows: Row[]
+
+                beforeAll(async () => {
+                  const relatedSchema: TableSchema = {}
+                  const row: Row = {}
+                  for (let i = 0; i < 100; i++) {
+                    const name = `column${i}`
+                    relatedSchema[name] = { name, type: FieldType.NUMBER }
+                    row[name] = i
+                  }
+                  const relatedTable = await createTable(relatedSchema)
+                  tableOrViewId = await createTableOrView({
+                    name: { name: "name", type: FieldType.STRING },
+                    related1: {
+                      type: FieldType.LINK,
+                      name: "related1",
+                      fieldName: "main1",
+                      tableId: relatedTable,
+                      relationshipType: RelationshipType.MANY_TO_MANY,
+                    },
+                  })
+                  relatedRows = await Promise.all([
+                    config.api.row.save(relatedTable, row),
+                  ])
+                  await config.api.row.save(tableOrViewId, {
+                    name: "foo",
+                    related1: [relatedRows[0]._id],
+                  })
+                })
+
+                it("retrieve the row with relationships", async () => {
+                  await expectQuery({}).toContainExactly([
+                    {
+                      name: "foo",
+                      related1: [{ _id: relatedRows[0]._id }],
+                    },
+                  ])
+                })
+              })
+
+            !isInternal &&
+              describe("SQL injection", () => {
+                const badStrings = [
+                  "1; DROP TABLE %table_name%;",
+                  "1; DELETE FROM %table_name%;",
+                  "1; UPDATE %table_name% SET name = 'foo';",
+                  "1; INSERT INTO %table_name% (name) VALUES ('foo');",
+                  "' OR '1'='1' --",
+                  "'; DROP TABLE %table_name%; --",
+                  "' OR 1=1 --",
+                  "' UNION SELECT null, null, null; --",
+                  "' AND (SELECT COUNT(*) FROM %table_name%) > 0 --",
+                  "\"; EXEC xp_cmdshell('dir'); --",
+                  "\"' OR 'a'='a",
+                  "OR 1=1;",
+                  "'; SHUTDOWN --",
+                ]
+
+                describe.each(badStrings)(
+                  "bad string: %s",
+                  badStringTemplate => {
+                    // The SQL that knex generates when you try to use a double quote in a
+                    // field name is always invalid and never works, so we skip it for these
+                    // tests.
+                    const skipFieldNameCheck =
+                      isOracle && badStringTemplate.includes('"')
+
+                    !skipFieldNameCheck &&
+                      it("should not allow SQL injection as a field name", async () => {
+                        const tableOrViewId = await createTableOrView()
+                        const table = await getTable(tableOrViewId)
+                        const badString = badStringTemplate.replace(
+                          /%table_name%/g,
+                          table.name
+                        )
+
+                        await config.api.table.save({
+                          ...table,
+                          schema: {
+                            ...table.schema,
+                            [badString]: {
+                              name: badString,
+                              type: FieldType.STRING,
+                            },
+                          },
+                        })
+
+                        if (docIds.isViewId(tableOrViewId)) {
+                          const view = await config.api.viewV2.get(
+                            tableOrViewId
+                          )
+                          await config.api.viewV2.update({
+                            ...view,
+                            schema: {
+                              [badString]: { visible: true },
+                            },
+                          })
+                        }
+
+                        await config.api.row.save(tableOrViewId, {
+                          [badString]: "foo",
+                        })
+
+                        await assertTableExists(table)
+                        await assertTableNumRows(table, 1)
+
+                        const { rows } = await config.api.row.search(
+                          tableOrViewId,
+                          { query: {} },
+                          { status: 200 }
+                        )
+
+                        expect(rows).toHaveLength(1)
+
+                        await assertTableExists(table)
+                        await assertTableNumRows(table, 1)
+                      })
+
+                    it("should not allow SQL injection as a field value", async () => {
+                      const tableOrViewId = await createTableOrView({
+                        foo: {
+                          name: "foo",
+                          type: FieldType.STRING,
+                        },
+                      })
+                      const table = await getTable(tableOrViewId)
+                      const badString = badStringTemplate.replace(
+                        /%table_name%/g,
+                        table.name
+                      )
+
+                      await config.api.row.save(tableOrViewId, { foo: "foo" })
+
+                      await assertTableExists(table)
+                      await assertTableNumRows(table, 1)
+
+                      const { rows } = await config.api.row.search(
+                        tableOrViewId,
+                        { query: { equal: { foo: badString } } },
+                        { status: 200 }
+                      )
+
+                      expect(rows).toBeEmpty()
+                      await assertTableExists(table)
+                      await assertTableNumRows(table, 1)
+                    })
+                  }
+                )
+              })
+          }
+        )
       })
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/table.spec.ts b/packages/server/src/api/routes/tests/table.spec.ts
index 692a3c4b91..2a7f039ff5 100644
--- a/packages/server/src/api/routes/tests/table.spec.ts
+++ b/packages/server/src/api/routes/tests/table.spec.ts
@@ -38,203 +38,859 @@ import timekeeper from "timekeeper"
 const { basicTable } = setup.structures
 const ISO_REGEX_PATTERN = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/
 
-datasourceDescribe(
-  { name: "/tables (%s)", exclude: [DatabaseName.MONGODB] },
-  ({ config, dsProvider, isInternal, isOracle }) => {
-    let datasource: Datasource | undefined
+const descriptions = datasourceDescribe({ exclude: [DatabaseName.MONGODB] })
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource
-    })
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "/tables ($dbName)",
+    ({ config, dsProvider, isInternal, isOracle }) => {
+      let datasource: Datasource | undefined
 
-    describe("create", () => {
-      beforeEach(() => {
-        jest.clearAllMocks()
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource
       })
 
-      let names = [
-        "alphanum",
-        "with spaces",
-        "with-dashes",
-        "with_underscores",
-        "with `backticks`",
-      ]
-
-      if (!isOracle) {
-        names.push(`with "double quotes"`)
-        names.push(`with 'single quotes'`)
-      }
-
-      it.each(names)("creates a table with name: %s", async name => {
-        const table = await config.api.table.save(
-          tableForDatasource(datasource, { name })
-        )
-        expect(table.name).toEqual(name)
-        expect(events.table.created).toHaveBeenCalledTimes(1)
-        expect(events.table.created).toHaveBeenCalledWith(table)
-
-        const res = await config.api.table.get(table._id!)
-        expect(res.name).toEqual(name)
-      })
-
-      it("creates a table via data import", async () => {
-        const table: SaveTableRequest = basicTable()
-        table.rows = [{ name: "test-name", description: "test-desc" }]
-
-        const res = await config.api.table.save(table)
-
-        expect(events.table.created).toHaveBeenCalledTimes(1)
-        expect(events.table.created).toHaveBeenCalledWith(res)
-        expect(events.table.imported).toHaveBeenCalledTimes(1)
-        expect(events.table.imported).toHaveBeenCalledWith(res)
-        expect(events.rows.imported).toHaveBeenCalledTimes(1)
-        expect(events.rows.imported).toHaveBeenCalledWith(res, 1)
-      })
-
-      it("should not allow a column to have a default value and be required", async () => {
-        await config.api.table.save(
-          tableForDatasource(datasource, {
-            schema: {
-              name: {
-                name: "name",
-                type: FieldType.STRING,
-                default: "default",
-                constraints: {
-                  presence: true,
-                },
-              },
-            },
-          }),
-          {
-            status: 400,
-            body: {
-              message:
-                'Cannot make field "name" required, it has a default value.',
-            },
-          }
-        )
-      })
-
-      it("should apply authorization to endpoint", async () => {
-        await checkBuilderEndpoint({
-          config,
-          method: "POST",
-          url: `/api/tables`,
-          body: basicTable(),
+      describe("create", () => {
+        beforeEach(() => {
+          jest.clearAllMocks()
         })
-      })
 
-      it("does not persist the row fields that are not on the table schema", async () => {
-        const table: SaveTableRequest = basicTable()
-        table.rows = [
-          {
-            name: "test-name",
-            description: "test-desc",
-            nonValid: "test-non-valid",
-          },
+        let names = [
+          "alphanum",
+          "with spaces",
+          "with-dashes",
+          "with_underscores",
+          "with `backticks`",
         ]
 
-        const res = await config.api.table.save(table)
+        if (!isOracle) {
+          names.push(`with "double quotes"`)
+          names.push(`with 'single quotes'`)
+        }
 
-        const persistedRows = await config.api.row.search(res._id!)
+        it.each(names)("creates a table with name: %s", async name => {
+          const table = await config.api.table.save(
+            tableForDatasource(datasource, { name })
+          )
+          expect(table.name).toEqual(name)
+          expect(events.table.created).toHaveBeenCalledTimes(1)
+          expect(events.table.created).toHaveBeenCalledWith(table)
 
-        expect(persistedRows.rows).toEqual([
-          expect.objectContaining({
-            name: "test-name",
-            description: "test-desc",
-          }),
-        ])
-        expect(persistedRows.rows[0].nonValid).toBeUndefined()
-      })
+          const res = await config.api.table.get(table._id!)
+          expect(res.name).toEqual(name)
+        })
 
-      it.each(
-        isInternal ? PROTECTED_INTERNAL_COLUMNS : PROTECTED_EXTERNAL_COLUMNS
-      )(
-        "cannot use protected column names (%s) while importing a table",
-        async columnName => {
+        it("creates a table via data import", async () => {
+          const table: SaveTableRequest = basicTable()
+          table.rows = [{ name: "test-name", description: "test-desc" }]
+
+          const res = await config.api.table.save(table)
+
+          expect(events.table.created).toHaveBeenCalledTimes(1)
+          expect(events.table.created).toHaveBeenCalledWith(res)
+          expect(events.table.imported).toHaveBeenCalledTimes(1)
+          expect(events.table.imported).toHaveBeenCalledWith(res)
+          expect(events.rows.imported).toHaveBeenCalledTimes(1)
+          expect(events.rows.imported).toHaveBeenCalledWith(res, 1)
+        })
+
+        it("should not allow a column to have a default value and be required", async () => {
+          await config.api.table.save(
+            tableForDatasource(datasource, {
+              schema: {
+                name: {
+                  name: "name",
+                  type: FieldType.STRING,
+                  default: "default",
+                  constraints: {
+                    presence: true,
+                  },
+                },
+              },
+            }),
+            {
+              status: 400,
+              body: {
+                message:
+                  'Cannot make field "name" required, it has a default value.',
+              },
+            }
+          )
+        })
+
+        it("should apply authorization to endpoint", async () => {
+          await checkBuilderEndpoint({
+            config,
+            method: "POST",
+            url: `/api/tables`,
+            body: basicTable(),
+          })
+        })
+
+        it("does not persist the row fields that are not on the table schema", async () => {
           const table: SaveTableRequest = basicTable()
           table.rows = [
             {
               name: "test-name",
               description: "test-desc",
+              nonValid: "test-non-valid",
             },
           ]
 
-          await config.api.table.save(
-            {
-              ...table,
+          const res = await config.api.table.save(table)
+
+          const persistedRows = await config.api.row.search(res._id!)
+
+          expect(persistedRows.rows).toEqual([
+            expect.objectContaining({
+              name: "test-name",
+              description: "test-desc",
+            }),
+          ])
+          expect(persistedRows.rows[0].nonValid).toBeUndefined()
+        })
+
+        it.each(
+          isInternal ? PROTECTED_INTERNAL_COLUMNS : PROTECTED_EXTERNAL_COLUMNS
+        )(
+          "cannot use protected column names (%s) while importing a table",
+          async columnName => {
+            const table: SaveTableRequest = basicTable()
+            table.rows = [
+              {
+                name: "test-name",
+                description: "test-desc",
+              },
+            ]
+
+            await config.api.table.save(
+              {
+                ...table,
+                schema: {
+                  ...table.schema,
+                  [columnName]: {
+                    name: columnName,
+                    type: FieldType.STRING,
+                  },
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message: `Column(s) "${columnName}" are duplicated - check for other columns with these name (case in-sensitive)`,
+                  status: 400,
+                },
+              }
+            )
+          }
+        )
+
+        it("can set primary display", async () => {
+          const columnName = generator.word()
+          const table = await config.api.table.save(
+            tableForDatasource(datasource, {
+              primaryDisplay: columnName,
               schema: {
-                ...table.schema,
                 [columnName]: {
                   name: columnName,
                   type: FieldType.STRING,
                 },
               },
-            },
+            })
+          )
+          expect(table.primaryDisplay).toEqual(columnName)
+
+          const res = await config.api.table.get(table._id!)
+          expect(res.primaryDisplay).toEqual(columnName)
+        })
+
+        it("cannot use unexisting columns as primary display", async () => {
+          const columnName = generator.word()
+          await config.api.table.save(
+            tableForDatasource(datasource, {
+              primaryDisplay: columnName,
+            }),
             {
               status: 400,
               body: {
-                message: `Column(s) "${columnName}" are duplicated - check for other columns with these name (case in-sensitive)`,
-                status: 400,
+                message: `Column "${columnName}" cannot be used as a display type.`,
               },
             }
           )
-        }
-      )
-    })
+        })
 
-    describe("permissions", () => {
-      it("get the base permissions for the table", async () => {
-        const table = await config.api.table.save(
-          tableForDatasource(datasource, {
+        it("cannot use invalid column types as display name", async () => {
+          const columnName = generator.word()
+
+          await config.api.table.save(
+            tableForDatasource(datasource, {
+              primaryDisplay: columnName,
+              schema: {
+                [columnName]: {
+                  name: columnName,
+                  type: FieldType.BOOLEAN,
+                },
+              },
+            }),
+            {
+              status: 400,
+              body: {
+                message: `Column "${columnName}" cannot be used as a display type.`,
+              },
+            }
+          )
+        })
+      })
+
+      describe("permissions", () => {
+        it("get the base permissions for the table", async () => {
+          const table = await config.api.table.save(
+            tableForDatasource(datasource, {
+              schema: {
+                name: {
+                  type: FieldType.STRING,
+                  name: "name",
+                },
+              },
+            })
+          )
+
+          // get the explicit permissions
+          const { permissions } = await config.api.permission.get(table._id!, {
+            status: 200,
+          })
+          const explicitPermissions = {
+            role: "ADMIN",
+            permissionType: "EXPLICIT",
+          }
+          expect(permissions.write).toEqual(explicitPermissions)
+          expect(permissions.read).toEqual(explicitPermissions)
+
+          // revoke the explicit permissions
+          for (let level of [PermissionLevel.WRITE, PermissionLevel.READ]) {
+            await config.api.permission.revoke(
+              {
+                roleId: permissions[level].role,
+                resourceId: table._id!,
+                level,
+              },
+              { status: 200 }
+            )
+          }
+
+          // check base permissions
+          const { permissions: basePermissions } =
+            await config.api.permission.get(table._id!, {
+              status: 200,
+            })
+          const basePerms = { role: "BASIC", permissionType: "BASE" }
+          expect(basePermissions.write).toEqual(basePerms)
+          expect(basePermissions.read).toEqual(basePerms)
+        })
+      })
+
+      describe("update", () => {
+        it("updates a table", async () => {
+          const table = await config.api.table.save(
+            tableForDatasource(datasource, {
+              schema: {
+                name: {
+                  type: FieldType.STRING,
+                  name: "name",
+                  constraints: {
+                    type: "string",
+                  },
+                },
+              },
+              primary: ["_id"],
+              views: {},
+              sql: true,
+            })
+          )
+
+          const updatedTable = await config.api.table.save({
+            ...table,
+            name: generator.guid(),
+          })
+          expect(events.table.updated).toHaveBeenCalledTimes(1)
+          expect(events.table.updated).toHaveBeenCalledWith(table, updatedTable)
+        })
+
+        it("updates all the row fields for a table when a schema key is renamed", async () => {
+          const testTable = await config.api.table.save(basicTable(datasource))
+          await config.createLegacyView({
+            name: "TestView",
+            field: "Price",
+            calculation: ViewCalculation.STATISTICS,
+            tableId: testTable._id!,
+            schema: {},
+            filters: [],
+          })
+
+          const testRow = await config.api.row.save(testTable._id!, {
+            name: "test",
+          })
+
+          const { name, ...otherColumns } = testTable.schema
+          const updatedTable = await config.api.table.save({
+            ...testTable,
+            _rename: {
+              old: "name",
+              updated: "updatedName",
+            },
             schema: {
-              name: {
-                type: FieldType.STRING,
-                name: "name",
+              ...otherColumns,
+              updatedName: {
+                ...name,
+                name: "updatedName",
               },
             },
           })
-        )
 
-        // get the explicit permissions
-        const { permissions } = await config.api.permission.get(table._id!, {
-          status: 200,
+          expect(updatedTable.name).toEqual(testTable.name)
+
+          const res = await config.api.row.get(testTable._id!, testRow._id!)
+          expect(res.updatedName).toEqual("test")
+          expect(res.name).toBeUndefined()
         })
-        const explicitPermissions = {
-          role: "ADMIN",
-          permissionType: "EXPLICIT",
-        }
-        expect(permissions.write).toEqual(explicitPermissions)
-        expect(permissions.read).toEqual(explicitPermissions)
 
-        // revoke the explicit permissions
-        for (let level of [PermissionLevel.WRITE, PermissionLevel.READ]) {
-          await config.api.permission.revoke(
-            {
-              roleId: permissions[level].role,
-              resourceId: table._id!,
-              level,
-            },
-            { status: 200 }
-          )
-        }
+        isInternal &&
+          it("updates only the passed fields", async () => {
+            await timekeeper.withFreeze(new Date(2021, 1, 1), async () => {
+              const table = await config.api.table.save(
+                tableForDatasource(datasource, {
+                  schema: {
+                    autoId: {
+                      name: "id",
+                      type: FieldType.NUMBER,
+                      subtype: AutoFieldSubType.AUTO_ID,
+                      autocolumn: true,
+                      constraints: {
+                        type: "number",
+                        presence: false,
+                      },
+                    },
+                  },
+                })
+              )
 
-        // check base permissions
-        const { permissions: basePermissions } =
-          await config.api.permission.get(table._id!, {
-            status: 200,
+              const newName = generator.guid()
+
+              const updatedTable = await config.api.table.save({
+                ...table,
+                name: newName,
+              })
+
+              let expected: Table = {
+                ...table,
+                name: newName,
+                _id: expect.any(String),
+              }
+              if (isInternal) {
+                expected._rev = expect.stringMatching(/^2-.+/)
+              }
+
+              expect(updatedTable).toEqual(expect.objectContaining(expected))
+
+              const persistedTable = await config.api.table.get(
+                updatedTable._id!
+              )
+              expected = {
+                ...table,
+                name: newName,
+                _id: updatedTable._id,
+              }
+              if (datasource?.isSQL) {
+                expected.sql = true
+              }
+              if (isInternal) {
+                expected._rev = expect.stringMatching(/^2-.+/)
+              }
+              expect(persistedTable).toEqual(expect.objectContaining(expected))
+            })
           })
-        const basePerms = { role: "BASIC", permissionType: "BASE" }
-        expect(basePermissions.write).toEqual(basePerms)
-        expect(basePermissions.read).toEqual(basePerms)
-      })
-    })
 
-    describe("update", () => {
-      it("updates a table", async () => {
-        const table = await config.api.table.save(
-          tableForDatasource(datasource, {
+        describe("user table", () => {
+          isInternal &&
+            it("should add roleId and email field when adjusting user table schema", async () => {
+              const table = await config.api.table.save({
+                ...basicTable(datasource),
+                _id: "ta_users",
+              })
+              expect(table.schema.email).toBeDefined()
+              expect(table.schema.roleId).toBeDefined()
+            })
+        })
+
+        describe("default field validation", () => {
+          it("should error if an existing column is set to required and has a default value", async () => {
+            const table = await config.api.table.save(
+              tableForDatasource(datasource, {
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    default: "default",
+                  },
+                },
+              })
+            )
+
+            await config.api.table.save(
+              {
+                ...table,
+                schema: {
+                  ...table.schema,
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    default: "default",
+                    constraints: {
+                      presence: true,
+                    },
+                  },
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Cannot make field "name" required, it has a default value.',
+                },
+              }
+            )
+          })
+
+          it("should error if an existing column is given a default value and is required", async () => {
+            const table = await config.api.table.save(
+              tableForDatasource(datasource, {
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    constraints: {
+                      presence: true,
+                    },
+                  },
+                },
+              })
+            )
+
+            await config.api.table.save(
+              {
+                ...table,
+                schema: {
+                  ...table.schema,
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    default: "default",
+                    constraints: {
+                      presence: true,
+                    },
+                  },
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Cannot make field "name" required, it has a default value.',
+                },
+              }
+            )
+          })
+
+          it("should be able to set an existing column to have a default value if it's not required", async () => {
+            const table = await config.api.table.save(
+              tableForDatasource(datasource, {
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                  },
+                },
+              })
+            )
+
+            await config.api.table.save(
+              {
+                ...table,
+                schema: {
+                  ...table.schema,
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    default: "default",
+                  },
+                },
+              },
+              { status: 200 }
+            )
+          })
+
+          it("should be able to remove a default value if the column is not required", async () => {
+            const table = await config.api.table.save(
+              tableForDatasource(datasource, {
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    default: "default",
+                  },
+                },
+              })
+            )
+
+            await config.api.table.save(
+              {
+                ...table,
+                schema: {
+                  ...table.schema,
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                  },
+                },
+              },
+              { status: 200 }
+            )
+          })
+        })
+
+        describe("external table validation", () => {
+          !isInternal &&
+            it("should error if column is of type auto", async () => {
+              const table = basicTable(datasource)
+              await config.api.table.save(
+                {
+                  ...table,
+                  schema: {
+                    ...table.schema,
+                    auto: {
+                      name: "auto",
+                      autocolumn: true,
+                      type: FieldType.AUTO,
+                      subtype: AutoFieldSubType.AUTO_ID,
+                    },
+                  },
+                },
+                {
+                  status: 400,
+                  body: {
+                    message: `Column "auto" has type "${FieldType.AUTO}" - this is not supported.`,
+                  },
+                }
+              )
+            })
+
+          !isInternal &&
+            it("should error if column has auto subtype", async () => {
+              const table = basicTable(datasource)
+              await config.api.table.save(
+                {
+                  ...table,
+                  schema: {
+                    ...table.schema,
+                    auto: {
+                      name: "auto",
+                      autocolumn: true,
+                      type: FieldType.NUMBER,
+                      subtype: AutoFieldSubType.AUTO_ID,
+                    },
+                  },
+                },
+                {
+                  status: 400,
+                  body: {
+                    message: `Column "auto" has subtype "${AutoFieldSubType.AUTO_ID}" - this is not supported.`,
+                  },
+                }
+              )
+            })
+        })
+
+        isInternal &&
+          it("shouldn't allow duplicate column names", async () => {
+            const saveTableRequest: SaveTableRequest = {
+              ...basicTable(),
+            }
+            saveTableRequest.schema["Type"] = {
+              type: FieldType.STRING,
+              name: "Type",
+            }
+            // allow the "Type" column - internal columns aren't case sensitive
+            await config.api.table.save(saveTableRequest, {
+              status: 200,
+            })
+            saveTableRequest.schema.foo = {
+              type: FieldType.STRING,
+              name: "foo",
+            }
+            saveTableRequest.schema.FOO = {
+              type: FieldType.STRING,
+              name: "FOO",
+            }
+
+            await config.api.table.save(saveTableRequest, {
+              status: 400,
+              body: {
+                message:
+                  'Column(s) "foo" are duplicated - check for other columns with these name (case in-sensitive)',
+              },
+            })
+          })
+
+        it("should add a new column for an internal DB table", async () => {
+          const saveTableRequest: SaveTableRequest = {
+            ...basicTable(),
+          }
+
+          const response = await config.api.table.save(saveTableRequest)
+
+          const expectedResponse = {
+            ...saveTableRequest,
+            _rev: expect.stringMatching(/^\d-.+/),
+            _id: expect.stringMatching(/^ta_.+/),
+            createdAt: expect.stringMatching(ISO_REGEX_PATTERN),
+            updatedAt: expect.stringMatching(ISO_REGEX_PATTERN),
+            views: {},
+          }
+          expect(response).toEqual(expectedResponse)
+        })
+
+        it("cannot use unexisting columns as primary display", async () => {
+          const table = await config.api.table.save(
+            tableForDatasource(datasource)
+          )
+
+          const columnName = generator.word()
+          const tableRequest = {
+            ...table,
+            primaryDisplay: columnName,
+          }
+          await config.api.table.save(tableRequest, {
+            status: 400,
+            body: {
+              message: `Column "${columnName}" cannot be used as a display type.`,
+            },
+          })
+        })
+
+        it("cannot use invalid column types as display name", async () => {
+          const table = await config.api.table.save(
+            tableForDatasource(datasource)
+          )
+          const columnName = generator.word()
+          const tableRequest: SaveTableRequest = {
+            ...table,
+            primaryDisplay: columnName,
+            schema: {
+              ...table.schema,
+              [columnName]: {
+                name: columnName,
+                type: FieldType.BOOLEAN,
+              },
+            },
+          }
+
+          await config.api.table.save(tableRequest, {
+            status: 400,
+            body: {
+              message: `Column "${columnName}" cannot be used as a display type.`,
+            },
+          })
+        })
+      })
+
+      describe("import", () => {
+        it("imports rows successfully", async () => {
+          const name = generator.guid()
+          const table = await config.api.table.save(
+            basicTable(datasource, { name })
+          )
+          const importRequest = {
+            schema: table.schema,
+            rows: [{ name: "test-name", description: "test-desc" }],
+          }
+
+          jest.clearAllMocks()
+
+          await config.api.table.import(table._id!, importRequest)
+
+          expect(events.table.created).not.toHaveBeenCalled()
+          expect(events.rows.imported).toHaveBeenCalledTimes(1)
+          expect(events.rows.imported).toHaveBeenCalledWith(
+            expect.objectContaining({
+              name,
+              _id: table._id,
+            }),
+            1
+          )
+        })
+      })
+
+      describe("fetch", () => {
+        let testTable: Table
+
+        beforeEach(async () => {
+          testTable = await config.api.table.save(
+            basicTable(datasource, { name: generator.guid() })
+          )
+        })
+
+        it("returns all tables", async () => {
+          const res = await config.api.table.fetch()
+          const table = res.find(t => t._id === testTable._id)
+          expect(table).toBeDefined()
+          expect(table!.name).toEqual(testTable.name)
+          expect(table!.type).toEqual("table")
+          expect(table!.sourceType).toEqual(testTable.sourceType)
+        })
+
+        it("should apply authorization to endpoint", async () => {
+          await checkBuilderEndpoint({
+            config,
+            method: "GET",
+            url: `/api/tables`,
+          })
+        })
+
+        it("should enrich the view schemas", async () => {
+          const viewV2 = await config.api.viewV2.create({
+            tableId: testTable._id!,
+            name: generator.guid(),
+          })
+          const legacyView = await config.api.legacyView.save({
+            tableId: testTable._id!,
+            name: generator.guid(),
+            filters: [],
+            schema: {},
+          })
+
+          const res = await config.api.table.fetch()
+
+          const table = res.find(t => t._id === testTable._id)
+          expect(table).toBeDefined()
+          expect(table!.views![viewV2.name]).toBeDefined()
+
+          const expectedViewV2: ViewV2Enriched = {
+            ...viewV2,
+            schema: {
+              description: {
+                constraints: {
+                  type: "string",
+                },
+                name: "description",
+                type: FieldType.STRING,
+                visible: false,
+              },
+              name: {
+                constraints: {
+                  type: "string",
+                },
+                name: "name",
+                type: FieldType.STRING,
+                visible: false,
+              },
+            },
+          }
+
+          if (!isInternal) {
+            expectedViewV2.schema!.id = {
+              name: "id",
+              type: FieldType.NUMBER,
+              visible: false,
+              autocolumn: true,
+            }
+          }
+
+          expect(table!.views![viewV2.name!]).toEqual(expectedViewV2)
+
+          if (isInternal) {
+            expect(table!.views![legacyView.name!]).toBeDefined()
+            expect(table!.views![legacyView.name!]).toEqual({
+              ...legacyView,
+              schema: {
+                description: {
+                  constraints: {
+                    type: "string",
+                  },
+                  name: "description",
+                  type: "string",
+                },
+                name: {
+                  constraints: {
+                    type: "string",
+                  },
+                  name: "name",
+                  type: "string",
+                },
+              },
+            })
+          }
+        })
+      })
+
+      describe("get", () => {
+        it("returns a table", async () => {
+          const table = await config.api.table.save(
+            basicTable(datasource, { name: generator.guid() })
+          )
+          const res = await config.api.table.get(table._id!)
+          expect(res).toEqual(expect.objectContaining(table))
+        })
+      })
+
+      describe("indexing", () => {
+        it("should be able to create a table with indexes", async () => {
+          await context.doInAppContext(config.getAppId(), async () => {
+            const db = context.getAppDB()
+            const indexCount = (await db.getIndexes()).total_rows
+            const table = basicTable()
+            table.indexes = ["name"]
+            const res = await config.api.table.save(table)
+            expect(res._id).toBeDefined()
+            expect(res._rev).toBeDefined()
+            expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+            // update index to see what happens
+            table.indexes = ["name", "description"]
+            await config.api.table.save({
+              ...table,
+              _id: res._id,
+              _rev: res._rev,
+            })
+            // shouldn't have created a new index
+            expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
+          })
+        })
+      })
+
+      describe("destroy", () => {
+        let testTable: Table
+
+        beforeEach(async () => {
+          testTable = await config.createTable()
+        })
+
+        it("returns a success response when a table is deleted.", async () => {
+          await config.api.table.destroy(testTable._id!, testTable._rev!, {
+            body: { message: `Table ${testTable._id} deleted.` },
+          })
+          expect(events.table.deleted).toHaveBeenCalledTimes(1)
+          expect(events.table.deleted).toHaveBeenCalledWith(
+            expect.objectContaining({
+              ...testTable,
+              tableId: testTable._id,
+            })
+          )
+        })
+
+        it("deletes linked references to the table after deletion", async () => {
+          const linkedTable = await config.createTable({
+            name: "LinkedTable",
+            type: "table",
             schema: {
               name: {
                 type: FieldType.STRING,
@@ -243,68 +899,299 @@ datasourceDescribe(
                   type: "string",
                 },
               },
+              TestTable: {
+                type: FieldType.LINK,
+                relationshipType: RelationshipType.ONE_TO_MANY,
+                name: "TestTable",
+                fieldName: "TestTable",
+                tableId: testTable._id!,
+                constraints: {
+                  type: "array",
+                },
+              },
             },
           })
-        )
 
-        const updatedTable = await config.api.table.save({
-          ...table,
-          name: generator.guid(),
+          await config.api.table.destroy(testTable._id!, testTable._rev!, {
+            body: { message: `Table ${testTable._id} deleted.` },
+          })
+          const dependentTable = await config.api.table.get(linkedTable._id!)
+          expect(dependentTable.schema.TestTable).not.toBeDefined()
         })
 
-        expect(events.table.updated).toHaveBeenCalledTimes(1)
-        expect(events.table.updated).toHaveBeenCalledWith(updatedTable)
+        it("should apply authorization to endpoint", async () => {
+          await checkBuilderEndpoint({
+            config,
+            method: "DELETE",
+            url: `/api/tables/${testTable._id}/${testTable._rev}`,
+          })
+        })
       })
 
-      it("updates all the row fields for a table when a schema key is renamed", async () => {
-        const testTable = await config.api.table.save(basicTable(datasource))
-        await config.createLegacyView({
-          name: "TestView",
-          field: "Price",
-          calculation: ViewCalculation.STATISTICS,
-          tableId: testTable._id!,
-          schema: {},
-          filters: [],
+      describe("migrate", () => {
+        let users: User[]
+        beforeAll(async () => {
+          users = await Promise.all([
+            config.createUser({ email: `${uuid.v4()}@example.com` }),
+            config.createUser({ email: `${uuid.v4()}@example.com` }),
+            config.createUser({ email: `${uuid.v4()}@example.com` }),
+          ])
         })
 
-        const testRow = await config.api.row.save(testTable._id!, {
-          name: "test",
-        })
-
-        const { name, ...otherColumns } = testTable.schema
-        const updatedTable = await config.api.table.save({
-          ...testTable,
-          _rename: {
-            old: "name",
-            updated: "updatedName",
-          },
-          schema: {
-            ...otherColumns,
-            updatedName: {
-              ...name,
-              name: "updatedName",
+        it("should successfully migrate a one-to-many user relationship to a user column", async () => {
+          const table = await config.api.table.save({
+            name: "table",
+            type: "table",
+            sourceId: INTERNAL_TABLE_SOURCE_ID,
+            sourceType: TableSourceType.INTERNAL,
+            schema: {
+              "user relationship": {
+                type: FieldType.LINK,
+                fieldName: "test",
+                name: "user relationship",
+                constraints: {
+                  type: "array",
+                  presence: false,
+                },
+                relationshipType: RelationshipType.ONE_TO_MANY,
+                tableId: InternalTable.USER_METADATA,
+              },
             },
-          },
+          })
+
+          const rows = await Promise.all(
+            users.map(u =>
+              config.api.row.save(table._id!, { "user relationship": [u] })
+            )
+          )
+
+          await config.api.table.migrate(table._id!, {
+            oldColumn: "user relationship",
+            newColumn: "user column",
+          })
+
+          const migratedTable = await config.api.table.get(table._id!)
+          expect(migratedTable.schema["user column"]).toEqual({
+            name: "user column",
+            type: FieldType.BB_REFERENCE_SINGLE,
+            subtype: BBReferenceFieldSubType.USER,
+          })
+          expect(migratedTable.schema["user relationship"]).not.toBeDefined()
+
+          const migratedRows = await config.api.row.fetch(table._id!)
+
+          rows.sort((a, b) => a._id!.localeCompare(b._id!))
+          migratedRows.sort((a, b) => a._id!.localeCompare(b._id!))
+
+          for (const [i, row] of rows.entries()) {
+            const migratedRow = migratedRows[i]
+            expect(migratedRow["user column"]).toBeDefined()
+            expect(migratedRow["user relationship"]).not.toBeDefined()
+            expect(row["user relationship"][0]._id).toEqual(
+              migratedRow["user column"]._id
+            )
+          }
         })
 
-        expect(updatedTable.name).toEqual(testTable.name)
+        it("should succeed when the row is created from the other side of the relationship", async () => {
+          // We found a bug just after releasing this feature where if the row was created from the
+          // users table, not the table linking to it, the migration would succeed but lose the data.
+          // This happened because the order of the documents in the link was reversed.
+          const table = await config.api.table.save({
+            name: "table",
+            type: "table",
+            sourceId: INTERNAL_TABLE_SOURCE_ID,
+            sourceType: TableSourceType.INTERNAL,
+            schema: {
+              "user relationship": {
+                type: FieldType.LINK,
+                fieldName: "test",
+                name: "user relationship",
+                constraints: {
+                  type: "array",
+                  presence: false,
+                },
+                relationshipType: RelationshipType.MANY_TO_ONE,
+                tableId: InternalTable.USER_METADATA,
+              },
+            },
+          })
 
-        const res = await config.api.row.get(testTable._id!, testRow._id!)
-        expect(res.updatedName).toEqual("test")
-        expect(res.name).toBeUndefined()
-      })
+          let testRow = await config.api.row.save(table._id!, {})
 
-      isInternal &&
-        it("updates only the passed fields", async () => {
-          await timekeeper.withFreeze(new Date(2021, 1, 1), async () => {
-            const table = await config.api.table.save(
+          await Promise.all(
+            users.map(u =>
+              config.api.row.patch(InternalTable.USER_METADATA, {
+                tableId: InternalTable.USER_METADATA,
+                _rev: u._rev!,
+                _id: u._id!,
+                test: [testRow],
+              })
+            )
+          )
+
+          await config.api.table.migrate(table._id!, {
+            oldColumn: "user relationship",
+            newColumn: "user column",
+          })
+
+          const migratedTable = await config.api.table.get(table._id!)
+          expect(migratedTable.schema["user column"]).toEqual({
+            name: "user column",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+            constraints: {
+              type: "array",
+            },
+          })
+          expect(migratedTable.schema["user relationship"]).not.toBeDefined()
+
+          const migratedRow = await config.api.row.get(table._id!, testRow._id!)
+
+          expect(migratedRow["user column"]).toBeDefined()
+          expect(migratedRow["user relationship"]).not.toBeDefined()
+          expect(migratedRow["user column"]).toHaveLength(3)
+          expect(migratedRow["user column"].map((u: Row) => u._id)).toEqual(
+            expect.arrayContaining(users.map(u => u._id))
+          )
+        })
+
+        it("should successfully migrate a many-to-many user relationship to a users column", async () => {
+          const table = await config.api.table.save({
+            name: "table",
+            type: "table",
+            sourceId: INTERNAL_TABLE_SOURCE_ID,
+            sourceType: TableSourceType.INTERNAL,
+            schema: {
+              "user relationship": {
+                type: FieldType.LINK,
+                fieldName: "test",
+                name: "user relationship",
+                constraints: {
+                  type: "array",
+                  presence: false,
+                },
+                relationshipType: RelationshipType.MANY_TO_MANY,
+                tableId: InternalTable.USER_METADATA,
+              },
+            },
+          })
+
+          const row1 = await config.api.row.save(table._id!, {
+            "user relationship": [users[0], users[1]],
+          })
+
+          const row2 = await config.api.row.save(table._id!, {
+            "user relationship": [users[1], users[2]],
+          })
+
+          await config.api.table.migrate(table._id!, {
+            oldColumn: "user relationship",
+            newColumn: "user column",
+          })
+
+          const migratedTable = await config.api.table.get(table._id!)
+          expect(migratedTable.schema["user column"]).toEqual({
+            name: "user column",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+            constraints: {
+              type: "array",
+            },
+          })
+          expect(migratedTable.schema["user relationship"]).not.toBeDefined()
+
+          const row1Migrated = await config.api.row.get(table._id!, row1._id!)
+          expect(row1Migrated["user relationship"]).not.toBeDefined()
+          expect(row1Migrated["user column"].map((r: Row) => r._id)).toEqual(
+            expect.arrayContaining([users[0]._id, users[1]._id])
+          )
+
+          const row2Migrated = await config.api.row.get(table._id!, row2._id!)
+          expect(row2Migrated["user relationship"]).not.toBeDefined()
+          expect(row2Migrated["user column"].map((r: Row) => r._id)).toEqual(
+            expect.arrayContaining([users[1]._id, users[2]._id])
+          )
+        })
+
+        it("should successfully migrate a many-to-one user relationship to a users column", async () => {
+          const table = await config.api.table.save({
+            name: "table",
+            type: "table",
+            sourceId: INTERNAL_TABLE_SOURCE_ID,
+            sourceType: TableSourceType.INTERNAL,
+            schema: {
+              "user relationship": {
+                type: FieldType.LINK,
+                fieldName: "test",
+                name: "user relationship",
+                constraints: {
+                  type: "array",
+                  presence: false,
+                },
+                relationshipType: RelationshipType.MANY_TO_ONE,
+                tableId: InternalTable.USER_METADATA,
+              },
+            },
+          })
+
+          const row1 = await config.api.row.save(table._id!, {
+            "user relationship": [users[0], users[1]],
+          })
+
+          const row2 = await config.api.row.save(table._id!, {
+            "user relationship": [users[2]],
+          })
+
+          await config.api.table.migrate(table._id!, {
+            oldColumn: "user relationship",
+            newColumn: "user column",
+          })
+
+          const migratedTable = await config.api.table.get(table._id!)
+          expect(migratedTable.schema["user column"]).toEqual({
+            name: "user column",
+            type: FieldType.BB_REFERENCE,
+            subtype: BBReferenceFieldSubType.USER,
+            constraints: {
+              type: "array",
+            },
+          })
+          expect(migratedTable.schema["user relationship"]).not.toBeDefined()
+
+          const row1Migrated = await config.api.row.get(table._id!, row1._id!)
+          expect(row1Migrated["user relationship"]).not.toBeDefined()
+          expect(row1Migrated["user column"].map((r: Row) => r._id)).toEqual(
+            expect.arrayContaining([users[0]._id, users[1]._id])
+          )
+
+          const row2Migrated = await config.api.row.get(table._id!, row2._id!)
+          expect(row2Migrated["user relationship"]).not.toBeDefined()
+          expect(row2Migrated["user column"].map((r: Row) => r._id)).toEqual([
+            users[2]._id,
+          ])
+        })
+
+        describe("unhappy paths", () => {
+          let table: Table
+          beforeAll(async () => {
+            table = await config.api.table.save(
               tableForDatasource(datasource, {
                 schema: {
-                  autoId: {
-                    name: "id",
+                  "user relationship": {
+                    type: FieldType.LINK,
+                    fieldName: "test",
+                    name: "user relationship",
+                    constraints: {
+                      type: "array",
+                      presence: false,
+                    },
+                    relationshipType: RelationshipType.MANY_TO_ONE,
+                    tableId: InternalTable.USER_METADATA,
+                  },
+                  num: {
                     type: FieldType.NUMBER,
-                    subtype: AutoFieldSubType.AUTO_ID,
-                    autocolumn: true,
+                    name: "num",
                     constraints: {
                       type: "number",
                       presence: false,
@@ -313,1077 +1200,238 @@ datasourceDescribe(
                 },
               })
             )
-
-            const newName = generator.guid()
-
-            const updatedTable = await config.api.table.save({
-              ...table,
-              name: newName,
-            })
-
-            let expected: Table = {
-              ...table,
-              name: newName,
-              _id: expect.any(String),
-            }
-            if (isInternal) {
-              expected._rev = expect.stringMatching(/^2-.+/)
-            }
-
-            expect(updatedTable).toEqual(expect.objectContaining(expected))
-
-            const persistedTable = await config.api.table.get(updatedTable._id!)
-            expected = {
-              ...table,
-              name: newName,
-              _id: updatedTable._id,
-            }
-            if (datasource?.isSQL) {
-              expected.sql = true
-            }
-            if (isInternal) {
-              expected._rev = expect.stringMatching(/^2-.+/)
-            }
-            expect(persistedTable).toEqual(expect.objectContaining(expected))
           })
-        })
 
-      describe("user table", () => {
-        isInternal &&
-          it("should add roleId and email field when adjusting user table schema", async () => {
-            const table = await config.api.table.save({
-              ...basicTable(datasource),
-              _id: "ta_users",
-            })
-            expect(table.schema.email).toBeDefined()
-            expect(table.schema.roleId).toBeDefined()
-          })
-      })
-
-      describe("default field validation", () => {
-        it("should error if an existing column is set to required and has a default value", async () => {
-          const table = await config.api.table.save(
-            tableForDatasource(datasource, {
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  default: "default",
-                },
-              },
-            })
-          )
-
-          await config.api.table.save(
-            {
-              ...table,
-              schema: {
-                ...table.schema,
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  default: "default",
-                  constraints: {
-                    presence: true,
-                  },
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Cannot make field "name" required, it has a default value.',
-              },
-            }
-          )
-        })
-
-        it("should error if an existing column is given a default value and is required", async () => {
-          const table = await config.api.table.save(
-            tableForDatasource(datasource, {
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  constraints: {
-                    presence: true,
-                  },
-                },
-              },
-            })
-          )
-
-          await config.api.table.save(
-            {
-              ...table,
-              schema: {
-                ...table.schema,
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  default: "default",
-                  constraints: {
-                    presence: true,
-                  },
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Cannot make field "name" required, it has a default value.',
-              },
-            }
-          )
-        })
-
-        it("should be able to set an existing column to have a default value if it's not required", async () => {
-          const table = await config.api.table.save(
-            tableForDatasource(datasource, {
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              },
-            })
-          )
-
-          await config.api.table.save(
-            {
-              ...table,
-              schema: {
-                ...table.schema,
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  default: "default",
-                },
-              },
-            },
-            { status: 200 }
-          )
-        })
-
-        it("should be able to remove a default value if the column is not required", async () => {
-          const table = await config.api.table.save(
-            tableForDatasource(datasource, {
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  default: "default",
-                },
-              },
-            })
-          )
-
-          await config.api.table.save(
-            {
-              ...table,
-              schema: {
-                ...table.schema,
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-              },
-            },
-            { status: 200 }
-          )
-        })
-      })
-
-      describe("external table validation", () => {
-        !isInternal &&
-          it("should error if column is of type auto", async () => {
-            const table = basicTable(datasource)
-            await config.api.table.save(
+          it("should fail if the new column name is blank", async () => {
+            await config.api.table.migrate(
+              table._id!,
               {
-                ...table,
-                schema: {
-                  ...table.schema,
-                  auto: {
-                    name: "auto",
-                    autocolumn: true,
-                    type: FieldType.AUTO,
-                    subtype: AutoFieldSubType.AUTO_ID,
-                  },
-                },
+                oldColumn: "user relationship",
+                newColumn: "",
               },
-              {
-                status: 400,
-                body: {
-                  message: `Column "auto" has type "${FieldType.AUTO}" - this is not supported.`,
-                },
-              }
+              { status: 400 }
             )
           })
 
-        !isInternal &&
-          it("should error if column has auto subtype", async () => {
-            const table = basicTable(datasource)
-            await config.api.table.save(
+          it("should fail if the new column name is a reserved name", async () => {
+            await config.api.table.migrate(
+              table._id!,
               {
-                ...table,
-                schema: {
-                  ...table.schema,
-                  auto: {
-                    name: "auto",
-                    autocolumn: true,
-                    type: FieldType.NUMBER,
-                    subtype: AutoFieldSubType.AUTO_ID,
-                  },
-                },
+                oldColumn: "user relationship",
+                newColumn: "_id",
               },
-              {
-                status: 400,
-                body: {
-                  message: `Column "auto" has subtype "${AutoFieldSubType.AUTO_ID}" - this is not supported.`,
-                },
-              }
+              { status: 400 }
             )
           })
-      })
 
-      isInternal &&
-        it("shouldn't allow duplicate column names", async () => {
-          const saveTableRequest: SaveTableRequest = {
-            ...basicTable(),
-          }
-          saveTableRequest.schema["Type"] = {
-            type: FieldType.STRING,
-            name: "Type",
-          }
-          // allow the "Type" column - internal columns aren't case sensitive
-          await config.api.table.save(saveTableRequest, {
-            status: 200,
+          it("should fail if the new column name is the same as an existing column", async () => {
+            await config.api.table.migrate(
+              table._id!,
+              {
+                oldColumn: "user relationship",
+                newColumn: "num",
+              },
+              { status: 400 }
+            )
           })
-          saveTableRequest.schema.foo = { type: FieldType.STRING, name: "foo" }
-          saveTableRequest.schema.FOO = { type: FieldType.STRING, name: "FOO" }
 
-          await config.api.table.save(saveTableRequest, {
-            status: 400,
-            body: {
-              message:
-                'Column(s) "foo" are duplicated - check for other columns with these name (case in-sensitive)',
-            },
+          it("should fail if the old column name isn't a column in the table", async () => {
+            await config.api.table.migrate(
+              table._id!,
+              {
+                oldColumn: "not a column",
+                newColumn: "new column",
+              },
+              { status: 400 }
+            )
           })
         })
-
-      it("should add a new column for an internal DB table", async () => {
-        const saveTableRequest: SaveTableRequest = {
-          ...basicTable(),
-        }
-
-        const response = await config.api.table.save(saveTableRequest)
-
-        const expectedResponse = {
-          ...saveTableRequest,
-          _rev: expect.stringMatching(/^\d-.+/),
-          _id: expect.stringMatching(/^ta_.+/),
-          createdAt: expect.stringMatching(ISO_REGEX_PATTERN),
-          updatedAt: expect.stringMatching(ISO_REGEX_PATTERN),
-          views: {},
-        }
-        expect(response).toEqual(expectedResponse)
-      })
-    })
-
-    describe("import", () => {
-      it("imports rows successfully", async () => {
-        const name = generator.guid()
-        const table = await config.api.table.save(
-          basicTable(datasource, { name })
-        )
-        const importRequest = {
-          schema: table.schema,
-          rows: [{ name: "test-name", description: "test-desc" }],
-        }
-
-        jest.clearAllMocks()
-
-        await config.api.table.import(table._id!, importRequest)
-
-        expect(events.table.created).not.toHaveBeenCalled()
-        expect(events.rows.imported).toHaveBeenCalledTimes(1)
-        expect(events.rows.imported).toHaveBeenCalledWith(
-          expect.objectContaining({
-            name,
-            _id: table._id,
-          }),
-          1
-        )
-      })
-    })
-
-    describe("fetch", () => {
-      let testTable: Table
-
-      beforeEach(async () => {
-        testTable = await config.api.table.save(
-          basicTable(datasource, { name: generator.guid() })
-        )
       })
 
-      it("returns all tables", async () => {
-        const res = await config.api.table.fetch()
-        const table = res.find(t => t._id === testTable._id)
-        expect(table).toBeDefined()
-        expect(table!.name).toEqual(testTable.name)
-        expect(table!.type).toEqual("table")
-        expect(table!.sourceType).toEqual(testTable.sourceType)
-      })
-
-      it("should apply authorization to endpoint", async () => {
-        await checkBuilderEndpoint({
-          config,
-          method: "GET",
-          url: `/api/tables`,
-        })
-      })
-
-      it("should enrich the view schemas", async () => {
-        const viewV2 = await config.api.viewV2.create({
-          tableId: testTable._id!,
-          name: generator.guid(),
-        })
-        const legacyView = await config.api.legacyView.save({
-          tableId: testTable._id!,
-          name: generator.guid(),
-          filters: [],
-          schema: {},
-        })
-
-        const res = await config.api.table.fetch()
-
-        const table = res.find(t => t._id === testTable._id)
-        expect(table).toBeDefined()
-        expect(table!.views![viewV2.name]).toBeDefined()
-
-        const expectedViewV2: ViewV2Enriched = {
-          ...viewV2,
-          schema: {
-            description: {
-              constraints: {
-                type: "string",
-              },
-              name: "description",
-              type: FieldType.STRING,
-              visible: false,
-            },
-            name: {
-              constraints: {
-                type: "string",
-              },
-              name: "name",
-              type: FieldType.STRING,
-              visible: false,
-            },
-          },
-        }
-
-        if (!isInternal) {
-          expectedViewV2.schema!.id = {
-            name: "id",
-            type: FieldType.NUMBER,
-            visible: false,
-            autocolumn: true,
-          }
-        }
-
-        expect(table!.views![viewV2.name!]).toEqual(expectedViewV2)
-
-        if (isInternal) {
-          expect(table!.views![legacyView.name!]).toBeDefined()
-          expect(table!.views![legacyView.name!]).toEqual({
-            ...legacyView,
-            schema: {
-              description: {
-                constraints: {
-                  type: "string",
-                },
-                name: "description",
-                type: "string",
-              },
-              name: {
-                constraints: {
-                  type: "string",
-                },
-                name: "name",
-                type: "string",
-              },
-            },
-          })
-        }
-      })
-    })
-
-    describe("get", () => {
-      it("returns a table", async () => {
-        const table = await config.api.table.save(
-          basicTable(datasource, { name: generator.guid() })
-        )
-        const res = await config.api.table.get(table._id!)
-        expect(res).toEqual(expect.objectContaining(table))
-      })
-    })
-
-    describe("indexing", () => {
-      it("should be able to create a table with indexes", async () => {
-        await context.doInAppContext(config.getAppId(), async () => {
-          const db = context.getAppDB()
-          const indexCount = (await db.getIndexes()).total_rows
-          const table = basicTable()
-          table.indexes = ["name"]
-          const res = await config.api.table.save(table)
-          expect(res._id).toBeDefined()
-          expect(res._rev).toBeDefined()
-          expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-          // update index to see what happens
-          table.indexes = ["name", "description"]
-          await config.api.table.save({
-            ...table,
-            _id: res._id,
-            _rev: res._rev,
-          })
-          // shouldn't have created a new index
-          expect((await db.getIndexes()).total_rows).toEqual(indexCount + 1)
-        })
-      })
-    })
-
-    describe("destroy", () => {
-      let testTable: Table
-
-      beforeEach(async () => {
-        testTable = await config.createTable()
-      })
-
-      it("returns a success response when a table is deleted.", async () => {
-        await config.api.table.destroy(testTable._id!, testTable._rev!, {
-          body: { message: `Table ${testTable._id} deleted.` },
-        })
-        expect(events.table.deleted).toHaveBeenCalledTimes(1)
-        expect(events.table.deleted).toHaveBeenCalledWith(
-          expect.objectContaining({
-            ...testTable,
-            tableId: testTable._id,
-          })
-        )
-      })
-
-      it("deletes linked references to the table after deletion", async () => {
-        const linkedTable = await config.createTable({
-          name: "LinkedTable",
-          type: "table",
-          schema: {
-            name: {
-              type: FieldType.STRING,
-              name: "name",
-              constraints: {
-                type: "string",
-              },
-            },
-            TestTable: {
-              type: FieldType.LINK,
-              relationshipType: RelationshipType.ONE_TO_MANY,
-              name: "TestTable",
-              fieldName: "TestTable",
-              tableId: testTable._id!,
-              constraints: {
-                type: "array",
-              },
-            },
-          },
-        })
-
-        await config.api.table.destroy(testTable._id!, testTable._rev!, {
-          body: { message: `Table ${testTable._id} deleted.` },
-        })
-        const dependentTable = await config.api.table.get(linkedTable._id!)
-        expect(dependentTable.schema.TestTable).not.toBeDefined()
-      })
-
-      it("should apply authorization to endpoint", async () => {
-        await checkBuilderEndpoint({
-          config,
-          method: "DELETE",
-          url: `/api/tables/${testTable._id}/${testTable._rev}`,
-        })
-      })
-    })
-
-    describe("migrate", () => {
-      let users: User[]
-      beforeAll(async () => {
-        users = await Promise.all([
-          config.createUser({ email: `${uuid.v4()}@example.com` }),
-          config.createUser({ email: `${uuid.v4()}@example.com` }),
-          config.createUser({ email: `${uuid.v4()}@example.com` }),
-        ])
-      })
-
-      it("should successfully migrate a one-to-many user relationship to a user column", async () => {
-        const table = await config.api.table.save({
-          name: "table",
-          type: "table",
-          sourceId: INTERNAL_TABLE_SOURCE_ID,
-          sourceType: TableSourceType.INTERNAL,
-          schema: {
-            "user relationship": {
-              type: FieldType.LINK,
-              fieldName: "test",
-              name: "user relationship",
-              constraints: {
-                type: "array",
-                presence: false,
-              },
-              relationshipType: RelationshipType.ONE_TO_MANY,
-              tableId: InternalTable.USER_METADATA,
-            },
-          },
-        })
-
-        const rows = await Promise.all(
-          users.map(u =>
-            config.api.row.save(table._id!, { "user relationship": [u] })
-          )
-        )
-
-        await config.api.table.migrate(table._id!, {
-          oldColumn: "user relationship",
-          newColumn: "user column",
-        })
-
-        const migratedTable = await config.api.table.get(table._id!)
-        expect(migratedTable.schema["user column"]).toEqual({
-          name: "user column",
-          type: FieldType.BB_REFERENCE_SINGLE,
-          subtype: BBReferenceFieldSubType.USER,
-        })
-        expect(migratedTable.schema["user relationship"]).not.toBeDefined()
-
-        const migratedRows = await config.api.row.fetch(table._id!)
-
-        rows.sort((a, b) => a._id!.localeCompare(b._id!))
-        migratedRows.sort((a, b) => a._id!.localeCompare(b._id!))
-
-        for (const [i, row] of rows.entries()) {
-          const migratedRow = migratedRows[i]
-          expect(migratedRow["user column"]).toBeDefined()
-          expect(migratedRow["user relationship"]).not.toBeDefined()
-          expect(row["user relationship"][0]._id).toEqual(
-            migratedRow["user column"]._id
-          )
-        }
-      })
-
-      it("should succeed when the row is created from the other side of the relationship", async () => {
-        // We found a bug just after releasing this feature where if the row was created from the
-        // users table, not the table linking to it, the migration would succeed but lose the data.
-        // This happened because the order of the documents in the link was reversed.
-        const table = await config.api.table.save({
-          name: "table",
-          type: "table",
-          sourceId: INTERNAL_TABLE_SOURCE_ID,
-          sourceType: TableSourceType.INTERNAL,
-          schema: {
-            "user relationship": {
-              type: FieldType.LINK,
-              fieldName: "test",
-              name: "user relationship",
-              constraints: {
-                type: "array",
-                presence: false,
-              },
-              relationshipType: RelationshipType.MANY_TO_ONE,
-              tableId: InternalTable.USER_METADATA,
-            },
-          },
-        })
-
-        let testRow = await config.api.row.save(table._id!, {})
-
-        await Promise.all(
-          users.map(u =>
-            config.api.row.patch(InternalTable.USER_METADATA, {
-              tableId: InternalTable.USER_METADATA,
-              _rev: u._rev!,
-              _id: u._id!,
-              test: [testRow],
-            })
-          )
-        )
-
-        await config.api.table.migrate(table._id!, {
-          oldColumn: "user relationship",
-          newColumn: "user column",
-        })
-
-        const migratedTable = await config.api.table.get(table._id!)
-        expect(migratedTable.schema["user column"]).toEqual({
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-          constraints: {
-            type: "array",
-          },
-        })
-        expect(migratedTable.schema["user relationship"]).not.toBeDefined()
-
-        const migratedRow = await config.api.row.get(table._id!, testRow._id!)
-
-        expect(migratedRow["user column"]).toBeDefined()
-        expect(migratedRow["user relationship"]).not.toBeDefined()
-        expect(migratedRow["user column"]).toHaveLength(3)
-        expect(migratedRow["user column"].map((u: Row) => u._id)).toEqual(
-          expect.arrayContaining(users.map(u => u._id))
-        )
-      })
-
-      it("should successfully migrate a many-to-many user relationship to a users column", async () => {
-        const table = await config.api.table.save({
-          name: "table",
-          type: "table",
-          sourceId: INTERNAL_TABLE_SOURCE_ID,
-          sourceType: TableSourceType.INTERNAL,
-          schema: {
-            "user relationship": {
-              type: FieldType.LINK,
-              fieldName: "test",
-              name: "user relationship",
-              constraints: {
-                type: "array",
-                presence: false,
-              },
-              relationshipType: RelationshipType.MANY_TO_MANY,
-              tableId: InternalTable.USER_METADATA,
-            },
-          },
-        })
-
-        const row1 = await config.api.row.save(table._id!, {
-          "user relationship": [users[0], users[1]],
-        })
-
-        const row2 = await config.api.row.save(table._id!, {
-          "user relationship": [users[1], users[2]],
-        })
-
-        await config.api.table.migrate(table._id!, {
-          oldColumn: "user relationship",
-          newColumn: "user column",
-        })
-
-        const migratedTable = await config.api.table.get(table._id!)
-        expect(migratedTable.schema["user column"]).toEqual({
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-          constraints: {
-            type: "array",
-          },
-        })
-        expect(migratedTable.schema["user relationship"]).not.toBeDefined()
-
-        const row1Migrated = await config.api.row.get(table._id!, row1._id!)
-        expect(row1Migrated["user relationship"]).not.toBeDefined()
-        expect(row1Migrated["user column"].map((r: Row) => r._id)).toEqual(
-          expect.arrayContaining([users[0]._id, users[1]._id])
-        )
-
-        const row2Migrated = await config.api.row.get(table._id!, row2._id!)
-        expect(row2Migrated["user relationship"]).not.toBeDefined()
-        expect(row2Migrated["user column"].map((r: Row) => r._id)).toEqual(
-          expect.arrayContaining([users[1]._id, users[2]._id])
-        )
-      })
-
-      it("should successfully migrate a many-to-one user relationship to a users column", async () => {
-        const table = await config.api.table.save({
-          name: "table",
-          type: "table",
-          sourceId: INTERNAL_TABLE_SOURCE_ID,
-          sourceType: TableSourceType.INTERNAL,
-          schema: {
-            "user relationship": {
-              type: FieldType.LINK,
-              fieldName: "test",
-              name: "user relationship",
-              constraints: {
-                type: "array",
-                presence: false,
-              },
-              relationshipType: RelationshipType.MANY_TO_ONE,
-              tableId: InternalTable.USER_METADATA,
-            },
-          },
-        })
-
-        const row1 = await config.api.row.save(table._id!, {
-          "user relationship": [users[0], users[1]],
-        })
-
-        const row2 = await config.api.row.save(table._id!, {
-          "user relationship": [users[2]],
-        })
-
-        await config.api.table.migrate(table._id!, {
-          oldColumn: "user relationship",
-          newColumn: "user column",
-        })
-
-        const migratedTable = await config.api.table.get(table._id!)
-        expect(migratedTable.schema["user column"]).toEqual({
-          name: "user column",
-          type: FieldType.BB_REFERENCE,
-          subtype: BBReferenceFieldSubType.USER,
-          constraints: {
-            type: "array",
-          },
-        })
-        expect(migratedTable.schema["user relationship"]).not.toBeDefined()
-
-        const row1Migrated = await config.api.row.get(table._id!, row1._id!)
-        expect(row1Migrated["user relationship"]).not.toBeDefined()
-        expect(row1Migrated["user column"].map((r: Row) => r._id)).toEqual(
-          expect.arrayContaining([users[0]._id, users[1]._id])
-        )
-
-        const row2Migrated = await config.api.row.get(table._id!, row2._id!)
-        expect(row2Migrated["user relationship"]).not.toBeDefined()
-        expect(row2Migrated["user column"].map((r: Row) => r._id)).toEqual([
-          users[2]._id,
-        ])
-      })
-
-      describe("unhappy paths", () => {
-        let table: Table
-        beforeAll(async () => {
-          table = await config.api.table.save(
-            tableForDatasource(datasource, {
-              schema: {
-                "user relationship": {
-                  type: FieldType.LINK,
-                  fieldName: "test",
-                  name: "user relationship",
-                  constraints: {
-                    type: "array",
-                    presence: false,
-                  },
-                  relationshipType: RelationshipType.MANY_TO_ONE,
-                  tableId: InternalTable.USER_METADATA,
-                },
-                num: {
-                  type: FieldType.NUMBER,
-                  name: "num",
-                  constraints: {
-                    type: "number",
-                    presence: false,
-                  },
-                },
-              },
-            })
-          )
-        })
-
-        it("should fail if the new column name is blank", async () => {
-          await config.api.table.migrate(
-            table._id!,
-            {
-              oldColumn: "user relationship",
-              newColumn: "",
-            },
-            { status: 400 }
-          )
-        })
-
-        it("should fail if the new column name is a reserved name", async () => {
-          await config.api.table.migrate(
-            table._id!,
-            {
-              oldColumn: "user relationship",
-              newColumn: "_id",
-            },
-            { status: 400 }
-          )
-        })
-
-        it("should fail if the new column name is the same as an existing column", async () => {
-          await config.api.table.migrate(
-            table._id!,
-            {
-              oldColumn: "user relationship",
-              newColumn: "num",
-            },
-            { status: 400 }
-          )
-        })
-
-        it("should fail if the old column name isn't a column in the table", async () => {
-          await config.api.table.migrate(
-            table._id!,
-            {
-              oldColumn: "not a column",
-              newColumn: "new column",
-            },
-            { status: 400 }
-          )
-        })
-      })
-    })
-
-    describe.each([
-      [
-        RowExportFormat.CSV,
-        (val: any) => JSON.stringify(val).replace(/"/g, "'"),
-      ],
-      [RowExportFormat.JSON, (val: any) => val],
-    ])("import validation (%s)", (_, userParser) => {
-      const basicSchema: TableSchema = {
-        id: {
-          type: FieldType.NUMBER,
-          name: "id",
-        },
-        name: {
-          type: FieldType.STRING,
-          name: "name",
-        },
-      }
-
-      const importCases: [
-        string,
-        (
-          rows: Row[],
-          schema: TableSchema
-        ) => Promise<ValidateTableImportResponse>
-      ][] = [
+      describe.each([
         [
-          "validateNewTableImport",
-          async (rows: Row[], schema: TableSchema) => {
-            const result = await config.api.table.validateNewTableImport({
-              rows,
-              schema,
-            })
-            return result
-          },
+          RowExportFormat.CSV,
+          (val: any) => JSON.stringify(val).replace(/"/g, "'"),
         ],
-        [
-          "validateExistingTableImport",
-          async (rows: Row[], schema: TableSchema) => {
-            const table = await config.api.table.save(
-              tableForDatasource(datasource, {
-                primary: ["id"],
+        [RowExportFormat.JSON, (val: any) => val],
+      ])("import validation (%s)", (_, userParser) => {
+        const basicSchema: TableSchema = {
+          id: {
+            type: FieldType.NUMBER,
+            name: "id",
+          },
+          name: {
+            type: FieldType.STRING,
+            name: "name",
+          },
+        }
+
+        const importCases: [
+          string,
+          (
+            rows: Row[],
+            schema: TableSchema
+          ) => Promise<ValidateTableImportResponse>
+        ][] = [
+          [
+            "validateNewTableImport",
+            async (rows: Row[], schema: TableSchema) => {
+              const result = await config.api.table.validateNewTableImport({
+                rows,
                 schema,
               })
+              return result
+            },
+          ],
+          [
+            "validateExistingTableImport",
+            async (rows: Row[], schema: TableSchema) => {
+              const table = await config.api.table.save(
+                tableForDatasource(datasource, {
+                  primary: ["id"],
+                  schema,
+                })
+              )
+              const result = await config.api.table.validateExistingTableImport(
+                {
+                  tableId: table._id,
+                  rows,
+                }
+              )
+              return result
+            },
+          ],
+        ]
+
+        describe.each(importCases)("%s", (_, testDelegate) => {
+          it("validates basic imports", async () => {
+            const result = await testDelegate(
+              [{ id: generator.natural(), name: generator.first() }],
+              basicSchema
             )
-            const result = await config.api.table.validateExistingTableImport({
-              tableId: table._id,
-              rows,
-            })
-            return result
-          },
-        ],
-      ]
 
-      describe.each(importCases)("%s", (_, testDelegate) => {
-        it("validates basic imports", async () => {
-          const result = await testDelegate(
-            [{ id: generator.natural(), name: generator.first() }],
-            basicSchema
-          )
-
-          expect(result).toEqual({
-            allValid: true,
-            errors: {},
-            invalidColumns: [],
-            schemaValidation: {
-              id: true,
-              name: true,
-            },
-          })
-        })
-
-        it.each(
-          isInternal ? PROTECTED_INTERNAL_COLUMNS : PROTECTED_EXTERNAL_COLUMNS
-        )("don't allow protected names in schema (%s)", async columnName => {
-          const result = await config.api.table.validateNewTableImport({
-            rows: [
-              {
-                id: generator.natural(),
-                name: generator.first(),
-                [columnName]: generator.word(),
+            expect(result).toEqual({
+              allValid: true,
+              errors: {},
+              invalidColumns: [],
+              schemaValidation: {
+                id: true,
+                name: true,
               },
-            ],
-            schema: {
-              ...basicSchema,
-            },
+            })
           })
 
-          expect(result).toEqual({
-            allValid: false,
-            errors: {
-              [columnName]: `${columnName} is a protected column name`,
-            },
-            invalidColumns: [],
-            schemaValidation: {
-              id: true,
-              name: true,
-              [columnName]: false,
-            },
-          })
-        })
-
-        it("does not allow imports without rows", async () => {
-          const result = await testDelegate([], basicSchema)
-
-          expect(result).toEqual({
-            allValid: false,
-            errors: {},
-            invalidColumns: [],
-            schemaValidation: {},
-          })
-        })
-
-        it("validates imports with some empty rows", async () => {
-          const result = await testDelegate(
-            [{}, { id: generator.natural(), name: generator.first() }, {}],
-            basicSchema
-          )
-
-          expect(result).toEqual({
-            allValid: true,
-            errors: {},
-            invalidColumns: [],
-            schemaValidation: {
-              id: true,
-              name: true,
-            },
-          })
-        })
-
-        isInternal &&
           it.each(
             isInternal ? PROTECTED_INTERNAL_COLUMNS : PROTECTED_EXTERNAL_COLUMNS
-          )(
-            "don't allow protected names in the rows (%s)",
-            async columnName => {
-              const result = await config.api.table.validateNewTableImport({
-                rows: [
-                  {
-                    id: generator.natural(),
-                    name: generator.first(),
+          )("don't allow protected names in schema (%s)", async columnName => {
+            const result = await config.api.table.validateNewTableImport({
+              rows: [
+                {
+                  id: generator.natural(),
+                  name: generator.first(),
+                  [columnName]: generator.word(),
+                },
+              ],
+              schema: {
+                ...basicSchema,
+              },
+            })
+
+            expect(result).toEqual({
+              allValid: false,
+              errors: {
+                [columnName]: `${columnName} is a protected column name`,
+              },
+              invalidColumns: [],
+              schemaValidation: {
+                id: true,
+                name: true,
+                [columnName]: false,
+              },
+            })
+          })
+
+          it("does not allow imports without rows", async () => {
+            const result = await testDelegate([], basicSchema)
+
+            expect(result).toEqual({
+              allValid: false,
+              errors: {},
+              invalidColumns: [],
+              schemaValidation: {},
+            })
+          })
+
+          it("validates imports with some empty rows", async () => {
+            const result = await testDelegate(
+              [{}, { id: generator.natural(), name: generator.first() }, {}],
+              basicSchema
+            )
+
+            expect(result).toEqual({
+              allValid: true,
+              errors: {},
+              invalidColumns: [],
+              schemaValidation: {
+                id: true,
+                name: true,
+              },
+            })
+          })
+
+          isInternal &&
+            it.each(
+              isInternal
+                ? PROTECTED_INTERNAL_COLUMNS
+                : PROTECTED_EXTERNAL_COLUMNS
+            )(
+              "don't allow protected names in the rows (%s)",
+              async columnName => {
+                const result = await config.api.table.validateNewTableImport({
+                  rows: [
+                    {
+                      id: generator.natural(),
+                      name: generator.first(),
+                    },
+                  ],
+                  schema: {
+                    ...basicSchema,
+                    [columnName]: {
+                      name: columnName,
+                      type: FieldType.STRING,
+                    },
                   },
-                ],
-                schema: {
-                  ...basicSchema,
-                  [columnName]: {
-                    name: columnName,
-                    type: FieldType.STRING,
+                })
+
+                expect(result).toEqual({
+                  allValid: false,
+                  errors: {
+                    [columnName]: `${columnName} is a protected column name`,
                   },
-                },
-              })
+                  invalidColumns: [],
+                  schemaValidation: {
+                    id: true,
+                    name: true,
+                    [columnName]: false,
+                  },
+                })
+              }
+            )
 
-              expect(result).toEqual({
-                allValid: false,
-                errors: {
-                  [columnName]: `${columnName} is a protected column name`,
-                },
-                invalidColumns: [],
-                schemaValidation: {
-                  id: true,
-                  name: true,
-                  [columnName]: false,
-                },
-              })
-            }
-          )
-
-        it("validates required fields and valid rows", async () => {
-          const schema: TableSchema = {
-            ...basicSchema,
-            name: {
-              type: FieldType.STRING,
-              name: "name",
-              constraints: { presence: true },
-            },
-          }
-
-          const result = await testDelegate(
-            [
-              { id: generator.natural(), name: generator.first() },
-              { id: generator.natural(), name: generator.first() },
-            ],
-            schema
-          )
-
-          expect(result).toEqual({
-            allValid: true,
-            errors: {},
-            invalidColumns: [],
-            schemaValidation: {
-              id: true,
-              name: true,
-            },
-          })
-        })
-
-        it("validates required fields and non-valid rows", async () => {
-          const schema: TableSchema = {
-            ...basicSchema,
-            name: {
-              type: FieldType.STRING,
-              name: "name",
-              constraints: { presence: true },
-            },
-          }
-
-          const result = await testDelegate(
-            [
-              { id: generator.natural(), name: generator.first() },
-              { id: generator.natural(), name: "" },
-            ],
-            schema
-          )
-
-          expect(result).toEqual({
-            allValid: false,
-            errors: {},
-            invalidColumns: [],
-            schemaValidation: {
-              id: true,
-              name: false,
-            },
-          })
-        })
-
-        describe("bb references", () => {
-          const getUserValues = () => ({
-            _id: docIds.generateGlobalUserID(),
-            primaryDisplay: generator.first(),
-            email: generator.email({}),
-          })
-
-          it("can validate user column imports", async () => {
+          it("validates required fields and valid rows", async () => {
             const schema: TableSchema = {
               ...basicSchema,
-              user: {
-                type: FieldType.BB_REFERENCE_SINGLE,
-                subtype: BBReferenceFieldSubType.USER,
-                name: "user",
+              name: {
+                type: FieldType.STRING,
+                name: "name",
+                constraints: { presence: true },
               },
             }
 
             const result = await testDelegate(
               [
-                {
-                  id: generator.natural(),
-                  name: generator.first(),
-                  user: userParser(getUserValues()),
-                },
+                { id: generator.natural(), name: generator.first() },
+                { id: generator.natural(), name: generator.first() },
               ],
               schema
             )
@@ -1395,33 +1443,24 @@ datasourceDescribe(
               schemaValidation: {
                 id: true,
                 name: true,
-                user: true,
               },
             })
           })
 
-          it("can validate user column imports with invalid data", async () => {
+          it("validates required fields and non-valid rows", async () => {
             const schema: TableSchema = {
               ...basicSchema,
-              user: {
-                type: FieldType.BB_REFERENCE_SINGLE,
-                subtype: BBReferenceFieldSubType.USER,
-                name: "user",
+              name: {
+                type: FieldType.STRING,
+                name: "name",
+                constraints: { presence: true },
               },
             }
 
             const result = await testDelegate(
               [
-                {
-                  id: generator.natural(),
-                  name: generator.first(),
-                  user: userParser(getUserValues()),
-                },
-                {
-                  id: generator.natural(),
-                  name: generator.first(),
-                  user: "no valid user data",
-                },
+                { id: generator.natural(), name: generator.first() },
+                { id: generator.natural(), name: "" },
               ],
               schema
             )
@@ -1432,99 +1471,164 @@ datasourceDescribe(
               invalidColumns: [],
               schemaValidation: {
                 id: true,
-                name: true,
-                user: false,
+                name: false,
               },
             })
           })
 
-          it("can validate users column imports", async () => {
-            const schema: TableSchema = {
-              ...basicSchema,
-              user: {
-                type: FieldType.BB_REFERENCE,
-                subtype: BBReferenceFieldSubType.USER,
-                name: "user",
-                externalType: "array",
-              },
-            }
+          describe("bb references", () => {
+            const getUserValues = () => ({
+              _id: docIds.generateGlobalUserID(),
+              primaryDisplay: generator.first(),
+              email: generator.email({}),
+            })
 
-            const result = await testDelegate(
-              [
-                {
-                  id: generator.natural(),
-                  name: generator.first(),
-                  user: userParser([
-                    getUserValues(),
-                    getUserValues(),
-                    getUserValues(),
-                  ]),
+            it("can validate user column imports", async () => {
+              const schema: TableSchema = {
+                ...basicSchema,
+                user: {
+                  type: FieldType.BB_REFERENCE_SINGLE,
+                  subtype: BBReferenceFieldSubType.USER,
+                  name: "user",
                 },
-              ],
-              schema
-            )
+              }
 
-            expect(result).toEqual({
-              allValid: true,
-              errors: {},
-              invalidColumns: [],
-              schemaValidation: {
-                id: true,
-                name: true,
-                user: true,
-              },
+              const result = await testDelegate(
+                [
+                  {
+                    id: generator.natural(),
+                    name: generator.first(),
+                    user: userParser(getUserValues()),
+                  },
+                ],
+                schema
+              )
+
+              expect(result).toEqual({
+                allValid: true,
+                errors: {},
+                invalidColumns: [],
+                schemaValidation: {
+                  id: true,
+                  name: true,
+                  user: true,
+                },
+              })
+            })
+
+            it("can validate user column imports with invalid data", async () => {
+              const schema: TableSchema = {
+                ...basicSchema,
+                user: {
+                  type: FieldType.BB_REFERENCE_SINGLE,
+                  subtype: BBReferenceFieldSubType.USER,
+                  name: "user",
+                },
+              }
+
+              const result = await testDelegate(
+                [
+                  {
+                    id: generator.natural(),
+                    name: generator.first(),
+                    user: userParser(getUserValues()),
+                  },
+                  {
+                    id: generator.natural(),
+                    name: generator.first(),
+                    user: "no valid user data",
+                  },
+                ],
+                schema
+              )
+
+              expect(result).toEqual({
+                allValid: false,
+                errors: {},
+                invalidColumns: [],
+                schemaValidation: {
+                  id: true,
+                  name: true,
+                  user: false,
+                },
+              })
+            })
+
+            it("can validate users column imports", async () => {
+              const schema: TableSchema = {
+                ...basicSchema,
+                user: {
+                  type: FieldType.BB_REFERENCE,
+                  subtype: BBReferenceFieldSubType.USER,
+                  name: "user",
+                  externalType: "array",
+                },
+              }
+
+              const result = await testDelegate(
+                [
+                  {
+                    id: generator.natural(),
+                    name: generator.first(),
+                    user: userParser([
+                      getUserValues(),
+                      getUserValues(),
+                      getUserValues(),
+                    ]),
+                  },
+                ],
+                schema
+              )
+
+              expect(result).toEqual({
+                allValid: true,
+                errors: {},
+                invalidColumns: [],
+                schemaValidation: {
+                  id: true,
+                  name: true,
+                  user: true,
+                },
+              })
             })
           })
         })
-      })
 
-      describe("validateExistingTableImport", () => {
-        isInternal &&
-          it("can reimport _id fields for internal tables", async () => {
-            const table = await config.api.table.save(
-              tableForDatasource(datasource, {
-                primary: ["id"],
-                schema: basicSchema,
-              })
-            )
-            const result = await config.api.table.validateExistingTableImport({
-              tableId: table._id,
-              rows: [
+        describe("validateExistingTableImport", () => {
+          isInternal &&
+            it("can reimport _id fields for internal tables", async () => {
+              const table = await config.api.table.save(
+                tableForDatasource(datasource, {
+                  primary: ["id"],
+                  schema: basicSchema,
+                })
+              )
+              const result = await config.api.table.validateExistingTableImport(
                 {
-                  _id: docIds.generateRowID(table._id!),
-                  id: generator.natural(),
-                  name: generator.first(),
-                },
-              ],
-            })
+                  tableId: table._id,
+                  rows: [
+                    {
+                      _id: docIds.generateRowID(table._id!),
+                      id: generator.natural(),
+                      name: generator.first(),
+                    },
+                  ],
+                }
+              )
 
-            expect(result).toEqual({
-              allValid: true,
-              errors: {},
-              invalidColumns: [],
-              schemaValidation: {
-                _id: true,
-                id: true,
-                name: true,
-              },
+              expect(result).toEqual({
+                allValid: true,
+                errors: {},
+                invalidColumns: [],
+                schemaValidation: {
+                  _id: true,
+                  id: true,
+                  name: true,
+                },
+              })
             })
-          })
+        })
       })
-    })
-    describe("csvToJson", () => {
-      const delimiters = [",", ";", ":", "|", "~", "\t", " "]
-      it.only.each(delimiters)(
-        "can parse CSVs with delimiter; %s",
-        async delimiter => {
-          const rows = await config.api.table.csvToJson({
-            csvString: [
-              ["a", "b", "c", "d", "e"].join(delimiter),
-              ["1", "2", "3", "4", "5"].join(delimiter),
-            ].join("\n"),
-          })
-          expect(rows).toEqual([{ a: "1", b: "2", c: "3", d: "4", e: "5" }])
-        }
-      )
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
index 6fa9e054b9..9d5417d041 100644
--- a/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
+++ b/packages/server/src/api/routes/tests/utilities/TestFunctions.ts
@@ -4,7 +4,7 @@ import { AppStatus } from "../../../../db/utils"
 import { roles, tenancy, context, db } from "@budibase/backend-core"
 import env from "../../../../environment"
 import Nano from "@budibase/nano"
-import TestConfiguration from "src/tests/utilities/TestConfiguration"
+import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
 
 class Request {
   appId: any
diff --git a/packages/server/src/api/routes/tests/view.spec.ts b/packages/server/src/api/routes/tests/view.spec.ts
index 57b589e79d..e1968d2899 100644
--- a/packages/server/src/api/routes/tests/view.spec.ts
+++ b/packages/server/src/api/routes/tests/view.spec.ts
@@ -73,25 +73,12 @@ describe("/views", () => {
   }
 
   describe("create", () => {
-    it("returns a success message when the view is successfully created", async () => {
-      await saveView()
-      expect(events.view.created).toHaveBeenCalledTimes(1)
-    })
-
     it("creates a view with a calculation", async () => {
       jest.clearAllMocks()
 
       const view = await saveView({ calculation: ViewCalculation.COUNT })
 
       expect(view.tableId).toBe(table._id)
-      expect(events.view.created).toHaveBeenCalledTimes(1)
-      expect(events.view.updated).not.toHaveBeenCalled()
-      expect(events.view.calculationCreated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("creates a view with a filter", async () => {
@@ -109,14 +96,6 @@ describe("/views", () => {
       })
 
       expect(view.tableId).toBe(table._id)
-      expect(events.view.created).toHaveBeenCalledTimes(1)
-      expect(events.view.updated).not.toHaveBeenCalled()
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).toHaveBeenCalledTimes(1)
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("updates the table row with the new view metadata", async () => {
@@ -166,13 +145,6 @@ describe("/views", () => {
       await saveView()
 
       expect(events.view.created).not.toHaveBeenCalled()
-      expect(events.view.updated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("updates a view calculation", async () => {
@@ -182,13 +154,6 @@ describe("/views", () => {
       await saveView({ calculation: ViewCalculation.COUNT })
 
       expect(events.view.created).not.toHaveBeenCalled()
-      expect(events.view.updated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("deletes a view calculation", async () => {
@@ -198,13 +163,6 @@ describe("/views", () => {
       await saveView({ calculation: undefined })
 
       expect(events.view.created).not.toHaveBeenCalled()
-      expect(events.view.updated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).toHaveBeenCalledTimes(1)
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("updates a view filter", async () => {
@@ -230,13 +188,6 @@ describe("/views", () => {
       })
 
       expect(events.view.created).not.toHaveBeenCalled()
-      expect(events.view.updated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).toHaveBeenCalledTimes(1)
-      expect(events.view.filterDeleted).not.toHaveBeenCalled()
     })
 
     it("deletes a view filter", async () => {
@@ -254,13 +205,6 @@ describe("/views", () => {
       await saveView({ filters: [] })
 
       expect(events.view.created).not.toHaveBeenCalled()
-      expect(events.view.updated).toHaveBeenCalledTimes(1)
-      expect(events.view.calculationCreated).not.toHaveBeenCalled()
-      expect(events.view.calculationUpdated).not.toHaveBeenCalled()
-      expect(events.view.calculationDeleted).not.toHaveBeenCalled()
-      expect(events.view.filterCreated).not.toHaveBeenCalled()
-      expect(events.view.filterUpdated).not.toHaveBeenCalled()
-      expect(events.view.filterDeleted).toHaveBeenCalledTimes(1)
     })
   })
 
diff --git a/packages/server/src/api/routes/tests/viewV2.spec.ts b/packages/server/src/api/routes/tests/viewV2.spec.ts
index 63d315cea9..9531737d30 100644
--- a/packages/server/src/api/routes/tests/viewV2.spec.ts
+++ b/packages/server/src/api/routes/tests/viewV2.spec.ts
@@ -1,39 +1,40 @@
 import {
+  AIOperationEnum,
+  ArrayOperator,
+  BasicOperator,
+  BBReferenceFieldSubType,
+  CalculationType,
   CreateViewRequest,
   Datasource,
+  EmptyFilterOption,
   FieldSchema,
   FieldType,
   INTERNAL_TABLE_SOURCE_ID,
+  JsonFieldSubType,
+  JsonTypes,
+  LegacyFilter,
+  NumericCalculationFieldMetadata,
   PermissionLevel,
   QuotaUsageType,
+  RelationshipType,
+  RenameColumn,
   Row,
   SaveTableRequest,
+  SearchFilters,
+  SearchResponse,
+  SearchViewRowRequest,
   SortOrder,
   SortType,
   StaticQuotaName,
   Table,
+  TableSchema,
   TableSourceType,
+  UILogicalOperator,
+  UISearchFilter,
   UpdateViewRequest,
   ViewV2,
-  SearchResponse,
-  BasicOperator,
-  CalculationType,
-  RelationshipType,
-  TableSchema,
-  RenameColumn,
-  BBReferenceFieldSubType,
-  NumericCalculationFieldMetadata,
   ViewV2Schema,
   ViewV2Type,
-  JsonTypes,
-  EmptyFilterOption,
-  JsonFieldSubType,
-  UISearchFilter,
-  LegacyFilter,
-  SearchViewRowRequest,
-  ArrayOperator,
-  UILogicalOperator,
-  SearchFilters,
 } from "@budibase/types"
 import { generator, mocks } from "@budibase/backend-core/tests"
 import {
@@ -42,160 +43,170 @@ import {
 } from "../../../integrations/tests/utils"
 import merge from "lodash/merge"
 import { quotas } from "@budibase/pro"
-import { db, roles, context } from "@budibase/backend-core"
+import { context, db, events, roles, setEnv } from "@budibase/backend-core"
+import { mockChatGPTResponse } from "../../../tests/utilities/mocks/openai"
+import nock from "nock"
 
-datasourceDescribe(
-  { name: "/v2/views (%s)", exclude: [DatabaseName.MONGODB] },
-  ({ config, isInternal, dsProvider }) => {
-    let table: Table
-    let rawDatasource: Datasource | undefined
-    let datasource: Datasource | undefined
+const descriptions = datasourceDescribe({ exclude: [DatabaseName.MONGODB] })
 
-    function saveTableRequest(
-      ...overrides: Partial<Omit<SaveTableRequest, "name">>[]
-    ): SaveTableRequest {
-      const req: SaveTableRequest = {
-        name: generator.guid().replaceAll("-", "").substring(0, 16),
-        type: "table",
-        sourceType: datasource
-          ? TableSourceType.EXTERNAL
-          : TableSourceType.INTERNAL,
-        sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
-        primary: ["id"],
-        schema: {
-          id: {
-            type: FieldType.NUMBER,
-            name: "id",
-            autocolumn: true,
-            constraints: {
-              presence: true,
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "/v2/views ($dbName)",
+    ({ config, isInternal, dsProvider }) => {
+      let table: Table
+      let rawDatasource: Datasource | undefined
+      let datasource: Datasource | undefined
+
+      function saveTableRequest(
+        ...overrides: Partial<SaveTableRequest>[]
+      ): SaveTableRequest {
+        const req: SaveTableRequest = {
+          name: generator.guid().replaceAll("-", "").substring(0, 16),
+          type: "table",
+          sourceType: datasource
+            ? TableSourceType.EXTERNAL
+            : TableSourceType.INTERNAL,
+          sourceId: datasource ? datasource._id! : INTERNAL_TABLE_SOURCE_ID,
+          primary: ["id"],
+          schema: {
+            id: {
+              type: FieldType.NUMBER,
+              name: "id",
+              autocolumn: true,
+              constraints: {
+                presence: true,
+              },
             },
           },
-        },
+        }
+        return merge(req, ...overrides)
       }
-      return merge(req, ...overrides)
-    }
 
-    function priceTable(): SaveTableRequest {
-      return saveTableRequest({
-        schema: {
-          Price: {
-            type: FieldType.NUMBER,
-            name: "Price",
-            constraints: {},
-          },
-          Category: {
-            type: FieldType.STRING,
-            name: "Category",
-            constraints: {
-              type: "string",
+      function priceTable(): SaveTableRequest {
+        return saveTableRequest({
+          schema: {
+            Price: {
+              type: FieldType.NUMBER,
+              name: "Price",
+              constraints: {},
+            },
+            Category: {
+              type: FieldType.STRING,
+              name: "Category",
+              constraints: {
+                type: "string",
+              },
             },
           },
-        },
-      })
-    }
-
-    beforeAll(async () => {
-      await config.init()
-
-      const ds = await dsProvider()
-      rawDatasource = ds.rawDatasource
-      datasource = ds.datasource
-      table = await config.api.table.save(priceTable())
-    })
-
-    beforeEach(() => {
-      jest.clearAllMocks()
-      mocks.licenses.useCloudFree()
-    })
-
-    describe("view crud", () => {
-      describe("create", () => {
-        it("persist the view when the view is successfully created", async () => {
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            schema: {
-              id: { visible: true },
-            },
-          }
-          const res = await config.api.viewV2.create(newView)
-
-          expect(res).toEqual({
-            ...newView,
-            id: expect.stringMatching(new RegExp(`${table._id!}_`)),
-            version: 2,
-          })
         })
+      }
 
-        it("can persist views with all fields", async () => {
-          const newView: Required<Omit<CreateViewRequest, "query" | "type">> = {
-            name: generator.name(),
-            tableId: table._id!,
-            primaryDisplay: "id",
-            queryUI: {
-              groups: [
-                {
-                  filters: [
+      beforeAll(async () => {
+        await config.init()
+        mocks.licenses.useCloudFree()
+
+        const ds = await dsProvider()
+        rawDatasource = ds.rawDatasource
+        datasource = ds.datasource
+        table = await config.api.table.save(priceTable())
+      })
+
+      beforeEach(() => {
+        jest.clearAllMocks()
+      })
+
+      describe("view crud", () => {
+        describe("create", () => {
+          it("persist the view when the view is successfully created", async () => {
+            const newView: CreateViewRequest = {
+              name: generator.name(),
+              tableId: table._id!,
+              schema: {
+                id: { visible: true },
+              },
+            }
+            const res = await config.api.viewV2.create(newView)
+
+            expect(res).toEqual({
+              ...newView,
+              id: expect.stringMatching(new RegExp(`${table._id!}_`)),
+              version: 2,
+            })
+            expect(events.view.created).toHaveBeenCalledTimes(1)
+          })
+
+          it("can persist views with all fields", async () => {
+            const newView: Required<Omit<CreateViewRequest, "query" | "type">> =
+              {
+                name: generator.name(),
+                tableId: table._id!,
+                primaryDisplay: "id",
+                queryUI: {
+                  groups: [
                     {
-                      operator: BasicOperator.EQUAL,
-                      field: "field",
-                      value: "value",
-                    },
-                  ],
-                },
-              ],
-            },
-            sort: {
-              field: "fieldToSort",
-              order: SortOrder.DESCENDING,
-              type: SortType.STRING,
-            },
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-              },
-            },
-          }
-          const res = await config.api.viewV2.create(newView)
-
-          const expected: ViewV2 = {
-            ...newView,
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-              },
-            },
-            query: {
-              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              $and: {
-                conditions: [
-                  {
-                    $and: {
-                      conditions: [
+                      filters: [
                         {
-                          equal: {
-                            field: "value",
-                          },
+                          operator: BasicOperator.EQUAL,
+                          field: "field",
+                          value: "value",
                         },
                       ],
                     },
+                  ],
+                },
+                sort: {
+                  field: "fieldToSort",
+                  order: SortOrder.DESCENDING,
+                  type: SortType.STRING,
+                },
+                schema: {
+                  id: { visible: true },
+                  Price: {
+                    visible: true,
                   },
-                ],
+                },
+                rowHeight: generator.integer(),
+              }
+            const res = await config.api.viewV2.create(newView)
+
+            const expected: ViewV2 = {
+              ...newView,
+              schema: {
+                id: { visible: true },
+                Price: {
+                  visible: true,
+                },
               },
-            },
-            id: expect.any(String),
-            version: 2,
-          }
+              query: {
+                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                $and: {
+                  conditions: [
+                    {
+                      $and: {
+                        conditions: [
+                          {
+                            equal: {
+                              field: "value",
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  ],
+                },
+              },
+              id: expect.any(String),
+              version: 2,
+            }
 
-          expect(res).toEqual(expected)
-        })
+            expect(res).toEqual(expected)
+            expect(events.view.created).toHaveBeenCalledTimes(1)
+          })
 
-        it("can create a view with just a query field, no queryUI, for backwards compatibility", async () => {
-          const newView: Required<Omit<CreateViewRequest, "queryUI" | "type">> =
-            {
+          it("can create a view with just a query field, no queryUI, for backwards compatibility", async () => {
+            const newView: Required<
+              Omit<CreateViewRequest, "queryUI" | "type">
+            > = {
               name: generator.name(),
               tableId: table._id!,
               primaryDisplay: "id",
@@ -217,181 +228,198 @@ datasourceDescribe(
                   visible: true,
                 },
               },
+              rowHeight: generator.integer(),
             }
-          const res = await config.api.viewV2.create(newView)
+            const res = await config.api.viewV2.create(newView)
+            expect(events.view.created).toHaveBeenCalledTimes(1)
 
-          const expected: ViewV2 = {
-            ...newView,
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-              },
-            },
-            queryUI: {
-              logicalOperator: UILogicalOperator.ALL,
-              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              groups: [
-                {
-                  logicalOperator: UILogicalOperator.ALL,
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "field",
-                      value: "value",
-                    },
-                  ],
+            const expected: ViewV2 = {
+              ...newView,
+              schema: {
+                id: { visible: true },
+                Price: {
+                  visible: true,
                 },
-              ],
-            },
-            id: expect.any(String),
-            version: 2,
-          }
-
-          expect(res).toEqual(expected)
-        })
-
-        it("persist only UI schema overrides", async () => {
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            schema: {
-              id: {
-                name: "id",
-                type: FieldType.NUMBER,
-                visible: true,
               },
-              Price: {
-                name: "Price",
-                type: FieldType.NUMBER,
-                visible: true,
-                order: 1,
-                width: 100,
-              },
-              Category: {
-                name: "Category",
-                type: FieldType.STRING,
-                visible: false,
-                icon: "ic",
-              },
-            } as ViewV2Schema,
-          }
-
-          const createdView = await config.api.viewV2.create(newView)
-
-          expect(createdView).toEqual({
-            ...newView,
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-                order: 1,
-                width: 100,
-              },
-              Category: {
-                visible: false,
-                icon: "ic",
-              },
-            },
-            id: createdView.id,
-            version: 2,
-          })
-        })
-
-        it("will not throw an exception if the schema is 'deleting' non UI fields", async () => {
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            schema: {
-              id: {
-                name: "id",
-                type: FieldType.NUMBER,
-                autocolumn: true,
-                visible: true,
-              },
-              Price: {
-                name: "Price",
-                type: FieldType.NUMBER,
-                visible: true,
-              },
-              Category: {
-                name: "Category",
-                type: FieldType.STRING,
-              },
-            } as ViewV2Schema,
-          }
-
-          await config.api.viewV2.create(newView, {
-            status: 201,
-          })
-        })
-
-        it("does not persist non-visible fields", async () => {
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            primaryDisplay: "id",
-            schema: {
-              id: { visible: true },
-              Price: { visible: true },
-              Category: { visible: false },
-            },
-          }
-          const res = await config.api.viewV2.create(newView)
-
-          expect(res).toEqual({
-            ...newView,
-            schema: {
-              id: { visible: true },
-              Price: { visible: true },
-              Category: { visible: false },
-            },
-            id: expect.any(String),
-            version: 2,
-          })
-        })
-
-        it("throws bad request when the schema fields are not valid", async () => {
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            schema: {
-              id: { visible: true },
-              nonExisting: {
-                visible: true,
-              },
-            },
-          }
-          await config.api.viewV2.create(newView, {
-            status: 400,
-            body: {
-              message:
-                'Field "nonExisting" is not valid for the requested table',
-            },
-          })
-        })
-
-        describe("readonly fields", () => {
-          it("readonly fields are persisted", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
+              queryUI: {
+                logicalOperator: UILogicalOperator.ALL,
+                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                groups: [
+                  {
+                    logicalOperator: UILogicalOperator.ALL,
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "field",
+                        value: "value",
+                      },
+                    ],
                   },
-                  description: {
-                    name: "description",
-                    type: FieldType.STRING,
-                  },
-                },
-              })
-            )
+                ],
+              },
+              id: expect.any(String),
+              version: 2,
+            }
 
+            expect(res).toEqual(expected)
+          })
+
+          it("persist only UI schema overrides", async () => {
             const newView: CreateViewRequest = {
               name: generator.name(),
               tableId: table._id!,
               schema: {
+                id: {
+                  name: "id",
+                  type: FieldType.NUMBER,
+                  visible: true,
+                },
+                Price: {
+                  name: "Price",
+                  type: FieldType.NUMBER,
+                  visible: true,
+                  order: 1,
+                  width: 100,
+                },
+                Category: {
+                  name: "Category",
+                  type: FieldType.STRING,
+                  visible: false,
+                  icon: "ic",
+                },
+              } as ViewV2Schema,
+            }
+
+            const createdView = await config.api.viewV2.create(newView)
+            expect(events.view.created).toHaveBeenCalledTimes(1)
+
+            expect(createdView).toEqual({
+              ...newView,
+              schema: {
+                id: { visible: true },
+                Price: {
+                  visible: true,
+                  order: 1,
+                  width: 100,
+                },
+                Category: {
+                  visible: false,
+                  icon: "ic",
+                },
+              },
+              id: createdView.id,
+              version: 2,
+            })
+          })
+
+          it("will not throw an exception if the schema is 'deleting' non UI fields", async () => {
+            const newView: CreateViewRequest = {
+              name: generator.name(),
+              tableId: table._id!,
+              schema: {
+                id: {
+                  name: "id",
+                  type: FieldType.NUMBER,
+                  autocolumn: true,
+                  visible: true,
+                },
+                Price: {
+                  name: "Price",
+                  type: FieldType.NUMBER,
+                  visible: true,
+                },
+                Category: {
+                  name: "Category",
+                  type: FieldType.STRING,
+                },
+              } as ViewV2Schema,
+            }
+
+            await config.api.viewV2.create(newView, {
+              status: 201,
+            })
+          })
+
+          it("does not persist non-visible fields", async () => {
+            const newView: CreateViewRequest = {
+              name: generator.name(),
+              tableId: table._id!,
+              primaryDisplay: "id",
+              schema: {
+                id: { visible: true },
+                Price: { visible: true },
+                Category: { visible: false },
+              },
+            }
+            const res = await config.api.viewV2.create(newView)
+
+            expect(res).toEqual({
+              ...newView,
+              schema: {
+                id: { visible: true },
+                Price: { visible: true },
+                Category: { visible: false },
+              },
+              id: expect.any(String),
+              version: 2,
+            })
+          })
+
+          it("throws bad request when the schema fields are not valid", async () => {
+            const newView: CreateViewRequest = {
+              name: generator.name(),
+              tableId: table._id!,
+              schema: {
+                id: { visible: true },
+                nonExisting: {
+                  visible: true,
+                },
+              },
+            }
+            await config.api.viewV2.create(newView, {
+              status: 400,
+              body: {
+                message:
+                  'Field "nonExisting" is not valid for the requested table',
+              },
+            })
+          })
+
+          describe("readonly fields", () => {
+            it("readonly fields are persisted", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                    description: {
+                      name: "description",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const newView: CreateViewRequest = {
+                name: generator.name(),
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: {
+                    visible: true,
+                    readonly: true,
+                  },
+                  description: {
+                    visible: true,
+                    readonly: true,
+                  },
+                },
+              }
+
+              const res = await config.api.viewV2.create(newView)
+              expect(res.schema).toEqual({
                 id: { visible: true },
                 name: {
                   visible: true,
@@ -401,63 +429,121 @@ datasourceDescribe(
                   visible: true,
                   readonly: true,
                 },
-              },
-            }
-
-            const res = await config.api.viewV2.create(newView)
-            expect(res.schema).toEqual({
-              id: { visible: true },
-              name: {
-                visible: true,
-                readonly: true,
-              },
-              description: {
-                visible: true,
-                readonly: true,
-              },
-            })
-          })
-
-          it("required fields cannot be marked as readonly", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                    constraints: { presence: true },
-                  },
-                  description: {
-                    name: "description",
-                    type: FieldType.STRING,
-                  },
-                },
               })
-            )
+            })
 
-            const newView: CreateViewRequest = {
-              name: generator.name(),
-              tableId: table._id!,
-              schema: {
-                id: { visible: true },
-                name: {
-                  visible: true,
-                  readonly: true,
+            it("required fields cannot be marked as readonly", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                      constraints: { presence: true },
+                    },
+                    description: {
+                      name: "description",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const newView: CreateViewRequest = {
+                name: generator.name(),
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: {
+                    visible: true,
+                    readonly: true,
+                  },
                 },
-              },
-            }
+              }
 
-            await config.api.viewV2.create(newView, {
-              status: 400,
-              body: {
-                message:
-                  'You can\'t make "name" readonly because it is a required field.',
+              await config.api.viewV2.create(newView, {
                 status: 400,
-              },
+                body: {
+                  message:
+                    'You can\'t make "name" readonly because it is a required field.',
+                  status: 400,
+                },
+              })
+            })
+
+            it("readonly fields must be visible", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                    description: {
+                      name: "description",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const newView: CreateViewRequest = {
+                name: generator.name(),
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: {
+                    visible: false,
+                    readonly: true,
+                  },
+                },
+              }
+
+              await config.api.viewV2.create(newView, {
+                status: 400,
+                body: {
+                  message:
+                    'Field "name" must be visible if you want to make it readonly',
+                  status: 400,
+                },
+              })
+            })
+
+            it("readonly fields can be used on free license", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                    description: {
+                      name: "description",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const newView: CreateViewRequest = {
+                name: generator.name(),
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: {
+                    visible: true,
+                    readonly: true,
+                  },
+                },
+              }
+
+              await config.api.viewV2.create(newView, {
+                status: 201,
+              })
             })
           })
 
-          it("readonly fields must be visible", async () => {
+          it("display fields must be visible", async () => {
             const table = await config.api.table.save(
               saveTableRequest({
                 schema: {
@@ -476,11 +562,11 @@ datasourceDescribe(
             const newView: CreateViewRequest = {
               name: generator.name(),
               tableId: table._id!,
+              primaryDisplay: "name",
               schema: {
                 id: { visible: true },
                 name: {
                   visible: false,
-                  readonly: true,
                 },
               },
             }
@@ -489,14 +575,13 @@ datasourceDescribe(
               status: 400,
               body: {
                 message:
-                  'Field "name" must be visible if you want to make it readonly',
+                  'You can\'t hide "name" because it is the display column.',
                 status: 400,
               },
             })
           })
 
-          it("readonly fields can be used on free license", async () => {
-            mocks.licenses.useCloudFree()
+          it("display fields can be readonly", async () => {
             const table = await config.api.table.save(
               saveTableRequest({
                 schema: {
@@ -515,6 +600,7 @@ datasourceDescribe(
             const newView: CreateViewRequest = {
               name: generator.name(),
               tableId: table._id!,
+              primaryDisplay: "name",
               schema: {
                 id: { visible: true },
                 name: {
@@ -528,134 +614,9 @@ datasourceDescribe(
               status: 201,
             })
           })
-        })
 
-        it("display fields must be visible", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-                description: {
-                  name: "description",
-                  type: FieldType.STRING,
-                },
-              },
-            })
-          )
-
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            primaryDisplay: "name",
-            schema: {
-              id: { visible: true },
-              name: {
-                visible: false,
-              },
-            },
-          }
-
-          await config.api.viewV2.create(newView, {
-            status: 400,
-            body: {
-              message:
-                'You can\'t hide "name" because it is the display column.',
-              status: 400,
-            },
-          })
-        })
-
-        it("display fields can be readonly", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                },
-                description: {
-                  name: "description",
-                  type: FieldType.STRING,
-                },
-              },
-            })
-          )
-
-          const newView: CreateViewRequest = {
-            name: generator.name(),
-            tableId: table._id!,
-            primaryDisplay: "name",
-            schema: {
-              id: { visible: true },
-              name: {
-                visible: true,
-                readonly: true,
-              },
-            },
-          }
-
-          await config.api.viewV2.create(newView, {
-            status: 201,
-          })
-        })
-
-        it("can create a view with calculation fields", async () => {
-          let view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              sum: {
-                visible: true,
-                calculationType: CalculationType.SUM,
-                field: "Price",
-              },
-            },
-          })
-
-          expect(Object.keys(view.schema!)).toHaveLength(1)
-
-          let sum = view.schema!.sum as NumericCalculationFieldMetadata
-          expect(sum).toBeDefined()
-          expect(sum.calculationType).toEqual(CalculationType.SUM)
-          expect(sum.field).toEqual("Price")
-
-          view = await config.api.viewV2.get(view.id)
-          sum = view.schema!.sum as NumericCalculationFieldMetadata
-          expect(sum).toBeDefined()
-          expect(sum.calculationType).toEqual(CalculationType.SUM)
-          expect(sum.field).toEqual("Price")
-        })
-
-        it("cannot create a view with calculation fields unless it has the right type", async () => {
-          await config.api.viewV2.create(
-            {
-              tableId: table._id!,
-              name: generator.guid(),
-              schema: {
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "Price",
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  "Calculation fields are not allowed in non-calculation views",
-              },
-            }
-          )
-        })
-
-        it("cannot create a calculation view with more than 5 aggregations", async () => {
-          await config.api.viewV2.create(
-            {
+          it("can create a view with calculation fields", async () => {
+            let view = await config.api.viewV2.create({
               tableId: table._id!,
               name: generator.guid(),
               type: ViewV2Type.CALCULATION,
@@ -665,622 +626,33 @@ datasourceDescribe(
                   calculationType: CalculationType.SUM,
                   field: "Price",
                 },
-                count: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  field: "Price",
-                },
-                countDistinct: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  distinct: true,
-                  field: "Price",
-                },
-                min: {
-                  visible: true,
-                  calculationType: CalculationType.MIN,
-                  field: "Price",
-                },
-                max: {
-                  visible: true,
-                  calculationType: CalculationType.MAX,
-                  field: "Price",
-                },
-                avg: {
-                  visible: true,
-                  calculationType: CalculationType.AVG,
-                  field: "Price",
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  "Calculation views can only have a maximum of 5 fields",
-              },
-            }
-          )
-        })
-
-        it("cannot create a calculation view with duplicate calculations", async () => {
-          await config.api.viewV2.create(
-            {
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "Price",
-                },
-                sum2: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "Price",
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Duplicate calculation on field "Price", calculation type "sum"',
-              },
-            }
-          )
-        })
-
-        it("finds duplicate counts", async () => {
-          await config.api.viewV2.create(
-            {
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                count: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  field: "Price",
-                },
-                count2: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  field: "Price",
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Duplicate calculation on field "Price", calculation type "count"',
-              },
-            }
-          )
-        })
-
-        it("finds duplicate count distincts", async () => {
-          await config.api.viewV2.create(
-            {
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                count: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  distinct: true,
-                  field: "Price",
-                },
-                count2: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  distinct: true,
-                  field: "Price",
-                },
-              },
-            },
-            {
-              status: 400,
-              body: {
-                message:
-                  'Duplicate calculation on field "Price", calculation type "count distinct"',
-              },
-            }
-          )
-        })
-
-        it("does not confuse counts and count distincts in the duplicate check", async () => {
-          await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              count: {
-                visible: true,
-                calculationType: CalculationType.COUNT,
-                field: "Price",
-              },
-              count2: {
-                visible: true,
-                calculationType: CalculationType.COUNT,
-                distinct: true,
-                field: "Price",
-              },
-            },
-          })
-        })
-
-        it("does not confuse counts on different fields in the duplicate check", async () => {
-          await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              count: {
-                visible: true,
-                calculationType: CalculationType.COUNT,
-                field: "Price",
-              },
-              count2: {
-                visible: true,
-                calculationType: CalculationType.COUNT,
-                field: "Category",
-              },
-            },
-          })
-        })
-
-        it("does not get confused when a calculation field shadows a basic one", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                age: {
-                  name: "age",
-                  type: FieldType.NUMBER,
-                },
               },
             })
-          )
 
-          await config.api.row.bulkImport(table._id!, {
-            rows: [{ age: 1 }, { age: 2 }, { age: 3 }],
+            expect(Object.keys(view.schema!)).toHaveLength(1)
+
+            let sum = view.schema!.sum as NumericCalculationFieldMetadata
+            expect(sum).toBeDefined()
+            expect(sum.calculationType).toEqual(CalculationType.SUM)
+            expect(sum.field).toEqual("Price")
+
+            view = await config.api.viewV2.get(view.id)
+            sum = view.schema!.sum as NumericCalculationFieldMetadata
+            expect(sum).toBeDefined()
+            expect(sum.calculationType).toEqual(CalculationType.SUM)
+            expect(sum.field).toEqual("Price")
           })
 
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              age: {
-                visible: true,
-                calculationType: CalculationType.SUM,
-                field: "age",
-              },
-            },
-          })
-
-          const { rows } = await config.api.row.search(view.id)
-          expect(rows).toHaveLength(1)
-          expect(rows[0].age).toEqual(6)
-        })
-
-        // We don't allow the creation of tables with most JsonTypes when using
-        // external datasources.
-        isInternal &&
-          it("cannot use complex types as group-by fields", async () => {
-            for (const type of JsonTypes) {
-              const field = { name: "field", type } as FieldSchema
-              const table = await config.api.table.save(
-                saveTableRequest({ schema: { field } })
-              )
-              await config.api.viewV2.create(
-                {
-                  tableId: table._id!,
-                  name: generator.guid(),
-                  type: ViewV2Type.CALCULATION,
-                  schema: {
-                    field: { visible: true },
-                  },
-                },
-                {
-                  status: 400,
-                  body: {
-                    message: `Grouping by fields of type "${type}" is not supported`,
-                  },
-                }
-              )
-            }
-          })
-
-        isInternal &&
-          it("shouldn't trigger a complex type check on a group by field if field is invisible", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  field: {
-                    name: "field",
-                    type: FieldType.JSON,
-                  },
-                },
-              })
-            )
-
+          it("cannot create a view with calculation fields unless it has the right type", async () => {
             await config.api.viewV2.create(
               {
                 tableId: table._id!,
                 name: generator.guid(),
-                type: ViewV2Type.CALCULATION,
                 schema: {
-                  field: { visible: false },
-                },
-              },
-              {
-                status: 201,
-              }
-            )
-          })
-      })
-
-      describe("update", () => {
-        let view: ViewV2
-        let table: Table
-
-        beforeEach(async () => {
-          table = await config.api.table.save(priceTable())
-
-          view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-            },
-          })
-        })
-
-        it("can update an existing view data", async () => {
-          const tableId = table._id!
-          await config.api.viewV2.update({
-            ...view,
-            query: [
-              {
-                operator: BasicOperator.EQUAL,
-                field: "newField",
-                value: "thatValue",
-              },
-            ],
-          })
-
-          const expected: ViewV2 = {
-            ...view,
-            query: [
-              {
-                operator: BasicOperator.EQUAL,
-                field: "newField",
-                value: "thatValue",
-              },
-            ],
-            // Should also update queryUI because query was not previously set.
-            queryUI: {
-              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              logicalOperator: UILogicalOperator.ALL,
-              groups: [
-                {
-                  logicalOperator: UILogicalOperator.ALL,
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "newField",
-                      value: "thatValue",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: expect.anything(),
-          }
-
-          expect((await config.api.table.get(tableId)).views).toEqual({
-            [view.name]: expected,
-          })
-        })
-
-        it("can update all fields", async () => {
-          const tableId = table._id!
-
-          const updatedData: Required<
-            Omit<UpdateViewRequest, "queryUI" | "type">
-          > = {
-            version: view.version,
-            id: view.id,
-            tableId,
-            name: view.name,
-            primaryDisplay: "Price",
-            query: [
-              {
-                operator: BasicOperator.EQUAL,
-                field: "newField",
-                value: "newValue",
-              },
-            ],
-            sort: {
-              field: generator.word(),
-              order: SortOrder.DESCENDING,
-              type: SortType.STRING,
-            },
-            schema: {
-              id: { visible: true },
-              Category: {
-                visible: false,
-              },
-              Price: {
-                visible: true,
-                readonly: true,
-              },
-            },
-          }
-          await config.api.viewV2.update(updatedData)
-
-          const expected: ViewV2 = {
-            ...updatedData,
-            // queryUI gets generated from query
-            queryUI: {
-              logicalOperator: UILogicalOperator.ALL,
-              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-              groups: [
-                {
-                  logicalOperator: UILogicalOperator.ALL,
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "newField",
-                      value: "newValue",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              ...table.schema,
-              id: expect.objectContaining({
-                visible: true,
-              }),
-              Category: expect.objectContaining({
-                visible: false,
-              }),
-              Price: expect.objectContaining({
-                visible: true,
-                readonly: true,
-              }),
-            },
-          }
-
-          expect((await config.api.table.get(tableId)).views).toEqual({
-            [view.name]: expected,
-          })
-        })
-
-        it("can update an existing view name", async () => {
-          const tableId = table._id!
-          const newName = generator.guid()
-          await config.api.viewV2.update({ ...view, name: newName })
-
-          expect(await config.api.table.get(tableId)).toEqual(
-            expect.objectContaining({
-              views: {
-                [newName]: {
-                  ...view,
-                  name: newName,
-                  schema: expect.anything(),
-                },
-              },
-            })
-          )
-        })
-
-        it("cannot update an unexisting views nor edit ids", async () => {
-          const tableId = table._id!
-          await config.api.viewV2.update(
-            { ...view, id: generator.guid() },
-            { status: 404 }
-          )
-
-          expect(await config.api.table.get(tableId)).toEqual(
-            expect.objectContaining({
-              views: {
-                [view.name]: {
-                  ...view,
-                  schema: expect.anything(),
-                },
-              },
-            })
-          )
-        })
-
-        it("cannot update views with the wrong tableId", async () => {
-          const tableId = table._id!
-          await config.api.viewV2.update(
-            {
-              ...view,
-              tableId: generator.guid(),
-              query: [
-                {
-                  operator: BasicOperator.EQUAL,
-                  field: "newField",
-                  value: "thatValue",
-                },
-              ],
-            },
-            { status: 404 }
-          )
-
-          expect(await config.api.table.get(tableId)).toEqual(
-            expect.objectContaining({
-              views: {
-                [view.name]: {
-                  ...view,
-                  schema: expect.anything(),
-                },
-              },
-            })
-          )
-        })
-
-        isInternal &&
-          it("cannot update views v1", async () => {
-            const viewV1 = await config.api.legacyView.save({
-              tableId: table._id!,
-              name: generator.guid(),
-              filters: [],
-              schema: {},
-            })
-
-            await config.api.viewV2.update(viewV1 as unknown as ViewV2, {
-              status: 400,
-              body: {
-                message: "Only views V2 can be updated",
-                status: 400,
-              },
-            })
-          })
-
-        it("cannot update the a view with unmatching ids between url and body", async () => {
-          const anotherView = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-            },
-          })
-          const result = await config
-            .request!.put(`/api/v2/views/${anotherView.id}`)
-            .send(view)
-            .set(config.defaultHeaders())
-            .expect("Content-Type", /json/)
-            .expect(400)
-
-          expect(result.body).toEqual({
-            message: "View id does not match between the body and the uri path",
-            status: 400,
-          })
-        })
-
-        it("updates only UI schema overrides", async () => {
-          const updatedView = await config.api.viewV2.update({
-            ...view,
-            schema: {
-              ...view.schema,
-              Price: {
-                name: "Price",
-                type: FieldType.NUMBER,
-                visible: true,
-                order: 1,
-                width: 100,
-              },
-              Category: {
-                name: "Category",
-                type: FieldType.STRING,
-                visible: false,
-                icon: "ic",
-              },
-            } as ViewV2Schema,
-          })
-
-          expect(updatedView).toEqual({
-            ...view,
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-                order: 1,
-                width: 100,
-              },
-              Category: { visible: false, icon: "ic" },
-            },
-            id: view.id,
-            version: 2,
-          })
-        })
-
-        it("will not throw an exception if the schema is 'deleting' non UI fields", async () => {
-          await config.api.viewV2.update(
-            {
-              ...view,
-              schema: {
-                ...view.schema,
-                Price: {
-                  name: "Price",
-                  type: FieldType.NUMBER,
-                  visible: true,
-                },
-                Category: {
-                  name: "Category",
-                  type: FieldType.STRING,
-                },
-              } as ViewV2Schema,
-            },
-            {
-              status: 200,
-            }
-          )
-        })
-
-        it("cannot update view type after creation", async () => {
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              Price: {
-                visible: true,
-              },
-            },
-          })
-
-          await config.api.viewV2.update(
-            {
-              ...view,
-              type: ViewV2Type.CALCULATION,
-            },
-            {
-              status: 400,
-              body: {
-                message: "Cannot update view type after creation",
-              },
-            }
-          )
-        })
-
-        isInternal &&
-          it("updating schema will only validate modified field", async () => {
-            let view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              schema: {
-                id: { visible: true },
-                Price: {
-                  visible: true,
-                },
-                Category: { visible: true },
-              },
-            })
-
-            // Update the view to an invalid state
-            const tableToUpdate = await config.api.table.get(table._id!)
-            ;(tableToUpdate.views![view.name] as ViewV2).schema!.id.visible =
-              false
-            await db.getDB(config.appId!).put(tableToUpdate)
-
-            view = await config.api.viewV2.get(view.id)
-            await config.api.viewV2.update(
-              {
-                ...view,
-                schema: {
-                  ...view.schema,
-                  Price: {
-                    visible: false,
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "Price",
                   },
                 },
               },
@@ -1288,172 +660,196 @@ datasourceDescribe(
                 status: 400,
                 body: {
                   message:
-                    'You can\'t hide "id" because it is a required field.',
-                  status: 400,
+                    "Calculation fields are not allowed in non-calculation views",
                 },
               }
             )
           })
 
-        it("can update queryUI field and query gets regenerated", async () => {
-          await config.api.viewV2.update({
-            ...view,
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "field",
-                      value: "value",
-                    },
-                  ],
-                },
-              ],
-            },
-          })
-
-          let updatedView = await config.api.viewV2.get(view.id)
-          let expected: SearchFilters = {
-            onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-            $and: {
-              conditions: [
-                {
-                  $and: {
-                    conditions: [
-                      {
-                        equal: { field: "value" },
-                      },
-                    ],
-                  },
-                },
-              ],
-            },
-          }
-          expect(updatedView.query).toEqual(expected)
-
-          await config.api.viewV2.update({
-            ...updatedView,
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "newField",
-                      value: "newValue",
-                    },
-                  ],
-                },
-              ],
-            },
-          })
-
-          updatedView = await config.api.viewV2.get(view.id)
-          expected = {
-            onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-            $and: {
-              conditions: [
-                {
-                  $and: {
-                    conditions: [
-                      {
-                        equal: { newField: "newValue" },
-                      },
-                    ],
-                  },
-                },
-              ],
-            },
-          }
-          expect(updatedView.query).toEqual(expected)
-        })
-
-        it("can delete either query and it will get regenerated from queryUI", async () => {
-          await config.api.viewV2.update({
-            ...view,
-            query: [
+          it("cannot create a calculation view with more than 5 aggregations", async () => {
+            await config.api.viewV2.create(
               {
-                operator: BasicOperator.EQUAL,
-                field: "field",
-                value: "value",
-              },
-            ],
-          })
-
-          let updatedView = await config.api.viewV2.get(view.id)
-          expect(updatedView.queryUI).toBeDefined()
-
-          await config.api.viewV2.update({
-            ...updatedView,
-            query: undefined,
-          })
-
-          updatedView = await config.api.viewV2.get(view.id)
-          expect(updatedView.query).toBeDefined()
-        })
-
-        // This is because the conversion from queryUI -> query loses data, so you
-        // can't accurately reproduce the original queryUI from the query. If
-        // query is a LegacyFilter[] we allow it, because for Budibase v3
-        // everything in the db had query set to a LegacyFilter[], and there's no
-        // loss of information converting from a LegacyFilter[] to a
-        // UISearchFilter. But we convert to a SearchFilters and that can't be
-        // accurately converted to a UISearchFilter.
-        it("can't regenerate queryUI from a query once it has been generated from a queryUI", async () => {
-          await config.api.viewV2.update({
-            ...view,
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "field",
-                      value: "value",
-                    },
-                  ],
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "Price",
+                  },
+                  count: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    field: "Price",
+                  },
+                  countDistinct: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    distinct: true,
+                    field: "Price",
+                  },
+                  min: {
+                    visible: true,
+                    calculationType: CalculationType.MIN,
+                    field: "Price",
+                  },
+                  max: {
+                    visible: true,
+                    calculationType: CalculationType.MAX,
+                    field: "Price",
+                  },
+                  avg: {
+                    visible: true,
+                    calculationType: CalculationType.AVG,
+                    field: "Price",
+                  },
                 },
-              ],
-            },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    "Calculation views can only have a maximum of 5 fields",
+                },
+              }
+            )
           })
 
-          let updatedView = await config.api.viewV2.get(view.id)
-          expect(updatedView.query).toBeDefined()
-
-          await config.api.viewV2.update(
-            {
-              ...updatedView,
-              queryUI: undefined,
-            },
-            {
-              status: 400,
-              body: {
-                message: "view is missing queryUI field",
+          it("cannot create a calculation view with duplicate calculations", async () => {
+            await config.api.viewV2.create(
+              {
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "Price",
+                  },
+                  sum2: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "Price",
+                  },
+                },
               },
-            }
-          )
-        })
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Duplicate calculation on field "Price", calculation type "sum"',
+                },
+              }
+            )
+          })
 
-        describe("calculation views", () => {
-          let table: Table
-          let view: ViewV2
+          it("finds duplicate counts", async () => {
+            await config.api.viewV2.create(
+              {
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  count: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    field: "Price",
+                  },
+                  count2: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    field: "Price",
+                  },
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Duplicate calculation on field "Price", calculation type "count"',
+                },
+              }
+            )
+          })
 
-          beforeEach(async () => {
-            table = await config.api.table.save(
+          it("finds duplicate count distincts", async () => {
+            await config.api.viewV2.create(
+              {
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  count: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    distinct: true,
+                    field: "Price",
+                  },
+                  count2: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    distinct: true,
+                    field: "Price",
+                  },
+                },
+              },
+              {
+                status: 400,
+                body: {
+                  message:
+                    'Duplicate calculation on field "Price", calculation type "count distinct"',
+                },
+              }
+            )
+          })
+
+          it("does not confuse counts and count distincts in the duplicate check", async () => {
+            await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                count: {
+                  visible: true,
+                  calculationType: CalculationType.COUNT,
+                  field: "Price",
+                },
+                count2: {
+                  visible: true,
+                  calculationType: CalculationType.COUNT,
+                  distinct: true,
+                  field: "Price",
+                },
+              },
+            })
+          })
+
+          it("does not confuse counts on different fields in the duplicate check", async () => {
+            await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                count: {
+                  visible: true,
+                  calculationType: CalculationType.COUNT,
+                  field: "Price",
+                },
+                count2: {
+                  visible: true,
+                  calculationType: CalculationType.COUNT,
+                  field: "Category",
+                },
+              },
+            })
+          })
+
+          it("does not get confused when a calculation field shadows a basic one", async () => {
+            const table = await config.api.table.save(
               saveTableRequest({
                 schema: {
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                    constraints: {
-                      presence: true,
-                    },
-                  },
-                  country: {
-                    name: "country",
-                    type: FieldType.STRING,
-                  },
                   age: {
                     name: "age",
                     type: FieldType.NUMBER,
@@ -1462,14 +858,15 @@ datasourceDescribe(
               })
             )
 
-            view = await config.api.viewV2.create({
+            await config.api.row.bulkImport(table._id!, {
+              rows: [{ age: 1 }, { age: 2 }, { age: 3 }],
+            })
+
+            const view = await config.api.viewV2.create({
               tableId: table._id!,
               name: generator.guid(),
               type: ViewV2Type.CALCULATION,
               schema: {
-                country: {
-                  visible: true,
-                },
                 age: {
                   visible: true,
                   calculationType: CalculationType.SUM,
@@ -1478,774 +875,1360 @@ datasourceDescribe(
               },
             })
 
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
+            const { rows } = await config.api.row.search(view.id)
+            expect(rows).toHaveLength(1)
+            expect(rows[0].age).toEqual(6)
+          })
+
+          // We don't allow the creation of tables with most JsonTypes when using
+          // external datasources.
+          isInternal &&
+            it("cannot use complex types as group-by fields", async () => {
+              for (const type of JsonTypes) {
+                const field = { name: "field", type } as FieldSchema
+                const table = await config.api.table.save(
+                  saveTableRequest({ schema: { field } })
+                )
+                await config.api.viewV2.create(
+                  {
+                    tableId: table._id!,
+                    name: generator.guid(),
+                    type: ViewV2Type.CALCULATION,
+                    schema: {
+                      field: { visible: true },
+                    },
+                  },
+                  {
+                    status: 400,
+                    body: {
+                      message: `Grouping by fields of type "${type}" is not supported`,
+                    },
+                  }
+                )
+              }
+            })
+
+          isInternal &&
+            it("shouldn't trigger a complex type check on a group by field if field is invisible", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    field: {
+                      name: "field",
+                      type: FieldType.JSON,
+                    },
+                  },
+                })
+              )
+
+              await config.api.viewV2.create(
                 {
-                  name: "Steve",
-                  age: 30,
-                  country: "UK",
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  type: ViewV2Type.CALCULATION,
+                  schema: {
+                    field: { visible: false },
+                  },
                 },
                 {
-                  name: "Jane",
-                  age: 31,
-                  country: "UK",
-                },
+                  status: 201,
+                }
+              )
+            })
+
+          isInternal &&
+            describe("AI fields", () => {
+              let envCleanup: () => void
+              beforeAll(() => {
+                mocks.licenses.useBudibaseAI()
+                mocks.licenses.useAICustomConfigs()
+                envCleanup = setEnv({
+                  OPENAI_API_KEY: "sk-abcdefghijklmnopqrstuvwxyz1234567890abcd",
+                })
+
+                mockChatGPTResponse(prompt => {
+                  if (prompt.includes("elephant")) {
+                    return "big"
+                  }
+                  if (prompt.includes("mouse")) {
+                    return "small"
+                  }
+                  if (prompt.includes("whale")) {
+                    return "big"
+                  }
+                  return "unknown"
+                })
+              })
+
+              afterAll(() => {
+                nock.cleanAll()
+                envCleanup()
+                mocks.licenses.useCloudFree()
+              })
+
+              it("can use AI fields in view calculations", async () => {
+                const table = await config.api.table.save(
+                  saveTableRequest({
+                    schema: {
+                      animal: {
+                        name: "animal",
+                        type: FieldType.STRING,
+                      },
+                      bigOrSmall: {
+                        name: "bigOrSmall",
+                        type: FieldType.AI,
+                        operation: AIOperationEnum.CATEGORISE_TEXT,
+                        categories: "big,small",
+                        columns: ["animal"],
+                      },
+                    },
+                  })
+                )
+
+                const view = await config.api.viewV2.create({
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  type: ViewV2Type.CALCULATION,
+                  schema: {
+                    bigOrSmall: {
+                      visible: true,
+                    },
+                    count: {
+                      visible: true,
+                      calculationType: CalculationType.COUNT,
+                      field: "animal",
+                    },
+                  },
+                })
+
+                await config.api.row.save(table._id!, {
+                  animal: "elephant",
+                })
+
+                await config.api.row.save(table._id!, {
+                  animal: "mouse",
+                })
+
+                await config.api.row.save(table._id!, {
+                  animal: "whale",
+                })
+
+                const { rows } = await config.api.row.search(view.id, {
+                  sort: "bigOrSmall",
+                  sortOrder: SortOrder.ASCENDING,
+                })
+                expect(rows).toHaveLength(2)
+                expect(rows[0].bigOrSmall).toEqual("big")
+                expect(rows[1].bigOrSmall).toEqual("small")
+                expect(rows[0].count).toEqual(2)
+                expect(rows[1].count).toEqual(1)
+              })
+            })
+        })
+
+        describe("update", () => {
+          let view: ViewV2
+          let table: Table
+
+          beforeEach(async () => {
+            table = await config.api.table.save(priceTable())
+
+            view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+              },
+            })
+          })
+
+          it("can update an existing view data", async () => {
+            const tableId = table._id!
+            await config.api.viewV2.update({
+              ...view,
+              query: [
                 {
-                  name: "Ruari",
-                  age: 32,
-                  country: "USA",
-                },
-                {
-                  name: "Alice",
-                  age: 33,
-                  country: "USA",
+                  operator: BasicOperator.EQUAL,
+                  field: "newField",
+                  value: "thatValue",
                 },
               ],
             })
-          })
 
-          it("returns the expected rows prior to modification", async () => {
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(2)
-            expect(rows).toEqual(
-              expect.arrayContaining([
+            const expected: ViewV2 = {
+              ...view,
+              query: [
                 {
-                  country: "USA",
-                  age: 65,
+                  operator: BasicOperator.EQUAL,
+                  field: "newField",
+                  value: "thatValue",
                 },
-                {
-                  country: "UK",
-                  age: 61,
-                },
-              ])
-            )
-          })
-
-          it("can remove a group by field", async () => {
-            delete view.schema!.country
-            await config.api.viewV2.update(view)
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(1)
-            expect(rows).toEqual(
-              expect.arrayContaining([
-                {
-                  age: 126,
-                },
-              ])
-            )
-          })
-
-          it("can remove a calculation field", async () => {
-            delete view.schema!.age
-            await config.api.viewV2.update(view)
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(4)
-
-            // Because the removal of the calculation field actually makes this
-            // no longer a calculation view, these rows will now have _id and
-            // _rev fields.
-            expect(rows).toEqual(
-              expect.arrayContaining([
-                expect.objectContaining({ country: "UK" }),
-                expect.objectContaining({ country: "UK" }),
-                expect.objectContaining({ country: "USA" }),
-                expect.objectContaining({ country: "USA" }),
-              ])
-            )
-          })
-
-          it("can add a new group by field", async () => {
-            view.schema!.name = { visible: true }
-            await config.api.viewV2.update(view)
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(4)
-            expect(rows).toEqual(
-              expect.arrayContaining([
-                {
-                  name: "Steve",
-                  age: 30,
-                  country: "UK",
-                },
-                {
-                  name: "Jane",
-                  age: 31,
-                  country: "UK",
-                },
-                {
-                  name: "Ruari",
-                  age: 32,
-                  country: "USA",
-                },
-                {
-                  name: "Alice",
-                  age: 33,
-                  country: "USA",
-                },
-              ])
-            )
-          })
-
-          it("can add a new group by field that is invisible, even if required on the table", async () => {
-            view.schema!.name = { visible: false }
-            await config.api.viewV2.update(view)
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(2)
-            expect(rows).toEqual(
-              expect.arrayContaining([
-                {
-                  country: "USA",
-                  age: 65,
-                },
-                {
-                  country: "UK",
-                  age: 61,
-                },
-              ])
-            )
-          })
-
-          it("can add a new calculation field", async () => {
-            view.schema!.count = {
-              visible: true,
-              calculationType: CalculationType.COUNT,
-              field: "age",
-            }
-            await config.api.viewV2.update(view)
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(2)
-            expect(rows).toEqual(
-              expect.arrayContaining([
-                {
-                  country: "USA",
-                  age: 65,
-                  count: 2,
-                },
-                {
-                  country: "UK",
-                  age: 61,
-                  count: 2,
-                },
-              ])
-            )
-          })
-        })
-      })
-
-      describe("delete", () => {
-        let view: ViewV2
-
-        beforeAll(async () => {
-          view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-            },
-          })
-        })
-
-        it("can delete an existing view", async () => {
-          const tableId = table._id!
-          const getPersistedView = async () =>
-            (await config.api.table.get(tableId)).views![view.name]
-
-          expect(await getPersistedView()).toBeDefined()
-
-          await config.api.viewV2.delete(view.id)
-
-          expect(await getPersistedView()).toBeUndefined()
-        })
-      })
-
-      describe.each([
-        ["from view api", (view: ViewV2) => config.api.viewV2.get(view.id)],
-        [
-          "from table",
-          async (view: ViewV2) => {
-            const table = await config.api.table.get(view.tableId)
-            return table.views![view.name] as ViewV2
-          },
-        ],
-      ])("read (%s)", (_, getDelegate) => {
-        let table: Table
-        let tableId: string
-
-        beforeEach(async () => {
-          table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                one: {
-                  type: FieldType.STRING,
-                  name: "one",
-                },
-                two: {
-                  type: FieldType.STRING,
-                  name: "two",
-                },
-                three: {
-                  type: FieldType.STRING,
-                  name: "three",
-                },
-              },
-            })
-          )
-          tableId = table._id!
-        })
-
-        it("retrieves the view data with the enriched schema", async () => {
-          const view = await config.api.viewV2.create({
-            tableId,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-              two: { visible: true },
-            },
-          })
-
-          expect(await getDelegate(view)).toEqual({
-            ...view,
-            schema: {
-              id: { ...table.schema["id"], visible: true },
-              one: { ...table.schema["one"], visible: true },
-              two: { ...table.schema["two"], visible: true },
-              three: { ...table.schema["three"], visible: false },
-            },
-          })
-        })
-
-        it("does not include columns removed from the table", async () => {
-          const view = await config.api.viewV2.create({
-            tableId,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-              two: { visible: true },
-            },
-          })
-          const table = await config.api.table.get(tableId)
-          const { one: _, ...newSchema } = table.schema
-          await config.api.table.save({ ...table, schema: newSchema })
-
-          expect(await getDelegate(view)).toEqual({
-            ...view,
-            schema: {
-              id: { ...table.schema["id"], visible: true },
-              two: { ...table.schema["two"], visible: true },
-              three: { ...table.schema["three"], visible: false },
-            },
-          })
-        })
-
-        it("does not include columns hidden from the table", async () => {
-          const view = await config.api.viewV2.create({
-            tableId,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-              two: { visible: true },
-            },
-          })
-          const table = await config.api.table.get(tableId)
-          await config.api.table.save({
-            ...table,
-            schema: {
-              ...table.schema,
-              two: { ...table.schema["two"], visible: false },
-            },
-          })
-
-          expect(await getDelegate(view)).toEqual({
-            ...view,
-            schema: {
-              id: { ...table.schema["id"], visible: true },
-              one: { ...table.schema["one"], visible: true },
-              three: { ...table.schema["three"], visible: false },
-            },
-          })
-        })
-
-        it("should be able to fetch readonly config after downgrades", async () => {
-          const res = await config.api.viewV2.create({
-            name: generator.name(),
-            tableId: table._id!,
-            schema: {
-              id: { visible: true },
-              one: { visible: true, readonly: true },
-            },
-          })
-
-          mocks.licenses.useCloudFree()
-          const view = await getDelegate(res)
-          expect(view.schema?.one).toEqual(
-            expect.objectContaining({ visible: true, readonly: true })
-          )
-        })
-
-        it("should fill in the queryUI field if it's missing", async () => {
-          const res = await config.api.viewV2.create({
-            name: generator.name(),
-            tableId: tableId,
-            query: [
-              {
-                operator: BasicOperator.EQUAL,
-                field: "one",
-                value: "1",
-              },
-            ],
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-            },
-          })
-
-          const table = await config.api.table.get(tableId)
-          const rawView = table.views![res.name] as ViewV2
-          delete rawView.queryUI
-
-          await context.doInAppContext(config.getAppId(), async () => {
-            const db = context.getAppDB()
-
-            if (!rawDatasource) {
-              await db.put(table)
-            } else {
-              const ds = await config.api.datasource.get(datasource!._id!)
-              ds.entities![table.name] = table
-              const updatedDs = {
-                ...rawDatasource,
-                _id: ds._id,
-                _rev: ds._rev,
-                entities: ds.entities,
-              }
-              await db.put(updatedDs)
-            }
-          })
-
-          const view = await getDelegate(res)
-          const expected: UISearchFilter = {
-            onEmptyFilter: EmptyFilterOption.RETURN_ALL,
-            logicalOperator: UILogicalOperator.ALL,
-            groups: [
-              {
+              ],
+              // Should also update queryUI because query was not previously set.
+              queryUI: {
+                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
                 logicalOperator: UILogicalOperator.ALL,
-                filters: [
+                groups: [
                   {
-                    operator: BasicOperator.EQUAL,
-                    field: "one",
-                    value: "1",
+                    logicalOperator: UILogicalOperator.ALL,
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "newField",
+                        value: "thatValue",
+                      },
+                    ],
                   },
                 ],
               },
-            ],
-          }
-          expect(view.queryUI).toEqual(expected)
-        })
-      })
+              schema: expect.anything(),
+            }
 
-      describe("updating table schema", () => {
-        describe("existing columns changed to required", () => {
-          beforeEach(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  id: {
-                    name: "id",
-                    type: FieldType.NUMBER,
-                    autocolumn: true,
-                  },
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                  },
-                },
-              })
-            )
+            expect((await config.api.table.get(tableId)).views).toEqual({
+              [view.name]: expected,
+            })
+            expect(events.view.updated).toHaveBeenCalledTimes(1)
           })
 
-          it("allows updating when no views constrains the field", async () => {
-            await config.api.viewV2.create({
-              name: "view a",
-              tableId: table._id!,
-              schema: {
-                id: { visible: true },
-                name: { visible: true },
-              },
+          it("handles view grouped filter events", async () => {
+            view.queryUI = {
+              logicalOperator: UILogicalOperator.ALL,
+              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+              groups: [
+                {
+                  logicalOperator: UILogicalOperator.ALL,
+                  filters: [
+                    {
+                      operator: BasicOperator.EQUAL,
+                      field: "newField",
+                      value: "newValue",
+                    },
+                  ],
+                },
+              ],
+            }
+            await config.api.viewV2.update(view)
+            expect(events.view.filterUpdated).not.toHaveBeenCalled()
+
+            // @ts-ignore
+            view.queryUI.groups.push({
+              logicalOperator: UILogicalOperator.ALL,
+              filters: [
+                {
+                  operator: BasicOperator.EQUAL,
+                  field: "otherField",
+                  value: "otherValue",
+                },
+              ],
             })
 
-            table = await config.api.table.get(table._id!)
-            await config.api.table.save(
-              {
-                ...table,
-                schema: {
-                  ...table.schema,
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                    constraints: { presence: { allowEmpty: false } },
-                  },
-                },
-              },
-              { status: 200 }
-            )
+            await config.api.viewV2.update(view)
+            expect(events.view.filterUpdated).toHaveBeenCalledWith({
+              filterGroups: 2,
+              tableId: view.tableId,
+            })
           })
 
-          it("rejects if field is readonly in any view", async () => {
-            await config.api.viewV2.create({
-              name: "view a",
-              tableId: table._id!,
+          it("can update all fields", async () => {
+            const tableId = table._id!
+
+            const updatedData: Required<
+              Omit<UpdateViewRequest, "queryUI" | "type">
+            > = {
+              version: view.version,
+              id: view.id,
+              tableId,
+              name: view.name,
+              primaryDisplay: "Price",
+              query: [
+                {
+                  operator: BasicOperator.EQUAL,
+                  field: "newField",
+                  value: "newValue",
+                },
+              ],
+              sort: {
+                field: generator.word(),
+                order: SortOrder.DESCENDING,
+                type: SortType.STRING,
+              },
               schema: {
                 id: { visible: true },
-                name: {
+                Category: {
+                  visible: false,
+                },
+                Price: {
                   visible: true,
                   readonly: true,
                 },
               },
-            })
+              rowHeight: generator.integer(),
+            }
+            await config.api.viewV2.update(updatedData)
 
-            table = await config.api.table.get(table._id!)
-            await config.api.table.save(
-              {
-                ...table,
-                schema: {
-                  ...table.schema,
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                    constraints: { presence: true },
+            const expected: ViewV2 = {
+              ...updatedData,
+              // queryUI gets generated from query
+              queryUI: {
+                logicalOperator: UILogicalOperator.ALL,
+                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                groups: [
+                  {
+                    logicalOperator: UILogicalOperator.ALL,
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "newField",
+                        value: "newValue",
+                      },
+                    ],
+                  },
+                ],
+              },
+              schema: {
+                ...table.schema,
+                id: expect.objectContaining({
+                  visible: true,
+                }),
+                Category: expect.objectContaining({
+                  visible: false,
+                }),
+                Price: expect.objectContaining({
+                  visible: true,
+                  readonly: true,
+                }),
+              },
+            }
+
+            expect((await config.api.table.get(tableId)).views).toEqual({
+              [view.name]: expected,
+            })
+          })
+
+          it("can update an existing view name", async () => {
+            const tableId = table._id!
+            const newName = generator.guid()
+            await config.api.viewV2.update({ ...view, name: newName })
+
+            expect(await config.api.table.get(tableId)).toEqual(
+              expect.objectContaining({
+                views: {
+                  [newName]: {
+                    ...view,
+                    name: newName,
+                    schema: expect.anything(),
                   },
                 },
+              })
+            )
+          })
+
+          it("cannot update an unexisting views nor edit ids", async () => {
+            const tableId = table._id!
+            await config.api.viewV2.update(
+              { ...view, id: generator.guid() },
+              { status: 404 }
+            )
+
+            expect(await config.api.table.get(tableId)).toEqual(
+              expect.objectContaining({
+                views: {
+                  [view.name]: {
+                    ...view,
+                    schema: expect.anything(),
+                  },
+                },
+              })
+            )
+          })
+
+          it("cannot update views with the wrong tableId", async () => {
+            const tableId = table._id!
+            await config.api.viewV2.update(
+              {
+                ...view,
+                tableId: generator.guid(),
+                query: [
+                  {
+                    operator: BasicOperator.EQUAL,
+                    field: "newField",
+                    value: "thatValue",
+                  },
+                ],
+              },
+              { status: 404 }
+            )
+
+            expect(await config.api.table.get(tableId)).toEqual(
+              expect.objectContaining({
+                views: {
+                  [view.name]: {
+                    ...view,
+                    schema: expect.anything(),
+                  },
+                },
+              })
+            )
+          })
+
+          isInternal &&
+            it("cannot update views v1", async () => {
+              const viewV1 = await config.api.legacyView.save({
+                tableId: table._id!,
+                name: generator.guid(),
+                filters: [],
+                schema: {},
+              })
+
+              await config.api.viewV2.update(viewV1 as unknown as ViewV2, {
+                status: 400,
+                body: {
+                  message: "Only views V2 can be updated",
+                  status: 400,
+                },
+              })
+            })
+
+          it("cannot update the a view with unmatching ids between url and body", async () => {
+            const anotherView = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+              },
+            })
+            const result = await config
+              .request!.put(`/api/v2/views/${anotherView.id}`)
+              .send(view)
+              .set(config.defaultHeaders())
+              .expect("Content-Type", /json/)
+              .expect(400)
+
+            expect(result.body).toEqual({
+              message:
+                "View id does not match between the body and the uri path",
+              status: 400,
+            })
+          })
+
+          it("updates only UI schema overrides", async () => {
+            const updatedView = await config.api.viewV2.update({
+              ...view,
+              schema: {
+                ...view.schema,
+                Price: {
+                  name: "Price",
+                  type: FieldType.NUMBER,
+                  visible: true,
+                  order: 1,
+                  width: 100,
+                },
+                Category: {
+                  name: "Category",
+                  type: FieldType.STRING,
+                  visible: false,
+                  icon: "ic",
+                },
+              } as ViewV2Schema,
+            })
+
+            expect(updatedView).toEqual({
+              ...view,
+              schema: {
+                id: { visible: true },
+                Price: {
+                  visible: true,
+                  order: 1,
+                  width: 100,
+                },
+                Category: { visible: false, icon: "ic" },
+              },
+              id: view.id,
+              version: 2,
+            })
+          })
+
+          it("will not throw an exception if the schema is 'deleting' non UI fields", async () => {
+            await config.api.viewV2.update(
+              {
+                ...view,
+                schema: {
+                  ...view.schema,
+                  Price: {
+                    name: "Price",
+                    type: FieldType.NUMBER,
+                    visible: true,
+                  },
+                  Category: {
+                    name: "Category",
+                    type: FieldType.STRING,
+                  },
+                } as ViewV2Schema,
+              },
+              {
+                status: 200,
+              }
+            )
+          })
+
+          it("cannot update view type after creation", async () => {
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                Price: {
+                  visible: true,
+                },
+              },
+            })
+
+            await config.api.viewV2.update(
+              {
+                ...view,
+                type: ViewV2Type.CALCULATION,
               },
               {
                 status: 400,
                 body: {
-                  status: 400,
-                  message:
-                    'To make field "name" required, this field must be present and writable in views: view a.',
+                  message: "Cannot update view type after creation",
                 },
               }
             )
           })
 
-          it("rejects if field is hidden in any view", async () => {
-            await config.api.viewV2.create({
-              name: "view a",
-              tableId: table._id!,
-              schema: { id: { visible: true } },
-            })
-
-            table = await config.api.table.get(table._id!)
-            await config.api.table.save(
-              {
-                ...table,
+          isInternal &&
+            it("updating schema will only validate modified field", async () => {
+              let view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
                 schema: {
-                  ...table.schema,
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
-                    constraints: { presence: true },
+                  id: { visible: true },
+                  Price: {
+                    visible: true,
+                  },
+                  Category: { visible: true },
+                },
+              })
+
+              // Update the view to an invalid state
+              const tableToUpdate = await config.api.table.get(table._id!)
+              ;(tableToUpdate.views![view.name] as ViewV2).schema!.id.visible =
+                false
+              await db.getDB(config.appId!).put(tableToUpdate)
+
+              view = await config.api.viewV2.get(view.id)
+              await config.api.viewV2.update(
+                {
+                  ...view,
+                  schema: {
+                    ...view.schema,
+                    Price: {
+                      visible: false,
+                    },
                   },
                 },
+                {
+                  status: 400,
+                  body: {
+                    message:
+                      'You can\'t hide "id" because it is a required field.',
+                    status: 400,
+                  },
+                }
+              )
+            })
+
+          it("can update queryUI field and query gets regenerated", async () => {
+            await config.api.viewV2.update({
+              ...view,
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "field",
+                        value: "value",
+                      },
+                    ],
+                  },
+                ],
+              },
+            })
+
+            let updatedView = await config.api.viewV2.get(view.id)
+            let expected: SearchFilters = {
+              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+              $and: {
+                conditions: [
+                  {
+                    $and: {
+                      conditions: [
+                        {
+                          equal: { field: "value" },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            }
+            expect(updatedView.query).toEqual(expected)
+
+            await config.api.viewV2.update({
+              ...updatedView,
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "newField",
+                        value: "newValue",
+                      },
+                    ],
+                  },
+                ],
+              },
+            })
+
+            updatedView = await config.api.viewV2.get(view.id)
+            expected = {
+              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+              $and: {
+                conditions: [
+                  {
+                    $and: {
+                      conditions: [
+                        {
+                          equal: { newField: "newValue" },
+                        },
+                      ],
+                    },
+                  },
+                ],
+              },
+            }
+            expect(updatedView.query).toEqual(expected)
+          })
+
+          it("can delete either query and it will get regenerated from queryUI", async () => {
+            await config.api.viewV2.update({
+              ...view,
+              query: [
+                {
+                  operator: BasicOperator.EQUAL,
+                  field: "field",
+                  value: "value",
+                },
+              ],
+            })
+
+            let updatedView = await config.api.viewV2.get(view.id)
+            expect(updatedView.queryUI).toBeDefined()
+
+            await config.api.viewV2.update({
+              ...updatedView,
+              query: undefined,
+            })
+
+            updatedView = await config.api.viewV2.get(view.id)
+            expect(updatedView.query).toBeDefined()
+          })
+
+          // This is because the conversion from queryUI -> query loses data, so you
+          // can't accurately reproduce the original queryUI from the query. If
+          // query is a LegacyFilter[] we allow it, because for Budibase v3
+          // everything in the db had query set to a LegacyFilter[], and there's no
+          // loss of information converting from a LegacyFilter[] to a
+          // UISearchFilter. But we convert to a SearchFilters and that can't be
+          // accurately converted to a UISearchFilter.
+          it("can't regenerate queryUI from a query once it has been generated from a queryUI", async () => {
+            await config.api.viewV2.update({
+              ...view,
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "field",
+                        value: "value",
+                      },
+                    ],
+                  },
+                ],
+              },
+            })
+
+            let updatedView = await config.api.viewV2.get(view.id)
+            expect(updatedView.query).toBeDefined()
+
+            await config.api.viewV2.update(
+              {
+                ...updatedView,
+                queryUI: undefined,
               },
               {
                 status: 400,
                 body: {
-                  status: 400,
-                  message:
-                    'To make field "name" required, this field must be present and writable in views: view a.',
+                  message: "view is missing queryUI field",
                 },
               }
             )
           })
+
+          describe("calculation views", () => {
+            let table: Table
+            let view: ViewV2
+
+            beforeEach(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                      constraints: {
+                        presence: true,
+                      },
+                    },
+                    country: {
+                      name: "country",
+                      type: FieldType.STRING,
+                    },
+                    age: {
+                      name: "age",
+                      type: FieldType.NUMBER,
+                    },
+                  },
+                })
+              )
+
+              view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  country: {
+                    visible: true,
+                  },
+                  age: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "age",
+                  },
+                },
+              })
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  {
+                    name: "Steve",
+                    age: 30,
+                    country: "UK",
+                  },
+                  {
+                    name: "Jane",
+                    age: 31,
+                    country: "UK",
+                  },
+                  {
+                    name: "Ruari",
+                    age: 32,
+                    country: "USA",
+                  },
+                  {
+                    name: "Alice",
+                    age: 33,
+                    country: "USA",
+                  },
+                ],
+              })
+            })
+
+            it("returns the expected rows prior to modification", async () => {
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(2)
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  {
+                    country: "USA",
+                    age: 65,
+                  },
+                  {
+                    country: "UK",
+                    age: 61,
+                  },
+                ])
+              )
+            })
+
+            it("can remove a group by field", async () => {
+              delete view.schema!.country
+              await config.api.viewV2.update(view)
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(1)
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  {
+                    age: 126,
+                  },
+                ])
+              )
+            })
+
+            it("can remove a calculation field", async () => {
+              delete view.schema!.age
+              await config.api.viewV2.update(view)
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(4)
+
+              // Because the removal of the calculation field actually makes this
+              // no longer a calculation view, these rows will now have _id and
+              // _rev fields.
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  expect.objectContaining({ country: "UK" }),
+                  expect.objectContaining({ country: "UK" }),
+                  expect.objectContaining({ country: "USA" }),
+                  expect.objectContaining({ country: "USA" }),
+                ])
+              )
+            })
+
+            it("can add a new group by field", async () => {
+              view.schema!.name = { visible: true }
+              await config.api.viewV2.update(view)
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(4)
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  {
+                    name: "Steve",
+                    age: 30,
+                    country: "UK",
+                  },
+                  {
+                    name: "Jane",
+                    age: 31,
+                    country: "UK",
+                  },
+                  {
+                    name: "Ruari",
+                    age: 32,
+                    country: "USA",
+                  },
+                  {
+                    name: "Alice",
+                    age: 33,
+                    country: "USA",
+                  },
+                ])
+              )
+            })
+
+            it("can add a new group by field that is invisible, even if required on the table", async () => {
+              view.schema!.name = { visible: false }
+              await config.api.viewV2.update(view)
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(2)
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  {
+                    country: "USA",
+                    age: 65,
+                  },
+                  {
+                    country: "UK",
+                    age: 61,
+                  },
+                ])
+              )
+            })
+
+            it("can add a new calculation field", async () => {
+              view.schema!.count = {
+                visible: true,
+                calculationType: CalculationType.COUNT,
+                field: "age",
+              }
+              await config.api.viewV2.update(view)
+              expect(events.view.calculationCreated).toHaveBeenCalledTimes(1)
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(2)
+              expect(rows).toEqual(
+                expect.arrayContaining([
+                  {
+                    country: "USA",
+                    age: 65,
+                    count: 2,
+                  },
+                  {
+                    country: "UK",
+                    age: 61,
+                    count: 2,
+                  },
+                ])
+              )
+            })
+          })
         })
 
-        describe("foreign relationship columns", () => {
-          const createAuxTable = () =>
-            config.api.table.save(
+        describe("delete", () => {
+          let view: ViewV2
+
+          beforeAll(async () => {
+            view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+              },
+            })
+          })
+
+          it("can delete an existing view", async () => {
+            const tableId = table._id!
+            const getPersistedView = async () =>
+              (await config.api.table.get(tableId)).views![view.name]
+
+            expect(await getPersistedView()).toBeDefined()
+
+            await config.api.viewV2.delete(view.id)
+
+            expect(await getPersistedView()).toBeUndefined()
+          })
+        })
+
+        describe.each([
+          ["from view api", (view: ViewV2) => config.api.viewV2.get(view.id)],
+          [
+            "from table",
+            async (view: ViewV2) => {
+              const table = await config.api.table.get(view.tableId)
+              return table.views![view.name] as ViewV2
+            },
+          ],
+        ])("read (%s)", (_, getDelegate) => {
+          let table: Table
+          let tableId: string
+
+          beforeEach(async () => {
+            table = await config.api.table.save(
               saveTableRequest({
-                primaryDisplay: "name",
                 schema: {
-                  name: { name: "name", type: FieldType.STRING },
-                  age: { name: "age", type: FieldType.NUMBER },
+                  one: {
+                    type: FieldType.STRING,
+                    name: "one",
+                  },
+                  two: {
+                    type: FieldType.STRING,
+                    name: "two",
+                  },
+                  three: {
+                    type: FieldType.STRING,
+                    name: "three",
+                  },
                 },
               })
             )
+            tableId = table._id!
+          })
 
-          const createMainTable = async (
-            links: {
-              name: string
-              tableId: string
-              fk: string
-            }[]
-          ) => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {},
-              })
-            )
+          it("retrieves the view data with the enriched schema", async () => {
+            const view = await config.api.viewV2.create({
+              tableId,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+                two: { visible: true },
+              },
+            })
+
+            expect(await getDelegate(view)).toEqual({
+              ...view,
+              schema: {
+                id: { ...table.schema["id"], visible: true },
+                one: { ...table.schema["one"], visible: true },
+                two: { ...table.schema["two"], visible: true },
+                three: { ...table.schema["three"], visible: false },
+              },
+            })
+          })
+
+          it("does not include columns removed from the table", async () => {
+            const view = await config.api.viewV2.create({
+              tableId,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+                two: { visible: true },
+              },
+            })
+            const table = await config.api.table.get(tableId)
+            const { one: _, ...newSchema } = table.schema
+            await config.api.table.save({ ...table, schema: newSchema })
+
+            expect(await getDelegate(view)).toEqual({
+              ...view,
+              schema: {
+                id: { ...table.schema["id"], visible: true },
+                two: { ...table.schema["two"], visible: true },
+                three: { ...table.schema["three"], visible: false },
+              },
+            })
+          })
+
+          it("does not include columns hidden from the table", async () => {
+            const view = await config.api.viewV2.create({
+              tableId,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+                two: { visible: true },
+              },
+            })
+            const table = await config.api.table.get(tableId)
             await config.api.table.save({
               ...table,
               schema: {
                 ...table.schema,
-                ...links.reduce<TableSchema>((acc, c) => {
-                  acc[c.name] = {
-                    name: c.name,
-                    relationshipType: RelationshipType.ONE_TO_MANY,
-                    type: FieldType.LINK,
-                    tableId: c.tableId,
-                    fieldName: c.fk,
-                    constraints: { type: "array" },
-                  }
-                  return acc
-                }, {}),
+                two: { ...table.schema["two"], visible: false },
               },
             })
-            return table
-          }
 
-          const createView = async (tableId: string, schema: ViewV2Schema) =>
-            await config.api.viewV2.create({
-              name: generator.guid(),
-              tableId,
-              schema,
+            expect(await getDelegate(view)).toEqual({
+              ...view,
+              schema: {
+                id: { ...table.schema["id"], visible: true },
+                one: { ...table.schema["one"], visible: true },
+                three: { ...table.schema["three"], visible: false },
+              },
+            })
+          })
+
+          it("should be able to fetch readonly config after downgrades", async () => {
+            const res = await config.api.viewV2.create({
+              name: generator.name(),
+              tableId: table._id!,
+              schema: {
+                id: { visible: true },
+                one: { visible: true, readonly: true },
+              },
             })
 
-          const renameColumn = async (table: Table, renaming: RenameColumn) => {
-            const newSchema = { ...table.schema }
-            newSchema[renaming.updated] = {
-              ...table.schema[renaming.old],
-              name: renaming.updated,
+            const view = await getDelegate(res)
+            expect(view.schema?.one).toEqual(
+              expect.objectContaining({ visible: true, readonly: true })
+            )
+          })
+
+          it("should fill in the queryUI field if it's missing", async () => {
+            const res = await config.api.viewV2.create({
+              name: generator.name(),
+              tableId: tableId,
+              query: [
+                {
+                  operator: BasicOperator.EQUAL,
+                  field: "one",
+                  value: "1",
+                },
+              ],
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+              },
+            })
+
+            const table = await config.api.table.get(tableId)
+            const rawView = table.views![res.name] as ViewV2
+            delete rawView.queryUI
+
+            await context.doInAppContext(config.getAppId(), async () => {
+              const db = context.getAppDB()
+
+              if (!rawDatasource) {
+                await db.put(table)
+              } else {
+                const ds = await config.api.datasource.get(datasource!._id!)
+                ds.entities![table.name] = table
+                const updatedDs = {
+                  ...rawDatasource,
+                  _id: ds._id,
+                  _rev: ds._rev,
+                  entities: ds.entities,
+                }
+                await db.put(updatedDs)
+              }
+            })
+
+            const view = await getDelegate(res)
+            const expected: UISearchFilter = {
+              onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+              logicalOperator: UILogicalOperator.ALL,
+              groups: [
+                {
+                  logicalOperator: UILogicalOperator.ALL,
+                  filters: [
+                    {
+                      operator: BasicOperator.EQUAL,
+                      field: "one",
+                      value: "1",
+                    },
+                  ],
+                },
+              ],
             }
-            delete newSchema[renaming.old]
-
-            await config.api.table.save({
-              ...table,
-              schema: newSchema,
-              _rename: renaming,
-            })
-          }
-
-          it("updating a column will update link columns configuration", async () => {
-            let auxTable = await createAuxTable()
-
-            const table = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
-            ])
-            // Refetch auxTable
-            auxTable = await config.api.table.get(auxTable._id!)
-
-            const view = await createView(table._id!, {
-              aux: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                  age: { visible: true, readonly: true },
-                },
-              },
-            })
-
-            await renameColumn(auxTable, { old: "age", updated: "dob" })
-
-            const updatedView = await config.api.viewV2.get(view.id)
-            expect(updatedView).toEqual(
-              expect.objectContaining({
-                schema: expect.objectContaining({
-                  aux: expect.objectContaining({
-                    columns: {
-                      id: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                      name: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                      dob: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                    },
-                  }),
-                }),
-              })
-            )
+            expect(view.queryUI).toEqual(expected)
           })
 
-          it("handles multiple fields using the same table", async () => {
-            let auxTable = await createAuxTable()
-
-            const table = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
-              { name: "aux2", tableId: auxTable._id!, fk: "fk_aux2" },
-            ])
-            // Refetch auxTable
-            auxTable = await config.api.table.get(auxTable._id!)
-
-            const view = await createView(table._id!, {
-              aux: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                  age: { visible: true, readonly: true },
-                },
-              },
-              aux2: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                  age: { visible: true, readonly: true },
+          it("tables and views can contain whitespaces", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
+                name: `table with spaces ${generator.hash()}`,
+                schema: {
+                  name: {
+                    type: FieldType.STRING,
+                    name: "name",
+                  },
                 },
+              })
+            )
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: `view name with spaces`,
+              schema: {
+                name: { visible: true },
               },
             })
 
-            await renameColumn(auxTable, { old: "age", updated: "dob" })
-
-            const updatedView = await config.api.viewV2.get(view.id)
-            expect(updatedView).toEqual(
-              expect.objectContaining({
-                schema: expect.objectContaining({
-                  aux: expect.objectContaining({
-                    columns: {
-                      id: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                      name: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                      dob: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                    },
-                  }),
-                  aux2: expect.objectContaining({
-                    columns: {
-                      id: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                      name: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                      dob: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                    },
-                  }),
-                }),
-              })
-            )
-          })
-
-          it("does not rename columns with the same name but from other tables", async () => {
-            let auxTable = await createAuxTable()
-            let aux2Table = await createAuxTable()
-
-            const table = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
-              { name: "aux2", tableId: aux2Table._id!, fk: "fk_aux2" },
-            ])
-
-            // Refetch auxTable
-            auxTable = await config.api.table.get(auxTable._id!)
-
-            const view = await createView(table._id!, {
-              aux: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                },
-              },
-              aux2: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                },
+            expect(await getDelegate(view)).toEqual({
+              ...view,
+              schema: {
+                id: { ...table.schema["id"], visible: false },
+                name: { ...table.schema["name"], visible: true },
               },
             })
+          })
+        })
 
-            await renameColumn(auxTable, { old: "name", updated: "fullName" })
+        describe("updating table schema", () => {
+          describe("existing columns changed to required", () => {
+            beforeEach(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    id: {
+                      name: "id",
+                      type: FieldType.NUMBER,
+                      autocolumn: true,
+                    },
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+            })
 
-            const updatedView = await config.api.viewV2.get(view.id)
-            expect(updatedView).toEqual(
-              expect.objectContaining({
-                schema: expect.objectContaining({
-                  aux: expect.objectContaining({
-                    columns: {
-                      id: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                      fullName: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                      age: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                    },
-                  }),
-                  aux2: expect.objectContaining({
-                    columns: {
-                      id: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                      name: expect.objectContaining({
-                        visible: true,
-                        readonly: true,
-                      }),
-                      age: expect.objectContaining({
-                        visible: false,
-                        readonly: false,
-                      }),
-                    },
-                  }),
-                }),
+            it("allows updating when no views constrains the field", async () => {
+              await config.api.viewV2.create({
+                name: "view a",
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: { visible: true },
+                },
               })
-            )
+
+              table = await config.api.table.get(table._id!)
+              await config.api.table.save(
+                {
+                  ...table,
+                  schema: {
+                    ...table.schema,
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                      constraints: { presence: { allowEmpty: false } },
+                    },
+                  },
+                },
+                { status: 200 }
+              )
+            })
+
+            it("rejects if field is readonly in any view", async () => {
+              await config.api.viewV2.create({
+                name: "view a",
+                tableId: table._id!,
+                schema: {
+                  id: { visible: true },
+                  name: {
+                    visible: true,
+                    readonly: true,
+                  },
+                },
+              })
+
+              table = await config.api.table.get(table._id!)
+              await config.api.table.save(
+                {
+                  ...table,
+                  schema: {
+                    ...table.schema,
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                      constraints: { presence: true },
+                    },
+                  },
+                },
+                {
+                  status: 400,
+                  body: {
+                    status: 400,
+                    message:
+                      'To make field "name" required, this field must be present and writable in views: view a.',
+                  },
+                }
+              )
+            })
+
+            it("rejects if field is hidden in any view", async () => {
+              await config.api.viewV2.create({
+                name: "view a",
+                tableId: table._id!,
+                schema: { id: { visible: true } },
+              })
+
+              table = await config.api.table.get(table._id!)
+              await config.api.table.save(
+                {
+                  ...table,
+                  schema: {
+                    ...table.schema,
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                      constraints: { presence: true },
+                    },
+                  },
+                },
+                {
+                  status: 400,
+                  body: {
+                    status: 400,
+                    message:
+                      'To make field "name" required, this field must be present and writable in views: view a.',
+                  },
+                }
+              )
+            })
           })
 
-          it("updates all views references", async () => {
-            let auxTable = await createAuxTable()
+          describe("foreign relationship columns", () => {
+            const createAuxTable = () =>
+              config.api.table.save(
+                saveTableRequest({
+                  primaryDisplay: "name",
+                  schema: {
+                    name: { name: "name", type: FieldType.STRING },
+                    age: { name: "age", type: FieldType.NUMBER },
+                  },
+                })
+              )
 
-            const table1 = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux_table1" },
-            ])
-            const table2 = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux_table2" },
-            ])
-
-            // Refetch auxTable
-            auxTable = await config.api.table.get(auxTable._id!)
-
-            const viewSchema = {
-              aux: {
-                visible: true,
-                columns: {
-                  name: { visible: true, readonly: true },
-                  age: { visible: true, readonly: true },
+            const createMainTable = async (
+              links: {
+                name: string
+                tableId: string
+                fk: string
+              }[]
+            ) => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {},
+                })
+              )
+              await config.api.table.save({
+                ...table,
+                schema: {
+                  ...table.schema,
+                  ...links.reduce<TableSchema>((acc, c) => {
+                    acc[c.name] = {
+                      name: c.name,
+                      relationshipType: RelationshipType.ONE_TO_MANY,
+                      type: FieldType.LINK,
+                      tableId: c.tableId,
+                      fieldName: c.fk,
+                      constraints: { type: "array" },
+                    }
+                    return acc
+                  }, {}),
                 },
-              },
+              })
+              return table
             }
-            const view1 = await createView(table1._id!, viewSchema)
-            const view2 = await createView(table1._id!, viewSchema)
-            const view3 = await createView(table2._id!, viewSchema)
 
-            await renameColumn(auxTable, { old: "age", updated: "dob" })
+            const createView = async (tableId: string, schema: ViewV2Schema) =>
+              await config.api.viewV2.create({
+                name: generator.guid(),
+                tableId,
+                schema,
+              })
+
+            const renameColumn = async (
+              table: Table,
+              renaming: RenameColumn
+            ) => {
+              const newSchema = { ...table.schema }
+              newSchema[renaming.updated] = {
+                ...table.schema[renaming.old],
+                name: renaming.updated,
+              }
+              delete newSchema[renaming.old]
+
+              await config.api.table.save({
+                ...table,
+                schema: newSchema,
+                _rename: renaming,
+              })
+            }
+
+            it("updating a column will update link columns configuration", async () => {
+              let auxTable = await createAuxTable()
+
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+              ])
+              // Refetch auxTable
+              auxTable = await config.api.table.get(auxTable._id!)
+
+              const view = await createView(table._id!, {
+                aux: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                    age: { visible: true, readonly: true },
+                  },
+                },
+              })
+
+              await renameColumn(auxTable, { old: "age", updated: "dob" })
 
-            for (const view of [view1, view2, view3]) {
               const updatedView = await config.api.viewV2.get(view.id)
               expect(updatedView).toEqual(
                 expect.objectContaining({
@@ -2269,74 +2252,663 @@ datasourceDescribe(
                   }),
                 })
               )
-            }
+            })
+
+            it("handles multiple fields using the same table", async () => {
+              let auxTable = await createAuxTable()
+
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+                { name: "aux2", tableId: auxTable._id!, fk: "fk_aux2" },
+              ])
+              // Refetch auxTable
+              auxTable = await config.api.table.get(auxTable._id!)
+
+              const view = await createView(table._id!, {
+                aux: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                    age: { visible: true, readonly: true },
+                  },
+                },
+                aux2: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                    age: { visible: true, readonly: true },
+                  },
+                },
+              })
+
+              await renameColumn(auxTable, { old: "age", updated: "dob" })
+
+              const updatedView = await config.api.viewV2.get(view.id)
+              expect(updatedView).toEqual(
+                expect.objectContaining({
+                  schema: expect.objectContaining({
+                    aux: expect.objectContaining({
+                      columns: {
+                        id: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                        name: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                        dob: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                      },
+                    }),
+                    aux2: expect.objectContaining({
+                      columns: {
+                        id: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                        name: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                        dob: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                      },
+                    }),
+                  }),
+                })
+              )
+              expect(events.view.viewJoinCreated).not.toHaveBeenCalled()
+            })
+
+            it("does not rename columns with the same name but from other tables", async () => {
+              let auxTable = await createAuxTable()
+              let aux2Table = await createAuxTable()
+
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+                { name: "aux2", tableId: aux2Table._id!, fk: "fk_aux2" },
+              ])
+
+              // Refetch auxTable
+              auxTable = await config.api.table.get(auxTable._id!)
+
+              const view = await createView(table._id!, {
+                aux: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                  },
+                },
+                aux2: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                  },
+                },
+              })
+
+              await renameColumn(auxTable, { old: "name", updated: "fullName" })
+
+              const updatedView = await config.api.viewV2.get(view.id)
+              expect(updatedView).toEqual(
+                expect.objectContaining({
+                  schema: expect.objectContaining({
+                    aux: expect.objectContaining({
+                      columns: {
+                        id: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                        fullName: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                        age: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                      },
+                    }),
+                    aux2: expect.objectContaining({
+                      columns: {
+                        id: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                        name: expect.objectContaining({
+                          visible: true,
+                          readonly: true,
+                        }),
+                        age: expect.objectContaining({
+                          visible: false,
+                          readonly: false,
+                        }),
+                      },
+                    }),
+                  }),
+                })
+              )
+            })
+
+            it("handles events for changing column visibility from default false", async () => {
+              let auxTable = await createAuxTable()
+              let aux2Table = await createAuxTable()
+
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+                { name: "aux2", tableId: aux2Table._id!, fk: "fk_aux2" },
+              ])
+
+              const view = await createView(table._id!, {
+                aux: {
+                  visible: true,
+                  columns: {
+                    name: { visible: false, readonly: true },
+                  },
+                },
+                aux2: {
+                  visible: true,
+                  columns: {
+                    name: { visible: false, readonly: true },
+                  },
+                },
+              })
+
+              // @ts-expect-error column exists above
+              view.schema.aux2.columns.name.visible = true
+              await config.api.viewV2.update(view)
+              expect(events.view.viewJoinCreated).toHaveBeenCalledTimes(1)
+            })
+
+            it("updates all views references", async () => {
+              let auxTable = await createAuxTable()
+
+              const table1 = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux_table1" },
+              ])
+              const table2 = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux_table2" },
+              ])
+
+              // Refetch auxTable
+              auxTable = await config.api.table.get(auxTable._id!)
+
+              const viewSchema = {
+                aux: {
+                  visible: true,
+                  columns: {
+                    name: { visible: true, readonly: true },
+                    age: { visible: true, readonly: true },
+                  },
+                },
+              }
+              const view1 = await createView(table1._id!, viewSchema)
+              const view2 = await createView(table1._id!, viewSchema)
+              const view3 = await createView(table2._id!, viewSchema)
+
+              await renameColumn(auxTable, { old: "age", updated: "dob" })
+
+              for (const view of [view1, view2, view3]) {
+                const updatedView = await config.api.viewV2.get(view.id)
+                expect(updatedView).toEqual(
+                  expect.objectContaining({
+                    schema: expect.objectContaining({
+                      aux: expect.objectContaining({
+                        columns: {
+                          id: expect.objectContaining({
+                            visible: false,
+                            readonly: false,
+                          }),
+                          name: expect.objectContaining({
+                            visible: true,
+                            readonly: true,
+                          }),
+                          dob: expect.objectContaining({
+                            visible: true,
+                            readonly: true,
+                          }),
+                        },
+                      }),
+                    }),
+                  })
+                )
+              }
+            })
+          })
+        })
+
+        describe("calculation views", () => {
+          it("should not remove calculation columns when modifying table schema", async () => {
+            let table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                  },
+                  age: {
+                    name: "age",
+                    type: FieldType.NUMBER,
+                  },
+                },
+              })
+            )
+
+            let view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                sum: {
+                  visible: true,
+                  calculationType: CalculationType.SUM,
+                  field: "age",
+                },
+              },
+            })
+
+            table = await config.api.table.get(table._id!)
+            await config.api.table.save({
+              ...table,
+              schema: {
+                ...table.schema,
+                name: {
+                  name: "name",
+                  type: FieldType.STRING,
+                  constraints: { presence: true },
+                },
+              },
+            })
+
+            view = await config.api.viewV2.get(view.id)
+            expect(Object.keys(view.schema!).sort()).toEqual([
+              "age",
+              "id",
+              "name",
+              "sum",
+            ])
+          })
+
+          describe("bigints", () => {
+            let table: Table
+            let view: ViewV2
+
+            beforeEach(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    bigint: {
+                      name: "bigint",
+                      type: FieldType.BIGINT,
+                    },
+                  },
+                })
+              )
+
+              view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "bigint",
+                  },
+                },
+              })
+            })
+
+            it("should not lose precision handling ints larger than JSs int53", async () => {
+              // The sum of the following 3 numbers cannot be represented by
+              // JavaScripts default int53 datatype for numbers, so this is a test
+              // that makes sure we aren't losing precision between the DB and the
+              // user.
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  { bigint: "1000000000000000000" },
+                  { bigint: "123" },
+                  { bigint: "321" },
+                ],
+              })
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(1)
+              expect(rows[0].sum).toEqual("1000000000000000444")
+            })
+
+            it("should be able to handle up to 2**63 - 1 bigints", async () => {
+              await config.api.row.bulkImport(table._id!, {
+                rows: [{ bigint: "9223372036854775806" }, { bigint: "1" }],
+              })
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(1)
+              expect(rows[0].sum).toEqual("9223372036854775807")
+            })
           })
         })
       })
 
-      describe("calculation views", () => {
-        it("should not remove calculation columns when modifying table schema", async () => {
-          let table = await config.api.table.save(
+      describe("row operations", () => {
+        let table: Table, view: ViewV2
+        beforeEach(async () => {
+          table = await config.api.table.save(
             saveTableRequest({
               schema: {
-                name: {
-                  name: "name",
+                one: { type: FieldType.STRING, name: "one" },
+                two: { type: FieldType.STRING, name: "two" },
+                default: {
                   type: FieldType.STRING,
-                },
-                age: {
-                  name: "age",
-                  type: FieldType.NUMBER,
+                  name: "default",
+                  default: "default",
                 },
               },
             })
           )
-
-          let view = await config.api.viewV2.create({
+          view = await config.api.viewV2.create({
             tableId: table._id!,
             name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
             schema: {
-              sum: {
-                visible: true,
-                calculationType: CalculationType.SUM,
-                field: "age",
-              },
+              id: { visible: true },
+              two: { visible: true },
             },
           })
-
-          table = await config.api.table.get(table._id!)
-          await config.api.table.save({
-            ...table,
-            schema: {
-              ...table.schema,
-              name: {
-                name: "name",
-                type: FieldType.STRING,
-                constraints: { presence: true },
-              },
-            },
-          })
-
-          view = await config.api.viewV2.get(view.id)
-          expect(Object.keys(view.schema!).sort()).toEqual([
-            "age",
-            "id",
-            "name",
-            "sum",
-          ])
         })
 
-        describe("bigints", () => {
-          let table: Table
-          let view: ViewV2
+        describe("create", () => {
+          it("should persist a new row with only the provided view fields", async () => {
+            const newRow = await config.api.row.save(view.id, {
+              tableId: table!._id,
+              _viewId: view.id,
+              one: "foo",
+              two: "bar",
+              default: "ohnoes",
+            })
 
+            const row = await config.api.row.get(table._id!, newRow._id!)
+            expect(row.one).toBeUndefined()
+            expect(row.two).toEqual("bar")
+            expect(row.default).toEqual("default")
+          })
+
+          it("can't persist readonly columns", async () => {
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                one: { visible: true, readonly: true },
+                two: { visible: true },
+              },
+            })
+            const row = await config.api.row.save(view.id, {
+              tableId: table!._id,
+              _viewId: view.id,
+              one: "foo",
+              two: "bar",
+            })
+
+            expect(row.one).toBeUndefined()
+            expect(row.two).toEqual("bar")
+          })
+
+          it("should not return non-view view fields for a row", async () => {
+            const newRow = await config.api.row.save(view.id, {
+              one: "foo",
+              two: "bar",
+            })
+
+            expect(newRow.one).toBeUndefined()
+            expect(newRow.two).toEqual("bar")
+          })
+
+          it("should not be possible to create a row in a calculation view", async () => {
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+              },
+            })
+
+            await config.api.row.save(
+              view.id,
+              { one: "foo" },
+              {
+                status: 400,
+                body: {
+                  message: "Cannot insert rows through a calculation view",
+                  status: 400,
+                },
+              }
+            )
+          })
+        })
+
+        describe("patch", () => {
+          it("should not return non-view view fields for a row", async () => {
+            const newRow = await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            const row = await config.api.row.patch(view.id, {
+              tableId: table._id!,
+              _id: newRow._id!,
+              _rev: newRow._rev!,
+              one: "newFoo",
+              two: "newBar",
+            })
+
+            expect(row.one).toBeUndefined()
+            expect(row.two).toEqual("newBar")
+          })
+
+          it("should update only the view fields for a row", async () => {
+            const newRow = await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            await config.api.row.patch(view.id, {
+              tableId: table._id!,
+              _id: newRow._id!,
+              _rev: newRow._rev!,
+              one: "newFoo",
+              two: "newBar",
+            })
+
+            const row = await config.api.row.get(table._id!, newRow._id!)
+            expect(row.one).toEqual("foo")
+            expect(row.two).toEqual("newBar")
+          })
+
+          it("can't update readonly columns", async () => {
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {
+                id: { visible: true },
+                one: { visible: true, readonly: true },
+                two: { visible: true },
+              },
+            })
+            const newRow = await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            await config.api.row.patch(view.id, {
+              tableId: table._id!,
+              _id: newRow._id!,
+              _rev: newRow._rev!,
+              one: "newFoo",
+              two: "newBar",
+            })
+
+            const row = await config.api.row.get(table._id!, newRow._id!)
+            expect(row.one).toEqual("foo")
+            expect(row.two).toEqual("newBar")
+          })
+
+          it("should not be possible to modify a row in a calculation view", async () => {
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+              },
+            })
+
+            const newRow = await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+
+            await config.api.row.patch(
+              view.id,
+              {
+                tableId: table._id!,
+                _id: newRow._id!,
+                _rev: newRow._rev!,
+                one: "newFoo",
+                two: "newBar",
+              },
+              {
+                status: 400,
+                body: {
+                  message: "Cannot update rows through a calculation view",
+                },
+              }
+            )
+          })
+        })
+
+        describe("fetch", () => {
+          let view: ViewV2, view2: ViewV2
+          let table: Table, table2: Table
           beforeEach(async () => {
+            table = await config.api.table.save(saveTableRequest())
+            table2 = await config.api.table.save(saveTableRequest())
+            view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              schema: {},
+            })
+            view2 = await config.api.viewV2.create({
+              tableId: table2._id!,
+              name: generator.guid(),
+              schema: {},
+            })
+          })
+
+          it("should be able to list views", async () => {
+            const response = await config.api.viewV2.fetch({
+              status: 200,
+            })
+            expect(response.data.find(v => v.id === view.id)).toBeDefined()
+            expect(response.data.find(v => v.id === view2.id)).toBeDefined()
+          })
+        })
+
+        describe("destroy", () => {
+          const getRowUsage = async () => {
+            const { total } = await config.doInContext(undefined, () =>
+              quotas.getCurrentUsageValues(
+                QuotaUsageType.STATIC,
+                StaticQuotaName.ROWS
+              )
+            )
+            return total
+          }
+
+          const assertRowUsage = async (expected: number) => {
+            const usage = await getRowUsage()
+            expect(usage).toBe(expected)
+          }
+
+          it("should be able to delete a row", async () => {
+            const createdRow = await config.api.row.save(table._id!, {})
+            const rowUsage = await getRowUsage()
+            await config.api.row.bulkDelete(view.id, { rows: [createdRow] })
+            await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
+            await config.api.row.get(table._id!, createdRow._id!, {
+              status: 404,
+            })
+          })
+
+          it("should be able to delete multiple rows", async () => {
+            const rows = await Promise.all([
+              config.api.row.save(table._id!, {}),
+              config.api.row.save(table._id!, {}),
+              config.api.row.save(table._id!, {}),
+            ])
+            const rowUsage = await getRowUsage()
+
+            await config.api.row.bulkDelete(view.id, {
+              rows: [rows[0], rows[2]],
+            })
+
+            await assertRowUsage(isInternal ? rowUsage - 2 : rowUsage)
+
+            await config.api.row.get(table._id!, rows[0]._id!, {
+              status: 404,
+            })
+            await config.api.row.get(table._id!, rows[2]._id!, {
+              status: 404,
+            })
+            await config.api.row.get(table._id!, rows[1]._id!, { status: 200 })
+          })
+
+          it("should not be possible to delete a row in a calculation view", async () => {
+            const row = await config.api.row.save(table._id!, {})
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+              },
+            })
+
+            await config.api.row.delete(
+              view.id,
+              { _id: row._id! },
+              {
+                status: 400,
+                body: {
+                  message: "Cannot delete rows through a calculation view",
+                  status: 400,
+                },
+              }
+            )
+          })
+        })
+
+        describe("read", () => {
+          let view: ViewV2
+          let table: Table
+
+          beforeAll(async () => {
             table = await config.api.table.save(
               saveTableRequest({
                 schema: {
-                  bigint: {
-                    name: "bigint",
-                    type: FieldType.BIGINT,
+                  Country: {
+                    type: FieldType.STRING,
+                    name: "Country",
+                  },
+                  Story: {
+                    type: FieldType.STRING,
+                    name: "Story",
                   },
                 },
               })
@@ -2345,852 +2917,552 @@ datasourceDescribe(
             view = await config.api.viewV2.create({
               tableId: table._id!,
               name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "bigint",
-                },
-              },
-            })
-          })
-
-          it("should not lose precision handling ints larger than JSs int53", async () => {
-            // The sum of the following 3 numbers cannot be represented by
-            // JavaScripts default int53 datatype for numbers, so this is a test
-            // that makes sure we aren't losing precision between the DB and the
-            // user.
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                { bigint: "1000000000000000000" },
-                { bigint: "123" },
-                { bigint: "321" },
-              ],
-            })
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(1)
-            expect(rows[0].sum).toEqual("1000000000000000444")
-          })
-
-          it("should be able to handle up to 2**63 - 1 bigints", async () => {
-            await config.api.row.bulkImport(table._id!, {
-              rows: [{ bigint: "9223372036854775806" }, { bigint: "1" }],
-            })
-
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(1)
-            expect(rows[0].sum).toEqual("9223372036854775807")
-          })
-        })
-      })
-    })
-
-    describe("row operations", () => {
-      let table: Table, view: ViewV2
-      beforeEach(async () => {
-        table = await config.api.table.save(
-          saveTableRequest({
-            schema: {
-              one: { type: FieldType.STRING, name: "one" },
-              two: { type: FieldType.STRING, name: "two" },
-              default: {
-                type: FieldType.STRING,
-                name: "default",
-                default: "default",
-              },
-            },
-          })
-        )
-        view = await config.api.viewV2.create({
-          tableId: table._id!,
-          name: generator.guid(),
-          schema: {
-            id: { visible: true },
-            two: { visible: true },
-          },
-        })
-      })
-
-      describe("create", () => {
-        it("should persist a new row with only the provided view fields", async () => {
-          const newRow = await config.api.row.save(view.id, {
-            tableId: table!._id,
-            _viewId: view.id,
-            one: "foo",
-            two: "bar",
-            default: "ohnoes",
-          })
-
-          const row = await config.api.row.get(table._id!, newRow._id!)
-          expect(row.one).toBeUndefined()
-          expect(row.two).toEqual("bar")
-          expect(row.default).toEqual("default")
-        })
-
-        it("can't persist readonly columns", async () => {
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              one: { visible: true, readonly: true },
-              two: { visible: true },
-            },
-          })
-          const row = await config.api.row.save(view.id, {
-            tableId: table!._id,
-            _viewId: view.id,
-            one: "foo",
-            two: "bar",
-          })
-
-          expect(row.one).toBeUndefined()
-          expect(row.two).toEqual("bar")
-        })
-
-        it("should not return non-view view fields for a row", async () => {
-          const newRow = await config.api.row.save(view.id, {
-            one: "foo",
-            two: "bar",
-          })
-
-          expect(newRow.one).toBeUndefined()
-          expect(newRow.two).toEqual("bar")
-        })
-
-        it("should not be possible to create a row in a calculation view", async () => {
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-            },
-          })
-
-          await config.api.row.save(
-            view.id,
-            { one: "foo" },
-            {
-              status: 400,
-              body: {
-                message: "Cannot insert rows through a calculation view",
-                status: 400,
-              },
-            }
-          )
-        })
-      })
-
-      describe("patch", () => {
-        it("should not return non-view view fields for a row", async () => {
-          const newRow = await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          const row = await config.api.row.patch(view.id, {
-            tableId: table._id!,
-            _id: newRow._id!,
-            _rev: newRow._rev!,
-            one: "newFoo",
-            two: "newBar",
-          })
-
-          expect(row.one).toBeUndefined()
-          expect(row.two).toEqual("newBar")
-        })
-
-        it("should update only the view fields for a row", async () => {
-          const newRow = await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          await config.api.row.patch(view.id, {
-            tableId: table._id!,
-            _id: newRow._id!,
-            _rev: newRow._rev!,
-            one: "newFoo",
-            two: "newBar",
-          })
-
-          const row = await config.api.row.get(table._id!, newRow._id!)
-          expect(row.one).toEqual("foo")
-          expect(row.two).toEqual("newBar")
-        })
-
-        it("can't update readonly columns", async () => {
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              one: { visible: true, readonly: true },
-              two: { visible: true },
-            },
-          })
-          const newRow = await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          await config.api.row.patch(view.id, {
-            tableId: table._id!,
-            _id: newRow._id!,
-            _rev: newRow._rev!,
-            one: "newFoo",
-            two: "newBar",
-          })
-
-          const row = await config.api.row.get(table._id!, newRow._id!)
-          expect(row.one).toEqual("foo")
-          expect(row.two).toEqual("newBar")
-        })
-
-        it("should not be possible to modify a row in a calculation view", async () => {
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-            },
-          })
-
-          const newRow = await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-
-          await config.api.row.patch(
-            view.id,
-            {
-              tableId: table._id!,
-              _id: newRow._id!,
-              _rev: newRow._rev!,
-              one: "newFoo",
-              two: "newBar",
-            },
-            {
-              status: 400,
-              body: {
-                message: "Cannot update rows through a calculation view",
-              },
-            }
-          )
-        })
-      })
-
-      describe("destroy", () => {
-        const getRowUsage = async () => {
-          const { total } = await config.doInContext(undefined, () =>
-            quotas.getCurrentUsageValues(
-              QuotaUsageType.STATIC,
-              StaticQuotaName.ROWS
-            )
-          )
-          return total
-        }
-
-        const assertRowUsage = async (expected: number) => {
-          const usage = await getRowUsage()
-          expect(usage).toBe(expected)
-        }
-
-        it("should be able to delete a row", async () => {
-          const createdRow = await config.api.row.save(table._id!, {})
-          const rowUsage = await getRowUsage()
-          await config.api.row.bulkDelete(view.id, { rows: [createdRow] })
-          await assertRowUsage(isInternal ? rowUsage - 1 : rowUsage)
-          await config.api.row.get(table._id!, createdRow._id!, {
-            status: 404,
-          })
-        })
-
-        it("should be able to delete multiple rows", async () => {
-          const rows = await Promise.all([
-            config.api.row.save(table._id!, {}),
-            config.api.row.save(table._id!, {}),
-            config.api.row.save(table._id!, {}),
-          ])
-          const rowUsage = await getRowUsage()
-
-          await config.api.row.bulkDelete(view.id, { rows: [rows[0], rows[2]] })
-
-          await assertRowUsage(isInternal ? rowUsage - 2 : rowUsage)
-
-          await config.api.row.get(table._id!, rows[0]._id!, {
-            status: 404,
-          })
-          await config.api.row.get(table._id!, rows[2]._id!, {
-            status: 404,
-          })
-          await config.api.row.get(table._id!, rows[1]._id!, { status: 200 })
-        })
-
-        it("should not be possible to delete a row in a calculation view", async () => {
-          const row = await config.api.row.save(table._id!, {})
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-            },
-          })
-
-          await config.api.row.delete(
-            view.id,
-            { _id: row._id! },
-            {
-              status: 400,
-              body: {
-                message: "Cannot delete rows through a calculation view",
-                status: 400,
-              },
-            }
-          )
-        })
-      })
-
-      describe("read", () => {
-        let view: ViewV2
-        let table: Table
-
-        beforeAll(async () => {
-          table = await config.api.table.save(
-            saveTableRequest({
               schema: {
+                id: { visible: true },
                 Country: {
-                  type: FieldType.STRING,
-                  name: "Country",
-                },
-                Story: {
-                  type: FieldType.STRING,
-                  name: "Story",
+                  visible: true,
                 },
               },
             })
-          )
+          })
 
-          view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            schema: {
-              id: { visible: true },
-              Country: {
-                visible: true,
-              },
-            },
+          it("views have extra data trimmed", async () => {
+            let row = await config.api.row.save(view.id, {
+              Country: "Aussy",
+              Story: "aaaaa",
+            })
+
+            row = await config.api.row.get(table._id!, row._id!)
+            expect(row.Story).toBeUndefined()
+            expect(row.Country).toEqual("Aussy")
           })
         })
 
-        it("views have extra data trimmed", async () => {
-          let row = await config.api.row.save(view.id, {
-            Country: "Aussy",
-            Story: "aaaaa",
-          })
-
-          row = await config.api.row.get(table._id!, row._id!)
-          expect(row.Story).toBeUndefined()
-          expect(row.Country).toEqual("Aussy")
-        })
-      })
-
-      describe("search", () => {
-        it("returns empty rows from view when no schema is passed", async () => {
-          const rows = await Promise.all(
-            Array.from({ length: 10 }, () =>
-              config.api.row.save(table._id!, {})
+        describe("search", () => {
+          it("returns empty rows from view when no schema is passed", async () => {
+            const rows = await Promise.all(
+              Array.from({ length: 10 }, () =>
+                config.api.row.save(table._id!, {})
+              )
             )
-          )
-          const response = await config.api.viewV2.search(view.id)
-          expect(response.rows).toHaveLength(10)
-          expect(response).toEqual({
-            rows: expect.arrayContaining(
-              rows.map(r => ({
-                _viewId: view.id,
-                tableId: table._id,
-                id: r.id,
-                _id: r._id,
-                _rev: r._rev,
-                ...(isInternal
-                  ? {
-                      type: "row",
-                      updatedAt: expect.any(String),
-                      createdAt: expect.any(String),
-                    }
-                  : {}),
-              }))
-            ),
-            ...(isInternal
-              ? {}
-              : {
-                  hasNextPage: false,
-                }),
-          })
-        })
-
-        it("searching respects the view filters", async () => {
-          await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          const two = await config.api.row.save(table._id!, {
-            one: "foo2",
-            two: "bar2",
-          })
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "two",
-                      value: "bar2",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              id: { visible: true },
-              one: { visible: false },
-              two: { visible: true },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id)
-          expect(response.rows).toHaveLength(1)
-          expect(response).toEqual({
-            rows: expect.arrayContaining([
-              {
-                _viewId: view.id,
-                tableId: table._id,
-                id: two.id,
-                two: two.two,
-                _id: two._id,
-                _rev: two._rev,
-                ...(isInternal
-                  ? {
-                      type: "row",
-                      createdAt: expect.any(String),
-                      updatedAt: expect.any(String),
-                    }
-                  : {}),
-              },
-            ]),
-            ...(isInternal
-              ? {}
-              : {
-                  hasNextPage: false,
-                }),
-          })
-        })
-
-        it("views filters are respected even if the column is hidden", async () => {
-          await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          const two = await config.api.row.save(table._id!, {
-            one: "foo2",
-            two: "bar2",
-          })
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "two",
-                      value: "bar2",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              id: { visible: true },
-              one: { visible: false },
-              two: { visible: false },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id)
-          expect(response.rows).toHaveLength(1)
-          expect(response.rows).toEqual([
-            expect.objectContaining({ _id: two._id }),
-          ])
-        })
-
-        it("views without data can be returned", async () => {
-          const response = await config.api.viewV2.search(view.id)
-          expect(response.rows).toHaveLength(0)
-        })
-
-        it("respects the limit parameter", async () => {
-          await Promise.all(
-            Array.from({ length: 10 }, () =>
-              config.api.row.save(table._id!, {})
-            )
-          )
-          const limit = generator.integer({ min: 1, max: 8 })
-          const response = await config.api.viewV2.search(view.id, {
-            limit,
-            query: {},
-          })
-          expect(response.rows).toHaveLength(limit)
-        })
-
-        it("can handle pagination", async () => {
-          await Promise.all(
-            Array.from({ length: 10 }, () =>
-              config.api.row.save(table._id!, {})
-            )
-          )
-          const rows = (await config.api.viewV2.search(view.id)).rows
-
-          const page1 = await config.api.viewV2.search(view.id, {
-            paginate: true,
-            limit: 4,
-            query: {},
-            countRows: true,
-          })
-          expect(page1).toEqual({
-            rows: expect.arrayContaining(rows.slice(0, 4)),
-            hasNextPage: true,
-            bookmark: expect.anything(),
-            totalRows: 10,
-          })
-
-          const page2 = await config.api.viewV2.search(view.id, {
-            paginate: true,
-            limit: 4,
-            bookmark: page1.bookmark,
-            query: {},
-            countRows: true,
-          })
-          expect(page2).toEqual({
-            rows: expect.arrayContaining(rows.slice(4, 8)),
-            hasNextPage: true,
-            bookmark: expect.anything(),
-            totalRows: 10,
-          })
-
-          const page3 = await config.api.viewV2.search(view.id, {
-            paginate: true,
-            limit: 4,
-            bookmark: page2.bookmark,
-            query: {},
-            countRows: true,
-          })
-          const expectation: SearchResponse<Row> = {
-            rows: expect.arrayContaining(rows.slice(8)),
-            hasNextPage: false,
-            totalRows: 10,
-          }
-          expect(page3).toEqual(expectation)
-        })
-
-        const sortTestOptions: [
-          {
-            field: string
-            order?: SortOrder
-            type?: SortType
-          },
-          string[]
-        ][] = [
-          [
-            {
-              field: "name",
-              order: SortOrder.ASCENDING,
-              type: SortType.STRING,
-            },
-            ["Alice", "Bob", "Charly", "Danny"],
-          ],
-          [
-            {
-              field: "name",
-            },
-            ["Alice", "Bob", "Charly", "Danny"],
-          ],
-          [
-            {
-              field: "name",
-              order: SortOrder.DESCENDING,
-            },
-            ["Danny", "Charly", "Bob", "Alice"],
-          ],
-          [
-            {
-              field: "name",
-              order: SortOrder.DESCENDING,
-              type: SortType.STRING,
-            },
-            ["Danny", "Charly", "Bob", "Alice"],
-          ],
-          [
-            {
-              field: "age",
-              order: SortOrder.ASCENDING,
-              type: SortType.NUMBER,
-            },
-            ["Danny", "Alice", "Charly", "Bob"],
-          ],
-          [
-            {
-              field: "age",
-              order: SortOrder.ASCENDING,
-            },
-            ["Danny", "Alice", "Charly", "Bob"],
-          ],
-          [
-            {
-              field: "age",
-              order: SortOrder.DESCENDING,
-            },
-            ["Bob", "Charly", "Alice", "Danny"],
-          ],
-          [
-            {
-              field: "age",
-              order: SortOrder.DESCENDING,
-              type: SortType.NUMBER,
-            },
-            ["Bob", "Charly", "Alice", "Danny"],
-          ],
-        ]
-
-        describe("sorting", () => {
-          let table: Table
-          const viewSchema = {
-            id: { visible: true },
-            age: { visible: true },
-            name: { visible: true },
-          }
-
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                type: "table",
-                schema: {
-                  name: {
-                    type: FieldType.STRING,
-                    name: "name",
-                  },
-                  surname: {
-                    type: FieldType.STRING,
-                    name: "surname",
-                  },
-                  age: {
-                    type: FieldType.NUMBER,
-                    name: "age",
-                  },
-                  address: {
-                    type: FieldType.STRING,
-                    name: "address",
-                  },
-                  jobTitle: {
-                    type: FieldType.STRING,
-                    name: "jobTitle",
-                  },
-                },
-              })
-            )
-
-            const users = [
-              { name: "Alice", age: 25 },
-              { name: "Bob", age: 30 },
-              { name: "Charly", age: 27 },
-              { name: "Danny", age: 15 },
-            ]
-            await Promise.all(
-              users.map(u =>
-                config.api.row.save(table._id!, {
+            const response = await config.api.viewV2.search(view.id)
+            expect(response.rows).toHaveLength(10)
+            expect(response).toEqual({
+              rows: expect.arrayContaining(
+                rows.map(r => ({
+                  _viewId: view.id,
                   tableId: table._id,
-                  ...u,
+                  id: r.id,
+                  _id: r._id,
+                  _rev: r._rev,
+                  ...(isInternal
+                    ? {
+                        type: "row",
+                        updatedAt: expect.any(String),
+                        createdAt: expect.any(String),
+                      }
+                    : {}),
+                }))
+              ),
+              ...(isInternal
+                ? {}
+                : {
+                    hasNextPage: false,
+                  }),
+            })
+          })
+
+          it("searching respects the view filters", async () => {
+            await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            const two = await config.api.row.save(table._id!, {
+              one: "foo2",
+              two: "bar2",
+            })
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "two",
+                        value: "bar2",
+                      },
+                    ],
+                  },
+                ],
+              },
+              schema: {
+                id: { visible: true },
+                one: { visible: false },
+                two: { visible: true },
+              },
+            })
+
+            const response = await config.api.viewV2.search(view.id)
+            expect(response.rows).toHaveLength(1)
+            expect(response).toEqual({
+              rows: expect.arrayContaining([
+                {
+                  _viewId: view.id,
+                  tableId: table._id,
+                  id: two.id,
+                  two: two.two,
+                  _id: two._id,
+                  _rev: two._rev,
+                  ...(isInternal
+                    ? {
+                        type: "row",
+                        createdAt: expect.any(String),
+                        updatedAt: expect.any(String),
+                      }
+                    : {}),
+                },
+              ]),
+              ...(isInternal
+                ? {}
+                : {
+                    hasNextPage: false,
+                  }),
+            })
+          })
+
+          it("views filters are respected even if the column is hidden", async () => {
+            await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            const two = await config.api.row.save(table._id!, {
+              one: "foo2",
+              two: "bar2",
+            })
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "two",
+                        value: "bar2",
+                      },
+                    ],
+                  },
+                ],
+              },
+              schema: {
+                id: { visible: true },
+                one: { visible: false },
+                two: { visible: false },
+              },
+            })
+
+            const response = await config.api.viewV2.search(view.id)
+            expect(response.rows).toHaveLength(1)
+            expect(response.rows).toEqual([
+              expect.objectContaining({ _id: two._id }),
+            ])
+          })
+
+          it("views without data can be returned", async () => {
+            const response = await config.api.viewV2.search(view.id)
+            expect(response.rows).toHaveLength(0)
+          })
+
+          it("respects the limit parameter", async () => {
+            await Promise.all(
+              Array.from({ length: 10 }, () =>
+                config.api.row.save(table._id!, {})
+              )
+            )
+            const limit = generator.integer({ min: 1, max: 8 })
+            const response = await config.api.viewV2.search(view.id, {
+              limit,
+              query: {},
+            })
+            expect(response.rows).toHaveLength(limit)
+          })
+
+          it("can handle pagination", async () => {
+            await Promise.all(
+              Array.from({ length: 10 }, () =>
+                config.api.row.save(table._id!, {})
+              )
+            )
+            const rows = (await config.api.viewV2.search(view.id)).rows
+
+            const page1 = await config.api.viewV2.search(view.id, {
+              paginate: true,
+              limit: 4,
+              query: {},
+              countRows: true,
+            })
+            expect(page1).toEqual({
+              rows: expect.arrayContaining(rows.slice(0, 4)),
+              hasNextPage: true,
+              bookmark: expect.anything(),
+              totalRows: 10,
+            })
+
+            const page2 = await config.api.viewV2.search(view.id, {
+              paginate: true,
+              limit: 4,
+              bookmark: page1.bookmark,
+              query: {},
+              countRows: true,
+            })
+            expect(page2).toEqual({
+              rows: expect.arrayContaining(rows.slice(4, 8)),
+              hasNextPage: true,
+              bookmark: expect.anything(),
+              totalRows: 10,
+            })
+
+            const page3 = await config.api.viewV2.search(view.id, {
+              paginate: true,
+              limit: 4,
+              bookmark: page2.bookmark,
+              query: {},
+              countRows: true,
+            })
+            const expectation: SearchResponse<Row> = {
+              rows: expect.arrayContaining(rows.slice(8)),
+              hasNextPage: false,
+              totalRows: 10,
+            }
+            expect(page3).toEqual(expectation)
+          })
+
+          const sortTestOptions: [
+            {
+              field: string
+              order?: SortOrder
+              type?: SortType
+            },
+            string[]
+          ][] = [
+            [
+              {
+                field: "name",
+                order: SortOrder.ASCENDING,
+                type: SortType.STRING,
+              },
+              ["Alice", "Bob", "Charly", "Danny"],
+            ],
+            [
+              {
+                field: "name",
+              },
+              ["Alice", "Bob", "Charly", "Danny"],
+            ],
+            [
+              {
+                field: "name",
+                order: SortOrder.DESCENDING,
+              },
+              ["Danny", "Charly", "Bob", "Alice"],
+            ],
+            [
+              {
+                field: "name",
+                order: SortOrder.DESCENDING,
+                type: SortType.STRING,
+              },
+              ["Danny", "Charly", "Bob", "Alice"],
+            ],
+            [
+              {
+                field: "age",
+                order: SortOrder.ASCENDING,
+                type: SortType.NUMBER,
+              },
+              ["Danny", "Alice", "Charly", "Bob"],
+            ],
+            [
+              {
+                field: "age",
+                order: SortOrder.ASCENDING,
+              },
+              ["Danny", "Alice", "Charly", "Bob"],
+            ],
+            [
+              {
+                field: "age",
+                order: SortOrder.DESCENDING,
+              },
+              ["Bob", "Charly", "Alice", "Danny"],
+            ],
+            [
+              {
+                field: "age",
+                order: SortOrder.DESCENDING,
+                type: SortType.NUMBER,
+              },
+              ["Bob", "Charly", "Alice", "Danny"],
+            ],
+          ]
+
+          describe("sorting", () => {
+            let table: Table
+            const viewSchema = {
+              id: { visible: true },
+              age: { visible: true },
+              name: { visible: true },
+            }
+
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  type: "table",
+                  schema: {
+                    name: {
+                      type: FieldType.STRING,
+                      name: "name",
+                    },
+                    surname: {
+                      type: FieldType.STRING,
+                      name: "surname",
+                    },
+                    age: {
+                      type: FieldType.NUMBER,
+                      name: "age",
+                    },
+                    address: {
+                      type: FieldType.STRING,
+                      name: "address",
+                    },
+                    jobTitle: {
+                      type: FieldType.STRING,
+                      name: "jobTitle",
+                    },
+                  },
                 })
               )
+
+              const users = [
+                { name: "Alice", age: 25 },
+                { name: "Bob", age: 30 },
+                { name: "Charly", age: 27 },
+                { name: "Danny", age: 15 },
+              ]
+              await Promise.all(
+                users.map(u =>
+                  config.api.row.save(table._id!, {
+                    tableId: table._id,
+                    ...u,
+                  })
+                )
+              )
+            })
+
+            it.each(sortTestOptions)(
+              "allow sorting (%s)",
+              async (sortParams, expected) => {
+                const view = await config.api.viewV2.create({
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  sort: sortParams,
+                  schema: viewSchema,
+                })
+
+                const response = await config.api.viewV2.search(view.id)
+
+                expect(response.rows).toHaveLength(4)
+                expect(response.rows).toEqual(
+                  expected.map(name => expect.objectContaining({ name }))
+                )
+              }
+            )
+
+            it.each(sortTestOptions)(
+              "allow override the default view sorting (%s)",
+              async (sortParams, expected) => {
+                const view = await config.api.viewV2.create({
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  sort: {
+                    field: "name",
+                    order: SortOrder.ASCENDING,
+                    type: SortType.STRING,
+                  },
+                  schema: viewSchema,
+                })
+
+                const response = await config.api.viewV2.search(view.id, {
+                  sort: sortParams.field,
+                  sortOrder: sortParams.order,
+                  sortType: sortParams.type,
+                  query: {},
+                })
+
+                expect(response.rows).toHaveLength(4)
+                expect(response.rows).toEqual(
+                  expected.map(name => expect.objectContaining({ name }))
+                )
+              }
             )
           })
 
-          it.each(sortTestOptions)(
-            "allow sorting (%s)",
-            async (sortParams, expected) => {
-              const view = await config.api.viewV2.create({
-                tableId: table._id!,
-                name: generator.guid(),
-                sort: sortParams,
-                schema: viewSchema,
+          it("can query on top of the view filters", async () => {
+            await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            await config.api.row.save(table._id!, {
+              one: "foo2",
+              two: "bar2",
+            })
+            const three = await config.api.row.save(table._id!, {
+              one: "foo3",
+              two: "bar3",
+            })
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.NOT_EQUAL,
+                        field: "one",
+                        value: "foo2",
+                      },
+                    ],
+                  },
+                ],
+              },
+              schema: {
+                id: { visible: true },
+                one: { visible: true },
+                two: { visible: true },
+              },
+            })
+
+            const response = await config.api.viewV2.search(view.id, {
+              query: {
+                [BasicOperator.EQUAL]: {
+                  two: "bar3",
+                },
+                [BasicOperator.NOT_EMPTY]: {
+                  two: null,
+                },
+              },
+            })
+            expect(response.rows).toHaveLength(1)
+            expect(response.rows).toEqual(
+              expect.arrayContaining([
+                expect.objectContaining({ _id: three._id }),
+              ])
+            )
+          })
+
+          it("can query on top of the view filters (using or filters)", async () => {
+            const one = await config.api.row.save(table._id!, {
+              one: "foo",
+              two: "bar",
+            })
+            await config.api.row.save(table._id!, {
+              one: "foo2",
+              two: "bar2",
+            })
+            const three = await config.api.row.save(table._id!, {
+              one: "foo3",
+              two: "bar3",
+            })
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.NOT_EQUAL,
+                        field: "one",
+                        value: "foo2",
+                      },
+                    ],
+                  },
+                ],
+              },
+              schema: {
+                id: { visible: true },
+                one: { visible: false },
+                two: { visible: true },
+              },
+            })
+
+            const response = await config.api.viewV2.search(view.id, {
+              query: {
+                allOr: true,
+                [BasicOperator.NOT_EQUAL]: {
+                  two: "bar",
+                },
+                [BasicOperator.NOT_EMPTY]: {
+                  two: null,
+                },
+              },
+            })
+            expect(response.rows).toHaveLength(2)
+            expect(response.rows).toEqual(
+              expect.arrayContaining([
+                expect.objectContaining({ _id: one._id }),
+                expect.objectContaining({ _id: three._id }),
+              ])
+            )
+          })
+
+          it.each([true, false])(
+            "can filter a view without a view filter",
+            async allOr => {
+              const one = await config.api.row.save(table._id!, {
+                one: "foo",
+                two: "bar",
+              })
+              await config.api.row.save(table._id!, {
+                one: "foo2",
+                two: "bar2",
               })
 
-              const response = await config.api.viewV2.search(view.id)
-
-              expect(response.rows).toHaveLength(4)
-              expect(response.rows).toEqual(
-                expected.map(name => expect.objectContaining({ name }))
-              )
-            }
-          )
-
-          it.each(sortTestOptions)(
-            "allow override the default view sorting (%s)",
-            async (sortParams, expected) => {
               const view = await config.api.viewV2.create({
                 tableId: table._id!,
                 name: generator.guid(),
-                sort: {
-                  field: "name",
-                  order: SortOrder.ASCENDING,
-                  type: SortType.STRING,
+                schema: {
+                  id: { visible: true },
+                  one: { visible: false },
+                  two: { visible: true },
                 },
-                schema: viewSchema,
               })
 
               const response = await config.api.viewV2.search(view.id, {
-                sort: sortParams.field,
-                sortOrder: sortParams.order,
-                sortType: sortParams.type,
-                query: {},
+                query: {
+                  allOr,
+                  equal: {
+                    two: "bar",
+                  },
+                },
               })
-
-              expect(response.rows).toHaveLength(4)
-              expect(response.rows).toEqual(
-                expected.map(name => expect.objectContaining({ name }))
-              )
+              expect(response.rows).toHaveLength(1)
+              expect(response.rows).toEqual([
+                expect.objectContaining({ _id: one._id }),
+              ])
             }
           )
-        })
 
-        it("can query on top of the view filters", async () => {
-          await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          await config.api.row.save(table._id!, {
-            one: "foo2",
-            two: "bar2",
-          })
-          const three = await config.api.row.save(table._id!, {
-            one: "foo3",
-            two: "bar3",
-          })
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.NOT_EQUAL,
-                      field: "one",
-                      value: "foo2",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              id: { visible: true },
-              one: { visible: true },
-              two: { visible: true },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id, {
-            query: {
-              [BasicOperator.EQUAL]: {
-                two: "bar3",
-              },
-              [BasicOperator.NOT_EMPTY]: {
-                two: null,
-              },
-            },
-          })
-          expect(response.rows).toHaveLength(1)
-          expect(response.rows).toEqual(
-            expect.arrayContaining([
-              expect.objectContaining({ _id: three._id }),
-            ])
-          )
-        })
-
-        it("can query on top of the view filters (using or filters)", async () => {
-          const one = await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          await config.api.row.save(table._id!, {
-            one: "foo2",
-            two: "bar2",
-          })
-          const three = await config.api.row.save(table._id!, {
-            one: "foo3",
-            two: "bar3",
-          })
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.NOT_EQUAL,
-                      field: "one",
-                      value: "foo2",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              id: { visible: true },
-              one: { visible: false },
-              two: { visible: true },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id, {
-            query: {
-              allOr: true,
-              [BasicOperator.NOT_EQUAL]: {
-                two: "bar",
-              },
-              [BasicOperator.NOT_EMPTY]: {
-                two: null,
-              },
-            },
-          })
-          expect(response.rows).toHaveLength(2)
-          expect(response.rows).toEqual(
-            expect.arrayContaining([
-              expect.objectContaining({ _id: one._id }),
-              expect.objectContaining({ _id: three._id }),
-            ])
-          )
-        })
-
-        it.each([true, false])(
-          "can filter a view without a view filter",
-          async allOr => {
-            const one = await config.api.row.save(table._id!, {
+          it.each([true, false])("cannot bypass a view filter", async allOr => {
+            await config.api.row.save(table._id!, {
               one: "foo",
               two: "bar",
             })
@@ -3202,6 +3474,19 @@ datasourceDescribe(
             const view = await config.api.viewV2.create({
               tableId: table._id!,
               name: generator.guid(),
+              queryUI: {
+                groups: [
+                  {
+                    filters: [
+                      {
+                        operator: BasicOperator.EQUAL,
+                        field: "two",
+                        value: "bar2",
+                      },
+                    ],
+                  },
+                ],
+              },
               schema: {
                 id: { visible: true },
                 one: { visible: false },
@@ -3217,408 +3502,330 @@ datasourceDescribe(
                 },
               },
             })
-            expect(response.rows).toHaveLength(1)
-            expect(response.rows).toEqual([
-              expect.objectContaining({ _id: one._id }),
-            ])
-          }
-        )
-
-        it.each([true, false])("cannot bypass a view filter", async allOr => {
-          await config.api.row.save(table._id!, {
-            one: "foo",
-            two: "bar",
-          })
-          await config.api.row.save(table._id!, {
-            one: "foo2",
-            two: "bar2",
+            expect(response.rows).toHaveLength(0)
           })
 
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "two",
-                      value: "bar2",
-                    },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              id: { visible: true },
-              one: { visible: false },
-              two: { visible: true },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id, {
-            query: {
-              allOr,
-              equal: {
-                two: "bar",
-              },
-            },
-          })
-          expect(response.rows).toHaveLength(0)
-        })
-
-        describe("foreign relationship columns", () => {
-          const createMainTable = async (
-            links: {
-              name: string
-              tableId: string
-              fk: string
-            }[]
-          ) => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: { title: { name: "title", type: FieldType.STRING } },
-              })
-            )
-            await config.api.table.save({
-              ...table,
-              schema: {
-                ...table.schema,
-                ...links.reduce<TableSchema>((acc, c) => {
-                  acc[c.name] = {
-                    name: c.name,
-                    relationshipType: RelationshipType.ONE_TO_MANY,
-                    type: FieldType.LINK,
-                    tableId: c.tableId,
-                    fieldName: c.fk,
-                    constraints: { type: "array" },
-                  }
-                  return acc
-                }, {}),
-              },
-            })
-            return table
-          }
-          const createAuxTable = (schema: TableSchema) =>
-            config.api.table.save(
-              saveTableRequest({
-                primaryDisplay: "name",
-                schema: {
-                  ...schema,
-                  name: { name: "name", type: FieldType.STRING },
-                },
-              })
-            )
-
-          it("returns squashed fields respecting the view config", async () => {
-            const auxTable = await createAuxTable({
-              age: { name: "age", type: FieldType.NUMBER },
-            })
-            const auxRow = await config.api.row.save(auxTable._id!, {
-              name: generator.name(),
-              age: generator.age(),
-            })
-
-            const table = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
-            ])
-            await config.api.row.save(table._id!, {
-              title: generator.word(),
-              aux: [auxRow],
-            })
-
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              schema: {
-                title: { visible: true },
-                aux: {
-                  visible: true,
-                  columns: {
-                    name: { visible: false, readonly: false },
-                    age: { visible: true, readonly: true },
-                  },
-                },
-              },
-            })
-
-            const response = await config.api.viewV2.search(view.id)
-            expect(response.rows).toEqual([
-              expect.objectContaining({
-                aux: [
-                  {
-                    _id: auxRow._id,
-                    primaryDisplay: auxRow.name,
-                    age: auxRow.age,
-                  },
-                ],
-              }),
-            ])
-          })
-
-          it("enriches squashed fields", async () => {
-            const auxTable = await createAuxTable({
-              user: {
-                name: "user",
-                type: FieldType.BB_REFERENCE_SINGLE,
-                subtype: BBReferenceFieldSubType.USER,
-                constraints: { presence: true },
-              },
-            })
-            const table = await createMainTable([
-              { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
-            ])
-
-            const user = config.getUser()
-            const auxRow = await config.api.row.save(auxTable._id!, {
-              name: generator.name(),
-              user: user._id,
-            })
-            await config.api.row.save(table._id!, {
-              title: generator.word(),
-              aux: [auxRow],
-            })
-
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              schema: {
-                title: { visible: true },
-                aux: {
-                  visible: true,
-                  columns: {
-                    name: { visible: true, readonly: true },
-                    user: { visible: true, readonly: true },
-                  },
-                },
-              },
-            })
-
-            const response = await config.api.viewV2.search(view.id)
-
-            expect(response.rows).toEqual([
-              expect.objectContaining({
-                aux: [
-                  {
-                    _id: auxRow._id,
-                    primaryDisplay: auxRow.name,
-                    name: auxRow.name,
-                    user: {
-                      _id: user._id,
-                      email: user.email,
-                      firstName: user.firstName,
-                      lastName: user.lastName,
-                      primaryDisplay: user.email,
-                    },
-                  },
-                ],
-              }),
-            ])
-          })
-        })
-
-        describe("calculations", () => {
-          let table: Table
-          let rows: Row[]
-
-          beforeAll(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  quantity: {
-                    type: FieldType.NUMBER,
-                    name: "quantity",
-                  },
-                  price: {
-                    type: FieldType.NUMBER,
-                    name: "price",
-                  },
-                },
-              })
-            )
-
-            rows = await Promise.all(
-              Array.from({ length: 10 }, () =>
-                config.api.row.save(table._id!, {
-                  quantity: generator.natural({ min: 1, max: 10 }),
-                  price: generator.natural({ min: 1, max: 10 }),
+          describe("foreign relationship columns", () => {
+            const createMainTable = async (
+              links: {
+                name: string
+                tableId: string
+                fk: string
+              }[]
+            ) => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: { title: { name: "title", type: FieldType.STRING } },
                 })
               )
-            )
-          })
-
-          it("should be able to search by calculations", async () => {
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              type: ViewV2Type.CALCULATION,
-              name: generator.guid(),
-              schema: {
-                "Quantity Sum": {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "quantity",
-                },
-              },
-            })
-
-            const response = await config.api.viewV2.search(view.id, {
-              query: {},
-            })
-
-            expect(response.rows).toHaveLength(1)
-            expect(response.rows).toEqual(
-              expect.arrayContaining([
-                expect.objectContaining({
-                  "Quantity Sum": rows.reduce((acc, r) => acc + r.quantity, 0),
-                }),
-              ])
-            )
-
-            // Calculation views do not return rows that can be linked back to
-            // the source table, and so should not have an _id field.
-            for (const row of response.rows) {
-              expect("_id" in row).toBe(false)
-            }
-          })
-
-          it("should be able to group by a basic field", async () => {
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                quantity: {
-                  visible: true,
-                  field: "quantity",
-                },
-                "Total Price": {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "price",
-                },
-              },
-            })
-
-            const response = await config.api.viewV2.search(view.id, {
-              query: {},
-            })
-
-            const priceByQuantity: Record<number, number> = {}
-            for (const row of rows) {
-              priceByQuantity[row.quantity] ??= 0
-              priceByQuantity[row.quantity] += row.price
-            }
-
-            for (const row of response.rows) {
-              expect(row["Total Price"]).toEqual(priceByQuantity[row.quantity])
-            }
-          })
-
-          it.each([
-            CalculationType.COUNT,
-            CalculationType.SUM,
-            CalculationType.AVG,
-            CalculationType.MIN,
-            CalculationType.MAX,
-          ])("should be able to calculate $type", async type => {
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                aggregate: {
-                  visible: true,
-                  calculationType: type,
-                  field: "price",
-                },
-              },
-            })
-
-            const response = await config.api.viewV2.search(view.id, {
-              query: {},
-            })
-
-            function calculate(
-              type: CalculationType,
-              numbers: number[]
-            ): number {
-              switch (type) {
-                case CalculationType.COUNT:
-                  return numbers.length
-                case CalculationType.SUM:
-                  return numbers.reduce((a, b) => a + b, 0)
-                case CalculationType.AVG:
-                  return numbers.reduce((a, b) => a + b, 0) / numbers.length
-                case CalculationType.MIN:
-                  return Math.min(...numbers)
-                case CalculationType.MAX:
-                  return Math.max(...numbers)
-              }
-            }
-
-            const prices = rows.map(row => row.price)
-            const expected = calculate(type, prices)
-            const actual = response.rows[0].aggregate
-
-            if (type === CalculationType.AVG) {
-              // The average calculation can introduce floating point rounding
-              // errors, so we need to compare to within a small margin of
-              // error.
-              expect(actual).toBeCloseTo(expected)
-            } else {
-              expect(actual).toEqual(expected)
-            }
-          })
-
-          it("should be able to do a COUNT(DISTINCT)", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
+              await config.api.table.save({
+                ...table,
                 schema: {
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
+                  ...table.schema,
+                  ...links.reduce<TableSchema>((acc, c) => {
+                    acc[c.name] = {
+                      name: c.name,
+                      relationshipType: RelationshipType.ONE_TO_MANY,
+                      type: FieldType.LINK,
+                      tableId: c.tableId,
+                      fieldName: c.fk,
+                      constraints: { type: "array" },
+                    }
+                    return acc
+                  }, {}),
+                },
+              })
+              return table
+            }
+            const createAuxTable = (schema: TableSchema) =>
+              config.api.table.save(
+                saveTableRequest({
+                  primaryDisplay: "name",
+                  schema: {
+                    ...schema,
+                    name: { name: "name", type: FieldType.STRING },
+                  },
+                })
+              )
+
+            it("returns squashed fields respecting the view config", async () => {
+              const auxTable = await createAuxTable({
+                age: { name: "age", type: FieldType.NUMBER },
+              })
+              const auxRow = await config.api.row.save(auxTable._id!, {
+                name: generator.name(),
+                age: generator.age(),
+              })
+
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+              ])
+              await config.api.row.save(table._id!, {
+                title: generator.word(),
+                aux: [auxRow],
+              })
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                schema: {
+                  title: { visible: true },
+                  aux: {
+                    visible: true,
+                    columns: {
+                      name: { visible: false, readonly: false },
+                      age: { visible: true, readonly: true },
+                    },
                   },
                 },
               })
-            )
 
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                count: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  distinct: true,
-                  field: "name",
-                },
-              },
+              const response = await config.api.viewV2.search(view.id)
+              expect(response.rows).toEqual([
+                expect.objectContaining({
+                  aux: [
+                    {
+                      _id: auxRow._id,
+                      primaryDisplay: auxRow.name,
+                      age: auxRow.age,
+                    },
+                  ],
+                }),
+              ])
             })
 
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                {
-                  name: "John",
+            it("enriches squashed fields", async () => {
+              const auxTable = await createAuxTable({
+                user: {
+                  name: "user",
+                  type: FieldType.BB_REFERENCE_SINGLE,
+                  subtype: BBReferenceFieldSubType.USER,
+                  constraints: { presence: true },
                 },
-                {
-                  name: "John",
-                },
-                {
-                  name: "Sue",
-                },
-              ],
-            })
+              })
+              const table = await createMainTable([
+                { name: "aux", tableId: auxTable._id!, fk: "fk_aux" },
+              ])
 
-            const { rows } = await config.api.row.search(view.id)
-            expect(rows).toHaveLength(1)
-            expect(rows[0].count).toEqual(2)
+              const user = config.getUser()
+              const auxRow = await config.api.row.save(auxTable._id!, {
+                name: generator.name(),
+                user: user._id,
+              })
+              await config.api.row.save(table._id!, {
+                title: generator.word(),
+                aux: [auxRow],
+              })
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                schema: {
+                  title: { visible: true },
+                  aux: {
+                    visible: true,
+                    columns: {
+                      name: { visible: true, readonly: true },
+                      user: { visible: true, readonly: true },
+                    },
+                  },
+                },
+              })
+
+              const response = await config.api.viewV2.search(view.id)
+
+              expect(response.rows).toEqual([
+                expect.objectContaining({
+                  aux: [
+                    {
+                      _id: auxRow._id,
+                      primaryDisplay: auxRow.name,
+                      name: auxRow.name,
+                      user: {
+                        _id: user._id,
+                        email: user.email,
+                        firstName: user.firstName,
+                        lastName: user.lastName,
+                        primaryDisplay: user.email,
+                      },
+                    },
+                  ],
+                }),
+              ])
+            })
           })
 
-          it("should not be able to COUNT(DISTINCT ...) against a non-existent field", async () => {
-            await config.api.viewV2.create(
-              {
+          describe("calculations", () => {
+            let table: Table
+            let rows: Row[]
+
+            beforeAll(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    quantity: {
+                      type: FieldType.NUMBER,
+                      name: "quantity",
+                    },
+                    price: {
+                      type: FieldType.NUMBER,
+                      name: "price",
+                    },
+                  },
+                })
+              )
+
+              rows = await Promise.all(
+                Array.from({ length: 10 }, () =>
+                  config.api.row.save(table._id!, {
+                    quantity: generator.natural({ min: 1, max: 10 }),
+                    price: generator.natural({ min: 1, max: 10 }),
+                  })
+                )
+              )
+            })
+
+            it("should be able to search by calculations", async () => {
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                type: ViewV2Type.CALCULATION,
+                name: generator.guid(),
+                schema: {
+                  "Quantity Sum": {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "quantity",
+                  },
+                },
+              })
+
+              const response = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+
+              expect(response.rows).toHaveLength(1)
+              expect(response.rows).toEqual(
+                expect.arrayContaining([
+                  expect.objectContaining({
+                    "Quantity Sum": rows.reduce(
+                      (acc, r) => acc + r.quantity,
+                      0
+                    ),
+                  }),
+                ])
+              )
+
+              // Calculation views do not return rows that can be linked back to
+              // the source table, and so should not have an _id field.
+              for (const row of response.rows) {
+                expect("_id" in row).toBe(false)
+              }
+            })
+
+            it("should be able to group by a basic field", async () => {
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  quantity: {
+                    visible: true,
+                    field: "quantity",
+                  },
+                  "Total Price": {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "price",
+                  },
+                },
+              })
+
+              const response = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+
+              const priceByQuantity: Record<number, number> = {}
+              for (const row of rows) {
+                priceByQuantity[row.quantity] ??= 0
+                priceByQuantity[row.quantity] += row.price
+              }
+
+              for (const row of response.rows) {
+                expect(row["Total Price"]).toEqual(
+                  priceByQuantity[row.quantity]
+                )
+              }
+            })
+
+            it.each([
+              CalculationType.COUNT,
+              CalculationType.SUM,
+              CalculationType.AVG,
+              CalculationType.MIN,
+              CalculationType.MAX,
+            ])("should be able to calculate $type", async type => {
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  aggregate: {
+                    visible: true,
+                    calculationType: type,
+                    field: "price",
+                  },
+                },
+              })
+
+              const response = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+
+              function calculate(
+                type: CalculationType,
+                numbers: number[]
+              ): number {
+                switch (type) {
+                  case CalculationType.COUNT:
+                    return numbers.length
+                  case CalculationType.SUM:
+                    return numbers.reduce((a, b) => a + b, 0)
+                  case CalculationType.AVG:
+                    return numbers.reduce((a, b) => a + b, 0) / numbers.length
+                  case CalculationType.MIN:
+                    return Math.min(...numbers)
+                  case CalculationType.MAX:
+                    return Math.max(...numbers)
+                }
+              }
+
+              const prices = rows.map(row => row.price)
+              const expected = calculate(type, prices)
+              const actual = response.rows[0].aggregate
+
+              if (type === CalculationType.AVG) {
+                // The average calculation can introduce floating point rounding
+                // errors, so we need to compare to within a small margin of
+                // error.
+                expect(actual).toBeCloseTo(expected)
+              } else {
+                expect(actual).toEqual(expected)
+              }
+            })
+
+            it("should be able to do a COUNT(DISTINCT)", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
                 tableId: table._id!,
                 name: generator.guid(),
                 type: ViewV2Type.CALCULATION,
@@ -3627,71 +3834,474 @@ datasourceDescribe(
                     visible: true,
                     calculationType: CalculationType.COUNT,
                     distinct: true,
-                    field: "does not exist oh no",
-                  },
-                },
-              },
-              {
-                status: 400,
-                body: {
-                  message:
-                    'Calculation field "count" references field "does not exist oh no" which does not exist in the table schema',
-                },
-              }
-            )
-          })
-
-          it("should be able to filter on relationships", async () => {
-            const companies = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  name: {
-                    name: "name",
-                    type: FieldType.STRING,
+                    field: "name",
                   },
                 },
               })
-            )
 
-            const employees = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  age: {
-                    type: FieldType.NUMBER,
-                    name: "age",
-                  },
-                  name: {
-                    type: FieldType.STRING,
-                    name: "name",
-                  },
-                  company: {
-                    type: FieldType.LINK,
-                    name: "company",
-                    tableId: companies._id!,
-                    relationshipType: RelationshipType.ONE_TO_MANY,
-                    fieldName: "company",
-                  },
-                },
-              })
-            )
-
-            const view = await config.api.viewV2.create({
-              tableId: employees._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              queryUI: {
-                groups: [
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
                   {
-                    filters: [
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "company.name",
-                        value: "Aperture Science Laboratories",
-                      },
-                    ],
+                    name: "John",
+                  },
+                  {
+                    name: "John",
+                  },
+                  {
+                    name: "Sue",
                   },
                 ],
-              },
+              })
+
+              const { rows } = await config.api.row.search(view.id)
+              expect(rows).toHaveLength(1)
+              expect(rows[0].count).toEqual(2)
+            })
+
+            it("should not be able to COUNT(DISTINCT ...) against a non-existent field", async () => {
+              await config.api.viewV2.create(
+                {
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  type: ViewV2Type.CALCULATION,
+                  schema: {
+                    count: {
+                      visible: true,
+                      calculationType: CalculationType.COUNT,
+                      distinct: true,
+                      field: "does not exist oh no",
+                    },
+                  },
+                },
+                {
+                  status: 400,
+                  body: {
+                    message:
+                      'Calculation field "count" references field "does not exist oh no" which does not exist in the table schema',
+                  },
+                }
+              )
+            })
+
+            it("should be able to filter on relationships", async () => {
+              const companies = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    name: {
+                      name: "name",
+                      type: FieldType.STRING,
+                    },
+                  },
+                })
+              )
+
+              const employees = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    age: {
+                      type: FieldType.NUMBER,
+                      name: "age",
+                    },
+                    name: {
+                      type: FieldType.STRING,
+                      name: "name",
+                    },
+                    company: {
+                      type: FieldType.LINK,
+                      name: "company",
+                      tableId: companies._id!,
+                      relationshipType: RelationshipType.ONE_TO_MANY,
+                      fieldName: "company",
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
+                tableId: employees._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                queryUI: {
+                  groups: [
+                    {
+                      filters: [
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "company.name",
+                          value: "Aperture Science Laboratories",
+                        },
+                      ],
+                    },
+                  ],
+                },
+                schema: {
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "age",
+                  },
+                },
+              })
+
+              const apertureScience = await config.api.row.save(
+                companies._id!,
+                {
+                  name: "Aperture Science Laboratories",
+                }
+              )
+
+              const blackMesa = await config.api.row.save(companies._id!, {
+                name: "Black Mesa",
+              })
+
+              await Promise.all([
+                config.api.row.save(employees._id!, {
+                  name: "Alice",
+                  age: 25,
+                  company: apertureScience._id,
+                }),
+                config.api.row.save(employees._id!, {
+                  name: "Bob",
+                  age: 30,
+                  company: apertureScience._id,
+                }),
+                config.api.row.save(employees._id!, {
+                  name: "Charly",
+                  age: 27,
+                  company: blackMesa._id,
+                }),
+                config.api.row.save(employees._id!, {
+                  name: "Danny",
+                  age: 15,
+                  company: blackMesa._id,
+                }),
+              ])
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+
+              expect(rows).toHaveLength(1)
+              expect(rows[0].sum).toEqual(55)
+            })
+
+            it("should be able to count non-numeric fields", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    firstName: {
+                      type: FieldType.STRING,
+                      name: "firstName",
+                    },
+                    lastName: {
+                      type: FieldType.STRING,
+                      name: "lastName",
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  count: {
+                    visible: true,
+                    calculationType: CalculationType.COUNT,
+                    field: "firstName",
+                  },
+                },
+              })
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  { firstName: "Jane", lastName: "Smith" },
+                  { firstName: "Jane", lastName: "Doe" },
+                  { firstName: "Alice", lastName: "Smith" },
+                ],
+              })
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+
+              expect(rows).toHaveLength(1)
+              expect(rows[0].count).toEqual(3)
+            })
+
+            it("should be able to filter rows on the view itself", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    quantity: {
+                      type: FieldType.NUMBER,
+                      name: "quantity",
+                    },
+                    price: {
+                      type: FieldType.NUMBER,
+                      name: "price",
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                queryUI: {
+                  groups: [
+                    {
+                      filters: [
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "quantity",
+                          value: 1,
+                        },
+                      ],
+                    },
+                  ],
+                },
+                schema: {
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "price",
+                  },
+                },
+              })
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  {
+                    quantity: 1,
+                    price: 1,
+                  },
+                  {
+                    quantity: 1,
+                    price: 2,
+                  },
+                  {
+                    quantity: 2,
+                    price: 10,
+                  },
+                ],
+              })
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {},
+              })
+              expect(rows).toHaveLength(1)
+              expect(rows[0].sum).toEqual(3)
+            })
+
+            it("should be able to filter on group by fields", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    quantity: {
+                      type: FieldType.NUMBER,
+                      name: "quantity",
+                    },
+                    price: {
+                      type: FieldType.NUMBER,
+                      name: "price",
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  quantity: { visible: true },
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "price",
+                  },
+                },
+              })
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  {
+                    quantity: 1,
+                    price: 1,
+                  },
+                  {
+                    quantity: 1,
+                    price: 2,
+                  },
+                  {
+                    quantity: 2,
+                    price: 10,
+                  },
+                ],
+              })
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {
+                  equal: {
+                    quantity: 1,
+                  },
+                },
+              })
+
+              expect(rows).toHaveLength(1)
+              expect(rows[0].sum).toEqual(3)
+            })
+
+            it("should be able to sort by group by field", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    quantity: {
+                      type: FieldType.NUMBER,
+                      name: "quantity",
+                    },
+                    price: {
+                      type: FieldType.NUMBER,
+                      name: "price",
+                    },
+                  },
+                })
+              )
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  quantity: { visible: true },
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "price",
+                  },
+                },
+              })
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  {
+                    quantity: 1,
+                    price: 1,
+                  },
+                  {
+                    quantity: 1,
+                    price: 2,
+                  },
+                  {
+                    quantity: 2,
+                    price: 10,
+                  },
+                ],
+              })
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {},
+                sort: "quantity",
+                sortOrder: SortOrder.DESCENDING,
+              })
+
+              expect(rows).toEqual([
+                expect.objectContaining({ quantity: 2, sum: 10 }),
+                expect.objectContaining({ quantity: 1, sum: 3 }),
+              ])
+            })
+
+            it("should be able to sort by a calculation", async () => {
+              const table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    quantity: {
+                      type: FieldType.NUMBER,
+                      name: "quantity",
+                    },
+                    price: {
+                      type: FieldType.NUMBER,
+                      name: "price",
+                    },
+                  },
+                })
+              )
+
+              await config.api.row.bulkImport(table._id!, {
+                rows: [
+                  {
+                    quantity: 1,
+                    price: 1,
+                  },
+                  {
+                    quantity: 1,
+                    price: 2,
+                  },
+                  {
+                    quantity: 2,
+                    price: 10,
+                  },
+                ],
+              })
+
+              const view = await config.api.viewV2.create({
+                tableId: table._id!,
+                name: generator.guid(),
+                type: ViewV2Type.CALCULATION,
+                schema: {
+                  quantity: { visible: true },
+                  sum: {
+                    visible: true,
+                    calculationType: CalculationType.SUM,
+                    field: "price",
+                  },
+                },
+              })
+
+              const { rows } = await config.api.viewV2.search(view.id, {
+                query: {},
+                sort: "sum",
+                sortOrder: SortOrder.DESCENDING,
+              })
+
+              expect(rows).toEqual([
+                expect.objectContaining({ quantity: 2, sum: 10 }),
+                expect.objectContaining({ quantity: 1, sum: 3 }),
+              ])
+            })
+          })
+
+          it("should not need required fields to be present", async () => {
+            const table = await config.api.table.save(
+              saveTableRequest({
+                schema: {
+                  name: {
+                    name: "name",
+                    type: FieldType.STRING,
+                    constraints: {
+                      presence: true,
+                    },
+                  },
+                  age: {
+                    name: "age",
+                    type: FieldType.NUMBER,
+                  },
+                },
+              })
+            )
+
+            await Promise.all([
+              config.api.row.save(table._id!, { name: "Steve", age: 30 }),
+              config.api.row.save(table._id!, { name: "Jane", age: 31 }),
+            ])
+
+            const view = await config.api.viewV2.create({
+              tableId: table._id!,
+              name: generator.guid(),
+              type: ViewV2Type.CALCULATION,
               schema: {
                 sum: {
                   visible: true,
@@ -3701,934 +4311,572 @@ datasourceDescribe(
               },
             })
 
-            const apertureScience = await config.api.row.save(companies._id!, {
-              name: "Aperture Science Laboratories",
-            })
-
-            const blackMesa = await config.api.row.save(companies._id!, {
-              name: "Black Mesa",
-            })
-
-            await Promise.all([
-              config.api.row.save(employees._id!, {
-                name: "Alice",
-                age: 25,
-                company: apertureScience._id,
-              }),
-              config.api.row.save(employees._id!, {
-                name: "Bob",
-                age: 30,
-                company: apertureScience._id,
-              }),
-              config.api.row.save(employees._id!, {
-                name: "Charly",
-                age: 27,
-                company: blackMesa._id,
-              }),
-              config.api.row.save(employees._id!, {
-                name: "Danny",
-                age: 15,
-                company: blackMesa._id,
-              }),
-            ])
-
-            const { rows } = await config.api.viewV2.search(view.id, {
+            const response = await config.api.viewV2.search(view.id, {
               query: {},
             })
 
-            expect(rows).toHaveLength(1)
-            expect(rows[0].sum).toEqual(55)
+            expect(response.rows).toHaveLength(1)
+            expect(response.rows[0].sum).toEqual(61)
           })
 
-          it("should be able to count non-numeric fields", async () => {
+          it("should be able to filter on a single user field in both the view query and search query", async () => {
             const table = await config.api.table.save(
               saveTableRequest({
                 schema: {
-                  firstName: {
-                    type: FieldType.STRING,
-                    name: "firstName",
-                  },
-                  lastName: {
-                    type: FieldType.STRING,
-                    name: "lastName",
+                  user: {
+                    name: "user",
+                    type: FieldType.BB_REFERENCE_SINGLE,
+                    subtype: BBReferenceFieldSubType.USER,
                   },
                 },
               })
             )
 
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                count: {
-                  visible: true,
-                  calculationType: CalculationType.COUNT,
-                  field: "firstName",
-                },
-              },
+            await config.api.row.save(table._id!, {
+              user: config.getUser()._id,
             })
 
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                { firstName: "Jane", lastName: "Smith" },
-                { firstName: "Jane", lastName: "Doe" },
-                { firstName: "Alice", lastName: "Smith" },
-              ],
-            })
-
-            const { rows } = await config.api.viewV2.search(view.id, {
-              query: {},
-            })
-
-            expect(rows).toHaveLength(1)
-            expect(rows[0].count).toEqual(3)
-          })
-
-          it("should be able to filter rows on the view itself", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  quantity: {
-                    type: FieldType.NUMBER,
-                    name: "quantity",
-                  },
-                  price: {
-                    type: FieldType.NUMBER,
-                    name: "price",
-                  },
-                },
-              })
-            )
-
             const view = await config.api.viewV2.create({
               tableId: table._id!,
               name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
               queryUI: {
                 groups: [
                   {
                     filters: [
                       {
                         operator: BasicOperator.EQUAL,
-                        field: "quantity",
-                        value: 1,
+                        field: "user",
+                        value: "{{ [user].[_id] }}",
                       },
                     ],
                   },
                 ],
               },
               schema: {
-                sum: {
+                user: {
                   visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "price",
                 },
               },
             })
 
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                {
-                  quantity: 1,
-                  price: 1,
-                },
-                {
-                  quantity: 1,
-                  price: 2,
-                },
-                {
-                  quantity: 2,
-                  price: 10,
-                },
-              ],
-            })
-
-            const { rows } = await config.api.viewV2.search(view.id, {
-              query: {},
-            })
-            expect(rows).toHaveLength(1)
-            expect(rows[0].sum).toEqual(3)
-          })
-
-          it("should be able to filter on group by fields", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  quantity: {
-                    type: FieldType.NUMBER,
-                    name: "quantity",
-                  },
-                  price: {
-                    type: FieldType.NUMBER,
-                    name: "price",
-                  },
-                },
-              })
-            )
-
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                quantity: { visible: true },
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "price",
-                },
-              },
-            })
-
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                {
-                  quantity: 1,
-                  price: 1,
-                },
-                {
-                  quantity: 1,
-                  price: 2,
-                },
-                {
-                  quantity: 2,
-                  price: 10,
-                },
-              ],
-            })
-
             const { rows } = await config.api.viewV2.search(view.id, {
               query: {
                 equal: {
-                  quantity: 1,
+                  user: "{{ [user].[_id] }}",
                 },
               },
             })
 
             expect(rows).toHaveLength(1)
-            expect(rows[0].sum).toEqual(3)
+            expect(rows[0].user._id).toEqual(config.getUser()._id)
           })
 
-          it("should be able to sort by group by field", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  quantity: {
-                    type: FieldType.NUMBER,
-                    name: "quantity",
-                  },
-                  price: {
-                    type: FieldType.NUMBER,
-                    name: "price",
-                  },
-                },
-              })
-            )
-
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                quantity: { visible: true },
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "price",
-                },
-              },
-            })
-
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                {
-                  quantity: 1,
-                  price: 1,
-                },
-                {
-                  quantity: 1,
-                  price: 2,
-                },
-                {
-                  quantity: 2,
-                  price: 10,
-                },
-              ],
-            })
-
-            const { rows } = await config.api.viewV2.search(view.id, {
-              query: {},
-              sort: "quantity",
-              sortOrder: SortOrder.DESCENDING,
-            })
-
-            expect(rows).toEqual([
-              expect.objectContaining({ quantity: 2, sum: 10 }),
-              expect.objectContaining({ quantity: 1, sum: 3 }),
-            ])
-          })
-
-          it("should be able to sort by a calculation", async () => {
-            const table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  quantity: {
-                    type: FieldType.NUMBER,
-                    name: "quantity",
-                  },
-                  price: {
-                    type: FieldType.NUMBER,
-                    name: "price",
-                  },
-                },
-              })
-            )
-
-            await config.api.row.bulkImport(table._id!, {
-              rows: [
-                {
-                  quantity: 1,
-                  price: 1,
-                },
-                {
-                  quantity: 1,
-                  price: 2,
-                },
-                {
-                  quantity: 2,
-                  price: 10,
-                },
-              ],
-            })
-
-            const view = await config.api.viewV2.create({
-              tableId: table._id!,
-              name: generator.guid(),
-              type: ViewV2Type.CALCULATION,
-              schema: {
-                quantity: { visible: true },
-                sum: {
-                  visible: true,
-                  calculationType: CalculationType.SUM,
-                  field: "price",
-                },
-              },
-            })
-
-            const { rows } = await config.api.viewV2.search(view.id, {
-              query: {},
-              sort: "sum",
-              sortOrder: SortOrder.DESCENDING,
-            })
-
-            expect(rows).toEqual([
-              expect.objectContaining({ quantity: 2, sum: 10 }),
-              expect.objectContaining({ quantity: 1, sum: 3 }),
-            ])
-          })
-        })
-
-        it("should not need required fields to be present", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                name: {
-                  name: "name",
-                  type: FieldType.STRING,
-                  constraints: {
-                    presence: true,
-                  },
-                },
-                age: {
-                  name: "age",
-                  type: FieldType.NUMBER,
-                },
-              },
-            })
-          )
-
-          await Promise.all([
-            config.api.row.save(table._id!, { name: "Steve", age: 30 }),
-            config.api.row.save(table._id!, { name: "Jane", age: 31 }),
-          ])
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            type: ViewV2Type.CALCULATION,
-            schema: {
-              sum: {
-                visible: true,
-                calculationType: CalculationType.SUM,
-                field: "age",
-              },
-            },
-          })
-
-          const response = await config.api.viewV2.search(view.id, {
-            query: {},
-          })
-
-          expect(response.rows).toHaveLength(1)
-          expect(response.rows[0].sum).toEqual(61)
-        })
-
-        it("should be able to filter on a single user field in both the view query and search query", async () => {
-          const table = await config.api.table.save(
-            saveTableRequest({
-              schema: {
-                user: {
-                  name: "user",
-                  type: FieldType.BB_REFERENCE_SINGLE,
-                  subtype: BBReferenceFieldSubType.USER,
-                },
-              },
-            })
-          )
-
-          await config.api.row.save(table._id!, {
-            user: config.getUser()._id,
-          })
-
-          const view = await config.api.viewV2.create({
-            tableId: table._id!,
-            name: generator.guid(),
-            queryUI: {
-              groups: [
-                {
-                  filters: [
-                    {
-                      operator: BasicOperator.EQUAL,
-                      field: "user",
-                      value: "{{ [user].[_id] }}",
+          describe("search operators", () => {
+            let table: Table
+            beforeEach(async () => {
+              table = await config.api.table.save(
+                saveTableRequest({
+                  schema: {
+                    string: { name: "string", type: FieldType.STRING },
+                    longform: { name: "longform", type: FieldType.LONGFORM },
+                    options: {
+                      name: "options",
+                      type: FieldType.OPTIONS,
+                      constraints: { inclusion: ["a", "b", "c"] },
                     },
-                  ],
-                },
-              ],
-            },
-            schema: {
-              user: {
-                visible: true,
-              },
-            },
-          })
-
-          const { rows } = await config.api.viewV2.search(view.id, {
-            query: {
-              equal: {
-                user: "{{ [user].[_id] }}",
-              },
-            },
-          })
-
-          expect(rows).toHaveLength(1)
-          expect(rows[0].user._id).toEqual(config.getUser()._id)
-        })
-
-        describe("search operators", () => {
-          let table: Table
-          beforeEach(async () => {
-            table = await config.api.table.save(
-              saveTableRequest({
-                schema: {
-                  string: { name: "string", type: FieldType.STRING },
-                  longform: { name: "longform", type: FieldType.LONGFORM },
-                  options: {
-                    name: "options",
-                    type: FieldType.OPTIONS,
-                    constraints: { inclusion: ["a", "b", "c"] },
-                  },
-                  array: {
-                    name: "array",
-                    type: FieldType.ARRAY,
-                    constraints: {
-                      type: JsonFieldSubType.ARRAY,
-                      inclusion: ["a", "b", "c"],
-                    },
-                  },
-                  number: { name: "number", type: FieldType.NUMBER },
-                  bigint: { name: "bigint", type: FieldType.BIGINT },
-                  datetime: { name: "datetime", type: FieldType.DATETIME },
-                  boolean: { name: "boolean", type: FieldType.BOOLEAN },
-                  user: {
-                    name: "user",
-                    type: FieldType.BB_REFERENCE_SINGLE,
-                    subtype: BBReferenceFieldSubType.USER,
-                  },
-                  users: {
-                    name: "users",
-                    type: FieldType.BB_REFERENCE,
-                    subtype: BBReferenceFieldSubType.USER,
-                    constraints: {
-                      type: JsonFieldSubType.ARRAY,
+                    array: {
+                      name: "array",
+                      type: FieldType.ARRAY,
+                      constraints: {
+                        type: JsonFieldSubType.ARRAY,
+                        inclusion: ["a", "b", "c"],
+                      },
+                    },
+                    number: { name: "number", type: FieldType.NUMBER },
+                    bigint: { name: "bigint", type: FieldType.BIGINT },
+                    datetime: { name: "datetime", type: FieldType.DATETIME },
+                    boolean: { name: "boolean", type: FieldType.BOOLEAN },
+                    user: {
+                      name: "user",
+                      type: FieldType.BB_REFERENCE_SINGLE,
+                      subtype: BBReferenceFieldSubType.USER,
+                    },
+                    users: {
+                      name: "users",
+                      type: FieldType.BB_REFERENCE,
+                      subtype: BBReferenceFieldSubType.USER,
+                      constraints: {
+                        type: JsonFieldSubType.ARRAY,
+                      },
                     },
                   },
+                })
+              )
+            })
+
+            interface TestCase {
+              name: string
+              query: UISearchFilter | (() => UISearchFilter)
+              insert: Row[] | (() => Row[])
+              expected: Row[] | (() => Row[])
+              searchOpts?: Partial<SearchViewRowRequest>
+            }
+
+            function simpleQuery(...filters: LegacyFilter[]): UISearchFilter {
+              return { groups: [{ filters }] }
+            }
+
+            const testCases: TestCase[] = [
+              {
+                name: "empty query return all",
+                insert: [{ string: "foo" }],
+                query: {
+                  onEmptyFilter: EmptyFilterOption.RETURN_ALL,
                 },
-              })
-            )
-          })
-
-          interface TestCase {
-            name: string
-            query: UISearchFilter | (() => UISearchFilter)
-            insert: Row[] | (() => Row[])
-            expected: Row[] | (() => Row[])
-            searchOpts?: Partial<SearchViewRowRequest>
-          }
-
-          function simpleQuery(...filters: LegacyFilter[]): UISearchFilter {
-            return { groups: [{ filters }] }
-          }
-
-          const testCases: TestCase[] = [
-            {
-              name: "empty query return all",
-              insert: [{ string: "foo" }],
-              query: {
-                onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+                expected: [{ string: "foo" }],
               },
-              expected: [{ string: "foo" }],
-            },
-            {
-              name: "empty query return none",
-              insert: [{ string: "foo" }],
-              query: {
-                onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+              {
+                name: "empty query return none",
+                insert: [{ string: "foo" }],
+                query: {
+                  onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+                },
+                expected: [],
               },
-              expected: [],
-            },
-            {
-              name: "simple string search",
-              insert: [{ string: "foo" }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "string",
-                value: "foo",
-              }),
-              expected: [{ string: "foo" }],
-            },
-            {
-              name: "non matching string search",
-              insert: [{ string: "foo" }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "string",
-                value: "bar",
-              }),
-              expected: [],
-            },
-            {
-              name: "allOr",
-              insert: [{ string: "bar" }, { string: "foo" }],
-              query: simpleQuery(
-                {
+              {
+                name: "simple string search",
+                insert: [{ string: "foo" }],
+                query: simpleQuery({
                   operator: BasicOperator.EQUAL,
                   field: "string",
                   value: "foo",
-                },
-                {
+                }),
+                expected: [{ string: "foo" }],
+              },
+              {
+                name: "non matching string search",
+                insert: [{ string: "foo" }],
+                query: simpleQuery({
                   operator: BasicOperator.EQUAL,
                   field: "string",
                   value: "bar",
+                }),
+                expected: [],
+              },
+              {
+                name: "allOr",
+                insert: [{ string: "bar" }, { string: "foo" }],
+                query: simpleQuery(
+                  {
+                    operator: BasicOperator.EQUAL,
+                    field: "string",
+                    value: "foo",
+                  },
+                  {
+                    operator: BasicOperator.EQUAL,
+                    field: "string",
+                    value: "bar",
+                  },
+                  {
+                    operator: "allOr",
+                  }
+                ),
+                searchOpts: {
+                  sort: "string",
+                  sortOrder: SortOrder.ASCENDING,
                 },
-                {
-                  operator: "allOr",
-                }
-              ),
-              searchOpts: {
-                sort: "string",
-                sortOrder: SortOrder.ASCENDING,
+                expected: [{ string: "bar" }, { string: "foo" }],
               },
-              expected: [{ string: "bar" }, { string: "foo" }],
-            },
-            {
-              name: "can find rows with fuzzy search",
-              insert: [{ string: "foo" }, { string: "bar" }],
-              query: simpleQuery({
-                operator: BasicOperator.FUZZY,
-                field: "string",
-                value: "fo",
-              }),
-              expected: [{ string: "foo" }],
-            },
-            {
-              name: "can find nothing with fuzzy search",
-              insert: [{ string: "foo" }, { string: "bar" }],
-              query: simpleQuery({
-                operator: BasicOperator.FUZZY,
-                field: "string",
-                value: "baz",
-              }),
-              expected: [],
-            },
-            {
-              name: "can find numeric rows",
-              insert: [{ number: 1 }, { number: 2 }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "number",
-                value: 1,
-              }),
-              expected: [{ number: 1 }],
-            },
-            {
-              name: "can find numeric values with rangeHigh",
-              insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
-              query: simpleQuery({
-                operator: "rangeHigh",
-                field: "number",
-                value: 2,
-              }),
-              searchOpts: {
-                sort: "number",
-                sortOrder: SortOrder.ASCENDING,
+              {
+                name: "can find rows with fuzzy search",
+                insert: [{ string: "foo" }, { string: "bar" }],
+                query: simpleQuery({
+                  operator: BasicOperator.FUZZY,
+                  field: "string",
+                  value: "fo",
+                }),
+                expected: [{ string: "foo" }],
               },
-              expected: [{ number: 1 }, { number: 2 }],
-            },
-            {
-              name: "can find numeric values with rangeLow",
-              insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
-              query: simpleQuery({
-                operator: "rangeLow",
-                field: "number",
-                value: 2,
-              }),
-              searchOpts: {
-                sort: "number",
-                sortOrder: SortOrder.ASCENDING,
+              {
+                name: "can find nothing with fuzzy search",
+                insert: [{ string: "foo" }, { string: "bar" }],
+                query: simpleQuery({
+                  operator: BasicOperator.FUZZY,
+                  field: "string",
+                  value: "baz",
+                }),
+                expected: [],
               },
-              expected: [{ number: 2 }, { number: 3 }],
-            },
-            {
-              name: "can find numeric values with full range",
-              insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
-              query: simpleQuery(
-                {
+              {
+                name: "can find numeric rows",
+                insert: [{ number: 1 }, { number: 2 }],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "number",
+                  value: 1,
+                }),
+                expected: [{ number: 1 }],
+              },
+              {
+                name: "can find numeric values with rangeHigh",
+                insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
+                query: simpleQuery({
                   operator: "rangeHigh",
                   field: "number",
                   value: 2,
+                }),
+                searchOpts: {
+                  sort: "number",
+                  sortOrder: SortOrder.ASCENDING,
                 },
-                {
+                expected: [{ number: 1 }, { number: 2 }],
+              },
+              {
+                name: "can find numeric values with rangeLow",
+                insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
+                query: simpleQuery({
                   operator: "rangeLow",
                   field: "number",
                   value: 2,
-                }
-              ),
-              expected: [{ number: 2 }],
-            },
-            {
-              name: "can find longform values",
-              insert: [{ longform: "foo" }, { longform: "bar" }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "longform",
-                value: "foo",
-              }),
-              expected: [{ longform: "foo" }],
-            },
-            {
-              name: "can find options values",
-              insert: [{ options: "a" }, { options: "b" }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "options",
-                value: "a",
-              }),
-              expected: [{ options: "a" }],
-            },
-            {
-              name: "can find array values",
-              insert: [
-                // Number field here is just to guarantee order.
-                { number: 1, array: ["a"] },
-                { number: 2, array: ["b"] },
-                { number: 3, array: ["a", "c"] },
-              ],
-              query: simpleQuery({
-                operator: ArrayOperator.CONTAINS,
-                field: "array",
-                value: "a",
-              }),
-              searchOpts: {
-                sort: "number",
-                sortOrder: SortOrder.ASCENDING,
-              },
-              expected: [{ array: ["a"] }, { array: ["a", "c"] }],
-            },
-            {
-              name: "can find bigint values",
-              insert: [{ bigint: "1" }, { bigint: "2" }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "bigint",
-                type: FieldType.BIGINT,
-                value: "1",
-              }),
-              expected: [{ bigint: "1" }],
-            },
-            {
-              name: "can find datetime values",
-              insert: [
-                { datetime: "2021-01-01T00:00:00.000Z" },
-                { datetime: "2021-01-02T00:00:00.000Z" },
-              ],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "datetime",
-                type: FieldType.DATETIME,
-                value: "2021-01-01",
-              }),
-              expected: [{ datetime: "2021-01-01T00:00:00.000Z" }],
-            },
-            {
-              name: "can find boolean values",
-              insert: [{ boolean: true }, { boolean: false }],
-              query: simpleQuery({
-                operator: BasicOperator.EQUAL,
-                field: "boolean",
-                value: true,
-              }),
-              expected: [{ boolean: true }],
-            },
-            {
-              name: "can find user values",
-              insert: () => [{ user: config.getUser() }],
-              query: () =>
-                simpleQuery({
-                  operator: BasicOperator.EQUAL,
-                  field: "user",
-                  value: config.getUser()._id,
                 }),
-              expected: () => [
-                {
-                  user: expect.objectContaining({ _id: config.getUser()._id }),
+                searchOpts: {
+                  sort: "number",
+                  sortOrder: SortOrder.ASCENDING,
                 },
-              ],
-            },
-            {
-              name: "can find users values",
-              insert: () => [{ users: [config.getUser()] }],
-              query: () =>
-                simpleQuery({
-                  operator: ArrayOperator.CONTAINS,
-                  field: "users",
-                  value: [config.getUser()._id],
+                expected: [{ number: 2 }, { number: 3 }],
+              },
+              {
+                name: "can find numeric values with full range",
+                insert: [{ number: 1 }, { number: 2 }, { number: 3 }],
+                query: simpleQuery(
+                  {
+                    operator: "rangeHigh",
+                    field: "number",
+                    value: 2,
+                  },
+                  {
+                    operator: "rangeLow",
+                    field: "number",
+                    value: 2,
+                  }
+                ),
+                expected: [{ number: 2 }],
+              },
+              {
+                name: "can find longform values",
+                insert: [{ longform: "foo" }, { longform: "bar" }],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "longform",
+                  value: "foo",
                 }),
-              expected: () => [
-                {
-                  users: [
-                    expect.objectContaining({ _id: config.getUser()._id }),
+                expected: [{ longform: "foo" }],
+              },
+              {
+                name: "can find options values",
+                insert: [{ options: "a" }, { options: "b" }],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "options",
+                  value: "a",
+                }),
+                expected: [{ options: "a" }],
+              },
+              {
+                name: "can find array values",
+                insert: [
+                  // Number field here is just to guarantee order.
+                  { number: 1, array: ["a"] },
+                  { number: 2, array: ["b"] },
+                  { number: 3, array: ["a", "c"] },
+                ],
+                query: simpleQuery({
+                  operator: ArrayOperator.CONTAINS,
+                  field: "array",
+                  value: "a",
+                }),
+                searchOpts: {
+                  sort: "number",
+                  sortOrder: SortOrder.ASCENDING,
+                },
+                expected: [{ array: ["a"] }, { array: ["a", "c"] }],
+              },
+              {
+                name: "can find bigint values",
+                insert: [{ bigint: "1" }, { bigint: "2" }],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "bigint",
+                  type: FieldType.BIGINT,
+                  value: "1",
+                }),
+                expected: [{ bigint: "1" }],
+              },
+              {
+                name: "can find datetime values",
+                insert: [
+                  { datetime: "2021-01-01T00:00:00.000Z" },
+                  { datetime: "2021-01-02T00:00:00.000Z" },
+                ],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "datetime",
+                  type: FieldType.DATETIME,
+                  value: "2021-01-01",
+                }),
+                expected: [{ datetime: "2021-01-01T00:00:00.000Z" }],
+              },
+              {
+                name: "can find boolean values",
+                insert: [{ boolean: true }, { boolean: false }],
+                query: simpleQuery({
+                  operator: BasicOperator.EQUAL,
+                  field: "boolean",
+                  value: true,
+                }),
+                expected: [{ boolean: true }],
+              },
+              {
+                name: "can find user values",
+                insert: () => [{ user: config.getUser() }],
+                query: () =>
+                  simpleQuery({
+                    operator: BasicOperator.EQUAL,
+                    field: "user",
+                    value: config.getUser()._id,
+                  }),
+                expected: () => [
+                  {
+                    user: expect.objectContaining({
+                      _id: config.getUser()._id,
+                    }),
+                  },
+                ],
+              },
+              {
+                name: "can find users values",
+                insert: () => [{ users: [config.getUser()] }],
+                query: () =>
+                  simpleQuery({
+                    operator: ArrayOperator.CONTAINS,
+                    field: "users",
+                    value: [config.getUser()._id],
+                  }),
+                expected: () => [
+                  {
+                    users: [
+                      expect.objectContaining({ _id: config.getUser()._id }),
+                    ],
+                  },
+                ],
+              },
+              {
+                name: "can handle logical operator any",
+                insert: [{ string: "bar" }, { string: "foo" }],
+                query: {
+                  groups: [
+                    {
+                      logicalOperator: UILogicalOperator.ANY,
+                      filters: [
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "string",
+                          value: "foo",
+                        },
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "string",
+                          value: "bar",
+                        },
+                      ],
+                    },
                   ],
                 },
-              ],
-            },
-            {
-              name: "can handle logical operator any",
-              insert: [{ string: "bar" }, { string: "foo" }],
-              query: {
-                groups: [
-                  {
-                    logicalOperator: UILogicalOperator.ANY,
-                    filters: [
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "string",
-                        value: "foo",
-                      },
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "string",
-                        value: "bar",
-                      },
-                    ],
-                  },
-                ],
-              },
-              searchOpts: {
-                sort: "string",
-                sortOrder: SortOrder.ASCENDING,
-              },
-              expected: [{ string: "bar" }, { string: "foo" }],
-            },
-            {
-              name: "can handle logical operator all",
-              insert: [
-                { string: "bar", number: 1 },
-                { string: "foo", number: 2 },
-              ],
-              query: {
-                groups: [
-                  {
-                    logicalOperator: UILogicalOperator.ALL,
-                    filters: [
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "string",
-                        value: "foo",
-                      },
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "number",
-                        value: 2,
-                      },
-                    ],
-                  },
-                ],
-              },
-              searchOpts: {
-                sort: "string",
-                sortOrder: SortOrder.ASCENDING,
-              },
-              expected: [{ string: "foo", number: 2 }],
-            },
-            {
-              name: "overrides allOr with logical operators",
-              insert: [
-                { string: "bar", number: 1 },
-                { string: "foo", number: 1 },
-              ],
-              query: {
-                groups: [
-                  {
-                    logicalOperator: UILogicalOperator.ALL,
-                    filters: [
-                      { operator: "allOr" },
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "string",
-                        value: "foo",
-                      },
-                      {
-                        operator: BasicOperator.EQUAL,
-                        field: "number",
-                        value: 1,
-                      },
-                    ],
-                  },
-                ],
-              },
-              searchOpts: {
-                sort: "string",
-                sortOrder: SortOrder.ASCENDING,
-              },
-              expected: [{ string: "foo", number: 1 }],
-            },
-          ]
-
-          it.each(testCases)(
-            "$name",
-            async ({ query, insert, expected, searchOpts }) => {
-              // Some values can't be specified outside of a test (e.g. getting
-              // config.getUser(), it won't be initialised), so we use functions
-              // in those cases.
-              if (typeof insert === "function") {
-                insert = insert()
-              }
-              if (typeof expected === "function") {
-                expected = expected()
-              }
-              if (typeof query === "function") {
-                query = query()
-              }
-
-              await config.api.row.bulkImport(table._id!, { rows: insert })
-
-              const view = await config.api.viewV2.create({
-                tableId: table._id!,
-                name: generator.guid(),
-                queryUI: query,
-                schema: {
-                  string: { visible: true },
-                  longform: { visible: true },
-                  options: { visible: true },
-                  array: { visible: true },
-                  number: { visible: true },
-                  bigint: { visible: true },
-                  datetime: { visible: true },
-                  boolean: { visible: true },
-                  user: { visible: true },
-                  users: { visible: true },
+                searchOpts: {
+                  sort: "string",
+                  sortOrder: SortOrder.ASCENDING,
                 },
-              })
+                expected: [{ string: "bar" }, { string: "foo" }],
+              },
+              {
+                name: "can handle logical operator all",
+                insert: [
+                  { string: "bar", number: 1 },
+                  { string: "foo", number: 2 },
+                ],
+                query: {
+                  groups: [
+                    {
+                      logicalOperator: UILogicalOperator.ALL,
+                      filters: [
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "string",
+                          value: "foo",
+                        },
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "number",
+                          value: 2,
+                        },
+                      ],
+                    },
+                  ],
+                },
+                searchOpts: {
+                  sort: "string",
+                  sortOrder: SortOrder.ASCENDING,
+                },
+                expected: [{ string: "foo", number: 2 }],
+              },
+              {
+                name: "overrides allOr with logical operators",
+                insert: [
+                  { string: "bar", number: 1 },
+                  { string: "foo", number: 1 },
+                ],
+                query: {
+                  groups: [
+                    {
+                      logicalOperator: UILogicalOperator.ALL,
+                      filters: [
+                        { operator: "allOr" },
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "string",
+                          value: "foo",
+                        },
+                        {
+                          operator: BasicOperator.EQUAL,
+                          field: "number",
+                          value: 1,
+                        },
+                      ],
+                    },
+                  ],
+                },
+                searchOpts: {
+                  sort: "string",
+                  sortOrder: SortOrder.ASCENDING,
+                },
+                expected: [{ string: "foo", number: 1 }],
+              },
+            ]
 
-              const { rows } = await config.api.viewV2.search(view.id, {
-                query: {},
-                ...searchOpts,
-              })
-              expect(rows).toEqual(
-                expected.map(r => expect.objectContaining(r))
-              )
-            }
-          )
-        })
-      })
+            it.each(testCases)(
+              "$name",
+              async ({ query, insert, expected, searchOpts }) => {
+                // Some values can't be specified outside of a test (e.g. getting
+                // config.getUser(), it won't be initialised), so we use functions
+                // in those cases.
+                if (typeof insert === "function") {
+                  insert = insert()
+                }
+                if (typeof expected === "function") {
+                  expected = expected()
+                }
+                if (typeof query === "function") {
+                  query = query()
+                }
 
-      describe("permissions", () => {
-        beforeEach(async () => {
-          await Promise.all(
-            Array.from({ length: 10 }, () =>
-              config.api.row.save(table._id!, {})
+                await config.api.row.bulkImport(table._id!, { rows: insert })
+
+                const view = await config.api.viewV2.create({
+                  tableId: table._id!,
+                  name: generator.guid(),
+                  queryUI: query,
+                  schema: {
+                    string: { visible: true },
+                    longform: { visible: true },
+                    options: { visible: true },
+                    array: { visible: true },
+                    number: { visible: true },
+                    bigint: { visible: true },
+                    datetime: { visible: true },
+                    boolean: { visible: true },
+                    user: { visible: true },
+                    users: { visible: true },
+                  },
+                })
+
+                const { rows } = await config.api.viewV2.search(view.id, {
+                  query: {},
+                  ...searchOpts,
+                })
+                expect(rows).toEqual(
+                  expected.map(r => expect.objectContaining(r))
+                )
+              }
             )
-          )
-        })
-
-        it("does not allow public users to fetch by default", async () => {
-          await config.publish()
-          await config.api.viewV2.publicSearch(view.id, undefined, {
-            status: 401,
           })
         })
 
-        it("allow public users to fetch when permissions are explicit", async () => {
-          await config.api.permission.add({
-            roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
-            level: PermissionLevel.READ,
-            resourceId: view.id,
+        describe("permissions", () => {
+          beforeEach(async () => {
+            await Promise.all(
+              Array.from({ length: 10 }, () =>
+                config.api.row.save(table._id!, {})
+              )
+            )
           })
-          await config.publish()
 
-          const response = await config.api.viewV2.publicSearch(view.id)
-
-          expect(response.rows).toHaveLength(10)
-        })
-
-        it("allow public users to fetch when permissions are inherited", async () => {
-          await config.api.permission.add({
-            roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
-            level: PermissionLevel.READ,
-            resourceId: table._id!,
+          it("does not allow public users to fetch by default", async () => {
+            await config.publish()
+            await config.api.viewV2.publicSearch(view.id, undefined, {
+              status: 401,
+            })
           })
-          await config.api.permission.revoke({
-            roleId: roles.BUILTIN_ROLE_IDS.PUBLIC, // Don't think this matters since we are revoking the permission
-            level: PermissionLevel.READ,
-            resourceId: view.id,
+
+          it("allow public users to fetch when permissions are explicit", async () => {
+            await config.api.permission.add({
+              roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
+              level: PermissionLevel.READ,
+              resourceId: view.id,
+            })
+            await config.publish()
+
+            const response = await config.api.viewV2.publicSearch(view.id)
+
+            expect(response.rows).toHaveLength(10)
           })
-          await config.publish()
 
-          const response = await config.api.viewV2.publicSearch(view.id)
+          it("allow public users to fetch when permissions are inherited", async () => {
+            await config.api.permission.add({
+              roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
+              level: PermissionLevel.READ,
+              resourceId: table._id!,
+            })
+            await config.api.permission.revoke({
+              roleId: roles.BUILTIN_ROLE_IDS.PUBLIC, // Don't think this matters since we are revoking the permission
+              level: PermissionLevel.READ,
+              resourceId: view.id,
+            })
+            await config.publish()
 
-          expect(response.rows).toHaveLength(10)
-        })
+            const response = await config.api.viewV2.publicSearch(view.id)
 
-        it("respects inherited permissions, not allowing not public views from public tables", async () => {
-          await config.api.permission.add({
-            roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
-            level: PermissionLevel.READ,
-            resourceId: table._id!,
+            expect(response.rows).toHaveLength(10)
           })
-          await config.api.permission.add({
-            roleId: roles.BUILTIN_ROLE_IDS.POWER,
-            level: PermissionLevel.READ,
-            resourceId: view.id,
-          })
-          await config.publish()
 
-          await config.api.viewV2.publicSearch(view.id, undefined, {
-            status: 401,
+          it("respects inherited permissions, not allowing not public views from public tables", async () => {
+            await config.api.permission.add({
+              roleId: roles.BUILTIN_ROLE_IDS.PUBLIC,
+              level: PermissionLevel.READ,
+              resourceId: table._id!,
+            })
+            await config.api.permission.add({
+              roleId: roles.BUILTIN_ROLE_IDS.POWER,
+              level: PermissionLevel.READ,
+              resourceId: view.id,
+            })
+            await config.publish()
+
+            await config.api.viewV2.publicSearch(view.id, undefined, {
+              status: 401,
+            })
           })
         })
       })
-    })
-  }
-)
+    }
+  )
+}
diff --git a/packages/server/src/api/routes/utils/validators.ts b/packages/server/src/api/routes/utils/validators.ts
index 0343cc186c..a8fa12ec3d 100644
--- a/packages/server/src/api/routes/utils/validators.ts
+++ b/packages/server/src/api/routes/utils/validators.ts
@@ -1,5 +1,4 @@
 import { auth, permissions } from "@budibase/backend-core"
-import { DataSourceOperation } from "../../../constants"
 import {
   AutomationActionStepId,
   AutomationStep,
@@ -9,6 +8,13 @@ import {
   Table,
   WebhookActionType,
   BuiltinPermissionID,
+  ViewV2Type,
+  SortOrder,
+  SortType,
+  UILogicalOperator,
+  BasicOperator,
+  ArrayOperator,
+  RangeOperator,
 } from "@budibase/types"
 import Joi, { CustomValidator } from "joi"
 import { ValidSnippetNameRegex, helpers } from "@budibase/shared-core"
@@ -66,6 +72,66 @@ export function tableValidator() {
   )
 }
 
+function searchUIFilterValidator() {
+  const logicalOperator = Joi.string().valid(
+    ...Object.values(UILogicalOperator)
+  )
+  const operators = [
+    ...Object.values(BasicOperator),
+    ...Object.values(ArrayOperator),
+    ...Object.values(RangeOperator),
+  ]
+  const filters = Joi.array().items(
+    Joi.object({
+      operator: Joi.string()
+        .valid(...operators)
+        .required(),
+      field: Joi.string().required(),
+      // could do with better validation of value based on operator
+      value: Joi.any().required(),
+    })
+  )
+  return Joi.object({
+    logicalOperator,
+    onEmptyFilter: Joi.string().valid(...Object.values(EmptyFilterOption)),
+    groups: Joi.array().items(
+      Joi.object({
+        logicalOperator,
+        filters,
+        groups: Joi.array().items(
+          Joi.object({
+            filters,
+            logicalOperator,
+          })
+        ),
+      })
+    ),
+  })
+}
+
+export function viewValidator() {
+  return auth.joiValidator.body(
+    Joi.object({
+      id: OPTIONAL_STRING,
+      tableId: Joi.string().required(),
+      name: Joi.string().required(),
+      type: Joi.string().optional().valid(null, ViewV2Type.CALCULATION),
+      primaryDisplay: OPTIONAL_STRING,
+      schema: Joi.object().required(),
+      query: searchUIFilterValidator().optional(),
+      sort: Joi.object({
+        field: Joi.string().required(),
+        order: Joi.string()
+          .optional()
+          .valid(...Object.values(SortOrder)),
+        type: Joi.string()
+          .optional()
+          .valid(...Object.values(SortType)),
+      }).optional(),
+    })
+  )
+}
+
 export function nameValidator() {
   return auth.joiValidator.body(
     Joi.object({
@@ -91,8 +157,7 @@ export function datasourceValidator() {
   )
 }
 
-function filterObject(opts?: { unknown: boolean }) {
-  const { unknown = true } = opts || {}
+function searchFiltersValidator() {
   const conditionalFilteringObject = () =>
     Joi.object({
       conditions: Joi.array().items(Joi.link("#schema")).required(),
@@ -119,7 +184,14 @@ function filterObject(opts?: { unknown: boolean }) {
     fuzzyOr: Joi.forbidden(),
     documentType: Joi.forbidden(),
   }
-  return Joi.object(filtersValidators).unknown(unknown).id("schema")
+
+  return Joi.object(filtersValidators)
+}
+
+function filterObject(opts?: { unknown: boolean }) {
+  const { unknown = true } = opts || {}
+
+  return searchFiltersValidator().unknown(unknown).id("schema")
 }
 
 export function internalSearchValidator() {
@@ -158,30 +230,6 @@ export function externalSearchValidator() {
   )
 }
 
-export function datasourceQueryValidator() {
-  return auth.joiValidator.body(
-    Joi.object({
-      endpoint: Joi.object({
-        datasourceId: Joi.string().required(),
-        operation: Joi.string()
-          .required()
-          .valid(...Object.values(DataSourceOperation)),
-        entityId: Joi.string().required(),
-      }).required(),
-      resource: Joi.object({
-        fields: Joi.array().items(Joi.string()).optional(),
-      }).optional(),
-      body: Joi.object().optional(),
-      sort: Joi.object().optional(),
-      filters: filterObject().optional(),
-      paginate: Joi.object({
-        page: Joi.string().alphanum().optional(),
-        limit: Joi.number().optional(),
-      }).optional(),
-    })
-  )
-}
-
 export function webhookValidator() {
   return auth.joiValidator.body(
     Joi.object({
diff --git a/packages/server/src/api/routes/view.ts b/packages/server/src/api/routes/view.ts
index 807d8e2f28..92e5f02a18 100644
--- a/packages/server/src/api/routes/view.ts
+++ b/packages/server/src/api/routes/view.ts
@@ -8,6 +8,11 @@ import { permissions } from "@budibase/backend-core"
 const router: Router = new Router()
 
 router
+  .get(
+    "/api/v2/views",
+    authorized(permissions.BUILDER),
+    viewController.v2.fetch
+  )
   .get(
     "/api/v2/views/:viewId",
     authorizedResource(
diff --git a/packages/server/src/automations/actions.ts b/packages/server/src/automations/actions.ts
index a8b69fa7d7..65a57c2586 100644
--- a/packages/server/src/automations/actions.ts
+++ b/packages/server/src/automations/actions.ts
@@ -1,3 +1,4 @@
+import { automations } from "@budibase/shared-core"
 import * as sendSmtpEmail from "./steps/sendSmtpEmail"
 import * as createRow from "./steps/createRow"
 import * as updateRow from "./steps/updateRow"
@@ -14,11 +15,10 @@ import * as make from "./steps/make"
 import * as filter from "./steps/filter"
 import * as delay from "./steps/delay"
 import * as queryRow from "./steps/queryRows"
-import * as loop from "./steps/loop"
 import * as collect from "./steps/collect"
-import * as branch from "./steps/branch"
 import * as triggerAutomationRun from "./steps/triggerAutomationRun"
 import * as openai from "./steps/openai"
+import * as bash from "./steps/bash"
 import env from "../environment"
 import {
   PluginType,
@@ -27,11 +27,9 @@ import {
   Hosting,
   ActionImplementation,
   AutomationStepDefinition,
-  FeatureFlag,
 } from "@budibase/types"
 import sdk from "../sdk"
 import { getAutomationPlugin } from "../utilities/fileSystem"
-import { features } from "@budibase/backend-core"
 
 type ActionImplType = ActionImplementations<
   typeof env.SELF_HOSTED extends "true" ? Hosting.SELF : Hosting.CLOUD
@@ -64,50 +62,47 @@ export const BUILTIN_ACTION_DEFINITIONS: Record<
   string,
   AutomationStepDefinition
 > = {
-  SEND_EMAIL_SMTP: sendSmtpEmail.definition,
-  CREATE_ROW: createRow.definition,
-  UPDATE_ROW: updateRow.definition,
-  DELETE_ROW: deleteRow.definition,
-  OUTGOING_WEBHOOK: outgoingWebhook.definition,
-  EXECUTE_SCRIPT: executeScript.definition,
-  EXECUTE_QUERY: executeQuery.definition,
-  SERVER_LOG: serverLog.definition,
-  DELAY: delay.definition,
-  FILTER: filter.definition,
-  QUERY_ROWS: queryRow.definition,
-  LOOP: loop.definition,
-  COLLECT: collect.definition,
-  TRIGGER_AUTOMATION_RUN: triggerAutomationRun.definition,
+  SEND_EMAIL_SMTP: automations.steps.sendSmtpEmail.definition,
+  CREATE_ROW: automations.steps.createRow.definition,
+  UPDATE_ROW: automations.steps.updateRow.definition,
+  DELETE_ROW: automations.steps.deleteRow.definition,
+  OUTGOING_WEBHOOK: automations.steps.outgoingWebhook.definition,
+  EXECUTE_SCRIPT: automations.steps.executeScript.definition,
+  EXECUTE_QUERY: automations.steps.executeQuery.definition,
+  SERVER_LOG: automations.steps.serverLog.definition,
+  DELAY: automations.steps.delay.definition,
+  FILTER: automations.steps.filter.definition,
+  QUERY_ROWS: automations.steps.queryRows.definition,
+  LOOP: automations.steps.loop.definition,
+  COLLECT: automations.steps.collect.definition,
+  TRIGGER_AUTOMATION_RUN: automations.steps.triggerAutomationRun.definition,
+  BRANCH: automations.steps.branch.definition,
   // these used to be lowercase step IDs, maintain for backwards compat
-  discord: discord.definition,
-  slack: slack.definition,
-  zapier: zapier.definition,
-  integromat: make.definition,
-  n8n: n8n.definition,
+  discord: automations.steps.discord.definition,
+  slack: automations.steps.slack.definition,
+  zapier: automations.steps.zapier.definition,
+  integromat: automations.steps.make.definition,
+  n8n: automations.steps.n8n.definition,
 }
 
 // don't add the bash script/definitions unless in self host
 // the fact this isn't included in any definitions means it cannot be
 // ran at all
 if (env.SELF_HOSTED) {
-  const bash = require("./steps/bash")
-
-  // @ts-ignore
+  // @ts-expect-error
   ACTION_IMPLS["EXECUTE_BASH"] = bash.run
-  // @ts-ignore
-  BUILTIN_ACTION_DEFINITIONS["EXECUTE_BASH"] = bash.definition
+  BUILTIN_ACTION_DEFINITIONS["EXECUTE_BASH"] = automations.steps.bash.definition
+
+  if (env.isTest()) {
+    BUILTIN_ACTION_DEFINITIONS["OPENAI"] = automations.steps.openai.definition
+  }
 }
 
-export async function getActionDefinitions() {
-  if (await features.flags.isEnabled(FeatureFlag.AUTOMATION_BRANCHING)) {
-    BUILTIN_ACTION_DEFINITIONS["BRANCH"] = branch.definition
-  }
-  if (
-    env.SELF_HOSTED ||
-    (await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) ||
-    (await features.flags.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS))
-  ) {
-    BUILTIN_ACTION_DEFINITIONS["OPENAI"] = openai.definition
+export async function getActionDefinitions(): Promise<
+  Record<keyof typeof AutomationActionStepId, AutomationStepDefinition>
+> {
+  if (env.SELF_HOSTED) {
+    BUILTIN_ACTION_DEFINITIONS["OPENAI"] = automations.steps.openai.definition
   }
 
   const actionDefinitions = BUILTIN_ACTION_DEFINITIONS
diff --git a/packages/server/src/automations/steps/bash.ts b/packages/server/src/automations/steps/bash.ts
index 636e659ffe..f6d2feecf6 100644
--- a/packages/server/src/automations/steps/bash.ts
+++ b/packages/server/src/automations/steps/bash.ts
@@ -2,55 +2,7 @@ import { execSync } from "child_process"
 import { processStringSync } from "@budibase/string-templates"
 import * as automationUtils from "../automationUtils"
 import environment from "../../environment"
-import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
-  BashStepInputs,
-  BashStepOutputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Bash Scripting",
-  tagline: "Execute a bash command",
-  icon: "JourneyEvent",
-  description: "Run a bash script",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.EXECUTE_BASH,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        code: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.CODE,
-          title: "Code",
-        },
-      },
-      required: ["code"],
-    },
-    outputs: {
-      properties: {
-        stdout: {
-          type: AutomationIOType.STRING,
-          description: "Standard output of your bash command or script",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the command was successful",
-        },
-      },
-      required: ["stdout"],
-    },
-  },
-}
+import { BashStepInputs, BashStepOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/collect.ts b/packages/server/src/automations/steps/collect.ts
index 3b2ca7d21f..689c3d347f 100644
--- a/packages/server/src/automations/steps/collect.ts
+++ b/packages/server/src/automations/steps/collect.ts
@@ -1,48 +1,4 @@
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  CollectStepInputs,
-  CollectStepOutputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Collect Data",
-  tagline: "Collect data to be sent to design",
-  icon: "Collection",
-  description:
-    "Collects specified data so it can be provided to the design section",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {},
-  stepId: AutomationActionStepId.COLLECT,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        collection: {
-          type: AutomationIOType.STRING,
-          title: "What to Collect",
-        },
-      },
-      required: ["collection"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-        value: {
-          type: AutomationIOType.STRING,
-          description: "Collected data",
-        },
-      },
-      required: ["success", "value"],
-    },
-  },
-}
+import { CollectStepInputs, CollectStepOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/createRow.ts b/packages/server/src/automations/steps/createRow.ts
index 4b9010dd01..cf915dd300 100644
--- a/packages/server/src/automations/steps/createRow.ts
+++ b/packages/server/src/automations/steps/createRow.ts
@@ -6,75 +6,10 @@ import {
 } from "../automationUtils"
 import { buildCtx } from "./utils"
 import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
+  ContextEmitter,
   CreateRowStepInputs,
   CreateRowStepOutputs,
 } from "@budibase/types"
-import { EventEmitter } from "events"
-
-export const definition: AutomationStepDefinition = {
-  name: "Create Row",
-  tagline: "Create a {{inputs.enriched.table.name}} row",
-  icon: "TableRowAddBottom",
-  description: "Add a row to your database",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.CREATE_ROW,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        row: {
-          type: AutomationIOType.OBJECT,
-          properties: {
-            tableId: {
-              type: AutomationIOType.STRING,
-              customType: AutomationCustomIOType.TABLE,
-            },
-          },
-          customType: AutomationCustomIOType.ROW,
-          title: "Table",
-          required: ["tableId"],
-        },
-      },
-      required: ["row"],
-    },
-    outputs: {
-      properties: {
-        row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
-          description: "The new row",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The response from the table",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the row creation was successful",
-        },
-        id: {
-          type: AutomationIOType.STRING,
-          description: "The identifier of the new row",
-        },
-        revision: {
-          type: AutomationIOType.STRING,
-          description: "The revision of the new row",
-        },
-      },
-      required: ["success", "id", "revision"],
-    },
-  },
-}
 
 export async function run({
   inputs,
@@ -83,7 +18,7 @@ export async function run({
 }: {
   inputs: CreateRowStepInputs
   appId: string
-  emitter: EventEmitter
+  emitter: ContextEmitter
 }): Promise<CreateRowStepOutputs> {
   if (inputs.row == null || inputs.row.tableId == null) {
     return {
@@ -97,7 +32,7 @@ export async function run({
   const ctx: any = buildCtx(appId, emitter, {
     body: inputs.row,
     params: {
-      tableId: inputs.row.tableId,
+      tableId: decodeURIComponent(inputs.row.tableId),
     },
   })
   try {
@@ -112,7 +47,7 @@ export async function run({
       response: ctx.body,
       id: ctx.body._id,
       revision: ctx.body._rev,
-      success: ctx.status === 200,
+      success: !!ctx.body._id,
     }
   } catch (err) {
     return {
diff --git a/packages/server/src/automations/steps/delay.ts b/packages/server/src/automations/steps/delay.ts
index c623693488..4ca5a16942 100644
--- a/packages/server/src/automations/steps/delay.ts
+++ b/packages/server/src/automations/steps/delay.ts
@@ -1,44 +1,5 @@
 import { wait } from "../../utilities"
-import {
-  AutomationActionStepId,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
-  DelayStepInputs,
-  DelayStepOutputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Delay",
-  icon: "Clock",
-  tagline: "Delay for {{inputs.time}} milliseconds",
-  description: "Delay the automation until an amount of time has passed",
-  stepId: AutomationActionStepId.DELAY,
-  internal: true,
-  features: {},
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        time: {
-          type: AutomationIOType.NUMBER,
-          title: "Delay in milliseconds",
-        },
-      },
-      required: ["time"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the delay was successful",
-        },
-      },
-      required: ["success"],
-    },
-  },
-  type: AutomationStepType.LOGIC,
-}
+import { DelayStepInputs, DelayStepOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/deleteRow.ts b/packages/server/src/automations/steps/deleteRow.ts
index c4c42d8200..2498a4e4de 100644
--- a/packages/server/src/automations/steps/deleteRow.ts
+++ b/packages/server/src/automations/steps/deleteRow.ts
@@ -1,66 +1,12 @@
-import { EventEmitter } from "events"
 import { destroy } from "../../api/controllers/row"
 import { buildCtx } from "./utils"
 import { getError } from "../automationUtils"
 import {
-  AutomationActionStepId,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationCustomIOType,
-  AutomationFeature,
+  ContextEmitter,
   DeleteRowStepInputs,
   DeleteRowStepOutputs,
-  AutomationStepDefinition,
 } from "@budibase/types"
 
-export const definition: AutomationStepDefinition = {
-  description: "Delete a row from your database",
-  icon: "TableRowRemoveCenter",
-  name: "Delete Row",
-  tagline: "Delete a {{inputs.enriched.table.name}} row",
-  type: AutomationStepType.ACTION,
-  stepId: AutomationActionStepId.DELETE_ROW,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        tableId: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.TABLE,
-          title: "Table",
-        },
-        id: {
-          type: AutomationIOType.STRING,
-          title: "Row ID",
-        },
-      },
-      required: ["tableId", "id"],
-    },
-    outputs: {
-      properties: {
-        row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
-          description: "The deleted row",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The response from the table",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the deletion was successful",
-        },
-      },
-      required: ["row", "success"],
-    },
-  },
-}
-
 export async function run({
   inputs,
   appId,
@@ -68,7 +14,7 @@ export async function run({
 }: {
   inputs: DeleteRowStepInputs
   appId: string
-  emitter: EventEmitter
+  emitter: ContextEmitter
 }): Promise<DeleteRowStepOutputs> {
   if (inputs.id == null) {
     return {
@@ -85,7 +31,7 @@ export async function run({
       _rev: inputs.revision,
     },
     params: {
-      tableId: inputs.tableId,
+      tableId: decodeURIComponent(inputs.tableId),
     },
   })
 
@@ -94,7 +40,7 @@ export async function run({
     return {
       response: ctx.body,
       row: ctx.row,
-      success: ctx.status === 200,
+      success: ctx.body.ok,
     }
   } catch (err) {
     return {
diff --git a/packages/server/src/automations/steps/discord.ts b/packages/server/src/automations/steps/discord.ts
index 1ce21fc89e..30d3e8137b 100644
--- a/packages/server/src/automations/steps/discord.ts
+++ b/packages/server/src/automations/steps/discord.ts
@@ -1,71 +1,10 @@
 import fetch from "node-fetch"
 import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  ExternalAppStepOutputs,
-  DiscordStepInputs,
-  AutomationStepDefinition,
-} from "@budibase/types"
+import { ExternalAppStepOutputs, DiscordStepInputs } from "@budibase/types"
 
 const DEFAULT_USERNAME = "Budibase Automate"
 const DEFAULT_AVATAR_URL = "https://i.imgur.com/a1cmTKM.png"
 
-export const definition: AutomationStepDefinition = {
-  name: "Discord Message",
-  tagline: "Send a message to a Discord server",
-  description: "Send a message to a Discord server",
-  icon: "ri-discord-line",
-  stepId: AutomationActionStepId.discord,
-  type: AutomationStepType.ACTION,
-  internal: false,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        url: {
-          type: AutomationIOType.STRING,
-          title: "Discord Webhook URL",
-        },
-        username: {
-          type: AutomationIOType.STRING,
-          title: "Bot Name",
-        },
-        avatar_url: {
-          type: AutomationIOType.STRING,
-          title: "Bot Avatar URL",
-        },
-        content: {
-          type: AutomationIOType.STRING,
-          title: "Message",
-        },
-      },
-      required: ["url", "content"],
-    },
-    outputs: {
-      properties: {
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code of the request",
-        },
-        response: {
-          type: AutomationIOType.STRING,
-          description: "The response from the Discord Webhook",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the message sent successfully",
-        },
-      },
-    },
-  },
-}
-
 export async function run({
   inputs,
 }: {
diff --git a/packages/server/src/automations/steps/executeQuery.ts b/packages/server/src/automations/steps/executeQuery.ts
index a42182df37..ad99240eb8 100644
--- a/packages/server/src/automations/steps/executeQuery.ts
+++ b/packages/server/src/automations/steps/executeQuery.ts
@@ -1,69 +1,12 @@
-import { EventEmitter } from "events"
 import * as queryController from "../../api/controllers/query"
 import { buildCtx } from "./utils"
 import * as automationUtils from "../automationUtils"
 import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
+  ContextEmitter,
   ExecuteQueryStepInputs,
   ExecuteQueryStepOutputs,
 } from "@budibase/types"
 
-export const definition: AutomationStepDefinition = {
-  name: "External Data Connector",
-  tagline: "Execute Data Connector",
-  icon: "Data",
-  description: "Execute a query in an external data connector",
-  type: AutomationStepType.ACTION,
-  stepId: AutomationActionStepId.EXECUTE_QUERY,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        query: {
-          type: AutomationIOType.OBJECT,
-          properties: {
-            queryId: {
-              type: AutomationIOType.STRING,
-              customType: AutomationCustomIOType.QUERY,
-            },
-          },
-          customType: AutomationCustomIOType.QUERY_PARAMS,
-          title: "Parameters",
-          required: ["queryId"],
-        },
-      },
-      required: ["query"],
-    },
-    outputs: {
-      properties: {
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The response from the datasource execution",
-        },
-        info: {
-          type: AutomationIOType.OBJECT,
-          description:
-            "Some query types may return extra data, like headers from a REST query",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-      },
-      required: ["response", "success"],
-    },
-  },
-}
-
 export async function run({
   inputs,
   appId,
@@ -71,7 +14,7 @@ export async function run({
 }: {
   inputs: ExecuteQueryStepInputs
   appId: string
-  emitter: EventEmitter
+  emitter: ContextEmitter
 }): Promise<ExecuteQueryStepOutputs> {
   if (inputs.query == null) {
     return {
@@ -94,7 +37,7 @@ export async function run({
   })
 
   try {
-    await queryController.executeV2(ctx, { isAutomation: true })
+    await queryController.executeV2AsAutomation(ctx)
     const { data, ...rest } = ctx.body
 
     return {
diff --git a/packages/server/src/automations/steps/executeScript.ts b/packages/server/src/automations/steps/executeScript.ts
index 97145f3e14..db05d0937a 100644
--- a/packages/server/src/automations/steps/executeScript.ts
+++ b/packages/server/src/automations/steps/executeScript.ts
@@ -2,55 +2,10 @@ import * as scriptController from "../../api/controllers/script"
 import { buildCtx } from "./utils"
 import * as automationUtils from "../automationUtils"
 import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
+  ContextEmitter,
   ExecuteScriptStepInputs,
   ExecuteScriptStepOutputs,
 } from "@budibase/types"
-import { EventEmitter } from "events"
-
-export const definition: AutomationStepDefinition = {
-  name: "JS Scripting",
-  tagline: "Execute JavaScript Code",
-  icon: "Code",
-  description: "Run a piece of JavaScript code in your automation",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  stepId: AutomationActionStepId.EXECUTE_SCRIPT,
-  inputs: {},
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  schema: {
-    inputs: {
-      properties: {
-        code: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.CODE,
-          title: "Code",
-        },
-      },
-      required: ["code"],
-    },
-    outputs: {
-      properties: {
-        value: {
-          type: AutomationIOType.STRING,
-          description: "The result of the return statement",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-      },
-      required: ["success"],
-    },
-  },
-}
 
 export async function run({
   inputs,
@@ -61,7 +16,7 @@ export async function run({
   inputs: ExecuteScriptStepInputs
   appId: string
   context: object
-  emitter: EventEmitter
+  emitter: ContextEmitter
 }): Promise<ExecuteScriptStepOutputs> {
   if (inputs.code == null) {
     return {
diff --git a/packages/server/src/automations/steps/filter.ts b/packages/server/src/automations/steps/filter.ts
index 84cea00b93..9b7e347034 100644
--- a/packages/server/src/automations/steps/filter.ts
+++ b/packages/server/src/automations/steps/filter.ts
@@ -1,74 +1,7 @@
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  FilterStepInputs,
-  FilterStepOutputs,
-} from "@budibase/types"
+import { FilterStepInputs, FilterStepOutputs } from "@budibase/types"
+import { automations } from "@budibase/shared-core"
 
-export const FilterConditions = {
-  EQUAL: "EQUAL",
-  NOT_EQUAL: "NOT_EQUAL",
-  GREATER_THAN: "GREATER_THAN",
-  LESS_THAN: "LESS_THAN",
-}
-
-export const PrettyFilterConditions = {
-  [FilterConditions.EQUAL]: "Equals",
-  [FilterConditions.NOT_EQUAL]: "Not equals",
-  [FilterConditions.GREATER_THAN]: "Greater than",
-  [FilterConditions.LESS_THAN]: "Less than",
-}
-
-export const definition: AutomationStepDefinition = {
-  name: "Condition",
-  tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
-  icon: "Branch2",
-  description:
-    "Conditionally halt automations which do not meet certain conditions",
-  type: AutomationStepType.LOGIC,
-  internal: true,
-  features: {},
-  stepId: AutomationActionStepId.FILTER,
-  inputs: {
-    condition: FilterConditions.EQUAL,
-  },
-  schema: {
-    inputs: {
-      properties: {
-        field: {
-          type: AutomationIOType.STRING,
-          title: "Reference Value",
-        },
-        condition: {
-          type: AutomationIOType.STRING,
-          title: "Condition",
-          enum: Object.values(FilterConditions),
-          pretty: Object.values(PrettyFilterConditions),
-        },
-        value: {
-          type: AutomationIOType.STRING,
-          title: "Comparison Value",
-        },
-      },
-      required: ["field", "condition", "value"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-        result: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the logic block passed",
-        },
-      },
-      required: ["success", "result"],
-    },
-  },
-}
+const FilterConditions = automations.steps.filter.FilterConditions
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/make.ts b/packages/server/src/automations/steps/make.ts
index 62cfd66302..241cccce9e 100644
--- a/packages/server/src/automations/steps/make.ts
+++ b/packages/server/src/automations/steps/make.ts
@@ -1,62 +1,6 @@
 import fetch from "node-fetch"
 import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  ExternalAppStepOutputs,
-  MakeIntegrationInputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Make Integration",
-  stepTitle: "Make",
-  tagline: "Trigger a Make scenario",
-  description:
-    "Performs a webhook call to Make and gets the response (if configured)",
-  icon: "ri-shut-down-line",
-  stepId: AutomationActionStepId.integromat,
-  type: AutomationStepType.ACTION,
-  internal: false,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        url: {
-          type: AutomationIOType.STRING,
-          title: "Webhook URL",
-        },
-        body: {
-          type: AutomationIOType.JSON,
-          title: "Payload",
-        },
-      },
-      required: ["url", "body"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether call was successful",
-        },
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code returned",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The webhook response - this can have properties",
-        },
-      },
-      required: ["success", "response"],
-    },
-  },
-}
+import { ExternalAppStepOutputs, MakeIntegrationInputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/n8n.ts b/packages/server/src/automations/steps/n8n.ts
index 8e55d2535b..29883dd327 100644
--- a/packages/server/src/automations/steps/n8n.ts
+++ b/packages/server/src/automations/steps/n8n.ts
@@ -1,73 +1,11 @@
 import fetch, { HeadersInit } from "node-fetch"
 import { getFetchResponse } from "./utils"
 import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
   HttpMethod,
   ExternalAppStepOutputs,
   n8nStepInputs,
 } from "@budibase/types"
 
-export const definition: AutomationStepDefinition = {
-  name: "n8n Integration",
-  stepTitle: "n8n",
-  tagline: "Trigger an n8n workflow",
-  description:
-    "Performs a webhook call to n8n and gets the response (if configured)",
-  icon: "ri-shut-down-line",
-  stepId: AutomationActionStepId.n8n,
-  type: AutomationStepType.ACTION,
-  internal: false,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        url: {
-          type: AutomationIOType.STRING,
-          title: "Webhook URL",
-        },
-        method: {
-          type: AutomationIOType.STRING,
-          title: "Method",
-          enum: Object.values(HttpMethod),
-        },
-        authorization: {
-          type: AutomationIOType.STRING,
-          title: "Authorization",
-        },
-        body: {
-          type: AutomationIOType.JSON,
-          title: "Payload",
-        },
-      },
-      required: ["url", "method"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether call was successful",
-        },
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code returned",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The webhook response - this can have properties",
-        },
-      },
-      required: ["success", "response"],
-    },
-  },
-}
-
 export async function run({
   inputs,
 }: {
diff --git a/packages/server/src/automations/steps/openai.ts b/packages/server/src/automations/steps/openai.ts
index 6f9adec1dc..55f57aff7c 100644
--- a/packages/server/src/automations/steps/openai.ts
+++ b/packages/server/src/automations/steps/openai.ts
@@ -1,68 +1,10 @@
 import { OpenAI } from "openai"
 
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  OpenAIStepInputs,
-  OpenAIStepOutputs,
-  FeatureFlag,
-} from "@budibase/types"
-import { env, features } from "@budibase/backend-core"
+import { OpenAIStepInputs, OpenAIStepOutputs } from "@budibase/types"
+import { env } from "@budibase/backend-core"
 import * as automationUtils from "../automationUtils"
 import * as pro from "@budibase/pro"
 
-enum Model {
-  GPT_4O_MINI = "gpt-4o-mini",
-  GPT_4O = "gpt-4o",
-  GPT_4 = "gpt-4",
-  GPT_35_TURBO = "gpt-3.5-turbo",
-}
-
-export const definition: AutomationStepDefinition = {
-  name: "OpenAI",
-  tagline: "Send prompts to ChatGPT",
-  icon: "Algorithm",
-  description: "Interact with the OpenAI ChatGPT API.",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {},
-  stepId: AutomationActionStepId.OPENAI,
-  inputs: {
-    prompt: "",
-  },
-  schema: {
-    inputs: {
-      properties: {
-        prompt: {
-          type: AutomationIOType.STRING,
-          title: "Prompt",
-        },
-        model: {
-          type: AutomationIOType.STRING,
-          title: "Model",
-          enum: Object.values(Model),
-        },
-      },
-      required: ["prompt", "model"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-        response: {
-          type: AutomationIOType.STRING,
-          description: "What was output",
-        },
-      },
-      required: ["success", "response"],
-    },
-  },
-}
-
 /**
  * Maintains backward compatibility with automation steps created before the introduction
  * of custom configurations and Budibase AI
@@ -99,20 +41,18 @@ export async function run({
 
   try {
     let response
-    const customConfigsEnabled =
-      (await features.flags.isEnabled(FeatureFlag.AI_CUSTOM_CONFIGS)) &&
-      (await pro.features.isAICustomConfigsEnabled())
-    const budibaseAIEnabled =
-      (await features.flags.isEnabled(FeatureFlag.BUDIBASE_AI)) &&
-      (await pro.features.isBudibaseAIEnabled())
+    const customConfigsEnabled = await pro.features.isAICustomConfigsEnabled()
+    const budibaseAIEnabled = await pro.features.isBudibaseAIEnabled()
 
-    let llm
+    let llmWrapper
     if (budibaseAIEnabled || customConfigsEnabled) {
-      llm = await pro.ai.LargeLanguageModel.forCurrentTenant(inputs.model)
+      llmWrapper = await pro.ai.LargeLanguageModel.forCurrentTenant(
+        inputs.model
+      )
     }
 
-    response = llm?.initialised
-      ? await llm.run(inputs.prompt)
+    response = llmWrapper?.llm
+      ? await llmWrapper.run(inputs.prompt)
       : await legacyOpenAIPrompt(inputs)
 
     return {
diff --git a/packages/server/src/automations/steps/outgoingWebhook.ts b/packages/server/src/automations/steps/outgoingWebhook.ts
index 70b8b1f476..a1211ea281 100644
--- a/packages/server/src/automations/steps/outgoingWebhook.ts
+++ b/packages/server/src/automations/steps/outgoingWebhook.ts
@@ -2,12 +2,6 @@ import fetch from "node-fetch"
 import { getFetchResponse } from "./utils"
 import * as automationUtils from "../automationUtils"
 import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
   ExternalAppStepOutputs,
   OutgoingWebhookStepInputs,
 } from "@budibase/types"
@@ -26,69 +20,6 @@ const BODY_REQUESTS = [RequestType.POST, RequestType.PUT, RequestType.PATCH]
  * NOTE: this functionality is deprecated - it no longer should be used.
  */
 
-export const definition: AutomationStepDefinition = {
-  deprecated: true,
-  name: "Outgoing webhook",
-  tagline: "Send a {{inputs.requestMethod}} request",
-  icon: "Send",
-  description: "Send a request of specified method to a URL",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
-  inputs: {
-    requestMethod: "POST",
-    url: "http://",
-    requestBody: "{}",
-    headers: "{}",
-  },
-  schema: {
-    inputs: {
-      properties: {
-        requestMethod: {
-          type: AutomationIOType.STRING,
-          enum: Object.values(RequestType),
-          title: "Request method",
-        },
-        url: {
-          type: AutomationIOType.STRING,
-          title: "URL",
-        },
-        requestBody: {
-          type: AutomationIOType.STRING,
-          title: "JSON Body",
-          customType: AutomationCustomIOType.WIDE,
-        },
-        headers: {
-          type: AutomationIOType.STRING,
-          title: "Headers",
-          customType: AutomationCustomIOType.WIDE,
-        },
-      },
-      required: ["requestMethod", "url"],
-    },
-    outputs: {
-      properties: {
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The response from the webhook",
-        },
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code returned",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-      },
-      required: ["response", "success"],
-    },
-  },
-}
-
 export async function run({
   inputs,
 }: {
diff --git a/packages/server/src/automations/steps/queryRows.ts b/packages/server/src/automations/steps/queryRows.ts
index dc4dda4482..9c60a63dac 100644
--- a/packages/server/src/automations/steps/queryRows.ts
+++ b/packages/server/src/automations/steps/queryRows.ts
@@ -4,84 +4,12 @@ import { buildCtx } from "./utils"
 import * as automationUtils from "../automationUtils"
 import {
   FieldType,
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
   EmptyFilterOption,
   SortOrder,
   QueryRowsStepInputs,
   QueryRowsStepOutputs,
 } from "@budibase/types"
 
-const SortOrderPretty = {
-  [SortOrder.ASCENDING]: "Ascending",
-  [SortOrder.DESCENDING]: "Descending",
-}
-
-export const definition: AutomationStepDefinition = {
-  description: "Query rows from the database",
-  icon: "Search",
-  name: "Query rows",
-  tagline: "Query rows from {{inputs.enriched.table.name}} table",
-  type: AutomationStepType.ACTION,
-  stepId: AutomationActionStepId.QUERY_ROWS,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        tableId: {
-          type: AutomationIOType.STRING,
-          customType: AutomationCustomIOType.TABLE,
-          title: "Table",
-        },
-        filters: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.FILTERS,
-          title: "Filtering",
-        },
-        sortColumn: {
-          type: AutomationIOType.STRING,
-          title: "Sort Column",
-          customType: AutomationCustomIOType.COLUMN,
-        },
-        sortOrder: {
-          type: AutomationIOType.STRING,
-          title: "Sort Order",
-          enum: Object.values(SortOrder),
-          pretty: Object.values(SortOrderPretty),
-        },
-        limit: {
-          type: AutomationIOType.NUMBER,
-          title: "Limit",
-          customType: AutomationCustomIOType.QUERY_LIMIT,
-        },
-      },
-      required: ["tableId"],
-    },
-    outputs: {
-      properties: {
-        rows: {
-          type: AutomationIOType.ARRAY,
-          customType: AutomationCustomIOType.ROWS,
-          description: "The rows that were found",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the query was successful",
-        },
-      },
-      required: ["rows", "success"],
-    },
-  },
-}
-
 async function getTable(appId: string, tableId: string) {
   const ctx: any = buildCtx(appId, null, {
     params: {
@@ -122,9 +50,10 @@ export async function run({
     sortType =
       fieldType === FieldType.NUMBER ? FieldType.NUMBER : FieldType.STRING
   }
+  // when passing the tableId in the Ctx it needs to be decoded
   const ctx = buildCtx(appId, null, {
     params: {
-      tableId,
+      tableId: decodeURIComponent(tableId),
     },
     body: {
       sortType,
@@ -152,7 +81,7 @@ export async function run({
 
     return {
       rows,
-      success: ctx.status === 200,
+      success: true,
     }
   } catch (err) {
     return {
diff --git a/packages/server/src/automations/steps/sendSmtpEmail.ts b/packages/server/src/automations/steps/sendSmtpEmail.ts
index 72ca410528..bfa2fa31ad 100644
--- a/packages/server/src/automations/steps/sendSmtpEmail.ts
+++ b/packages/server/src/automations/steps/sendSmtpEmail.ts
@@ -1,102 +1,6 @@
 import { sendSmtpEmail } from "../../utilities/workerRequests"
 import * as automationUtils from "../automationUtils"
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  AutomationCustomIOType,
-  SmtpEmailStepInputs,
-  BaseAutomationOutputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  description: "Send an email using SMTP",
-  tagline: "Send SMTP email to {{inputs.to}}",
-  icon: "Email",
-  name: "Send Email (SMTP)",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        to: {
-          type: AutomationIOType.STRING,
-          title: "Send To",
-        },
-        from: {
-          type: AutomationIOType.STRING,
-          title: "Send From",
-        },
-        cc: {
-          type: AutomationIOType.STRING,
-          title: "CC",
-        },
-        bcc: {
-          type: AutomationIOType.STRING,
-          title: "BCC",
-        },
-        subject: {
-          type: AutomationIOType.STRING,
-          title: "Email Subject",
-        },
-        contents: {
-          type: AutomationIOType.STRING,
-          title: "HTML Contents",
-        },
-        addInvite: {
-          type: AutomationIOType.BOOLEAN,
-          title: "Add calendar invite",
-        },
-        startTime: {
-          type: AutomationIOType.DATE,
-          title: "Start Time",
-          dependsOn: "addInvite",
-        },
-        endTime: {
-          type: AutomationIOType.DATE,
-          title: "End Time",
-          dependsOn: "addInvite",
-        },
-        summary: {
-          type: AutomationIOType.STRING,
-          title: "Meeting Summary",
-          dependsOn: "addInvite",
-        },
-        location: {
-          type: AutomationIOType.STRING,
-          title: "Location",
-          dependsOn: "addInvite",
-        },
-        attachments: {
-          type: AutomationIOType.ATTACHMENT,
-          customType: AutomationCustomIOType.MULTI_ATTACHMENTS,
-          title: "Attachments",
-        },
-      },
-      required: ["to", "from", "subject", "contents"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the email was sent",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "A response from the email client, this may be an error",
-        },
-      },
-      required: ["success"],
-    },
-  },
-}
+import { SmtpEmailStepInputs, BaseAutomationOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/serverLog.ts b/packages/server/src/automations/steps/serverLog.ts
index ffc517c05e..b3588b7378 100644
--- a/packages/server/src/automations/steps/serverLog.ts
+++ b/packages/server/src/automations/steps/serverLog.ts
@@ -1,58 +1,4 @@
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  ServerLogStepInputs,
-  ServerLogStepOutputs,
-} from "@budibase/types"
-
-/**
- * Note, there is some functionality in this that is not currently exposed as it
- * is complex and maybe better to be opinionated here.
- * GET/DELETE requests cannot handle body elements so they will not be sent if configured.
- */
-
-export const definition: AutomationStepDefinition = {
-  name: "Backend log",
-  tagline: "Console log a value in the backend",
-  icon: "Monitoring",
-  description: "Logs the given text to the server (using console.log)",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.SERVER_LOG,
-  inputs: {
-    text: "",
-  },
-  schema: {
-    inputs: {
-      properties: {
-        text: {
-          type: AutomationIOType.STRING,
-          title: "Log",
-        },
-      },
-      required: ["text"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-        message: {
-          type: AutomationIOType.STRING,
-          description: "What was output",
-        },
-      },
-      required: ["success", "message"],
-    },
-  },
-}
+import { ServerLogStepInputs, ServerLogStepOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
@@ -61,6 +7,9 @@ export async function run({
   inputs: ServerLogStepInputs
   appId: string
 }): Promise<ServerLogStepOutputs> {
+  if (typeof inputs.text !== "string") {
+    inputs.text = JSON.stringify(inputs.text)
+  }
   const message = `App ${appId} - ${inputs.text}`
   console.log(message)
   return {
diff --git a/packages/server/src/automations/steps/slack.ts b/packages/server/src/automations/steps/slack.ts
index 353611260c..12dcea74c7 100644
--- a/packages/server/src/automations/steps/slack.ts
+++ b/packages/server/src/automations/steps/slack.ts
@@ -1,59 +1,6 @@
 import fetch from "node-fetch"
 import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  ExternalAppStepOutputs,
-  SlackStepInputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Slack Message",
-  tagline: "Send a message to Slack",
-  description: "Send a message to Slack",
-  icon: "ri-slack-line",
-  stepId: AutomationActionStepId.slack,
-  type: AutomationStepType.ACTION,
-  internal: false,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        url: {
-          type: AutomationIOType.STRING,
-          title: "Incoming Webhook URL",
-        },
-        text: {
-          type: AutomationIOType.STRING,
-          title: "Message",
-        },
-      },
-      required: ["url", "text"],
-    },
-    outputs: {
-      properties: {
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code of the request",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the message sent successfully",
-        },
-        response: {
-          type: AutomationIOType.STRING,
-          description: "The response from the Slack Webhook",
-        },
-      },
-    },
-  },
-}
+import { ExternalAppStepOutputs, SlackStepInputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/steps/triggerAutomationRun.ts b/packages/server/src/automations/steps/triggerAutomationRun.ts
index c43f46b6f9..5c7959648d 100644
--- a/packages/server/src/automations/steps/triggerAutomationRun.ts
+++ b/packages/server/src/automations/steps/triggerAutomationRun.ts
@@ -1,11 +1,5 @@
 import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationResults,
   Automation,
-  AutomationCustomIOType,
   TriggerAutomationStepInputs,
   TriggerAutomationStepOutputs,
 } from "@budibase/types"
@@ -14,54 +8,6 @@ import { context } from "@budibase/backend-core"
 import { features } from "@budibase/pro"
 import env from "../../environment"
 
-export const definition: AutomationStepDefinition = {
-  name: "Trigger an automation",
-  tagline: "Triggers an automation synchronously",
-  icon: "Sync",
-  description: "Triggers an automation synchronously",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {},
-  stepId: AutomationActionStepId.TRIGGER_AUTOMATION_RUN,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        automation: {
-          type: AutomationIOType.OBJECT,
-          properties: {
-            automationId: {
-              type: AutomationIOType.STRING,
-              customType: AutomationCustomIOType.AUTOMATION,
-            },
-          },
-          customType: AutomationCustomIOType.AUTOMATION_FIELDS,
-          title: "automatioFields",
-          required: ["automationId"],
-        },
-        timeout: {
-          type: AutomationIOType.NUMBER,
-          title: "Timeout (ms)",
-        },
-      },
-      required: ["automationId"],
-    },
-    outputs: {
-      properties: {
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the automation was successful",
-        },
-        value: {
-          type: AutomationIOType.OBJECT,
-          description: "Automation Result",
-        },
-      },
-      required: ["success", "value"],
-    },
-  },
-}
-
 export async function run({
   inputs,
 }: {
@@ -78,7 +24,7 @@ export async function run({
       const db = context.getAppDB()
       let automation = await db.get<Automation>(inputs.automation.automationId)
 
-      const response: AutomationResults = await triggers.externalTrigger(
+      const response = await triggers.externalTrigger(
         automation,
         {
           fields: { ...fieldParams },
@@ -88,9 +34,13 @@ export async function run({
         { getResponses: true }
       )
 
-      return {
-        success: true,
-        value: response.steps,
+      if (triggers.isAutomationResults(response)) {
+        return {
+          success: true,
+          value: response.steps,
+        }
+      } else {
+        throw new Error("Automation did not have a collect block")
       }
     }
   } else {
diff --git a/packages/server/src/automations/steps/updateRow.ts b/packages/server/src/automations/steps/updateRow.ts
index 65b9bf93d3..7a62e40706 100644
--- a/packages/server/src/automations/steps/updateRow.ts
+++ b/packages/server/src/automations/steps/updateRow.ts
@@ -1,77 +1,12 @@
-import { EventEmitter } from "events"
 import * as rowController from "../../api/controllers/row"
 import * as automationUtils from "../automationUtils"
 import { buildCtx } from "./utils"
 import {
-  AutomationActionStepId,
-  AutomationCustomIOType,
-  AutomationFeature,
-  AutomationIOType,
-  AutomationStepDefinition,
-  AutomationStepType,
+  ContextEmitter,
   UpdateRowStepInputs,
   UpdateRowStepOutputs,
 } from "@budibase/types"
 
-export const definition: AutomationStepDefinition = {
-  name: "Update Row",
-  tagline: "Update a {{inputs.enriched.table.name}} row",
-  icon: "Refresh",
-  description: "Update a row in your database",
-  type: AutomationStepType.ACTION,
-  internal: true,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  stepId: AutomationActionStepId.UPDATE_ROW,
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        meta: {
-          type: AutomationIOType.OBJECT,
-          title: "Field settings",
-        },
-        row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
-          title: "Table",
-        },
-        rowId: {
-          type: AutomationIOType.STRING,
-          title: "Row ID",
-        },
-      },
-      required: ["row", "rowId"],
-    },
-    outputs: {
-      properties: {
-        row: {
-          type: AutomationIOType.OBJECT,
-          customType: AutomationCustomIOType.ROW,
-          description: "The updated row",
-        },
-        response: {
-          type: AutomationIOType.OBJECT,
-          description: "The response from the table",
-        },
-        success: {
-          type: AutomationIOType.BOOLEAN,
-          description: "Whether the action was successful",
-        },
-        id: {
-          type: AutomationIOType.STRING,
-          description: "The identifier of the updated row",
-        },
-        revision: {
-          type: AutomationIOType.STRING,
-          description: "The revision of the updated row",
-        },
-      },
-      required: ["success", "id", "revision"],
-    },
-  },
-}
 export async function run({
   inputs,
   appId,
@@ -79,7 +14,7 @@ export async function run({
 }: {
   inputs: UpdateRowStepInputs
   appId: string
-  emitter: EventEmitter
+  emitter: ContextEmitter
 }): Promise<UpdateRowStepOutputs> {
   if (inputs.rowId == null || inputs.row == null) {
     return {
@@ -90,6 +25,8 @@ export async function run({
     }
   }
   const tableId = inputs.row.tableId
+    ? decodeURIComponent(inputs.row.tableId)
+    : inputs.row.tableId
 
   // Base update
   let rowUpdate: Record<string, any>
@@ -157,7 +94,7 @@ export async function run({
       },
       params: {
         rowId: inputs.rowId,
-        tableId,
+        tableId: tableId,
       },
     })
     await rowController.patch(ctx)
@@ -166,7 +103,7 @@ export async function run({
       response: ctx.message,
       id: ctx.body._id,
       revision: ctx.body._rev,
-      success: ctx.status === 200,
+      success: !!ctx.body._id,
     }
   } catch (err) {
     return {
diff --git a/packages/server/src/automations/steps/utils.ts b/packages/server/src/automations/steps/utils.ts
index 8b99044303..20f1e67589 100644
--- a/packages/server/src/automations/steps/utils.ts
+++ b/packages/server/src/automations/steps/utils.ts
@@ -1,4 +1,4 @@
-import { EventEmitter } from "events"
+import { ContextEmitter } from "@budibase/types"
 
 export async function getFetchResponse(fetched: any) {
   let status = fetched.status,
@@ -22,7 +22,7 @@ export async function getFetchResponse(fetched: any) {
 // opts can contain, body, params and version
 export function buildCtx(
   appId: string,
-  emitter?: EventEmitter | null,
+  emitter?: ContextEmitter | null,
   opts: any = {}
 ) {
   const ctx: any = {
diff --git a/packages/server/src/automations/steps/zapier.ts b/packages/server/src/automations/steps/zapier.ts
index 888dae1e68..d17323cf0d 100644
--- a/packages/server/src/automations/steps/zapier.ts
+++ b/packages/server/src/automations/steps/zapier.ts
@@ -1,55 +1,6 @@
 import fetch from "node-fetch"
 import { getFetchResponse } from "./utils"
-import {
-  AutomationActionStepId,
-  AutomationStepDefinition,
-  AutomationStepType,
-  AutomationIOType,
-  AutomationFeature,
-  ZapierStepInputs,
-  ZapierStepOutputs,
-} from "@budibase/types"
-
-export const definition: AutomationStepDefinition = {
-  name: "Zapier Webhook",
-  stepId: AutomationActionStepId.zapier,
-  type: AutomationStepType.ACTION,
-  internal: false,
-  features: {
-    [AutomationFeature.LOOPING]: true,
-  },
-  description: "Trigger a Zapier Zap via webhooks",
-  tagline: "Trigger a Zapier Zap",
-  icon: "ri-flashlight-line",
-  inputs: {},
-  schema: {
-    inputs: {
-      properties: {
-        url: {
-          type: AutomationIOType.STRING,
-          title: "Webhook URL",
-        },
-        body: {
-          type: AutomationIOType.JSON,
-          title: "Payload",
-        },
-      },
-      required: ["url"],
-    },
-    outputs: {
-      properties: {
-        httpStatus: {
-          type: AutomationIOType.NUMBER,
-          description: "The HTTP status code of the request",
-        },
-        response: {
-          type: AutomationIOType.STRING,
-          description: "The response from Zapier",
-        },
-      },
-    },
-  },
-}
+import { ZapierStepInputs, ZapierStepOutputs } from "@budibase/types"
 
 export async function run({
   inputs,
diff --git a/packages/server/src/automations/tests/bash.spec.ts b/packages/server/src/automations/tests/bash.spec.ts
index 472d1092d6..12ed784268 100644
--- a/packages/server/src/automations/tests/bash.spec.ts
+++ b/packages/server/src/automations/tests/bash.spec.ts
@@ -1,26 +1,148 @@
-import { getConfig, afterAll as _afterAll, runStep } from "./utilities"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
+import * as automation from "../index"
+import * as setup from "./utilities"
+import { Table } from "@budibase/types"
 
-describe("test the bash action", () => {
-  let config = getConfig()
+describe("Execute Bash Automations", () => {
+  let config = setup.getConfig(),
+    table: Table
 
   beforeAll(async () => {
+    await automation.init()
     await config.init()
-  })
-  afterAll(_afterAll)
-
-  it("should be able to execute a script", async () => {
-    let res = await runStep(config, "EXECUTE_BASH", {
-      code: "echo 'test'",
+    table = await config.createTable()
+    await config.createRow({
+      name: "test row",
+      description: "test description",
+      tableId: table._id!,
     })
-    expect(res.stdout).toEqual("test\n")
-    expect(res.success).toEqual(true)
   })
 
-  it("should handle a null value", async () => {
-    let res = await runStep(config, "EXECUTE_BASH", {
-      code: null,
+  afterAll(setup.afterAll)
+
+  it("should use trigger data in bash command and pass output to subsequent steps", async () => {
+    const result = await createAutomationBuilder({
+      name: "Bash with Trigger Data",
+      config,
     })
-    expect(res.stdout).toEqual(
+      .appAction({ fields: { command: "hello world" } })
+      .bash(
+        { code: "echo '{{ trigger.fields.command }}'" },
+        { stepName: "Echo Command" }
+      )
+      .serverLog(
+        { text: "Bash output was: {{ steps.[Echo Command].stdout }}" },
+        { stepName: "Log Output" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.stdout).toEqual("hello world\n")
+    expect(result.steps[1].outputs.message).toContain(
+      "Bash output was: hello world"
+    )
+  })
+
+  it("should chain multiple bash commands using previous outputs", async () => {
+    const result = await createAutomationBuilder({
+      name: "Chained Bash Commands",
+      config,
+    })
+      .appAction({ fields: { filename: "testfile.txt" } })
+      .bash(
+        { code: "echo 'initial content' > {{ trigger.fields.filename }}" },
+        { stepName: "Create File" }
+      )
+      .bash(
+        { code: "cat {{ trigger.fields.filename }} | tr '[a-z]' '[A-Z]'" },
+        { stepName: "Transform Content" }
+      )
+      .bash(
+        { code: "rm {{ trigger.fields.filename }}" },
+        { stepName: "Cleanup" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.stdout).toEqual("INITIAL CONTENT\n")
+    expect(result.steps[1].outputs.success).toEqual(true)
+  })
+
+  it("should integrate bash output with row operations", async () => {
+    const result = await createAutomationBuilder({
+      name: "Bash with Row Operations",
+      config,
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          filters: {},
+        },
+        { stepName: "Get Row" }
+      )
+      .bash(
+        {
+          code: "echo Row data: {{ steps.[Get Row].rows.[0].name }} - {{ steps.[Get Row].rows.[0].description }}",
+        },
+        { stepName: "Process Row Data" }
+      )
+      .serverLog(
+        { text: "{{ steps.[Process Row Data].stdout }}" },
+        { stepName: "Log Result" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.stdout).toContain(
+      "Row data: test row - test description"
+    )
+    expect(result.steps[2].outputs.message).toContain(
+      "Row data: test row - test description"
+    )
+  })
+
+  it("should handle bash output in conditional logic", async () => {
+    const result = await createAutomationBuilder({
+      name: "Bash with Conditional",
+      config,
+    })
+      .appAction({ fields: { threshold: "5" } })
+      .bash(
+        { code: "echo $(( {{ trigger.fields.threshold }} + 5 ))" },
+        { stepName: "Calculate Value" }
+      )
+      .executeScript(
+        {
+          code: `
+            const value = parseInt(steps["Calculate Value"].stdout);
+            return value > 8 ? "high" : "low";
+          `,
+        },
+        { stepName: "Check Value" }
+      )
+      .serverLog(
+        { text: "Value was {{ steps.[Check Value].value }}" },
+        { stepName: "Log Result" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.stdout).toEqual("10\n")
+    expect(result.steps[1].outputs.value).toEqual("high")
+    expect(result.steps[2].outputs.message).toContain("Value was high")
+  })
+
+  it("should handle null values gracefully", async () => {
+    const result = await createAutomationBuilder({
+      name: "Null Bash Input",
+      config,
+    })
+      .appAction({ fields: {} })
+      .bash(
+        //@ts-ignore
+        { code: null },
+        { stepName: "Null Command" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.stdout).toBe(
       "Budibase bash automation failed: Invalid inputs"
     )
   })
diff --git a/packages/server/src/automations/tests/createRow.spec.ts b/packages/server/src/automations/tests/createRow.spec.ts
index bcf9845669..bd78de2217 100644
--- a/packages/server/src/automations/tests/createRow.spec.ts
+++ b/packages/server/src/automations/tests/createRow.spec.ts
@@ -1,6 +1,7 @@
 import * as setup from "./utilities"
 import { basicTableWithAttachmentField } from "../../tests/utilities/structures"
 import { objectStore } from "@budibase/backend-core"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 
 async function uploadTestFile(filename: string) {
   let bucket = "testbucket"
@@ -13,6 +14,7 @@ async function uploadTestFile(filename: string) {
 
   return presignedUrl
 }
+
 describe("test the create row action", () => {
   let table: any
   let row: any
@@ -31,30 +33,78 @@ describe("test the create row action", () => {
   afterAll(setup.afterAll)
 
   it("should be able to run the action", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Flow",
+      appId: config.getAppId(),
+      config,
     })
-    expect(res.id).toBeDefined()
-    expect(res.revision).toBeDefined()
-    expect(res.success).toEqual(true)
-    const gottenRow = await config.api.row.get(table._id, res.id)
+      .appAction({ fields: { status: "new" } })
+      .serverLog({ text: "Starting create row flow" }, { stepName: "StartLog" })
+      .createRow({ row }, { stepName: "CreateRow" })
+      .serverLog(
+        { text: "Row created with ID: {{ stepsByName.CreateRow.row._id }}" },
+        { stepName: "CreationLog" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toBeDefined()
+    expect(result.steps[1].outputs.id).toBeDefined()
+    expect(result.steps[1].outputs.revision).toBeDefined()
+    const gottenRow = await config.api.row.get(
+      table._id,
+      result.steps[1].outputs.id
+    )
     expect(gottenRow.name).toEqual("test")
     expect(gottenRow.description).toEqual("test")
+    expect(result.steps[2].outputs.message).toContain(
+      "Row created with ID: " + result.steps[1].outputs.id
+    )
   })
 
   it("should return an error (not throw) when bad info provided", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: {
-        tableId: "invalid",
-        invalid: "invalid",
-      },
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Error Flow",
+      appId: config.getAppId(),
+      config,
     })
-    expect(res.success).toEqual(false)
+      .appAction({ fields: { status: "error" } })
+      .serverLog({ text: "Starting error test flow" }, { stepName: "StartLog" })
+      .createRow(
+        {
+          row: {
+            tableId: "invalid",
+            invalid: "invalid",
+          },
+        },
+        { stepName: "CreateRow" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toEqual(false)
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Invalid Flow",
+      appId: config.getAppId(),
+      config,
+    })
+      .appAction({ fields: { status: "invalid" } })
+      .serverLog({ text: "Testing invalid input" }, { stepName: "StartLog" })
+      .createRow({ row: {} }, { stepName: "CreateRow" })
+      .filter({
+        field: "{{ stepsByName.CreateRow.success }}",
+        condition: "equal",
+        value: true,
+      })
+      .serverLog(
+        { text: "This log should not appear" },
+        { stepName: "SkippedLog" }
+      )
+      .run()
+
+    expect(result.steps[1].outputs.success).toEqual(false)
+    expect(result.steps.length).toBeLessThan(4)
   })
 
   it("should check that an attachment field is sent to storage and parsed", async () => {
@@ -76,13 +126,33 @@ describe("test the create row action", () => {
     ]
 
     attachmentRow.file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "attachment" } })
+      .serverLog(
+        { text: "Processing attachment upload" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .filter({
+        field: "{{ stepsByName.CreateRow.success }}",
+        condition: "equal",
+        value: true,
+      })
+      .serverLog(
+        {
+          text: "Attachment uploaded with key: {{ stepsByName.CreateRow.row.file_attachment.0.key }}",
+        },
+        { stepName: "UploadLog" }
+      )
+      .run()
 
-    expect(res.success).toEqual(true)
-    expect(res.row.file_attachment[0]).toHaveProperty("key")
-    let s3Key = res.row.file_attachment[0].key
+    expect(result.steps[1].outputs.success).toEqual(true)
+    expect(result.steps[1].outputs.row.file_attachment[0]).toHaveProperty("key")
+    let s3Key = result.steps[1].outputs.row.file_attachment[0].key
 
     const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS)
 
@@ -111,13 +181,53 @@ describe("test the create row action", () => {
     }
 
     attachmentRow.single_file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Single Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "single-attachment" } })
+      .serverLog(
+        { text: "Processing single attachment" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .branch({
+        success: {
+          steps: stepBuilder =>
+            stepBuilder
+              .serverLog(
+                { text: "Single attachment processed" },
+                { stepName: "ProcessLog" }
+              )
+              .serverLog(
+                {
+                  text: "File key: {{ stepsByName.CreateRow.row.single_file_attachment.key }}",
+                },
+                { stepName: "KeyLog" }
+              ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": true },
+          },
+        },
+        error: {
+          steps: stepBuilder =>
+            stepBuilder.serverLog(
+              { text: "Failed to process attachment" },
+              { stepName: "ErrorLog" }
+            ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": false },
+          },
+        },
+      })
+      .run()
 
-    expect(res.success).toEqual(true)
-    expect(res.row.single_file_attachment).toHaveProperty("key")
-    let s3Key = res.row.single_file_attachment.key
+    expect(result.steps[1].outputs.success).toEqual(true)
+    expect(result.steps[1].outputs.row.single_file_attachment).toHaveProperty(
+      "key"
+    )
+    let s3Key = result.steps[1].outputs.row.single_file_attachment.key
 
     const client = objectStore.ObjectStore(objectStore.ObjectStoreBuckets.APPS)
 
@@ -146,13 +256,50 @@ describe("test the create row action", () => {
     }
 
     attachmentRow.single_file_attachment = attachmentObject
-    const res = await setup.runStep(config, setup.actions.CREATE_ROW.stepId, {
-      row: attachmentRow,
+    const result = await createAutomationBuilder({
+      name: "Test Create Row Invalid Attachment Flow",
+      appId: config.getAppId(),
+      config,
     })
+      .appAction({ fields: { type: "invalid-attachment" } })
+      .serverLog(
+        { text: "Testing invalid attachment keys" },
+        { stepName: "StartLog" }
+      )
+      .createRow({ row: attachmentRow }, { stepName: "CreateRow" })
+      .branch({
+        success: {
+          steps: stepBuilder =>
+            stepBuilder.serverLog(
+              { text: "Unexpected success" },
+              { stepName: "UnexpectedLog" }
+            ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": true },
+          },
+        },
+        error: {
+          steps: stepBuilder =>
+            stepBuilder
+              .serverLog(
+                { text: "Expected error occurred" },
+                { stepName: "ErrorLog" }
+              )
+              .serverLog(
+                { text: "Error: {{ stepsByName.CreateRow.response }}" },
+                { stepName: "ErrorDetailsLog" }
+              ),
+          condition: {
+            equal: { "{{ stepsByName.CreateRow.success }}": false },
+          },
+        },
+      })
+      .run()
 
-    expect(res.success).toEqual(false)
-    expect(res.response).toEqual(
+    expect(result.steps[1].outputs.success).toEqual(false)
+    expect(result.steps[1].outputs.response).toEqual(
       'Error: Attachments must have both "url" and "filename" keys. You have provided: wrongKey, anotherWrongKey'
     )
+    expect(result.steps[2].outputs.status).toEqual("No branch condition met")
   })
 })
diff --git a/packages/server/src/automations/tests/deleteRow.spec.ts b/packages/server/src/automations/tests/deleteRow.spec.ts
index dd13aa49c1..cabf590421 100644
--- a/packages/server/src/automations/tests/deleteRow.spec.ts
+++ b/packages/server/src/automations/tests/deleteRow.spec.ts
@@ -1,52 +1,65 @@
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 import * as setup from "./utilities"
 
 describe("test the delete row action", () => {
-  let table: any
-  let row: any
-  let inputs: any
-  let config = setup.getConfig()
+  let table: any,
+    row: any,
+    config = setup.getConfig()
 
-  beforeEach(async () => {
+  beforeAll(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()
-    inputs = {
-      tableId: table._id,
-      id: row._id,
-      revision: row._rev,
-    }
   })
 
   afterAll(setup.afterAll)
 
-  it("should be able to run the action", async () => {
-    const res = await setup.runStep(
-      config,
-      setup.actions.DELETE_ROW.stepId,
-      inputs
-    )
-    expect(res.success).toEqual(true)
-    expect(res.response).toBeDefined()
-    expect(res.row._id).toEqual(row._id)
-  })
+  it("should be able to run the delete row action", async () => {
+    const builder = createAutomationBuilder({
+      name: "Delete Row Automation",
+    })
 
-  it("check usage quota attempts", async () => {
-    await setup.runInProd(async () => {
-      await setup.runStep(config, setup.actions.DELETE_ROW.stepId, inputs)
+    await builder
+      .appAction({ fields: {} })
+      .deleteRow({
+        tableId: table._id,
+        id: row._id,
+        revision: row._rev,
+      })
+      .run()
+
+    await config.api.row.get(table._id, row._id, {
+      status: 404,
     })
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.DELETE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const builder = createAutomationBuilder({
+      name: "Invalid Inputs Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .deleteRow({ tableId: "", id: "", revision: "" })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should return an error when table doesn't exist", async () => {
-    const res = await setup.runStep(config, setup.actions.DELETE_ROW.stepId, {
-      tableId: "invalid",
-      id: "invalid",
-      revision: "invalid",
+    const builder = createAutomationBuilder({
+      name: "Nonexistent Table Automation",
     })
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .deleteRow({
+        tableId: "invalid",
+        id: "invalid",
+        revision: "invalid",
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 })
diff --git a/packages/server/src/automations/tests/executeQuery.spec.ts b/packages/server/src/automations/tests/executeQuery.spec.ts
index 12bbe892a0..2d65be6e58 100644
--- a/packages/server/src/automations/tests/executeQuery.spec.ts
+++ b/packages/server/src/automations/tests/executeQuery.spec.ts
@@ -7,71 +7,74 @@ import {
 import { Knex } from "knex"
 import { generator } from "@budibase/backend-core/tests"
 
-datasourceDescribe(
-  {
-    name: "execute query action",
-    exclude: [DatabaseName.MONGODB, DatabaseName.SQS],
-  },
-  ({ config, dsProvider }) => {
-    let tableName: string
-    let client: Knex
-    let datasource: Datasource
-    let query: Query
+const descriptions = datasourceDescribe({
+  exclude: [DatabaseName.MONGODB, DatabaseName.SQS],
+})
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource!
-      client = ds.client!
-    })
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "execute query action ($dbName)",
+    ({ config, dsProvider }) => {
+      let tableName: string
+      let client: Knex
+      let datasource: Datasource
+      let query: Query
 
-    beforeEach(async () => {
-      tableName = generator.guid()
-      await client.schema.createTable(tableName, table => {
-        table.string("a")
-        table.integer("b")
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource!
+        client = ds.client!
       })
-      await client(tableName).insert({ a: "string", b: 1 })
-      query = await setup.saveTestQuery(config, client, tableName, datasource)
-    })
 
-    afterEach(async () => {
-      await client.schema.dropTable(tableName)
-    })
+      beforeEach(async () => {
+        tableName = generator.guid()
+        await client.schema.createTable(tableName, table => {
+          table.string("a")
+          table.integer("b")
+        })
+        await client(tableName).insert({ a: "string", b: 1 })
+        query = await setup.saveTestQuery(config, client, tableName, datasource)
+      })
 
-    it("should be able to execute a query", async () => {
-      let res = await setup.runStep(
-        config,
-        setup.actions.EXECUTE_QUERY.stepId,
-        {
-          query: { queryId: query._id },
-        }
-      )
-      expect(res.response).toEqual([{ a: "string", b: 1 }])
-      expect(res.success).toEqual(true)
-    })
+      afterEach(async () => {
+        await client.schema.dropTable(tableName)
+      })
 
-    it("should handle a null query value", async () => {
-      let res = await setup.runStep(
-        config,
-        setup.actions.EXECUTE_QUERY.stepId,
-        {
-          query: null,
-        }
-      )
-      expect(res.response.message).toEqual("Invalid inputs")
-      expect(res.success).toEqual(false)
-    })
+      it("should be able to execute a query", async () => {
+        let res = await setup.runStep(
+          config,
+          setup.actions.EXECUTE_QUERY.stepId,
+          {
+            query: { queryId: query._id },
+          }
+        )
+        expect(res.response).toEqual([{ a: "string", b: 1 }])
+        expect(res.success).toEqual(true)
+      })
 
-    it("should handle an error executing a query", async () => {
-      let res = await setup.runStep(
-        config,
-        setup.actions.EXECUTE_QUERY.stepId,
-        {
-          query: { queryId: "wrong_id" },
-        }
-      )
-      expect(res.response).toBeDefined()
-      expect(res.success).toEqual(false)
-    })
-  }
-)
+      it("should handle a null query value", async () => {
+        let res = await setup.runStep(
+          config,
+          setup.actions.EXECUTE_QUERY.stepId,
+          {
+            query: null,
+          }
+        )
+        expect(res.response.message).toEqual("Invalid inputs")
+        expect(res.success).toEqual(false)
+      })
+
+      it("should handle an error executing a query", async () => {
+        let res = await setup.runStep(
+          config,
+          setup.actions.EXECUTE_QUERY.stepId,
+          {
+            query: { queryId: "wrong_id" },
+          }
+        )
+        expect(res.response).toBeDefined()
+        expect(res.success).toEqual(false)
+      })
+    }
+  )
+}
diff --git a/packages/server/src/automations/tests/executeScript.spec.ts b/packages/server/src/automations/tests/executeScript.spec.ts
index fa30e642bc..f5845093bc 100644
--- a/packages/server/src/automations/tests/executeScript.spec.ts
+++ b/packages/server/src/automations/tests/executeScript.spec.ts
@@ -1,50 +1,123 @@
-import { getConfig, afterAll as _afterAll, runStep, actions } from "./utilities"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
+import * as automation from "../index"
+import * as setup from "./utilities"
+import { Table } from "@budibase/types"
 
-describe("test the execute script action", () => {
-  let config = getConfig()
+describe("Execute Script Automations", () => {
+  let config = setup.getConfig(),
+    table: Table
 
-  beforeAll(async () => {
+  beforeEach(async () => {
+    await automation.init()
     await config.init()
+    table = await config.createTable()
+    await config.createRow()
   })
-  afterAll(_afterAll)
 
-  it("should be able to execute a script", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: "return 1 + 1",
+  afterAll(setup.afterAll)
+
+  it("should execute a basic script and return the result", async () => {
+    const builder = createAutomationBuilder({
+      name: "Basic Script Execution",
     })
-    expect(res.value).toEqual(2)
-    expect(res.success).toEqual(true)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScript({ code: "return 2 + 2" })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual(4)
   })
 
-  it("should handle a null value", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: null,
+  it("should access bindings from previous steps", async () => {
+    const builder = createAutomationBuilder({
+      name: "Access Bindings",
     })
-    expect(res.response.message).toEqual("Invalid inputs")
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: { data: [1, 2, 3] } })
+      .executeScript(
+        {
+          code: "return trigger.fields.data.map(x => x * 2)",
+        },
+        { stepId: "binding-script-step" }
+      )
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual([2, 4, 6])
   })
 
-  it("should be able to get a value from context", async () => {
-    const res = await runStep(
-      config,
-      actions.EXECUTE_SCRIPT.stepId,
-      {
-        code: "return steps.map(d => d.value)",
-      },
-      {
-        steps: [{ value: 0 }, { value: 1 }],
-      }
+  it("should handle script execution errors gracefully", async () => {
+    const builder = createAutomationBuilder({
+      name: "Handle Script Errors",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .executeScript({ code: "return nonexistentVariable.map(x => x)" })
+      .run()
+
+    expect(results.steps[0].outputs.response).toContain(
+      "ReferenceError: nonexistentVariable is not defined"
     )
-    expect(res.value).toEqual([0, 1])
-    expect(res.response).toBeUndefined()
-    expect(res.success).toEqual(true)
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
-  it("should be able to handle an error gracefully", async () => {
-    const res = await runStep(config, actions.EXECUTE_SCRIPT.stepId, {
-      code: "return something.map(x => x.name)",
+  it("should handle conditional logic in scripts", async () => {
+    const builder = createAutomationBuilder({
+      name: "Conditional Script Logic",
     })
-    expect(res.response).toEqual("ReferenceError: something is not defined")
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: { value: 10 } })
+      .executeScript({
+        code: `
+            if (trigger.fields.value > 5) {
+              return "Value is greater than 5";
+            } else {
+              return "Value is 5 or less";
+            }
+          `,
+      })
+      .run()
+
+    expect(results.steps[0].outputs.value).toEqual("Value is greater than 5")
+  })
+
+  it("should use multiple steps and validate script execution", async () => {
+    const builder = createAutomationBuilder({
+      name: "Multi-Step Script Execution",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .serverLog(
+        { text: "Starting multi-step automation" },
+        { stepId: "start-log-step" }
+      )
+      .createRow(
+        { row: { name: "Test Row", value: 42, tableId: table._id } },
+        { stepId: "abc123" }
+      )
+      .executeScript(
+        {
+          code: `
+            const createdRow = steps['abc123'];
+            return createdRow.row.value * 2;
+          `,
+        },
+        { stepId: "ScriptingStep1" }
+      )
+      .serverLog({
+        text: `Final result is {{ steps.ScriptingStep1.value }}`,
+      })
+      .run()
+
+    expect(results.steps[0].outputs.message).toContain(
+      "Starting multi-step automation"
+    )
+    expect(results.steps[1].outputs.row.value).toEqual(42)
+    expect(results.steps[2].outputs.value).toEqual(84)
+    expect(results.steps[3].outputs.message).toContain("Final result is 84")
   })
 })
diff --git a/packages/server/src/automations/tests/filter.spec.ts b/packages/server/src/automations/tests/filter.spec.ts
index a1ed72dd74..674516517a 100644
--- a/packages/server/src/automations/tests/filter.spec.ts
+++ b/packages/server/src/automations/tests/filter.spec.ts
@@ -1,5 +1,7 @@
 import * as setup from "./utilities"
-import { FilterConditions } from "../steps/filter"
+import { automations } from "@budibase/shared-core"
+
+const FilterConditions = automations.steps.filter.FilterConditions
 
 describe("test the filter logic", () => {
   const config = setup.getConfig()
diff --git a/packages/server/src/automations/tests/loop.spec.ts b/packages/server/src/automations/tests/loop.spec.ts
index 372c3855b3..2199a2a3a0 100644
--- a/packages/server/src/automations/tests/loop.spec.ts
+++ b/packages/server/src/automations/tests/loop.spec.ts
@@ -3,7 +3,7 @@ import * as triggers from "../triggers"
 import { loopAutomation } from "../../tests/utilities/structures"
 import { context } from "@budibase/backend-core"
 import * as setup from "./utilities"
-import { Table, LoopStepType } from "@budibase/types"
+import { Table, LoopStepType, AutomationResults } from "@budibase/types"
 import * as loopUtils from "../loopUtils"
 import { LoopInput } from "../../definitions/automations"
 
@@ -20,15 +20,19 @@ describe("Attempt to run a basic loop automation", () => {
 
   afterAll(setup.afterAll)
 
-  async function runLoop(loopOpts?: LoopInput) {
+  async function runLoop(loopOpts?: LoopInput): Promise<AutomationResults> {
     const appId = config.getAppId()
     return await context.doInAppContext(appId, async () => {
       const params = { fields: { appId } }
-      return await triggers.externalTrigger(
+      const result = await triggers.externalTrigger(
         loopAutomation(table._id!, loopOpts),
         params,
         { getResponses: true }
       )
+      if ("outputs" in result && !result.outputs.success) {
+        throw new Error("Unable to proceed - failed to return anything.")
+      }
+      return result as AutomationResults
     })
   }
 
diff --git a/packages/server/src/automations/tests/openai.spec.ts b/packages/server/src/automations/tests/openai.spec.ts
index 8119750f8b..1985465fc0 100644
--- a/packages/server/src/automations/tests/openai.spec.ts
+++ b/packages/server/src/automations/tests/openai.spec.ts
@@ -1,7 +1,9 @@
-import { getConfig, runStep, afterAll as _afterAll } from "./utilities"
+import { getConfig, afterAll as _afterAll } from "./utilities"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 import { OpenAI } from "openai"
 import { setEnv as setCoreEnv } from "@budibase/backend-core"
 import * as pro from "@budibase/pro"
+import { Model } from "@budibase/types"
 
 jest.mock("openai", () => ({
   OpenAI: jest.fn().mockImplementation(() => ({
@@ -25,7 +27,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: jest.fn().mockImplementation(() => ({
-        initialised: true,
+        llm: {},
         init: jest.fn(),
         run: jest.fn(),
       })),
@@ -47,6 +49,7 @@ describe("test the openai action", () => {
   let resetEnv: () => void | undefined
 
   beforeAll(async () => {
+    setCoreEnv({ SELF_HOSTED: true })
     await config.init()
   })
 
@@ -62,17 +65,39 @@ describe("test the openai action", () => {
   afterAll(_afterAll)
 
   it("should be able to receive a response from ChatGPT given a prompt", async () => {
-    const res = await runStep(config, "OPENAI", { prompt: OPENAI_PROMPT })
-    expect(res.response).toEqual("This is a test")
-    expect(res.success).toBeTruthy()
+    setCoreEnv({ SELF_HOSTED: true })
+
+    const result = await createAutomationBuilder({
+      name: "Test OpenAI Response",
+      config,
+    })
+      .appAction({ fields: {} })
+      .openai(
+        { prompt: OPENAI_PROMPT, model: Model.GPT_4O_MINI },
+        { stepName: "Basic OpenAI Query" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.response).toEqual("This is a test")
+    expect(result.steps[0].outputs.success).toBeTruthy()
   })
 
   it("should present the correct error message when a prompt is not provided", async () => {
-    const res = await runStep(config, "OPENAI", { prompt: null })
-    expect(res.response).toEqual(
+    const result = await createAutomationBuilder({
+      name: "Test OpenAI No Prompt",
+      config,
+    })
+      .appAction({ fields: {} })
+      .openai(
+        { prompt: "", model: Model.GPT_4O_MINI },
+        { stepName: "Empty Prompt Query" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.response).toEqual(
       "Budibase OpenAI Automation Failed: No prompt supplied"
     )
-    expect(res.success).toBeFalsy()
+    expect(result.steps[0].outputs.success).toBeFalsy()
   })
 
   it("should present the correct error message when an error is thrown from the createChatCompletion call", async () => {
@@ -91,14 +116,21 @@ describe("test the openai action", () => {
         } as any)
     )
 
-    const res = await runStep(config, "OPENAI", {
-      prompt: OPENAI_PROMPT,
+    const result = await createAutomationBuilder({
+      name: "Test OpenAI Error",
+      config,
     })
+      .appAction({ fields: {} })
+      .openai(
+        { prompt: OPENAI_PROMPT, model: Model.GPT_4O_MINI },
+        { stepName: "Error Producing Query" }
+      )
+      .run()
 
-    expect(res.response).toEqual(
+    expect(result.steps[0].outputs.response).toEqual(
       "Error: An error occurred while calling createChatCompletion"
     )
-    expect(res.success).toBeFalsy()
+    expect(result.steps[0].outputs.success).toBeFalsy()
   })
 
   it("should ensure that the pro AI module is called when the budibase AI features are enabled", async () => {
@@ -106,10 +138,19 @@ describe("test the openai action", () => {
     jest.spyOn(pro.features, "isAICustomConfigsEnabled").mockResolvedValue(true)
 
     const prompt = "What is the meaning of life?"
-    await runStep(config, "OPENAI", {
-      model: "gpt-4o-mini",
-      prompt,
+    await createAutomationBuilder({
+      name: "Test OpenAI Pro Features",
+      config,
     })
+      .appAction({ fields: {} })
+      .openai(
+        {
+          model: Model.GPT_4O_MINI,
+          prompt,
+        },
+        { stepName: "Pro Features Query" }
+      )
+      .run()
 
     expect(pro.ai.LargeLanguageModel.forCurrentTenant).toHaveBeenCalledWith(
       "gpt-4o-mini"
diff --git a/packages/server/src/automations/tests/queryRows.spec.ts b/packages/server/src/automations/tests/queryRows.spec.ts
index 12611d3f90..6ec7b7abfb 100644
--- a/packages/server/src/automations/tests/queryRows.spec.ts
+++ b/packages/server/src/automations/tests/queryRows.spec.ts
@@ -1,5 +1,8 @@
-import { Table } from "@budibase/types"
+import { EmptyFilterOption, SortOrder, Table } from "@budibase/types"
 import * as setup from "./utilities"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
+import * as automation from "../index"
+import { basicTable } from "../../tests/utilities/structures"
 
 const NAME = "Test"
 
@@ -8,8 +11,10 @@ describe("Test a query step automation", () => {
   let config = setup.getConfig()
 
   beforeAll(async () => {
+    await automation.init()
     await config.init()
     table = await config.createTable()
+
     const row = {
       name: NAME,
       description: "original description",
@@ -22,107 +27,160 @@ describe("Test a query step automation", () => {
   afterAll(setup.afterAll)
 
   it("should be able to run the query step", async () => {
-    const inputs = {
-      tableId: table._id,
-      filters: {
-        equal: {
-          name: NAME,
-        },
-      },
-      sortColumn: "name",
-      sortOrder: "ascending",
-      limit: 10,
-    }
-    const res = await setup.runStep(
+    const result = await createAutomationBuilder({
+      name: "Basic Query Test",
       config,
-      setup.actions.QUERY_ROWS.stepId,
-      inputs
-    )
-    expect(res.success).toBe(true)
-    expect(res.rows).toBeDefined()
-    expect(res.rows.length).toBe(2)
-    expect(res.rows[0].name).toBe(NAME)
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          filters: {
+            equal: {
+              name: NAME,
+            },
+          },
+          sortColumn: "name",
+          sortOrder: SortOrder.ASCENDING,
+          limit: 10,
+        },
+        { stepName: "Query All Rows" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(2)
+    expect(result.steps[0].outputs.rows[0].name).toBe(NAME)
   })
 
   it("Returns all rows when onEmptyFilter has no value and no filters are passed", async () => {
-    const inputs = {
-      tableId: table._id,
-      filters: {},
-      sortColumn: "name",
-      sortOrder: "ascending",
-      limit: 10,
-    }
-    const res = await setup.runStep(
+    const result = await createAutomationBuilder({
+      name: "Empty Filter Test",
       config,
-      setup.actions.QUERY_ROWS.stepId,
-      inputs
-    )
-    expect(res.success).toBe(true)
-    expect(res.rows).toBeDefined()
-    expect(res.rows.length).toBe(2)
-    expect(res.rows[0].name).toBe(NAME)
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          filters: {},
+          sortColumn: "name",
+          sortOrder: SortOrder.ASCENDING,
+          limit: 10,
+        },
+        { stepName: "Query With Empty Filter" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(2)
+    expect(result.steps[0].outputs.rows[0].name).toBe(NAME)
   })
 
   it("Returns no rows when onEmptyFilter is RETURN_NONE and theres no filters", async () => {
-    const inputs = {
-      tableId: table._id,
-      filters: {},
-      "filters-def": [],
-      sortColumn: "name",
-      sortOrder: "ascending",
-      limit: 10,
-      onEmptyFilter: "none",
-    }
-    const res = await setup.runStep(
+    const result = await createAutomationBuilder({
+      name: "Return None Test",
       config,
-      setup.actions.QUERY_ROWS.stepId,
-      inputs
-    )
-    expect(res.success).toBe(false)
-    expect(res.rows).toBeDefined()
-    expect(res.rows.length).toBe(0)
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          filters: {},
+          "filters-def": [],
+          sortColumn: "name",
+          sortOrder: SortOrder.ASCENDING,
+          limit: 10,
+          onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+        },
+        { stepName: "Query With Return None" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(0)
   })
 
   it("Returns no rows when onEmptyFilters RETURN_NONE and a filter is passed with a null value", async () => {
-    const inputs = {
-      tableId: table._id,
-      onEmptyFilter: "none",
-      filters: {},
-      "filters-def": [
-        {
-          value: null,
-        },
-      ],
-      sortColumn: "name",
-      sortOrder: "ascending",
-      limit: 10,
-    }
-    const res = await setup.runStep(
+    const result = await createAutomationBuilder({
+      name: "Null Filter Test",
       config,
-      setup.actions.QUERY_ROWS.stepId,
-      inputs
-    )
-    expect(res.success).toBe(false)
-    expect(res.rows).toBeDefined()
-    expect(res.rows.length).toBe(0)
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          onEmptyFilter: EmptyFilterOption.RETURN_NONE,
+          filters: {},
+          "filters-def": [
+            {
+              value: null,
+            },
+          ],
+          sortColumn: "name",
+          sortOrder: SortOrder.ASCENDING,
+          limit: 10,
+        },
+        { stepName: "Query With Null Filter" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(0)
   })
 
   it("Returns rows when onEmptyFilter is RETURN_ALL and no filter is passed", async () => {
-    const inputs = {
-      tableId: table._id,
-      onEmptyFilter: "all",
-      filters: {},
-      sortColumn: "name",
-      sortOrder: "ascending",
-      limit: 10,
-    }
-    const res = await setup.runStep(
+    const result = await createAutomationBuilder({
+      name: "Return All Test",
       config,
-      setup.actions.QUERY_ROWS.stepId,
-      inputs
-    )
-    expect(res.success).toBe(true)
-    expect(res.rows).toBeDefined()
-    expect(res.rows.length).toBe(2)
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: table._id!,
+          onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+          filters: {},
+          sortColumn: "name",
+          sortOrder: SortOrder.ASCENDING,
+          limit: 10,
+        },
+        { stepName: "Query With Return All" }
+      )
+      .run()
+
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(2)
+  })
+
+  it("return rows when querying a table with a space in the name", async () => {
+    const tableWithSpaces = await config.createTable({
+      ...basicTable(),
+      name: "table with spaces",
+    })
+    await config.createRow({
+      name: NAME,
+      tableId: tableWithSpaces._id,
+    })
+    const result = await createAutomationBuilder({
+      name: "Return All Test",
+      config,
+    })
+      .appAction({ fields: {} })
+      .queryRows(
+        {
+          tableId: tableWithSpaces._id!,
+          onEmptyFilter: EmptyFilterOption.RETURN_ALL,
+          filters: {},
+        },
+        { stepName: "Query table with spaces" }
+      )
+      .run()
+    expect(result.steps[0].outputs.success).toBe(true)
+    expect(result.steps[0].outputs.rows).toBeDefined()
+    expect(result.steps[0].outputs.rows.length).toBe(1)
   })
 })
diff --git a/packages/server/src/automations/tests/scenarios/looping.spec.ts b/packages/server/src/automations/tests/scenarios/looping.spec.ts
index 9c5313e9da..0baa69b3bc 100644
--- a/packages/server/src/automations/tests/scenarios/looping.spec.ts
+++ b/packages/server/src/automations/tests/scenarios/looping.spec.ts
@@ -152,6 +152,44 @@ describe("Loop automations", () => {
     )
   })
 
+  it("ensure the loop stops if the max iterations are reached", async () => {
+    const builder = createAutomationBuilder({
+      name: "Test Loop max iterations",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .loop({
+        option: LoopStepType.ARRAY,
+        binding: ["test", "test2", "test3"],
+        iterations: 2,
+      })
+      .serverLog({ text: "{{loop.currentItem}}" })
+      .serverLog({ text: "{{steps.1.iterations}}" })
+      .run()
+
+    expect(results.steps[0].outputs.iterations).toBe(2)
+  })
+
+  it("should run an automation with loop and max iterations to ensure context correctness further down the tree", async () => {
+    const builder = createAutomationBuilder({
+      name: "Test context down tree with Loop and max iterations",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .loop({
+        option: LoopStepType.ARRAY,
+        binding: ["test", "test2", "test3"],
+        iterations: 2,
+      })
+      .serverLog({ text: "{{loop.currentItem}}" })
+      .serverLog({ text: "{{steps.1.iterations}}" })
+      .run()
+
+    expect(results.steps[1].outputs.message).toContain("- 2")
+  })
+
   it("should run an automation where a loop is successfully run twice", async () => {
     const builder = createAutomationBuilder({
       name: "Test Trigger with Loop and Create Row",
diff --git a/packages/server/src/automations/tests/scenarios/scenarios.spec.ts b/packages/server/src/automations/tests/scenarios/scenarios.spec.ts
index dcfd4a4341..3e203b7959 100644
--- a/packages/server/src/automations/tests/scenarios/scenarios.spec.ts
+++ b/packages/server/src/automations/tests/scenarios/scenarios.spec.ts
@@ -6,9 +6,11 @@ import {
   DatabaseName,
   datasourceDescribe,
 } from "../../../integrations/tests/utils"
-import { FilterConditions } from "../../../automations/steps/filter"
 import { Knex } from "knex"
 import { generator } from "@budibase/backend-core/tests"
+import { automations } from "@budibase/shared-core"
+
+const FilterConditions = automations.steps.filter.FilterConditions
 
 describe("Automation Scenarios", () => {
   let config = setup.getConfig()
@@ -433,9 +435,10 @@ describe("Automation Scenarios", () => {
   })
 })
 
-datasourceDescribe(
-  { name: "", only: [DatabaseName.MYSQL] },
-  ({ config, dsProvider }) => {
+const descriptions = datasourceDescribe({ only: [DatabaseName.MYSQL] })
+
+if (descriptions.length) {
+  describe.each(descriptions)("/rows ($dbName)", ({ config, dsProvider }) => {
     let datasource: Datasource
     let client: Knex
 
@@ -531,5 +534,5 @@ datasourceDescribe(
         )
       })
     })
-  }
-)
+  })
+}
diff --git a/packages/server/src/automations/tests/scenarios/webhook.spec.ts b/packages/server/src/automations/tests/scenarios/webhook.spec.ts
new file mode 100644
index 0000000000..cb15a96824
--- /dev/null
+++ b/packages/server/src/automations/tests/scenarios/webhook.spec.ts
@@ -0,0 +1,65 @@
+import * as automation from "../../index"
+import * as setup from "../utilities"
+import { Table, Webhook, WebhookActionType } from "@budibase/types"
+import { createAutomationBuilder } from "../utilities/AutomationTestBuilder"
+import { mocks } from "@budibase/backend-core/tests"
+
+mocks.licenses.useSyncAutomations()
+
+describe("Branching automations", () => {
+  let config = setup.getConfig(),
+    table: Table,
+    webhook: Webhook
+
+  async function createWebhookAutomation(testName: string) {
+    const builder = createAutomationBuilder({
+      name: testName,
+    })
+    const automation = await builder
+      .webhook({ fields: { parameter: "string" } })
+      .createRow({
+        row: { tableId: table._id!, name: "{{ trigger.parameter }}" },
+      })
+      .collect({ collection: `{{ trigger.parameter }}` })
+      .save()
+
+    webhook = await config.api.webhook.save({
+      name: "hook",
+      live: true,
+      action: {
+        type: WebhookActionType.AUTOMATION,
+        target: automation._id!,
+      },
+      bodySchema: {},
+    })
+    await config.api.webhook.buildSchema(config.getAppId(), webhook._id!, {
+      parameter: "string",
+    })
+    await config.publish()
+    return { webhook, automation }
+  }
+
+  beforeEach(async () => {
+    await automation.init()
+    await config.init()
+    table = await config.createTable()
+  })
+
+  afterAll(setup.afterAll)
+
+  it("should run the webhook automation - checking for parameters", async () => {
+    const { webhook } = await createWebhookAutomation(
+      "Check a basic webhook works as expected"
+    )
+    const res = await config.api.webhook.trigger(
+      config.getProdAppId(),
+      webhook._id!,
+      {
+        parameter: "testing",
+      }
+    )
+    expect(typeof res).toBe("object")
+    const collectedInfo = res as Record<string, any>
+    expect(collectedInfo.value).toEqual("testing")
+  })
+})
diff --git a/packages/server/src/automations/tests/updateRow.spec.ts b/packages/server/src/automations/tests/updateRow.spec.ts
index 457bf60533..45f78826f6 100644
--- a/packages/server/src/automations/tests/updateRow.spec.ts
+++ b/packages/server/src/automations/tests/updateRow.spec.ts
@@ -8,58 +8,83 @@ import {
   Table,
   TableSourceType,
 } from "@budibase/types"
+import { createAutomationBuilder } from "./utilities/AutomationTestBuilder"
 
 import * as setup from "./utilities"
 import * as uuid from "uuid"
 
 describe("test the update row action", () => {
-  let table: Table, row: Row, inputs: any
-  let config = setup.getConfig()
+  let table: Table,
+    row: Row,
+    config = setup.getConfig()
 
   beforeAll(async () => {
     await config.init()
     table = await config.createTable()
     row = await config.createRow()
-    inputs = {
-      rowId: row._id,
-      row: {
-        ...row,
-        name: "Updated name",
-        // put a falsy option in to be removed
-        description: "",
-      },
-    }
   })
 
   afterAll(setup.afterAll)
 
-  it("should be able to run the action", async () => {
-    const res = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      inputs
+  it("should be able to run the update row action", async () => {
+    const builder = createAutomationBuilder({
+      name: "Update Row Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
+        row: {
+          ...row,
+          name: "Updated name",
+          description: "",
+        },
+        meta: {},
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(true)
+    const updatedRow = await config.api.row.get(
+      table._id!,
+      results.steps[0].outputs.id
     )
-    expect(res.success).toEqual(true)
-    const updatedRow = await config.api.row.get(table._id!, res.id)
     expect(updatedRow.name).toEqual("Updated name")
     expect(updatedRow.description).not.toEqual("")
   })
 
   it("should check invalid inputs return an error", async () => {
-    const res = await setup.runStep(config, setup.actions.UPDATE_ROW.stepId, {})
-    expect(res.success).toEqual(false)
+    const builder = createAutomationBuilder({
+      name: "Invalid Inputs Automation",
+    })
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({ meta: {}, row: {}, rowId: "" })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should return an error when table doesn't exist", async () => {
-    const res = await setup.runStep(config, setup.actions.UPDATE_ROW.stepId, {
-      row: { _id: "invalid" },
-      rowId: "invalid",
+    const builder = createAutomationBuilder({
+      name: "Nonexistent Table Automation",
     })
-    expect(res.success).toEqual(false)
+
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        row: { _id: "invalid" },
+        rowId: "invalid",
+        meta: {},
+      })
+      .run()
+
+    expect(results.steps[0].outputs.success).toEqual(false)
   })
 
   it("should not overwrite links if those links are not set", async () => {
-    let linkField: FieldSchema = {
+    const linkField: FieldSchema = {
       type: FieldType.LINK,
       name: "",
       fieldName: "",
@@ -71,7 +96,7 @@ describe("test the update row action", () => {
       tableId: InternalTable.USER_METADATA,
     }
 
-    let table = await config.api.table.save({
+    const table = await config.api.table.save({
       name: uuid.v4(),
       type: "table",
       sourceType: TableSourceType.INTERNAL,
@@ -82,23 +107,22 @@ describe("test the update row action", () => {
       },
     })
 
-    let user1 = await config.createUser()
-    let user2 = await config.createUser()
+    const user1 = await config.createUser()
+    const user2 = await config.createUser()
 
-    let row = await config.api.row.save(table._id!, {
+    const row = await config.api.row.save(table._id!, {
       user1: [{ _id: user1._id }],
       user2: [{ _id: user2._id }],
     })
 
-    let getResp = await config.api.row.get(table._id!, row._id!)
-    expect(getResp.user1[0]._id).toEqual(user1._id)
-    expect(getResp.user2[0]._id).toEqual(user2._id)
+    const builder = createAutomationBuilder({
+      name: "Link Preservation Automation",
+    })
 
-    let stepResp = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      {
-        rowId: row._id,
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
         row: {
           _id: row._id,
           _rev: row._rev,
@@ -106,17 +130,19 @@ describe("test the update row action", () => {
           user1: [user2._id],
           user2: "",
         },
-      }
-    )
-    expect(stepResp.success).toEqual(true)
+        meta: {},
+      })
+      .run()
 
-    getResp = await config.api.row.get(table._id!, row._id!)
+    expect(results.steps[0].outputs.success).toEqual(true)
+
+    const getResp = await config.api.row.get(table._id!, row._id!)
     expect(getResp.user1[0]._id).toEqual(user2._id)
     expect(getResp.user2[0]._id).toEqual(user2._id)
   })
 
-  it("should overwrite links if those links are not set and we ask it do", async () => {
-    let linkField: FieldSchema = {
+  it("should overwrite links if those links are not set and we ask it to", async () => {
+    const linkField: FieldSchema = {
       type: FieldType.LINK,
       name: "",
       fieldName: "",
@@ -128,7 +154,7 @@ describe("test the update row action", () => {
       tableId: InternalTable.USER_METADATA,
     }
 
-    let table = await config.api.table.save({
+    const table = await config.api.table.save({
       name: uuid.v4(),
       type: "table",
       sourceType: TableSourceType.INTERNAL,
@@ -139,23 +165,22 @@ describe("test the update row action", () => {
       },
     })
 
-    let user1 = await config.createUser()
-    let user2 = await config.createUser()
+    const user1 = await config.createUser()
+    const user2 = await config.createUser()
 
-    let row = await config.api.row.save(table._id!, {
+    const row = await config.api.row.save(table._id!, {
       user1: [{ _id: user1._id }],
       user2: [{ _id: user2._id }],
     })
 
-    let getResp = await config.api.row.get(table._id!, row._id!)
-    expect(getResp.user1[0]._id).toEqual(user1._id)
-    expect(getResp.user2[0]._id).toEqual(user2._id)
+    const builder = createAutomationBuilder({
+      name: "Link Overwrite Automation",
+    })
 
-    let stepResp = await setup.runStep(
-      config,
-      setup.actions.UPDATE_ROW.stepId,
-      {
-        rowId: row._id,
+    const results = await builder
+      .appAction({ fields: {} })
+      .updateRow({
+        rowId: row._id!,
         row: {
           _id: row._id,
           _rev: row._rev,
@@ -170,11 +195,12 @@ describe("test the update row action", () => {
             },
           },
         },
-      }
-    )
-    expect(stepResp.success).toEqual(true)
+      })
+      .run()
 
-    getResp = await config.api.row.get(table._id!, row._id!)
+    expect(results.steps[0].outputs.success).toEqual(true)
+
+    const getResp = await config.api.row.get(table._id!, row._id!)
     expect(getResp.user1[0]._id).toEqual(user2._id)
     expect(getResp.user2).toBeUndefined()
   })
diff --git a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
index 76832d6a9a..50527d97af 100644
--- a/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
+++ b/packages/server/src/automations/tests/utilities/AutomationTestBuilder.ts
@@ -1,49 +1,55 @@
 import { v4 as uuidv4 } from "uuid"
-import { testAutomation } from "../../../api/routes/tests/utilities/TestFunctions"
-import {} from "../../steps/createRow"
 import { BUILTIN_ACTION_DEFINITIONS } from "../../actions"
 import { TRIGGER_DEFINITIONS } from "../../triggers"
 import {
-  LoopStepInputs,
-  DeleteRowStepInputs,
-  UpdateRowStepInputs,
-  CreateRowStepInputs,
+  AppActionTriggerInputs,
+  AppActionTriggerOutputs,
   Automation,
-  AutomationTrigger,
-  AutomationResults,
-  SmtpEmailStepInputs,
-  ExecuteQueryStepInputs,
-  QueryRowsStepInputs,
   AutomationActionStepId,
-  AutomationTriggerStepId,
   AutomationStep,
+  AutomationStepInputs,
+  AutomationTrigger,
   AutomationTriggerDefinition,
-  RowDeletedTriggerInputs,
-  RowDeletedTriggerOutputs,
-  RowUpdatedTriggerOutputs,
-  RowUpdatedTriggerInputs,
+  AutomationTriggerInputs,
+  AutomationTriggerStepId,
+  BashStepInputs,
+  Branch,
+  BranchStepInputs,
+  CollectStepInputs,
+  CreateRowStepInputs,
+  CronTriggerOutputs,
+  DeleteRowStepInputs,
+  ExecuteQueryStepInputs,
+  ExecuteScriptStepInputs,
+  FilterStepInputs,
+  isDidNotTriggerResponse,
+  LoopStepInputs,
+  OpenAIStepInputs,
+  QueryRowsStepInputs,
   RowCreatedTriggerInputs,
   RowCreatedTriggerOutputs,
-  AppActionTriggerOutputs,
-  CronTriggerOutputs,
-  AppActionTriggerInputs,
-  AutomationStepInputs,
-  AutomationTriggerInputs,
-  ServerLogStepInputs,
-  BranchStepInputs,
+  RowDeletedTriggerInputs,
+  RowDeletedTriggerOutputs,
+  RowUpdatedTriggerInputs,
+  RowUpdatedTriggerOutputs,
   SearchFilters,
-  Branch,
-  FilterStepInputs,
+  ServerLogStepInputs,
+  SmtpEmailStepInputs,
+  TestAutomationRequest,
+  UpdateRowStepInputs,
+  WebhookTriggerInputs,
+  WebhookTriggerOutputs,
 } from "@budibase/types"
 import TestConfiguration from "../../../tests/utilities/TestConfiguration"
 import * as setup from "../utilities"
-import { definition } from "../../../automations/steps/branch"
+import { automations } from "@budibase/shared-core"
 
 type TriggerOutputs =
   | RowCreatedTriggerOutputs
   | RowUpdatedTriggerOutputs
   | RowDeletedTriggerOutputs
   | AppActionTriggerOutputs
+  | WebhookTriggerOutputs
   | CronTriggerOutputs
   | undefined
 
@@ -97,7 +103,7 @@ class BaseStepBuilder {
       branchStepInputs.children![branchId] = stepBuilder.build()
     })
     const branchStep: AutomationStep = {
-      ...definition,
+      ...automations.steps.branch.definition,
       id: uuidv4(),
       stepId: AutomationActionStepId.BRANCH,
       inputs: branchStepInputs,
@@ -177,6 +183,7 @@ class BaseStepBuilder {
       opts
     )
   }
+
   loop(
     inputs: LoopStepInputs,
     opts?: { stepName?: string; stepId?: string }
@@ -201,6 +208,18 @@ class BaseStepBuilder {
     )
   }
 
+  executeScript(
+    input: ExecuteScriptStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.EXECUTE_SCRIPT,
+      BUILTIN_ACTION_DEFINITIONS.EXECUTE_SCRIPT,
+      input,
+      opts
+    )
+  }
+
   filter(input: FilterStepInputs): this {
     return this.step(
       AutomationActionStepId.FILTER,
@@ -208,7 +227,44 @@ class BaseStepBuilder {
       input
     )
   }
+
+  bash(
+    input: BashStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.EXECUTE_BASH,
+      BUILTIN_ACTION_DEFINITIONS.EXECUTE_BASH,
+      input,
+      opts
+    )
+  }
+
+  openai(
+    input: OpenAIStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.OPENAI,
+      BUILTIN_ACTION_DEFINITIONS.OPENAI,
+      input,
+      opts
+    )
+  }
+
+  collect(
+    input: CollectStepInputs,
+    opts?: { stepName?: string; stepId?: string }
+  ): this {
+    return this.step(
+      AutomationActionStepId.COLLECT,
+      BUILTIN_ACTION_DEFINITIONS.COLLECT,
+      input,
+      opts
+    )
+  }
 }
+
 class StepBuilder extends BaseStepBuilder {
   build(): AutomationStep[] {
     return this.steps
@@ -223,8 +279,8 @@ class StepBuilder extends BaseStepBuilder {
 class AutomationBuilder extends BaseStepBuilder {
   private automationConfig: Automation
   private config: TestConfiguration
-  private triggerOutputs: any
-  private triggerSet: boolean = false
+  private triggerOutputs: TriggerOutputs
+  private triggerSet = false
 
   constructor(
     options: { name?: string; appId?: string; config?: TestConfiguration } = {}
@@ -290,6 +346,16 @@ class AutomationBuilder extends BaseStepBuilder {
     )
   }
 
+  webhook(outputs: WebhookTriggerOutputs, inputs?: WebhookTriggerInputs) {
+    this.triggerOutputs = outputs
+    return this.trigger(
+      TRIGGER_DEFINITIONS.WEBHOOK,
+      AutomationTriggerStepId.WEBHOOK,
+      inputs,
+      outputs
+    )
+  }
+
   private trigger<TStep extends AutomationTriggerStepId>(
     triggerSchema: AutomationTriggerDefinition,
     stepId: TStep,
@@ -322,27 +388,29 @@ class AutomationBuilder extends BaseStepBuilder {
     return this.automationConfig
   }
 
-  async run() {
+  async save() {
     if (!Object.keys(this.automationConfig.definition.trigger).length) {
       throw new Error("Please add a trigger to this automation test")
     }
     this.automationConfig.definition.steps = this.steps
-    const automation = await this.config.createAutomation(this.build())
-    const results = await testAutomation(
-      this.config,
-      automation,
-      this.triggerOutputs
-    )
-    return this.processResults(results)
+    return await this.config.createAutomation(this.build())
   }
 
-  private processResults(results: {
-    body: AutomationResults
-  }): AutomationResults {
-    results.body.steps.shift()
+  async run() {
+    const automation = await this.save()
+    const response = await this.config.api.automation.test(
+      automation._id!,
+      this.triggerOutputs as TestAutomationRequest
+    )
+
+    if (isDidNotTriggerResponse(response)) {
+      throw new Error(response.message)
+    }
+
+    response.steps.shift()
     return {
-      trigger: results.body.trigger,
-      steps: results.body.steps,
+      trigger: response.trigger,
+      steps: response.steps,
     }
   }
 }
diff --git a/packages/server/src/automations/triggers.ts b/packages/server/src/automations/triggers.ts
index 70fda1f237..a9317772d9 100644
--- a/packages/server/src/automations/triggers.ts
+++ b/packages/server/src/automations/triggers.ts
@@ -20,6 +20,8 @@ import {
   AutomationStatus,
   AutomationRowEvent,
   UserBindings,
+  AutomationResults,
+  DidNotTriggerResponse,
 } from "@budibase/types"
 import { executeInThread } from "../threads/automation"
 import { dataFilters, sdk } from "@budibase/shared-core"
@@ -139,16 +141,36 @@ function rowPassesFilters(row: Row, filters: SearchFilters) {
   return filteredRows.length > 0
 }
 
+export function isAutomationResults(
+  response: AutomationResults | DidNotTriggerResponse | AutomationJob
+): response is AutomationResults {
+  return (
+    response !== null && "steps" in response && Array.isArray(response.steps)
+  )
+}
+
+interface AutomationTriggerParams {
+  fields: Record<string, any>
+  timeout?: number
+  appId?: string
+  user?: UserBindings
+}
+
 export async function externalTrigger(
   automation: Automation,
-  params: {
-    fields: Record<string, any>
-    timeout?: number
-    appId?: string
-    user?: UserBindings
-  },
+  params: AutomationTriggerParams,
+  options: { getResponses: true }
+): Promise<AutomationResults | DidNotTriggerResponse>
+export async function externalTrigger(
+  automation: Automation,
+  params: AutomationTriggerParams,
+  options?: { getResponses: false }
+): Promise<AutomationJob | DidNotTriggerResponse>
+export async function externalTrigger(
+  automation: Automation,
+  params: AutomationTriggerParams,
   { getResponses }: { getResponses?: boolean } = {}
-): Promise<any> {
+): Promise<AutomationResults | DidNotTriggerResponse | AutomationJob> {
   if (automation.disabled) {
     throw new Error("Automation is disabled")
   }
@@ -164,10 +186,14 @@ export async function externalTrigger(
       coercedFields[key] = coerce(params.fields[key], fields[key])
     }
     params.fields = coercedFields
-  } else if (sdk.automations.isRowAction(automation)) {
+  }
+  // row actions and webhooks flatten the fields down
+  else if (
+    sdk.automations.isRowAction(automation) ||
+    sdk.automations.isWebhookAction(automation)
+  ) {
     params = {
       ...params,
-      // Until we don't refactor all the types, we want to flatten the nested "fields" object
       ...params.fields,
       fields: {},
     }
diff --git a/packages/server/src/automations/utils.ts b/packages/server/src/automations/utils.ts
index 365dc36b68..292b288a70 100644
--- a/packages/server/src/automations/utils.ts
+++ b/packages/server/src/automations/utils.ts
@@ -2,16 +2,18 @@ import { Thread, ThreadType } from "../threads"
 import { definitions } from "./triggerInfo"
 import { automationQueue } from "./bullboard"
 import { updateEntityMetadata } from "../utilities"
-import { MetadataTypes } from "../constants"
 import { context, db as dbCore, utils } from "@budibase/backend-core"
 import { getAutomationMetadataParams } from "../db/utils"
 import { cloneDeep } from "lodash/fp"
 import { quotas } from "@budibase/pro"
 import {
   Automation,
+  AutomationActionStepId,
   AutomationJob,
   AutomationStepDefinition,
   AutomationTriggerDefinition,
+  AutomationTriggerStepId,
+  MetadataType,
 } from "@budibase/types"
 import { automationsEnabled } from "../features"
 import { helpers, REBOOT_CRON } from "@budibase/shared-core"
@@ -105,7 +107,7 @@ export async function updateTestHistory(
   history: any
 ) {
   return updateEntityMetadata(
-    MetadataTypes.AUTOMATION_TEST_HISTORY,
+    MetadataType.AUTOMATION_TEST_HISTORY,
     automation._id,
     (metadata: any) => {
       if (metadata && Array.isArray(metadata.history)) {
@@ -120,19 +122,21 @@ export async function updateTestHistory(
   )
 }
 
-export function removeDeprecated(
-  definitions: Record<
+export function removeDeprecated<
+  T extends
+    | Record<keyof typeof AutomationTriggerStepId, AutomationTriggerDefinition>
+    | Record<keyof typeof AutomationActionStepId, AutomationStepDefinition>
+>(definitions: T): T {
+  const base: Record<
     string,
-    AutomationStepDefinition | AutomationTriggerDefinition
-  >
-) {
-  const base = cloneDeep(definitions)
+    AutomationTriggerDefinition | AutomationStepDefinition
+  > = cloneDeep(definitions)
   for (let key of Object.keys(base)) {
     if (base[key].deprecated) {
       delete base[key]
     }
   }
-  return base
+  return base as T
 }
 
 // end the repetition and the job itself
diff --git a/packages/server/src/constants/index.ts b/packages/server/src/constants/index.ts
index bac838b53e..fde1efd1b9 100644
--- a/packages/server/src/constants/index.ts
+++ b/packages/server/src/constants/index.ts
@@ -45,17 +45,6 @@ export enum AuthTypes {
   EXTERNAL = "external",
 }
 
-export enum DataSourceOperation {
-  CREATE = "CREATE",
-  READ = "READ",
-  UPDATE = "UPDATE",
-  DELETE = "DELETE",
-  BULK_CREATE = "BULK_CREATE",
-  CREATE_TABLE = "CREATE_TABLE",
-  UPDATE_TABLE = "UPDATE_TABLE",
-  DELETE_TABLE = "DELETE_TABLE",
-}
-
 export enum DatasourceAuthTypes {
   GOOGLE = "google",
 }
@@ -135,11 +124,6 @@ export enum BaseQueryVerbs {
   DELETE = "delete",
 }
 
-export enum MetadataTypes {
-  AUTOMATION_TEST_INPUT = "automationTestInput",
-  AUTOMATION_TEST_HISTORY = "automationTestHistory",
-}
-
 export enum InvalidColumns {
   ID = "_id",
   REV = "_rev",
@@ -148,7 +132,6 @@ export enum InvalidColumns {
 
 export enum AutomationErrors {
   INCORRECT_TYPE = "INCORRECT_TYPE",
-  MAX_ITERATIONS = "MAX_ITERATIONS_REACHED",
   FAILURE_CONDITION = "FAILURE_CONDITION_MET",
 }
 
diff --git a/packages/server/src/definitions/automations.ts b/packages/server/src/definitions/automations.ts
index e45c555201..67d6e04e9d 100644
--- a/packages/server/src/definitions/automations.ts
+++ b/packages/server/src/definitions/automations.ts
@@ -26,3 +26,6 @@ export interface AutomationContext extends AutomationResults {
     company?: string
   }
 }
+
+export interface AutomationResponse
+  extends Omit<AutomationContext, "stepsByName" | "stepsById"> {}
diff --git a/packages/server/src/definitions/openapi.ts b/packages/server/src/definitions/openapi.ts
index 4479c89d9d..b82229130b 100644
--- a/packages/server/src/definitions/openapi.ts
+++ b/packages/server/src/definitions/openapi.ts
@@ -65,6 +65,9 @@ export interface paths {
   "/tables/{tableId}/rows/search": {
     post: operations["rowSearch"];
   };
+  "/views/{viewId}/rows/search": {
+    post: operations["rowViewSearch"];
+  };
   "/tables": {
     /** Create a table, this could be internal or external. */
     post: operations["tableCreate"];
@@ -93,6 +96,22 @@ export interface paths {
     /** Based on user properties (currently only name) search for users. */
     post: operations["userSearch"];
   };
+  "/views": {
+    /** Create a view, this can be against an internal or external table. */
+    post: operations["viewCreate"];
+  };
+  "/views/{viewId}": {
+    /** Lookup a view, this could be internal or external. */
+    get: operations["viewGetById"];
+    /** Update a view, this can be against an internal or external table. */
+    put: operations["viewUpdate"];
+    /** Delete a view, this can be against an internal or external table. */
+    delete: operations["viewDestroy"];
+  };
+  "/views/search": {
+    /** Based on view properties (currently only name) search for views. */
+    post: operations["viewSearch"];
+  };
 }
 
 export interface components {
@@ -813,10 +832,442 @@ export interface components {
         userIds: string[];
       };
     };
+    /** @description The view to be created/updated. */
+    view: {
+      /** @description The name of the view. */
+      name: string;
+      /** @description The ID of the table this view is based on. */
+      tableId: string;
+      /**
+       * @description The type of view - standard (empty value) or calculation.
+       * @enum {string}
+       */
+      type?: "calculation";
+      /** @description A column used to display rows from this view - usually used when rendered in tables. */
+      primaryDisplay?: string;
+      /** @description Search parameters for view */
+      query?: {
+        /**
+         * @description When using groups this defines whether all of the filters must match, or only one of them.
+         * @enum {string}
+         */
+        logicalOperator?: "all" | "any";
+        /**
+         * @description If no filters match, should the view return all rows, or no rows.
+         * @enum {string}
+         */
+        onEmptyFilter?: "all" | "none";
+        /** @description A grouping of filters to be applied. */
+        groups?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /** @description A list of filters to apply */
+          filters?: {
+            /**
+             * @description The type of search operation which is being performed.
+             * @enum {string}
+             */
+            operator?:
+              | "equal"
+              | "notEqual"
+              | "empty"
+              | "notEmpty"
+              | "fuzzy"
+              | "string"
+              | "contains"
+              | "notContains"
+              | "containsAny"
+              | "oneOf"
+              | "range";
+            /** @description The field in the view to perform the search on. */
+            field?: string;
+            /** @description The value to search for - the type will depend on the operator in use. */
+            value?:
+              | string
+              | number
+              | boolean
+              | { [key: string]: unknown }
+              | unknown[];
+          }[];
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+          }[];
+        }[];
+      };
+      sort?: {
+        /** @description The field from the table/view schema to sort on. */
+        field: string;
+        /**
+         * @description The order in which to sort.
+         * @enum {string}
+         */
+        order?: "ascending" | "descending";
+        /**
+         * @description The type of sort to perform (by number, or by alphabetically).
+         * @enum {string}
+         */
+        type?: "string" | "number";
+      };
+      schema: {
+        [key: string]:
+          | {
+              /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+              visible?: boolean;
+              /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+              readonly?: boolean;
+              /** @description A number defining where the column shows up in tables, lowest being first. */
+              order?: number;
+              /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+              width?: number;
+              /** @description If this is a relationship column, we can set the columns we wish to include */
+              column?: {
+                readonly?: boolean;
+              }[];
+            }
+          | {
+              /**
+               * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+               * @enum {string}
+               */
+              calculationType?: "sum" | "avg" | "count" | "min" | "max";
+              /** @description The field from the table to perform the calculation on. */
+              field?: string;
+              /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+              distinct?: boolean;
+            };
+      };
+    };
+    viewOutput: {
+      /** @description The view to be created/updated. */
+      data: {
+        /** @description The name of the view. */
+        name: string;
+        /** @description The ID of the table this view is based on. */
+        tableId: string;
+        /**
+         * @description The type of view - standard (empty value) or calculation.
+         * @enum {string}
+         */
+        type?: "calculation";
+        /** @description A column used to display rows from this view - usually used when rendered in tables. */
+        primaryDisplay?: string;
+        /** @description Search parameters for view */
+        query?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /**
+           * @description If no filters match, should the view return all rows, or no rows.
+           * @enum {string}
+           */
+          onEmptyFilter?: "all" | "none";
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+            /** @description A grouping of filters to be applied. */
+            groups?: {
+              /**
+               * @description When using groups this defines whether all of the filters must match, or only one of them.
+               * @enum {string}
+               */
+              logicalOperator?: "all" | "any";
+              /** @description A list of filters to apply */
+              filters?: {
+                /**
+                 * @description The type of search operation which is being performed.
+                 * @enum {string}
+                 */
+                operator?:
+                  | "equal"
+                  | "notEqual"
+                  | "empty"
+                  | "notEmpty"
+                  | "fuzzy"
+                  | "string"
+                  | "contains"
+                  | "notContains"
+                  | "containsAny"
+                  | "oneOf"
+                  | "range";
+                /** @description The field in the view to perform the search on. */
+                field?: string;
+                /** @description The value to search for - the type will depend on the operator in use. */
+                value?:
+                  | string
+                  | number
+                  | boolean
+                  | { [key: string]: unknown }
+                  | unknown[];
+              }[];
+            }[];
+          }[];
+        };
+        sort?: {
+          /** @description The field from the table/view schema to sort on. */
+          field: string;
+          /**
+           * @description The order in which to sort.
+           * @enum {string}
+           */
+          order?: "ascending" | "descending";
+          /**
+           * @description The type of sort to perform (by number, or by alphabetically).
+           * @enum {string}
+           */
+          type?: "string" | "number";
+        };
+        schema: {
+          [key: string]:
+            | {
+                /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+                visible?: boolean;
+                /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+                readonly?: boolean;
+                /** @description A number defining where the column shows up in tables, lowest being first. */
+                order?: number;
+                /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+                width?: number;
+                /** @description If this is a relationship column, we can set the columns we wish to include */
+                column?: {
+                  readonly?: boolean;
+                }[];
+              }
+            | {
+                /**
+                 * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+                 * @enum {string}
+                 */
+                calculationType?: "sum" | "avg" | "count" | "min" | "max";
+                /** @description The field from the table to perform the calculation on. */
+                field?: string;
+                /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+                distinct?: boolean;
+              };
+        };
+        /** @description The ID of the view. */
+        id: string;
+      };
+    };
+    viewSearch: {
+      data: {
+        /** @description The name of the view. */
+        name: string;
+        /** @description The ID of the table this view is based on. */
+        tableId: string;
+        /**
+         * @description The type of view - standard (empty value) or calculation.
+         * @enum {string}
+         */
+        type?: "calculation";
+        /** @description A column used to display rows from this view - usually used when rendered in tables. */
+        primaryDisplay?: string;
+        /** @description Search parameters for view */
+        query?: {
+          /**
+           * @description When using groups this defines whether all of the filters must match, or only one of them.
+           * @enum {string}
+           */
+          logicalOperator?: "all" | "any";
+          /**
+           * @description If no filters match, should the view return all rows, or no rows.
+           * @enum {string}
+           */
+          onEmptyFilter?: "all" | "none";
+          /** @description A grouping of filters to be applied. */
+          groups?: {
+            /**
+             * @description When using groups this defines whether all of the filters must match, or only one of them.
+             * @enum {string}
+             */
+            logicalOperator?: "all" | "any";
+            /** @description A list of filters to apply */
+            filters?: {
+              /**
+               * @description The type of search operation which is being performed.
+               * @enum {string}
+               */
+              operator?:
+                | "equal"
+                | "notEqual"
+                | "empty"
+                | "notEmpty"
+                | "fuzzy"
+                | "string"
+                | "contains"
+                | "notContains"
+                | "containsAny"
+                | "oneOf"
+                | "range";
+              /** @description The field in the view to perform the search on. */
+              field?: string;
+              /** @description The value to search for - the type will depend on the operator in use. */
+              value?:
+                | string
+                | number
+                | boolean
+                | { [key: string]: unknown }
+                | unknown[];
+            }[];
+            /** @description A grouping of filters to be applied. */
+            groups?: {
+              /**
+               * @description When using groups this defines whether all of the filters must match, or only one of them.
+               * @enum {string}
+               */
+              logicalOperator?: "all" | "any";
+              /** @description A list of filters to apply */
+              filters?: {
+                /**
+                 * @description The type of search operation which is being performed.
+                 * @enum {string}
+                 */
+                operator?:
+                  | "equal"
+                  | "notEqual"
+                  | "empty"
+                  | "notEmpty"
+                  | "fuzzy"
+                  | "string"
+                  | "contains"
+                  | "notContains"
+                  | "containsAny"
+                  | "oneOf"
+                  | "range";
+                /** @description The field in the view to perform the search on. */
+                field?: string;
+                /** @description The value to search for - the type will depend on the operator in use. */
+                value?:
+                  | string
+                  | number
+                  | boolean
+                  | { [key: string]: unknown }
+                  | unknown[];
+              }[];
+            }[];
+          }[];
+        };
+        sort?: {
+          /** @description The field from the table/view schema to sort on. */
+          field: string;
+          /**
+           * @description The order in which to sort.
+           * @enum {string}
+           */
+          order?: "ascending" | "descending";
+          /**
+           * @description The type of sort to perform (by number, or by alphabetically).
+           * @enum {string}
+           */
+          type?: "string" | "number";
+        };
+        schema: {
+          [key: string]:
+            | {
+                /** @description Defines whether the column is visible or not - rows retrieved/updated through this view will not be able to access it. */
+                visible?: boolean;
+                /** @description When used in combination with 'visible: true' the column will be visible in row responses but cannot be updated. */
+                readonly?: boolean;
+                /** @description A number defining where the column shows up in tables, lowest being first. */
+                order?: number;
+                /** @description A width for the column, defined in pixels - this affects rendering in tables. */
+                width?: number;
+                /** @description If this is a relationship column, we can set the columns we wish to include */
+                column?: {
+                  readonly?: boolean;
+                }[];
+              }
+            | {
+                /**
+                 * @description This column should be built from a calculation, specifying a type and field. It is important to note when a calculation is configured all non-calculation columns will be used for grouping.
+                 * @enum {string}
+                 */
+                calculationType?: "sum" | "avg" | "count" | "min" | "max";
+                /** @description The field from the table to perform the calculation on. */
+                field?: string;
+                /** @description Can be used in tandem with the count calculation type, to count unique entries. */
+                distinct?: boolean;
+              };
+        };
+        /** @description The ID of the view. */
+        id: string;
+      }[];
+    };
   };
   parameters: {
     /** @description The ID of the table which this request is targeting. */
     tableId: string;
+    /** @description The ID of the view which this request is targeting. */
+    viewId: string;
     /** @description The ID of the row which this request is targeting. */
     rowId: string;
     /** @description The ID of the app which this request is targeting. */
@@ -1213,6 +1664,31 @@ export interface operations {
       };
     };
   };
+  rowViewSearch: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** The response will contain an array of rows that match the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["searchOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["rowSearch"];
+      };
+    };
+  };
   /** Create a table, this could be internal or external. */
   tableCreate: {
     parameters: {
@@ -1409,6 +1885,118 @@ export interface operations {
       };
     };
   };
+  /** Create a view, this can be against an internal or external table. */
+  viewCreate: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the created view, including the ID which has been generated for it. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["view"];
+      };
+    };
+  };
+  /** Lookup a view, this could be internal or external. */
+  viewGetById: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the retrieved view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+  };
+  /** Update a view, this can be against an internal or external table. */
+  viewUpdate: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the updated view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["view"];
+      };
+    };
+  };
+  /** Delete a view, this can be against an internal or external table. */
+  viewDestroy: {
+    parameters: {
+      path: {
+        /** The ID of the view which this request is targeting. */
+        viewId: components["parameters"]["viewId"];
+      };
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the deleted view. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewOutput"];
+        };
+      };
+    };
+  };
+  /** Based on view properties (currently only name) search for views. */
+  viewSearch: {
+    parameters: {
+      header: {
+        /** The ID of the app which this request is targeting. */
+        "x-budibase-app-id": components["parameters"]["appId"];
+      };
+    };
+    responses: {
+      /** Returns the found views, based on the search parameters. */
+      200: {
+        content: {
+          "application/json": components["schemas"]["viewSearch"];
+        };
+      };
+    };
+    requestBody: {
+      content: {
+        "application/json": components["schemas"]["nameSearch"];
+      };
+    };
+  };
 }
 
 export interface external {}
diff --git a/packages/server/src/environment.ts b/packages/server/src/environment.ts
index 45d675ec3f..a9867b1231 100644
--- a/packages/server/src/environment.ts
+++ b/packages/server/src/environment.ts
@@ -54,7 +54,6 @@ const environment = {
   REDIS_URL: process.env.REDIS_URL,
   REDIS_PASSWORD: process.env.REDIS_PASSWORD,
   REDIS_CLUSTERED: process.env.REDIS_CLUSTERED,
-  HTTP_MIGRATIONS: process.env.HTTP_MIGRATIONS,
   CLUSTER_MODE: process.env.CLUSTER_MODE,
   API_REQ_LIMIT_PER_SEC: process.env.API_REQ_LIMIT_PER_SEC,
   GOOGLE_CLIENT_ID: process.env.GOOGLE_CLIENT_ID,
diff --git a/packages/server/src/integration-test/mysql.spec.ts b/packages/server/src/integration-test/mysql.spec.ts
index 8edf6a0190..9cf7242e24 100644
--- a/packages/server/src/integration-test/mysql.spec.ts
+++ b/packages/server/src/integration-test/mysql.spec.ts
@@ -10,119 +10,123 @@ function uniqueTableName(length?: number): string {
     .substring(0, length || 10)
 }
 
-datasourceDescribe(
-  {
-    name: "Integration compatibility with mysql search_path",
-    only: [DatabaseName.MYSQL],
-  },
-  ({ config, dsProvider }) => {
-    let rawDatasource: Datasource
-    let datasource: Datasource
-    let client: Knex
+const mainDescriptions = datasourceDescribe({ only: [DatabaseName.MYSQL] })
 
-    const database = generator.guid()
-    const database2 = generator.guid()
+if (mainDescriptions.length) {
+  describe.each(mainDescriptions)(
+    "/Integration compatibility with mysql search_path ($dbName)",
+    ({ config, dsProvider }) => {
+      let rawDatasource: Datasource
+      let datasource: Datasource
+      let client: Knex
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      rawDatasource = ds.rawDatasource!
-      datasource = ds.datasource!
-      client = ds.client!
+      const database = generator.guid()
+      const database2 = generator.guid()
 
-      await client.raw(`CREATE DATABASE \`${database}\`;`)
-      await client.raw(`CREATE DATABASE \`${database2}\`;`)
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        rawDatasource = ds.rawDatasource!
+        datasource = ds.datasource!
+        client = ds.client!
 
-      rawDatasource.config!.database = database
-      datasource = await config.api.datasource.create(rawDatasource)
-    })
+        await client.raw(`CREATE DATABASE \`${database}\`;`)
+        await client.raw(`CREATE DATABASE \`${database2}\`;`)
 
-    afterAll(async () => {
-      await client.raw(`DROP DATABASE \`${database}\`;`)
-      await client.raw(`DROP DATABASE \`${database2}\`;`)
-    })
-
-    it("discovers tables from any schema in search path", async () => {
-      await client.schema.createTable(`${database}.table1`, table => {
-        table.increments("id1").primary()
+        rawDatasource.config!.database = database
+        datasource = await config.api.datasource.create(rawDatasource)
       })
-      const res = await config.api.datasource.info(datasource)
-      expect(res.tableNames).toBeDefined()
-      expect(res.tableNames).toEqual(expect.arrayContaining(["table1"]))
-    })
 
-    it("does not mix columns from different tables", async () => {
-      const repeated_table_name = "table_same_name"
-      await client.schema.createTable(
-        `${database}.${repeated_table_name}`,
-        table => {
-          table.increments("id").primary()
-          table.string("val1")
-        }
-      )
-      await client.schema.createTable(
-        `${database2}.${repeated_table_name}`,
-        table => {
-          table.increments("id2").primary()
-          table.string("val2")
-        }
-      )
-
-      const res = await config.api.datasource.fetchSchema({
-        datasourceId: datasource._id!,
-        tablesFilter: [repeated_table_name],
+      afterAll(async () => {
+        await client.raw(`DROP DATABASE \`${database}\`;`)
+        await client.raw(`DROP DATABASE \`${database2}\`;`)
       })
-      expect(res.datasource.entities![repeated_table_name].schema).toBeDefined()
-      const schema = res.datasource.entities![repeated_table_name].schema
-      expect(Object.keys(schema).sort()).toEqual(["id", "val1"])
-    })
-  }
-)
 
-datasourceDescribe(
-  {
-    name: "POST /api/datasources/:datasourceId/schema",
-    only: [DatabaseName.MYSQL],
-  },
-  ({ config, dsProvider }) => {
-    let datasource: Datasource
-    let client: Knex
+      it("discovers tables from any schema in search path", async () => {
+        await client.schema.createTable(`${database}.table1`, table => {
+          table.increments("id1").primary()
+        })
+        const res = await config.api.datasource.info(datasource)
+        expect(res.tableNames).toBeDefined()
+        expect(res.tableNames).toEqual(expect.arrayContaining(["table1"]))
+      })
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource!
-      client = ds.client!
-    })
-
-    let tableName: string
-    beforeEach(async () => {
-      tableName = uniqueTableName()
-    })
-
-    afterEach(async () => {
-      await client.schema.dropTableIfExists(tableName)
-    })
-
-    it("recognises enum columns as options", async () => {
-      const enumColumnName = "status"
-
-      await client.schema.createTable(tableName, table => {
-        table.increments("order_id").primary()
-        table.string("customer_name", 100).notNullable()
-        table.enum(
-          enumColumnName,
-          ["pending", "processing", "shipped", "delivered", "cancelled"],
-          { useNative: true, enumName: `${tableName}_${enumColumnName}` }
+      it("does not mix columns from different tables", async () => {
+        const repeated_table_name = "table_same_name"
+        await client.schema.createTable(
+          `${database}.${repeated_table_name}`,
+          table => {
+            table.increments("id").primary()
+            table.string("val1")
+          }
         )
+        await client.schema.createTable(
+          `${database2}.${repeated_table_name}`,
+          table => {
+            table.increments("id2").primary()
+            table.string("val2")
+          }
+        )
+
+        const res = await config.api.datasource.fetchSchema({
+          datasourceId: datasource._id!,
+          tablesFilter: [repeated_table_name],
+        })
+        expect(
+          res.datasource.entities![repeated_table_name].schema
+        ).toBeDefined()
+        const schema = res.datasource.entities![repeated_table_name].schema
+        expect(Object.keys(schema).sort()).toEqual(["id", "val1"])
       })
+    }
+  )
 
-      const res = await config.api.datasource.fetchSchema({
-        datasourceId: datasource._id!,
-      })
+  const descriptions = datasourceDescribe({ only: [DatabaseName.MYSQL] })
 
-      const table = res.datasource.entities![tableName]
+  if (descriptions.length) {
+    describe.each(descriptions)(
+      "POST /api/datasources/:datasourceId/schema ($dbName)",
+      ({ config, dsProvider }) => {
+        let datasource: Datasource
+        let client: Knex
 
-      expect(table).toBeDefined()
-      expect(table.schema[enumColumnName].type).toEqual(FieldType.OPTIONS)
-    })
+        beforeAll(async () => {
+          const ds = await dsProvider()
+          datasource = ds.datasource!
+          client = ds.client!
+        })
+
+        let tableName: string
+        beforeEach(async () => {
+          tableName = uniqueTableName()
+        })
+
+        afterEach(async () => {
+          await client.schema.dropTableIfExists(tableName)
+        })
+
+        it("recognises enum columns as options", async () => {
+          const enumColumnName = "status"
+
+          await client.schema.createTable(tableName, table => {
+            table.increments("order_id").primary()
+            table.string("customer_name", 100).notNullable()
+            table.enum(
+              enumColumnName,
+              ["pending", "processing", "shipped", "delivered", "cancelled"],
+              { useNative: true, enumName: `${tableName}_${enumColumnName}` }
+            )
+          })
+
+          const res = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+
+          const table = res.datasource.entities![tableName]
+
+          expect(table).toBeDefined()
+          expect(table.schema[enumColumnName].type).toEqual(FieldType.OPTIONS)
+        })
+      }
+    )
   }
-)
+}
diff --git a/packages/server/src/integration-test/postgres.spec.ts b/packages/server/src/integration-test/postgres.spec.ts
index 7ef6b9a968..713605eadb 100644
--- a/packages/server/src/integration-test/postgres.spec.ts
+++ b/packages/server/src/integration-test/postgres.spec.ts
@@ -1,5 +1,4 @@
 import { Datasource, FieldType, Table } from "@budibase/types"
-import _ from "lodash"
 import { generator } from "@budibase/backend-core/tests"
 import {
   DatabaseName,
@@ -8,283 +7,294 @@ import {
 } from "../integrations/tests/utils"
 import { Knex } from "knex"
 
-datasourceDescribe(
-  { name: "postgres integrations", only: [DatabaseName.POSTGRES] },
-  ({ config, dsProvider }) => {
-    let datasource: Datasource
-    let client: Knex
+const mainDescriptions = datasourceDescribe({
+  only: [DatabaseName.POSTGRES, DatabaseName.POSTGRES_LEGACY],
+})
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource!
-      client = ds.client!
-    })
+if (mainDescriptions.length) {
+  describe.each(mainDescriptions)(
+    "/postgres integrations ($dbName)",
+    ({ config, dsProvider }) => {
+      let datasource: Datasource
+      let client: Knex
 
-    afterAll(config.end)
-
-    describe("POST /api/datasources/:datasourceId/schema", () => {
-      let tableName: string
-
-      beforeEach(async () => {
-        tableName = generator.guid().replaceAll("-", "").substring(0, 10)
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource!
+        client = ds.client!
       })
 
-      afterEach(async () => {
-        await client.schema.dropTableIfExists(tableName)
-      })
+      afterAll(config.end)
 
-      it("recognises when a table has no primary key", async () => {
-        await client.schema.createTable(tableName, table => {
-          table.increments("id", { primaryKey: false })
+      describe("POST /api/datasources/:datasourceId/schema", () => {
+        let tableName: string
+
+        beforeEach(async () => {
+          tableName = generator.guid().replaceAll("-", "").substring(0, 10)
         })
 
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
+        afterEach(async () => {
+          await client.schema.dropTableIfExists(tableName)
         })
 
-        expect(response.errors).toEqual({
-          [tableName]: "Table must have a primary key.",
-        })
-      })
+        it("recognises when a table has no primary key", async () => {
+          await client.schema.createTable(tableName, table => {
+            table.increments("id", { primaryKey: false })
+          })
 
-      it("recognises when a table is using a reserved column name", async () => {
-        await client.schema.createTable(tableName, table => {
-          table.increments("_id").primary()
-        })
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
 
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
-        })
-
-        expect(response.errors).toEqual({
-          [tableName]: "Table contains invalid columns.",
-        })
-      })
-
-      it("recognises enum columns as options", async () => {
-        const tableName = `orders_${generator
-          .guid()
-          .replaceAll("-", "")
-          .substring(0, 6)}`
-
-        await client.schema.createTable(tableName, table => {
-          table.increments("order_id").primary()
-          table.string("customer_name").notNullable()
-          table.enum("status", ["pending", "processing", "shipped"], {
-            useNative: true,
-            enumName: `${tableName}_status`,
+          expect(response.errors).toEqual({
+            [tableName]: "Table must have a primary key.",
           })
         })
 
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
+        it("recognises when a table is using a reserved column name", async () => {
+          await client.schema.createTable(tableName, table => {
+            table.increments("_id").primary()
+          })
+
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+
+          expect(response.errors).toEqual({
+            [tableName]: "Table contains invalid columns.",
+          })
         })
 
-        const table = response.datasource.entities?.[tableName]
+        it("recognises enum columns as options", async () => {
+          const tableName = `orders_${generator
+            .guid()
+            .replaceAll("-", "")
+            .substring(0, 6)}`
 
-        expect(table).toBeDefined()
-        expect(table?.schema["status"].type).toEqual(FieldType.OPTIONS)
-      })
-    })
+          await client.schema.createTable(tableName, table => {
+            table.increments("order_id").primary()
+            table.string("customer_name").notNullable()
+            table.enum("status", ["pending", "processing", "shipped"], {
+              useNative: true,
+              enumName: `${tableName}_status`,
+            })
+          })
 
-    describe("check custom column types", () => {
-      beforeAll(async () => {
-        await client.schema.createTable("binaryTable", table => {
-          table.binary("id").primary()
-          table.string("column1")
-          table.integer("column2")
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+
+          const table = response.datasource.entities?.[tableName]
+
+          expect(table).toBeDefined()
+          expect(table?.schema["status"].type).toEqual(FieldType.OPTIONS)
         })
       })
 
-      it("should handle binary columns", async () => {
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
+      describe("check custom column types", () => {
+        beforeAll(async () => {
+          await client.schema.createTable("binaryTable", table => {
+            table.binary("id").primary()
+            table.string("column1")
+            table.integer("column2")
+          })
         })
-        expect(response.datasource.entities).toBeDefined()
-        const table = response.datasource.entities?.["binaryTable"]
-        expect(table).toBeDefined()
-        expect(table?.schema.id.externalType).toBe("bytea")
-        const row = await config.api.row.save(table?._id!, {
-          id: "1111",
-          column1: "hello",
-          column2: 222,
-        })
-        expect(row._id).toBeDefined()
-        const decoded = decodeURIComponent(row._id!).replace(/'/g, '"')
-        expect(JSON.parse(decoded)[0]).toBe("1111")
-      })
-    })
 
-    describe("check fetching null/not null table", () => {
-      beforeAll(async () => {
-        await client.schema.createTable("nullableTable", table => {
-          table.increments("order_id").primary()
-          table.integer("order_number").notNullable()
+        it("should handle binary columns", async () => {
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+          expect(response.datasource.entities).toBeDefined()
+          const table = response.datasource.entities?.["binaryTable"]
+          expect(table).toBeDefined()
+          expect(table?.schema.id.externalType).toBe("bytea")
+          const row = await config.api.row.save(table!._id!, {
+            id: "1111",
+            column1: "hello",
+            column2: 222,
+          })
+          expect(row._id).toBeDefined()
+          const decoded = decodeURIComponent(row._id!).replace(/'/g, '"')
+          expect(JSON.parse(decoded)[0]).toBe("1111")
         })
       })
 
-      it("should be able to change the table to allow nullable and refetch this", async () => {
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
-        })
-        const entities = response.datasource.entities
-        expect(entities).toBeDefined()
-        const nullableTable = entities?.["nullableTable"]
-        expect(nullableTable).toBeDefined()
-        expect(
-          nullableTable?.schema["order_number"].constraints?.presence
-        ).toEqual(true)
-
-        // need to perform these calls raw to the DB so that the external state of the DB differs to what Budibase
-        // is aware of - therefore we can try to fetch and make sure BB updates correctly
-        await client.schema.alterTable("nullableTable", table => {
-          table.setNullable("order_number")
+      describe("check fetching null/not null table", () => {
+        beforeAll(async () => {
+          await client.schema.createTable("nullableTable", table => {
+            table.increments("order_id").primary()
+            table.integer("order_number").notNullable()
+          })
         })
 
-        const responseAfter = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
+        it("should be able to change the table to allow nullable and refetch this", async () => {
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+          const entities = response.datasource.entities
+          expect(entities).toBeDefined()
+          const nullableTable = entities?.["nullableTable"]
+          expect(nullableTable).toBeDefined()
+          expect(
+            nullableTable?.schema["order_number"].constraints?.presence
+          ).toEqual(true)
+
+          // need to perform these calls raw to the DB so that the external state of the DB differs to what Budibase
+          // is aware of - therefore we can try to fetch and make sure BB updates correctly
+          await client.schema.alterTable("nullableTable", table => {
+            table.setNullable("order_number")
+          })
+
+          const responseAfter = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+          const entitiesAfter = responseAfter.datasource.entities
+          expect(entitiesAfter).toBeDefined()
+          const nullableTableAfter = entitiesAfter?.["nullableTable"]
+          expect(nullableTableAfter).toBeDefined()
+          expect(
+            nullableTableAfter?.schema["order_number"].constraints?.presence
+          ).toBeUndefined()
         })
-        const entitiesAfter = responseAfter.datasource.entities
-        expect(entitiesAfter).toBeDefined()
-        const nullableTableAfter = entitiesAfter?.["nullableTable"]
-        expect(nullableTableAfter).toBeDefined()
-        expect(
-          nullableTableAfter?.schema["order_number"].constraints?.presence
-        ).toBeUndefined()
       })
-    })
 
-    describe("money field 💰", () => {
-      const tableName = "moneytable"
-      let table: Table
+      describe("money field 💰", () => {
+        const tableName = "moneytable"
+        let table: Table
 
-      beforeAll(async () => {
-        await client.raw(`
+        beforeAll(async () => {
+          await client.raw(`
         CREATE TABLE ${tableName} (
           id serial PRIMARY KEY,
           price money
         )   
       `)
-        const response = await config.api.datasource.fetchSchema({
-          datasourceId: datasource._id!,
-        })
-        table = response.datasource.entities![tableName]
-      })
-
-      it("should be able to import a money field", async () => {
-        expect(table).toBeDefined()
-        expect(table?.schema.price.type).toBe(FieldType.NUMBER)
-      })
-
-      it("should be able to search a money field", async () => {
-        await config.api.row.bulkImport(table._id!, {
-          rows: [{ price: 200 }, { price: 300 }],
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+          })
+          table = response.datasource.entities![tableName]
         })
 
-        const { rows } = await config.api.row.search(table._id!, {
-          query: {
-            equal: {
-              price: 200,
+        it("should be able to import a money field", async () => {
+          expect(table).toBeDefined()
+          expect(table?.schema.price.type).toBe(FieldType.NUMBER)
+        })
+
+        it("should be able to search a money field", async () => {
+          await config.api.row.bulkImport(table._id!, {
+            rows: [{ price: 200 }, { price: 300 }],
+          })
+
+          const { rows } = await config.api.row.search(table._id!, {
+            query: {
+              equal: {
+                price: 200,
+              },
             },
-          },
+          })
+          expect(rows).toHaveLength(1)
+          expect(rows[0].price).toBe("200.00")
+        })
+
+        it("should be able to update a money field", async () => {
+          let row = await config.api.row.save(table._id!, { price: 200 })
+          expect(row.price).toBe("200.00")
+
+          row = await config.api.row.save(table._id!, { ...row, price: 300 })
+          expect(row.price).toBe("300.00")
+
+          row = await config.api.row.save(table._id!, {
+            ...row,
+            price: "400.00",
+          })
+          expect(row.price).toBe("400.00")
         })
-        expect(rows).toHaveLength(1)
-        expect(rows[0].price).toBe("200.00")
       })
+    }
+  )
 
-      it("should be able to update a money field", async () => {
-        let row = await config.api.row.save(table._id!, { price: 200 })
-        expect(row.price).toBe("200.00")
+  const descriptions = datasourceDescribe({ only: [DatabaseName.POSTGRES] })
 
-        row = await config.api.row.save(table._id!, { ...row, price: 300 })
-        expect(row.price).toBe("300.00")
+  if (descriptions.length) {
+    describe.each(descriptions)(
+      "Integration compatibility with postgres search_path",
+      ({ config, dsProvider }) => {
+        let datasource: Datasource
+        let client: Knex
+        let schema1: string
+        let schema2: string
 
-        row = await config.api.row.save(table._id!, { ...row, price: "400.00" })
-        expect(row.price).toBe("400.00")
-      })
-    })
+        beforeEach(async () => {
+          const ds = await dsProvider()
+          datasource = ds.datasource!
+          const rawDatasource = ds.rawDatasource!
+
+          schema1 = generator.guid().replaceAll("-", "")
+          schema2 = generator.guid().replaceAll("-", "")
+
+          client = await knexClient(rawDatasource)
+
+          await client.schema.createSchema(schema1)
+          await client.schema.createSchema(schema2)
+
+          rawDatasource.config!.schema = `${schema1}, ${schema2}`
+
+          client = await knexClient(rawDatasource)
+          datasource = await config.api.datasource.create(rawDatasource)
+        })
+
+        afterEach(async () => {
+          await client.schema.dropSchema(schema1, true)
+          await client.schema.dropSchema(schema2, true)
+        })
+
+        it("discovers tables from any schema in search path", async () => {
+          await client.schema.createTable(`${schema1}.table1`, table => {
+            table.increments("id1").primary()
+          })
+
+          await client.schema.createTable(`${schema2}.table2`, table => {
+            table.increments("id2").primary()
+          })
+
+          const response = await config.api.datasource.info(datasource)
+          expect(response.tableNames).toBeDefined()
+          expect(response.tableNames).toEqual(
+            expect.arrayContaining(["table1", "table2"])
+          )
+        })
+
+        it("does not mix columns from different tables", async () => {
+          const repeated_table_name = "table_same_name"
+
+          await client.schema.createTable(
+            `${schema1}.${repeated_table_name}`,
+            table => {
+              table.increments("id").primary()
+              table.string("val1")
+            }
+          )
+
+          await client.schema.createTable(
+            `${schema2}.${repeated_table_name}`,
+            table => {
+              table.increments("id2").primary()
+              table.string("val2")
+            }
+          )
+
+          const response = await config.api.datasource.fetchSchema({
+            datasourceId: datasource._id!,
+            tablesFilter: [repeated_table_name],
+          })
+          expect(
+            response.datasource.entities?.[repeated_table_name].schema
+          ).toBeDefined()
+          const schema =
+            response.datasource.entities?.[repeated_table_name].schema
+          expect(Object.keys(schema || {}).sort()).toEqual(["id", "val1"])
+        })
+      }
+    )
   }
-)
-
-datasourceDescribe(
-  {
-    name: "Integration compatibility with postgres search_path",
-    only: [DatabaseName.POSTGRES],
-  },
-  ({ config, dsProvider }) => {
-    let datasource: Datasource
-    let client: Knex
-    let schema1: string
-    let schema2: string
-
-    beforeEach(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource!
-      const rawDatasource = ds.rawDatasource!
-
-      schema1 = generator.guid().replaceAll("-", "")
-      schema2 = generator.guid().replaceAll("-", "")
-
-      client = await knexClient(rawDatasource)
-
-      await client.schema.createSchema(schema1)
-      await client.schema.createSchema(schema2)
-
-      rawDatasource.config!.schema = `${schema1}, ${schema2}`
-
-      client = await knexClient(rawDatasource)
-      datasource = await config.api.datasource.create(rawDatasource)
-    })
-
-    afterEach(async () => {
-      await client.schema.dropSchema(schema1, true)
-      await client.schema.dropSchema(schema2, true)
-    })
-
-    it("discovers tables from any schema in search path", async () => {
-      await client.schema.createTable(`${schema1}.table1`, table => {
-        table.increments("id1").primary()
-      })
-
-      await client.schema.createTable(`${schema2}.table2`, table => {
-        table.increments("id2").primary()
-      })
-
-      const response = await config.api.datasource.info(datasource)
-      expect(response.tableNames).toBeDefined()
-      expect(response.tableNames).toEqual(
-        expect.arrayContaining(["table1", "table2"])
-      )
-    })
-
-    it("does not mix columns from different tables", async () => {
-      const repeated_table_name = "table_same_name"
-
-      await client.schema.createTable(
-        `${schema1}.${repeated_table_name}`,
-        table => {
-          table.increments("id").primary()
-          table.string("val1")
-        }
-      )
-
-      await client.schema.createTable(
-        `${schema2}.${repeated_table_name}`,
-        table => {
-          table.increments("id2").primary()
-          table.string("val2")
-        }
-      )
-
-      const response = await config.api.datasource.fetchSchema({
-        datasourceId: datasource._id!,
-        tablesFilter: [repeated_table_name],
-      })
-      expect(
-        response.datasource.entities?.[repeated_table_name].schema
-      ).toBeDefined()
-      const schema = response.datasource.entities?.[repeated_table_name].schema
-      expect(Object.keys(schema || {}).sort()).toEqual(["id", "val1"])
-    })
-  }
-)
+}
diff --git a/packages/server/src/integrations/base/query.ts b/packages/server/src/integrations/base/query.ts
index 55886cd20f..2cbbbecc8d 100644
--- a/packages/server/src/integrations/base/query.ts
+++ b/packages/server/src/integrations/base/query.ts
@@ -1,37 +1,39 @@
 import {
-  QueryJson,
-  Datasource,
   DatasourcePlusQueryResponse,
-  RowOperations,
+  EnrichedQueryJson,
+  QueryJson,
 } from "@budibase/types"
 import { getIntegration } from "../index"
 import sdk from "../../sdk"
+import { enrichQueryJson } from "../../sdk/app/rows/utils"
+
+function isEnriched(
+  json: QueryJson | EnrichedQueryJson
+): json is EnrichedQueryJson {
+  return "datasource" in json
+}
 
 export async function makeExternalQuery(
-  datasource: Datasource,
-  json: QueryJson
+  json: QueryJson | EnrichedQueryJson
 ): Promise<DatasourcePlusQueryResponse> {
-  const entityId = json.endpoint.entityId,
-    tableName = json.meta.table.name,
-    tableId = json.meta.table._id
-  // case found during testing - make sure this doesn't happen again
-  if (
-    RowOperations.includes(json.endpoint.operation) &&
-    entityId !== tableId &&
-    entityId !== tableName
-  ) {
-    throw new Error("Entity ID and table metadata do not align")
+  if (!isEnriched(json)) {
+    json = await enrichQueryJson(json)
+    if (json.datasource) {
+      json.datasource = await sdk.datasources.enrich(json.datasource)
+    }
   }
-  if (!datasource) {
+
+  if (!json.datasource) {
     throw new Error("No datasource provided for external query")
   }
-  datasource = await sdk.datasources.enrich(datasource)
-  const Integration = await getIntegration(datasource.source)
+
+  const Integration = await getIntegration(json.datasource.source)
+
   // query is the opinionated function
-  if (Integration.prototype.query) {
-    const integration = new Integration(datasource.config)
-    return integration.query(json)
-  } else {
+  if (!Integration.prototype.query) {
     throw "Datasource does not support query."
   }
+
+  const integration = new Integration(json.datasource.config)
+  return integration.query(json)
 }
diff --git a/packages/server/src/integrations/firebase.ts b/packages/server/src/integrations/firebase.ts
index 3f03f295a9..f96817616d 100644
--- a/packages/server/src/integrations/firebase.ts
+++ b/packages/server/src/integrations/firebase.ts
@@ -12,6 +12,7 @@ interface FirebaseConfig {
   email: string
   privateKey: string
   projectId: string
+  databaseId?: string
 }
 
 const SCHEMA: Integration = {
@@ -30,12 +31,21 @@ const SCHEMA: Integration = {
     },
     privateKey: {
       type: DatasourceFieldType.STRING,
+      display: "Private Key",
       required: true,
     },
     projectId: {
       type: DatasourceFieldType.STRING,
+      display: "Project ID",
       required: true,
     },
+    databaseId: {
+      type: DatasourceFieldType.STRING,
+      display: "Database ID",
+      required: false,
+      default: "(default)",
+      placeholder: "(default)",
+    },
   },
   query: {
     create: {
@@ -97,6 +107,7 @@ class FirebaseIntegration implements IntegrationBase {
     this.config = config
     this.client = new Firestore({
       projectId: config.projectId,
+      databaseId: config.databaseId || "(default)",
       credentials: {
         client_email: config.email,
         private_key: config.privateKey?.replace(/\\n/g, "\n"),
diff --git a/packages/server/src/integrations/googlesheets.ts b/packages/server/src/integrations/googlesheets.ts
index 5f61791683..0eeb38c78f 100644
--- a/packages/server/src/integrations/googlesheets.ts
+++ b/packages/server/src/integrations/googlesheets.ts
@@ -7,7 +7,6 @@ import {
   Integration,
   Operation,
   PaginationJson,
-  QueryJson,
   QueryType,
   Row,
   Schema,
@@ -18,6 +17,7 @@ import {
   TableSourceType,
   DatasourcePlusQueryResponse,
   BBReferenceFieldSubType,
+  EnrichedQueryJson,
 } from "@budibase/types"
 import { OAuth2Client } from "google-auth-library"
 import {
@@ -381,9 +381,9 @@ export class GoogleSheetsIntegration implements DatasourcePlus {
     return { tables: externalTables, errors }
   }
 
-  async query(json: QueryJson): Promise<DatasourcePlusQueryResponse> {
-    const sheet = json.endpoint.entityId
-    switch (json.endpoint.operation) {
+  async query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse> {
+    const sheet = json.table.name
+    switch (json.operation) {
       case Operation.CREATE:
         return this.create({ sheet, row: json.body as Row })
       case Operation.BULK_CREATE:
@@ -400,7 +400,7 @@ export class GoogleSheetsIntegration implements DatasourcePlus {
           rowIndex: json.extra?.idFilter?.equal?.rowNumber,
           sheet,
           row: json.body,
-          table: json.meta.table,
+          table: json.table,
         })
       case Operation.DELETE:
         return this.delete({
@@ -426,7 +426,7 @@ export class GoogleSheetsIntegration implements DatasourcePlus {
         return this.deleteTable(json?.table?.name)
       default:
         throw new Error(
-          `GSheets integration does not support "${json.endpoint.operation}".`
+          `GSheets integration does not support "${json.operation}".`
         )
     }
   }
diff --git a/packages/server/src/integrations/microsoftSqlServer.ts b/packages/server/src/integrations/microsoftSqlServer.ts
index 0a07371cd3..8548d57f15 100644
--- a/packages/server/src/integrations/microsoftSqlServer.ts
+++ b/packages/server/src/integrations/microsoftSqlServer.ts
@@ -4,9 +4,9 @@ import {
   DatasourceFieldType,
   DatasourcePlus,
   DatasourcePlusQueryResponse,
+  EnrichedQueryJson,
   Integration,
   Operation,
-  QueryJson,
   QueryType,
   Schema,
   SourceName,
@@ -193,9 +193,37 @@ const SCHEMA: Integration = {
   },
 }
 
+interface MSSQLColumnDefinition {
+  TableName: string
+  ColumnName: string
+  DataType: string
+  MaxLength: number
+  IsNullable: boolean
+  IsIdentity: boolean
+  Precision: number
+  Scale: number
+}
+
+interface ColumnDefinitionMetadata {
+  usesMaxLength?: boolean
+  usesPrecision?: boolean
+}
+
+const COLUMN_DEFINITION_METADATA: Record<string, ColumnDefinitionMetadata> = {
+  DATETIME2: { usesMaxLength: true },
+  TIME: { usesMaxLength: true },
+  DATETIMEOFFSET: { usesMaxLength: true },
+  NCHAR: { usesMaxLength: true },
+  NVARCHAR: { usesMaxLength: true },
+  BINARY: { usesMaxLength: true },
+  VARBINARY: { usesMaxLength: true },
+  DECIMAL: { usesPrecision: true },
+  NUMERIC: { usesPrecision: true },
+}
+
 class SqlServerIntegration extends Sql implements DatasourcePlus {
   private readonly config: MSSQLConfig
-  private index: number = 0
+  private index = 0
   private client?: sqlServer.ConnectionPool
 
   MASTER_TABLES = [
@@ -248,6 +276,7 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
           encrypt,
           enableArithAbort: true,
           requestTimeout: env.QUERY_THREAD_TIMEOUT,
+          connectTimeout: env.QUERY_THREAD_TIMEOUT,
         },
       }
       if (encrypt) {
@@ -281,8 +310,14 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
         case MSSQLConfigAuthType.NTLM: {
           const { domain, trustServerCertificate } =
             this.config.ntlmConfig || {}
+
+          if (!domain) {
+            throw Error("Domain must be provided for NTLM config")
+          }
+
           clientCfg.authentication = {
             type: "ntlm",
+            // @ts-expect-error - username and password not required for NTLM
             options: {
               domain,
             },
@@ -336,7 +371,8 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
           ? `${query.sql}; SELECT SCOPE_IDENTITY() AS id;`
           : query.sql
       this.log(sql, query.bindings)
-      return await request.query(sql)
+      const resp = await request.query(sql)
+      return resp
     } catch (err: any) {
       let readableMessage = getReadableErrorMessage(
         SourceName.SQL_SERVER,
@@ -499,43 +535,45 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
     return response.recordset || [{ deleted: true }]
   }
 
-  async query(json: QueryJson): Promise<DatasourcePlusQueryResponse> {
+  async query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse> {
     const schema = this.config.schema
     await this.connect()
-    if (schema && schema !== DEFAULT_SCHEMA && json?.endpoint) {
-      json.endpoint.schema = schema
+    if (schema && schema !== DEFAULT_SCHEMA) {
+      json.schema = schema
     }
     const operation = this._operation(json)
     const queryFn = (query: any, op: string) => this.internalQuery(query, op)
     const processFn = (result: any) => {
-      if (json?.meta?.table && result.recordset) {
+      if (result.recordset) {
         return this.convertJsonStringColumns(
-          json.meta.table,
+          json.table,
           result.recordset,
           json.tableAliases
         )
-      } else if (result.recordset) {
-        return result.recordset
       }
       return [{ [operation]: true }]
     }
     return this.queryWithReturning(json, queryFn, processFn)
   }
 
-  async getExternalSchema() {
+  private async getColumnDefinitions(): Promise<MSSQLColumnDefinition[]> {
     // Query to retrieve table schema
     const query = `
   SELECT
     t.name AS TableName,
     c.name AS ColumnName,
     ty.name AS DataType,
+    ty.precision AS Precision,
+    ty.scale AS Scale,
     c.max_length AS MaxLength,
     c.is_nullable AS IsNullable,
     c.is_identity AS IsIdentity
   FROM
     sys.tables t
     INNER JOIN sys.columns c ON t.object_id = c.object_id
-    INNER JOIN sys.types ty ON c.system_type_id = ty.system_type_id
+    INNER JOIN sys.types ty 
+      ON c.system_type_id = ty.system_type_id 
+      AND c.user_type_id = ty.user_type_id
   WHERE
     t.is_ms_shipped = 0
   ORDER BY
@@ -548,17 +586,36 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
       sql: query,
     })
 
+    return result.recordset as MSSQLColumnDefinition[]
+  }
+
+  private getDataType(columnDef: MSSQLColumnDefinition): string {
+    const { DataType, MaxLength, Precision, Scale } = columnDef
+    const { usesMaxLength = false, usesPrecision = false } =
+      COLUMN_DEFINITION_METADATA[DataType] || {}
+
+    let dataType = DataType
+
+    if (usesMaxLength) {
+      if (MaxLength === -1) {
+        dataType += `(MAX)`
+      } else {
+        dataType += `(${MaxLength})`
+      }
+    }
+    if (usesPrecision) {
+      dataType += `(${Precision}, ${Scale})`
+    }
+
+    return dataType
+  }
+
+  async getExternalSchema() {
     const scriptParts = []
     const tables: any = {}
-    for (const row of result.recordset) {
-      const {
-        TableName,
-        ColumnName,
-        DataType,
-        MaxLength,
-        IsNullable,
-        IsIdentity,
-      } = row
+    const columns = await this.getColumnDefinitions()
+    for (const row of columns) {
+      const { TableName, ColumnName, IsNullable, IsIdentity } = row
 
       if (!tables[TableName]) {
         tables[TableName] = {
@@ -566,9 +623,11 @@ class SqlServerIntegration extends Sql implements DatasourcePlus {
         }
       }
 
-      const columnDefinition = `${ColumnName} ${DataType}${
-        MaxLength ? `(${MaxLength})` : ""
-      }${IsNullable ? " NULL" : " NOT NULL"}`
+      const nullable = IsNullable ? "NULL" : "NOT NULL"
+      const identity = IsIdentity ? "IDENTITY" : ""
+      const columnDefinition = `[${ColumnName}] ${this.getDataType(
+        row
+      )} ${nullable} ${identity}`
 
       tables[TableName].columns.push(columnDefinition)
 
diff --git a/packages/server/src/integrations/mysql.ts b/packages/server/src/integrations/mysql.ts
index f78915fb49..b7833ae105 100644
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@@ -2,7 +2,6 @@ import {
   Integration,
   DatasourceFieldType,
   QueryType,
-  QueryJson,
   SqlQuery,
   Table,
   TableSchema,
@@ -15,6 +14,7 @@ import {
   DatasourcePlusQueryResponse,
   SqlQueryBinding,
   SqlClient,
+  EnrichedQueryJson,
 } from "@budibase/types"
 import {
   getSqlQuery,
@@ -322,9 +322,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
             presence: required && !isAuto && !hasDefault,
             externalType: column.Type,
             options: column.Type.startsWith("enum")
-              ? column.Type.substring(5, column.Type.length - 1)
-                  .split(",")
-                  .map(str => str.replace(/^'(.*)'$/, "$1"))
+              ? column.Type.substring(6, column.Type.length - 2).split("','")
               : undefined,
           })
         }
@@ -390,15 +388,15 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
     return results.length ? results : [{ deleted: true }]
   }
 
-  async query(json: QueryJson): Promise<DatasourcePlusQueryResponse> {
+  async query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse> {
     await this.connect()
     try {
       const queryFn = (query: any) =>
         this.internalQuery(query, { connect: false, disableCoercion: true })
       const processFn = (result: any) => {
-        if (json?.meta?.table && Array.isArray(result)) {
+        if (Array.isArray(result)) {
           return this.convertJsonStringColumns(
-            json.meta.table,
+            json.table,
             result,
             json.tableAliases
           )
@@ -414,7 +412,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
   async getExternalSchema() {
     try {
       const [databaseResult] = await this.internalQuery({
-        sql: `SHOW CREATE DATABASE ${this.config.database}`,
+        sql: `SHOW CREATE DATABASE IF NOT EXISTS \`${this.config.database}\``,
       })
       let dumpContent = [databaseResult["Create Database"]]
 
@@ -434,7 +432,7 @@ class MySQLIntegration extends Sql implements DatasourcePlus {
         dumpContent.push(createTableStatement)
       }
 
-      return dumpContent.join("\n")
+      return dumpContent.join(";\n") + ";"
     } finally {
       this.disconnect()
     }
diff --git a/packages/server/src/integrations/oracle.ts b/packages/server/src/integrations/oracle.ts
index fcbc0731ea..5fbb95aab3 100644
--- a/packages/server/src/integrations/oracle.ts
+++ b/packages/server/src/integrations/oracle.ts
@@ -3,7 +3,6 @@ import {
   DatasourceFieldType,
   Integration,
   Operation,
-  QueryJson,
   QueryType,
   SqlQuery,
   Table,
@@ -15,6 +14,7 @@ import {
   Row,
   DatasourcePlusQueryResponse,
   SqlClient,
+  EnrichedQueryJson,
 } from "@budibase/types"
 import {
   buildExternalTableId,
@@ -116,7 +116,7 @@ const OracleContraintTypes = {
 
 class OracleIntegration extends Sql implements DatasourcePlus {
   private readonly config: OracleConfig
-  private index: number = 1
+  private index = 1
 
   private static readonly COLUMNS_SQL = `
     SELECT
@@ -545,7 +545,7 @@ class OracleIntegration extends Sql implements DatasourcePlus {
       : [{ deleted: true }]
   }
 
-  async query(json: QueryJson): Promise<DatasourcePlusQueryResponse> {
+  async query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse> {
     const operation = this._operation(json)
     const input = this._query(json, { disableReturning: true }) as SqlQuery
     if (Array.isArray(input)) {
@@ -572,13 +572,9 @@ class OracleIntegration extends Sql implements DatasourcePlus {
         return response.rows as Row[]
       } else {
         // get the last row that was updated
-        if (
-          response.lastRowid &&
-          json.endpoint?.entityId &&
-          operation !== Operation.DELETE
-        ) {
+        if (response.lastRowid && operation !== Operation.DELETE) {
           const lastRow = await this.internalQuery({
-            sql: `SELECT * FROM "${json.endpoint.entityId}" WHERE ROWID = '${response.lastRowid}'`,
+            sql: `SELECT * FROM "${json.table.name}" WHERE ROWID = '${response.lastRowid}'`,
           })
           return lastRow.rows as Row[]
         } else {
diff --git a/packages/server/src/integrations/postgres.ts b/packages/server/src/integrations/postgres.ts
index 28400f616f..33c2d76a96 100644
--- a/packages/server/src/integrations/postgres.ts
+++ b/packages/server/src/integrations/postgres.ts
@@ -3,7 +3,6 @@ import {
   Integration,
   DatasourceFieldType,
   QueryType,
-  QueryJson,
   SqlQuery,
   Table,
   DatasourcePlus,
@@ -14,6 +13,7 @@ import {
   TableSourceType,
   DatasourcePlusQueryResponse,
   SqlClient,
+  EnrichedQueryJson,
 } from "@budibase/types"
 import {
   getSqlQuery,
@@ -149,7 +149,7 @@ const SCHEMA: Integration = {
 class PostgresIntegration extends Sql implements DatasourcePlus {
   private readonly client: Client
   private readonly config: PostgresConfig
-  private index: number = 1
+  private index = 1
   private open: boolean
 
   PRIMARY_KEYS_SQL = () => `
@@ -173,8 +173,13 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
   `
 
   COLUMNS_SQL = () => `
-    select * from information_schema.columns where table_schema = ANY(current_schemas(false)) 
-      AND pg_table_is_visible(to_regclass(format('%I.%I', table_schema, table_name)));
+  SELECT columns.*
+  FROM information_schema.columns columns
+  JOIN pg_class pg_class ON pg_class.relname = columns.table_name
+  JOIN pg_namespace name_space ON name_space.oid = pg_class.relnamespace
+  WHERE columns.table_schema = ANY(current_schemas(false))
+    AND columns.table_schema = name_space.nspname
+    AND pg_table_is_visible(pg_class.oid);
   `
 
   constructor(config: PostgresConfig) {
@@ -252,7 +257,7 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
     })
   }
 
-  async internalQuery(query: SqlQuery, close: boolean = true) {
+  async internalQuery(query: SqlQuery, close = true) {
     if (!this.open) {
       await this.openConnection()
     }
@@ -419,7 +424,7 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
     return response.rows.length ? response.rows : [{ deleted: true }]
   }
 
-  async query(json: QueryJson): Promise<DatasourcePlusQueryResponse> {
+  async query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse> {
     const operation = this._operation(json).toLowerCase()
     const input = this._query(json) as SqlQuery
     if (Array.isArray(input)) {
@@ -476,21 +481,15 @@ class PostgresIntegration extends Sql implements DatasourcePlus {
       this.config.password
     }" pg_dump --schema-only "${dumpCommandParts.join(" ")}"`
 
-    return new Promise<string>((res, rej) => {
+    return new Promise<string>((resolve, reject) => {
       exec(dumpCommand, (error, stdout, stderr) => {
-        if (error) {
-          console.error(`Error generating dump: ${error.message}`)
-          rej(error.message)
+        if (error || stderr) {
+          console.error(stderr)
+          reject(new Error(stderr))
           return
         }
 
-        if (stderr) {
-          console.error(`pg_dump error: ${stderr}`)
-          rej(stderr)
-          return
-        }
-
-        res(stdout)
+        resolve(stdout)
         console.log("SQL dump generated successfully!")
       })
     })
diff --git a/packages/server/src/integrations/redis.ts b/packages/server/src/integrations/redis.ts
index e127cddd56..ff0e1d25c3 100644
--- a/packages/server/src/integrations/redis.ts
+++ b/packages/server/src/integrations/redis.ts
@@ -129,7 +129,7 @@ class RedisIntegration {
     return this.client.quit()
   }
 
-  async redisContext(query: Function) {
+  async redisContext<T>(query: () => Promise<T>) {
     try {
       return await query()
     } catch (err) {
diff --git a/packages/server/src/integrations/rest.ts b/packages/server/src/integrations/rest.ts
index ce2ec7d545..4f8b246233 100644
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@@ -171,7 +171,7 @@ export class RestIntegration implements IntegrationBase {
         path.basename(parse(contentDisposition).parameters?.filename) || ""
     }
 
-    let triedParsing: boolean = false,
+    let triedParsing = false,
       responseTxt: string | undefined
     try {
       if (filename) {
@@ -313,7 +313,9 @@ export class RestIntegration implements IntegrationBase {
     }
 
     // Util to add pagination values to a certain body type
-    const addPaginationToBody = (insertFn: Function) => {
+    const addPaginationToBody = (
+      insertFn: (pageParam: string, page?: string | number) => void
+    ) => {
       if (pagination?.location === "body") {
         if (pagination?.pageParam && paginationValues?.page != null) {
           insertFn(pagination.pageParam, paginationValues.page)
diff --git a/packages/server/src/integrations/snowflake.ts b/packages/server/src/integrations/snowflake.ts
index 9a1dac10e5..838cbb4106 100644
--- a/packages/server/src/integrations/snowflake.ts
+++ b/packages/server/src/integrations/snowflake.ts
@@ -6,7 +6,8 @@ import {
   QueryType,
   SqlQuery,
 } from "@budibase/types"
-import { Snowflake } from "snowflake-promise"
+import snowflakeSdk, { SnowflakeError } from "snowflake-sdk"
+import { promisify } from "util"
 
 interface SnowflakeConfig {
   account: string
@@ -71,11 +72,52 @@ const SCHEMA: Integration = {
   },
 }
 
-class SnowflakeIntegration {
-  private client: Snowflake
+class SnowflakePromise {
+  config: SnowflakeConfig
+  client?: snowflakeSdk.Connection
 
   constructor(config: SnowflakeConfig) {
-    this.client = new Snowflake(config)
+    this.config = config
+  }
+
+  async connect() {
+    if (this.client?.isUp()) return
+
+    this.client = snowflakeSdk.createConnection(this.config)
+    const connectAsync = promisify(this.client.connect.bind(this.client))
+    return connectAsync()
+  }
+
+  async execute(sql: string) {
+    return new Promise((resolve, reject) => {
+      if (!this.client) {
+        throw Error(
+          "No snowflake client present to execute query. Run connect() first to initialise."
+        )
+      }
+
+      this.client.execute({
+        sqlText: sql,
+        complete: function (
+          err: SnowflakeError | undefined,
+          statementExecuted: any,
+          rows: any
+        ) {
+          if (err) {
+            return reject(err)
+          }
+          resolve(rows)
+        },
+      })
+    })
+  }
+}
+
+class SnowflakeIntegration {
+  private client: SnowflakePromise
+
+  constructor(config: SnowflakeConfig) {
+    this.client = new SnowflakePromise(config)
   }
 
   async testConnection(): Promise<ConnectionInfo> {
diff --git a/packages/server/src/integrations/tests/googlesheets.spec.ts b/packages/server/src/integrations/tests/googlesheets.spec.ts
index 34be1c0c6c..966123513c 100644
--- a/packages/server/src/integrations/tests/googlesheets.spec.ts
+++ b/packages/server/src/integrations/tests/googlesheets.spec.ts
@@ -389,25 +389,24 @@ describe("Google Sheets Integration", () => {
     })
 
     // TODO: this gets the error "Sheet is not large enough to fit 27 columns. Resize the sheet first."
-    // eslint-disable-next-line jest/no-commented-out-tests
-    // it("should be able to add a new column", async () => {
-    //   const updatedTable = await config.api.table.save({
-    //     ...table,
-    //     schema: {
-    //       ...table.schema,
-    //       newColumn: {
-    //         name: "newColumn",
-    //         type: FieldType.STRING,
-    //       },
-    //     },
-    //   })
+    it.skip("should be able to add a new column", async () => {
+      const updatedTable = await config.api.table.save({
+        ...table,
+        schema: {
+          ...table.schema,
+          newColumn: {
+            name: "newColumn",
+            type: FieldType.STRING,
+          },
+        },
+      })
 
-    //   expect(updatedTable.schema.newColumn).toBeDefined()
+      expect(updatedTable.schema.newColumn).toBeDefined()
 
-    //   expect(mock.cell("A1")).toEqual("name")
-    //   expect(mock.cell("B1")).toEqual("description")
-    //   expect(mock.cell("C1")).toEqual("newColumn")
-    // })
+      expect(mock.cell("A1")).toEqual("name")
+      expect(mock.cell("B1")).toEqual("description")
+      expect(mock.cell("C1")).toEqual("newColumn")
+    })
 
     it("should be able to delete a column", async () => {
       const row = await config.api.row.save(table._id!, {
diff --git a/packages/server/src/integrations/tests/rest.spec.ts b/packages/server/src/integrations/tests/rest.spec.ts
index e869c58875..0411a1380e 100644
--- a/packages/server/src/integrations/tests/rest.spec.ts
+++ b/packages/server/src/integrations/tests/rest.spec.ts
@@ -3,6 +3,8 @@ import { RestIntegration } from "../rest"
 import { BodyType, RestAuthType } from "@budibase/types"
 import { Response } from "node-fetch"
 import TestConfiguration from "../../../src/tests/utilities/TestConfiguration"
+import { createServer } from "http"
+import { AddressInfo } from "net"
 
 const UUID_REGEX =
   "[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}"
@@ -455,29 +457,27 @@ describe("REST Integration", () => {
     // NOTE(samwho): it seems like this code doesn't actually work because it requires
     // node-fetch >=3, and we're not on that because upgrading to it produces errors to
     // do with ESM that are above my pay grade.
+    it.skip("doesn't fail when legacyHttpParser is set", async () => {
+      const server = createServer((req, res) => {
+        res.writeHead(200, {
+          "Transfer-Encoding": "chunked",
+          "Content-Length": "10",
+        })
+        res.end(JSON.stringify({ foo: "bar" }))
+      })
 
-    // eslint-disable-next-line jest/no-commented-out-tests
-    // it("doesn't fail when legacyHttpParser is set", async () => {
-    //   const server = createServer((req, res) => {
-    //     res.writeHead(200, {
-    //       "Transfer-Encoding": "chunked",
-    //       "Content-Length": "10",
-    //     })
-    //     res.end(JSON.stringify({ foo: "bar" }))
-    //   })
+      server.listen()
+      await new Promise(resolve => server.once("listening", resolve))
 
-    //   server.listen()
-    //   await new Promise(resolve => server.once("listening", resolve))
+      const address = server.address() as AddressInfo
 
-    //   const address = server.address() as AddressInfo
-
-    //   const integration = new RestIntegration({
-    //     url: `http://localhost:${address.port}`,
-    //     legacyHttpParser: true,
-    //   })
-    //   const { data } = await integration.read({})
-    //   expect(data).toEqual({ foo: "bar" })
-    // })
+      const integration = new RestIntegration({
+        url: `http://localhost:${address.port}`,
+        legacyHttpParser: true,
+      })
+      const { data } = await integration.read({})
+      expect(data).toEqual({ foo: "bar" })
+    })
 
     it("doesn't fail when legacyHttpParser is true", async () => {
       nock("https://example.com").get("/").reply(200, { foo: "bar" })
diff --git a/packages/server/src/integrations/tests/sql.spec.ts b/packages/server/src/integrations/tests/sql.spec.ts
deleted file mode 100644
index 2b3649161c..0000000000
--- a/packages/server/src/integrations/tests/sql.spec.ts
+++ /dev/null
@@ -1,268 +0,0 @@
-import {
-  FieldType,
-  Operation,
-  PaginationJson,
-  QueryJson,
-  SearchFilters,
-  SortJson,
-  SqlClient,
-  Table,
-  TableSourceType,
-} from "@budibase/types"
-import { sql } from "@budibase/backend-core"
-import { merge } from "lodash"
-
-const Sql = sql.Sql
-
-const TABLE_NAME = "test"
-const TABLE: Table = {
-  type: "table",
-  sourceType: TableSourceType.EXTERNAL,
-  sourceId: "SOURCE_ID",
-  schema: {
-    id: {
-      name: "id",
-      type: FieldType.NUMBER,
-    },
-  },
-  name: TABLE_NAME,
-  primary: ["id"],
-}
-
-const ORACLE_TABLE: Partial<Table> = {
-  schema: {
-    name: {
-      name: "name",
-      type: FieldType.STRING,
-    },
-  },
-}
-
-function endpoint(table: string, operation: Operation) {
-  return {
-    datasourceId: "Postgres",
-    operation: operation,
-    entityId: table || TABLE_NAME,
-  }
-}
-
-function generateReadJson({
-  table,
-  fields,
-  filters,
-  sort,
-  paginate,
-}: {
-  table?: Partial<Table>
-  fields?: string[]
-  filters?: SearchFilters
-  sort?: SortJson
-  paginate?: PaginationJson
-} = {}): QueryJson {
-  let tableObj: Table = { ...TABLE }
-  if (table) {
-    tableObj = merge(TABLE, table)
-  }
-  return {
-    endpoint: endpoint(tableObj.name || TABLE_NAME, Operation.READ),
-    resource: {
-      fields: fields || [],
-    },
-    filters: filters || {},
-    sort: sort || {},
-    paginate: paginate || undefined,
-    meta: {
-      table: tableObj,
-    },
-  }
-}
-
-function generateRelationshipJson(config: { schema?: string } = {}): QueryJson {
-  return {
-    endpoint: {
-      datasourceId: "Postgres",
-      entityId: "brands",
-      operation: Operation.READ,
-      schema: config.schema,
-    },
-    resource: {
-      fields: [
-        "brands.brand_id",
-        "brands.brand_name",
-        "products.product_id",
-        "products.product_name",
-        "products.brand_id",
-      ],
-    },
-    filters: {},
-    sort: {},
-    relationships: [
-      {
-        from: "brand_id",
-        to: "brand_id",
-        tableName: "products",
-        column: "products",
-      },
-    ],
-    extra: { idFilter: {} },
-    meta: {
-      table: TABLE,
-    },
-  }
-}
-
-function generateManyRelationshipJson(config: { schema?: string } = {}) {
-  return {
-    endpoint: {
-      datasourceId: "Postgres",
-      entityId: "stores",
-      operation: "READ",
-      schema: config.schema,
-    },
-    resource: {
-      fields: [
-        "stores.store_id",
-        "stores.store_name",
-        "products.product_id",
-        "products.product_name",
-      ],
-    },
-    filters: {},
-    sort: {},
-    paginate: {},
-    relationships: [
-      {
-        from: "store_id",
-        to: "product_id",
-        tableName: "products",
-        column: "products",
-        through: "stocks",
-        fromPrimary: "store_id",
-        toPrimary: "product_id",
-      },
-    ],
-    extra: { idFilter: {} },
-    meta: {
-      table: TABLE,
-    },
-  }
-}
-
-describe("SQL query builder", () => {
-  const relationshipLimit = 500
-  const limit = 500
-  const client = SqlClient.POSTGRES
-  let sql: any
-
-  beforeEach(() => {
-    sql = new Sql(client, limit)
-  })
-
-  it("should add the schema to the LEFT JOIN", () => {
-    const query = sql._query(generateRelationshipJson({ schema: "production" }))
-    expect(query).toEqual({
-      bindings: [limit, relationshipLimit],
-      sql: `with "paginated" as (select "brands".* from "production"."brands" order by "test"."id" asc limit $1) select "brands".*, (select json_agg(json_build_object('brand_id',"products"."brand_id",'product_id',"products"."product_id",'product_name',"products"."product_name")) from (select "products".* from "production"."products" as "products" where "products"."brand_id" = "brands"."brand_id" order by "products"."brand_id" asc limit $2) as "products") as "products" from "paginated" as "brands" order by "test"."id" asc`,
-    })
-  })
-
-  it("should handle if the schema is not present when doing a LEFT JOIN", () => {
-    const query = sql._query(generateRelationshipJson())
-    expect(query).toEqual({
-      bindings: [limit, relationshipLimit],
-      sql: `with "paginated" as (select "brands".* from "brands" order by "test"."id" asc limit $1) select "brands".*, (select json_agg(json_build_object('brand_id',"products"."brand_id",'product_id',"products"."product_id",'product_name',"products"."product_name")) from (select "products".* from "products" as "products" where "products"."brand_id" = "brands"."brand_id" order by "products"."brand_id" asc limit $2) as "products") as "products" from "paginated" as "brands" order by "test"."id" asc`,
-    })
-  })
-
-  it("should add the schema to both the toTable and throughTable in many-to-many join", () => {
-    const query = sql._query(
-      generateManyRelationshipJson({ schema: "production" })
-    )
-    expect(query).toEqual({
-      bindings: [limit, relationshipLimit],
-      sql: `with "paginated" as (select "stores".* from "production"."stores" order by "test"."id" asc limit $1) select "stores".*, (select json_agg(json_build_object('product_id',"products"."product_id",'product_name',"products"."product_name")) from (select "products".* from "production"."products" as "products" inner join "production"."stocks" as "stocks" on "products"."product_id" = "stocks"."product_id" where "stocks"."store_id" = "stores"."store_id" order by "products"."product_id" asc limit $2) as "products") as "products" from "paginated" as "stores" order by "test"."id" asc`,
-    })
-  })
-
-  it("should lowercase the values for Oracle LIKE statements", () => {
-    let query = new Sql(SqlClient.ORACLE, limit)._query(
-      generateReadJson({
-        filters: {
-          string: {
-            name: "John",
-          },
-        },
-      })
-    )
-    expect(query).toEqual({
-      bindings: ["john%", limit],
-      sql: `select * from (select * from "test" where LOWER("test"."name") LIKE :1 order by "test"."id" asc) where rownum <= :2`,
-    })
-
-    query = new Sql(SqlClient.ORACLE, limit)._query(
-      generateReadJson({
-        filters: {
-          contains: {
-            age: [20, 25],
-            name: ["John", "Mary"],
-          },
-        },
-      })
-    )
-    const filterSet = [`%20%`, `%25%`, `%"john"%`, `%"mary"%`]
-    expect(query).toEqual({
-      bindings: [...filterSet, limit],
-      sql: `select * from (select * from "test" where ((COALESCE(LOWER("test"."age"), '') like :1 and COALESCE(LOWER("test"."age"), '') like :2)) and ((COALESCE(LOWER("test"."name"), '') like :3 and COALESCE(LOWER("test"."name"), '') like :4)) order by "test"."id" asc) where rownum <= :5`,
-    })
-
-    query = new Sql(SqlClient.ORACLE, limit)._query(
-      generateReadJson({
-        filters: {
-          fuzzy: {
-            name: "Jo",
-          },
-        },
-      })
-    )
-    expect(query).toEqual({
-      bindings: [`%jo%`, limit],
-      sql: `select * from (select * from "test" where LOWER("test"."name") LIKE :1 order by "test"."id" asc) where rownum <= :2`,
-    })
-  })
-
-  it("should use an oracle compatible coalesce query for oracle when using the equals filter", () => {
-    let query = new Sql(SqlClient.ORACLE, limit)._query(
-      generateReadJson({
-        table: ORACLE_TABLE,
-        filters: {
-          equal: {
-            name: "John",
-          },
-        },
-      })
-    )
-
-    expect(query).toEqual({
-      bindings: ["John", limit],
-      sql: `select * from (select * from "test" where (to_char("test"."name") is not null and to_char("test"."name") = :1) order by "test"."id" asc) where rownum <= :2`,
-    })
-  })
-
-  it("should use an oracle compatible coalesce query for oracle when using the not equals filter", () => {
-    let query = new Sql(SqlClient.ORACLE, limit)._query(
-      generateReadJson({
-        table: ORACLE_TABLE,
-        filters: {
-          notEqual: {
-            name: "John",
-          },
-        },
-      })
-    )
-
-    expect(query).toEqual({
-      bindings: ["John", limit],
-      sql: `select * from (select * from "test" where (to_char("test"."name") is not null and to_char("test"."name") != :1) or to_char("test"."name") is null order by "test"."id" asc) where rownum <= :2`,
-    })
-  })
-})
diff --git a/packages/server/src/integrations/tests/sqlAlias.spec.ts b/packages/server/src/integrations/tests/sqlAlias.spec.ts
index 739d3a4aee..898ab9314a 100644
--- a/packages/server/src/integrations/tests/sqlAlias.spec.ts
+++ b/packages/server/src/integrations/tests/sqlAlias.spec.ts
@@ -1,12 +1,13 @@
 import {
   Datasource,
   Operation,
-  QueryJson,
   SourceName,
   SqlQuery,
+  SqlClient,
+  EnrichedQueryJson,
+  TableSchema,
   Table,
   TableSourceType,
-  SqlClient,
 } from "@budibase/types"
 import { sql } from "@budibase/backend-core"
 import { join } from "path"
@@ -16,17 +17,21 @@ import sdk from "../../sdk"
 const Sql = sql.Sql
 
 // this doesn't exist strictly
-const TABLE: Table = {
-  type: "table",
-  sourceType: TableSourceType.EXTERNAL,
-  sourceId: "SOURCE_ID",
-  schema: {},
-  name: "tableName",
-  primary: ["id"],
-}
+const TABLE = buildTable("tableName", {})
 
 const AliasTables = sdk.rows.AliasTables
 
+function buildTable(name: string, schema: TableSchema): Table {
+  return {
+    type: "table",
+    sourceType: TableSourceType.EXTERNAL,
+    sourceId: "SOURCE_ID",
+    schema: schema,
+    name: name,
+    primary: ["id"],
+  }
+}
+
 function multiline(sql: string) {
   return sql.replace(/\n/g, "").replace(/ +/g, " ")
 }
@@ -35,8 +40,22 @@ describe("Captures of real examples", () => {
   const relationshipLimit = 500
   const primaryLimit = 100
 
-  function getJson(name: string): QueryJson {
-    return require(join(__dirname, "sqlQueryJson", name)) as QueryJson
+  function getJson(name: string): EnrichedQueryJson {
+    // tables aren't fully specified in the test JSON
+    const base = require(join(__dirname, "sqlQueryJson", name)) as Omit<
+      EnrichedQueryJson,
+      "tables"
+    >
+    const tables: Record<string, Table> = { [base.table.name]: base.table }
+    if (base.relationships) {
+      for (let { tableName } of base.relationships) {
+        tables[tableName] = buildTable(tableName, {})
+      }
+    }
+    return {
+      ...base,
+      tables: tables,
+    }
   }
 
   describe("create", () => {
@@ -54,6 +73,27 @@ describe("Captures of real examples", () => {
   })
 
   describe("read", () => {
+    it("should retrieve all fields if non are specified", () => {
+      const queryJson = getJson("basicFetch.json")
+      delete queryJson.resource
+
+      let query = new Sql(SqlClient.POSTGRES)._query(queryJson)
+      expect(query).toEqual({
+        bindings: [primaryLimit],
+        sql: `select * from "persons" as "a" order by "a"."firstname" asc nulls first, "a"."personid" asc limit $1`,
+      })
+    })
+
+    it("should retrieve only requested fields", () => {
+      const queryJson = getJson("basicFetch.json")
+
+      let query = new Sql(SqlClient.POSTGRES)._query(queryJson)
+      expect(query).toEqual({
+        bindings: [primaryLimit],
+        sql: `select "a"."year", "a"."firstname", "a"."personid", "a"."age", "a"."type", "a"."lastname" from "persons" as "a" order by "a"."firstname" asc nulls first, "a"."personid" asc limit $1`,
+      })
+    })
+
     it("should handle basic retrieval with relationships", () => {
       const queryJson = getJson("basicFetchWithRelationships.json")
       let query = new Sql(SqlClient.POSTGRES, relationshipLimit)._query(
@@ -63,7 +103,7 @@ describe("Captures of real examples", () => {
         bindings: [primaryLimit, relationshipLimit, relationshipLimit],
         sql: expect.stringContaining(
           multiline(
-            `select json_agg(json_build_object('completed',"b"."completed",'completed',"b"."completed",'executorid',"b"."executorid",'executorid',"b"."executorid",'qaid',"b"."qaid",'qaid',"b"."qaid",'taskid',"b"."taskid",'taskid',"b"."taskid",'taskname',"b"."taskname",'taskname',"b"."taskname")`
+            `select json_agg(json_build_object('executorid',"b"."executorid",'executorid',"b"."executorid",'qaid',"b"."qaid",'qaid',"b"."qaid",'taskid',"b"."taskid",'taskid',"b"."taskid",'completed',"b"."completed",'completed',"b"."completed",'taskname',"b"."taskname",'taskname',"b"."taskname"`
           )
         ),
       })
@@ -93,9 +133,9 @@ describe("Captures of real examples", () => {
         bindings: [primaryLimit, relationshipLimit],
         sql: expect.stringContaining(
           multiline(
-            `with "paginated" as (select "a".* from "products" as "a" order by "a"."productname" asc nulls first, "a"."productid" asc limit $1) 
-                 select "a".*, (select json_agg(json_build_object('completed',"b"."completed",'executorid',"b"."executorid",'qaid',"b"."qaid",'taskid',"b"."taskid",'taskname',"b"."taskname")) 
-                 from (select "b".* from "tasks" as "b" inner join "products_tasks" as "c" on "b"."taskid" = "c"."taskid" where "c"."productid" = "a"."productid" order by "b"."taskid" asc limit $2) as "b") as "tasks" 
+            `with "paginated" as (select * from "products" as "a" order by "a"."productname" asc nulls first, "a"."productid" asc limit $1) 
+                 select "a"."productname", "a"."productid", (select json_agg(json_build_object('executorid',"b"."executorid",'qaid',"b"."qaid",'taskid',"b"."taskid",'completed',"b"."completed",'taskname',"b"."taskname")) 
+                 from (select "b"."executorid", "b"."qaid", "b"."taskid", "b"."completed", "b"."taskname" from "tasks" as "b" inner join "products_tasks" as "c" on "b"."taskid" = "c"."taskid" where "c"."productid" = "a"."productid" order by "b"."taskid" asc limit $2) as "b") as "tasks" 
                  from "paginated" as "a" order by "a"."productname" asc nulls first, "a"."productid" asc`
           )
         ),
@@ -111,9 +151,9 @@ describe("Captures of real examples", () => {
       expect(query).toEqual({
         bindings: [...filters, relationshipLimit, relationshipLimit],
         sql: multiline(
-          `with "paginated" as (select "a".* from "tasks" as "a" where "a"."taskid" in ($1, $2) order by "a"."taskid" asc limit $3) 
-               select "a".*, (select json_agg(json_build_object('productid',"b"."productid",'productname',"b"."productname")) 
-               from (select "b".* from "products" as "b" inner join "products_tasks" as "c" on "b"."productid" = "c"."productid" 
+          `with "paginated" as (select * from "tasks" as "a" where "a"."taskid" in ($1, $2) order by "a"."taskid" asc limit $3) 
+               select "a"."executorid", "a"."taskname", "a"."taskid", "a"."completed", "a"."qaid", (select json_agg(json_build_object('productid',"b"."productid",'productname',"b"."productname")) 
+               from (select "b"."productid", "b"."productname" from "products" as "b" inner join "products_tasks" as "c" on "b"."productid" = "c"."productid" 
                where "c"."taskid" = "a"."taskid" order by "b"."productid" asc limit $4) as "b") as "products" from "paginated" as "a" order by "a"."taskid" asc`
         ),
       })
@@ -125,10 +165,10 @@ describe("Captures of real examples", () => {
         queryJson
       )
       const filters = queryJson.filters
-      const notEqualsValue = Object.values(filters?.notEqual!)[0]
+      const notEqualsValue = Object.values(filters!.notEqual!)[0]
       const rangeValue: { high?: string | number; low?: string | number } =
-        Object.values(filters?.range!)[0]
-      const equalValue = Object.values(filters?.equal!)[0]
+        Object.values(filters!.range!)[0]
+      const equalValue = Object.values(filters!.equal!)[0]
 
       expect(query).toEqual({
         bindings: [
@@ -190,7 +230,7 @@ describe("Captures of real examples", () => {
         bindings: ["ddd", ""],
         sql: multiline(`delete from "compositetable" as "a" 
           where COALESCE("a"."keypartone" = $1, FALSE) and COALESCE("a"."keyparttwo" = $2, FALSE)
-          returning "a".*`),
+          returning "a"."keyparttwo", "a"."keypartone", "a"."name"`),
       })
     })
   })
@@ -212,8 +252,7 @@ describe("Captures of real examples", () => {
       }, queryJson)
       expect(returningQuery).toEqual({
         sql: multiline(
-          `select top (@p0) * from [people] where CASE WHEN [people].[name] = @p1 THEN 1 ELSE 0 END = 1 
-               and CASE WHEN [people].[age] = @p2 THEN 1 ELSE 0 END = 1 order by [people].[name] asc`
+          `select top (@p0) * from [people] where CASE WHEN [people].[name] = @p1 THEN 1 ELSE 0 END = 1 and CASE WHEN [people].[age] = @p2 THEN 1 ELSE 0 END = 1 order by [people].[name] asc`
         ),
         bindings: [1, "Test", 22],
       })
@@ -227,7 +266,7 @@ describe("Captures of real examples", () => {
         tableNames.push(generator.guid())
       }
       const aliasing = new AliasTables(tableNames)
-      let alias: string = ""
+      let alias = ""
       for (let table of tableNames) {
         alias = aliasing.getAlias(table)
       }
@@ -246,15 +285,17 @@ describe("Captures of real examples", () => {
       }
     }
 
-    function getQuery(op: Operation, fields: string[] = ["a"]): QueryJson {
+    function getQuery(
+      op: Operation,
+      fields: string[] = ["a"]
+    ): EnrichedQueryJson {
       return {
-        endpoint: { datasourceId: "", entityId: "", operation: op },
+        operation: op,
         resource: {
           fields,
         },
-        meta: {
-          table: TABLE,
-        },
+        table: TABLE,
+        tables: { [TABLE.name]: TABLE },
       }
     }
 
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/basicFetch.json b/packages/server/src/integrations/tests/sqlQueryJson/basicFetch.json
new file mode 100644
index 0000000000..9d9026c922
--- /dev/null
+++ b/packages/server/src/integrations/tests/sqlQueryJson/basicFetch.json
@@ -0,0 +1,137 @@
+{
+  "operation": "READ",
+  "resource": {
+    "fields": [
+      "a.year",
+      "a.firstname",
+      "a.personid",
+      "a.age",
+      "a.type",
+      "a.lastname"
+    ]
+  },
+  "filters": {},
+  "sort": {
+    "firstname": {
+      "direction": "ascending"
+    }
+  },
+  "paginate": {
+    "limit": 100,
+    "page": 1
+  },
+  "relationships": [],
+  "extra": {
+    "idFilter": {}
+  },
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
+    "primary": ["personid"],
+    "name": "persons",
+    "schema": {
+      "year": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "year",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "firstname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "firstname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "personid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "personid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "address": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "address",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "age": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "type": {
+        "type": "options",
+        "externalType": "USER-DEFINED",
+        "autocolumn": false,
+        "name": "type",
+        "constraints": {
+          "presence": false,
+          "inclusion": ["support", "designer", "programmer", "qa"]
+        }
+      },
+      "city": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "city",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "lastname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "lastname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "QA": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "QA",
+        "relationshipType": "many-to-one",
+        "fieldName": "qaid",
+        "type": "link",
+        "main": true,
+        "_id": "ccb68481c80c34217a4540a2c6c27fe46",
+        "foreignKey": "personid"
+      },
+      "executor": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "executor",
+        "relationshipType": "many-to-one",
+        "fieldName": "executorid",
+        "type": "link",
+        "main": true,
+        "_id": "c89530b9770d94bec851e062b5cff3001",
+        "foreignKey": "personid",
+        "tableName": "persons"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "firstname",
+    "views": {}
+  },
+  "tableAliases": {
+    "persons": "a",
+    "tasks": "b"
+  }
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/basicFetchWithRelationships.json b/packages/server/src/integrations/tests/sqlQueryJson/basicFetchWithRelationships.json
index aa2cab3afd..c61d66d684 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/basicFetchWithRelationships.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/basicFetchWithRelationships.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "persons",
-    "operation": "READ"
-  },
+  "operation": "READ",
   "resource": {
     "fields": [
       "a.year",
@@ -61,113 +57,111 @@
   "extra": {
     "idFilter": {}
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
-      "primary": ["personid"],
-      "name": "persons",
-      "schema": {
-        "year": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "year",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "firstname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "firstname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "personid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "personid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "address": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "address",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "age": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "age",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "type": {
-          "type": "options",
-          "externalType": "USER-DEFINED",
-          "autocolumn": false,
-          "name": "type",
-          "constraints": {
-            "presence": false,
-            "inclusion": ["support", "designer", "programmer", "qa"]
-          }
-        },
-        "city": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "city",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "lastname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "lastname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "QA": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "QA",
-          "relationshipType": "many-to-one",
-          "fieldName": "qaid",
-          "type": "link",
-          "main": true,
-          "_id": "ccb68481c80c34217a4540a2c6c27fe46",
-          "foreignKey": "personid"
-        },
-        "executor": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "executor",
-          "relationshipType": "many-to-one",
-          "fieldName": "executorid",
-          "type": "link",
-          "main": true,
-          "_id": "c89530b9770d94bec851e062b5cff3001",
-          "foreignKey": "personid",
-          "tableName": "persons"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
+    "primary": ["personid"],
+    "name": "persons",
+    "schema": {
+      "year": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "year",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "firstname",
-      "views": {}
-    }
+      "firstname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "firstname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "personid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "personid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "address": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "address",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "age": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "type": {
+        "type": "options",
+        "externalType": "USER-DEFINED",
+        "autocolumn": false,
+        "name": "type",
+        "constraints": {
+          "presence": false,
+          "inclusion": ["support", "designer", "programmer", "qa"]
+        }
+      },
+      "city": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "city",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "lastname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "lastname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "QA": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "QA",
+        "relationshipType": "many-to-one",
+        "fieldName": "qaid",
+        "type": "link",
+        "main": true,
+        "_id": "ccb68481c80c34217a4540a2c6c27fe46",
+        "foreignKey": "personid"
+      },
+      "executor": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "executor",
+        "relationshipType": "many-to-one",
+        "fieldName": "executorid",
+        "type": "link",
+        "main": true,
+        "_id": "c89530b9770d94bec851e062b5cff3001",
+        "foreignKey": "personid",
+        "tableName": "persons"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "firstname",
+    "views": {}
   },
   "tableAliases": {
     "persons": "a",
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/createSimple.json b/packages/server/src/integrations/tests/sqlQueryJson/createSimple.json
index 33a88d30e1..ac487e4e90 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/createSimple.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/createSimple.json
@@ -1,14 +1,7 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_0ed5835e5552496285df546030f7c4ae",
-    "entityId": "people",
-    "operation": "CREATE"
-  },
+  "operation": "CREATE",
   "resource": {
-    "fields": [
-      "a.name",
-      "a.age"
-    ]
+    "fields": ["a.name", "a.age"]
   },
   "filters": {},
   "relationships": [],
@@ -24,41 +17,36 @@
       }
     }
   },
-  "meta": {
-    "table": {
-      "_id": "datasource_plus_0ed5835e5552496285df546030f7c4ae__people",
-      "type": "table",
-      "sourceId": "datasource_plus_0ed5835e5552496285df546030f7c4ae",
-      "sourceType": "external",
-      "primary": [
-        "name",
-        "age"
-      ],
-      "name": "people",
-      "schema": {
-        "name": {
-          "type": "string",
-          "externalType": "varchar",
-          "autocolumn": false,
-          "name": "name",
-          "constraints": {
-            "presence": true
-          }
-        },
-        "age": {
-          "type": "number",
-          "externalType": "int",
-          "autocolumn": false,
-          "name": "age",
-          "constraints": {
-            "presence": false
-          }
+  "table": {
+    "_id": "datasource_plus_0ed5835e5552496285df546030f7c4ae__people",
+    "type": "table",
+    "sourceId": "datasource_plus_0ed5835e5552496285df546030f7c4ae",
+    "sourceType": "external",
+    "primary": ["name", "age"],
+    "name": "people",
+    "schema": {
+      "name": {
+        "type": "string",
+        "externalType": "varchar",
+        "autocolumn": false,
+        "name": "name",
+        "constraints": {
+          "presence": true
         }
       },
-      "primaryDisplay": "name"
-    }
+      "age": {
+        "type": "number",
+        "externalType": "int",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      }
+    },
+    "primaryDisplay": "name"
   },
   "tableAliases": {
     "people": "a"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/createWithRelationships.json b/packages/server/src/integrations/tests/sqlQueryJson/createWithRelationships.json
index 82d85c417b..571fbcf4ac 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/createWithRelationships.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/createWithRelationships.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "persons",
-    "operation": "CREATE"
-  },
+  "operation": "CREATE",
   "resource": {
     "fields": [
       "a.year",
@@ -51,123 +47,114 @@
   "extra": {
     "idFilter": {}
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
-      "primary": [
-        "personid"
-      ],
-      "name": "persons",
-      "schema": {
-        "year": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "year",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "firstname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "firstname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "personid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "personid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "address": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "address",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "age": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "age",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "type": {
-          "type": "options",
-          "externalType": "USER-DEFINED",
-          "autocolumn": false,
-          "name": "type",
-          "constraints": {
-            "presence": false,
-            "inclusion": [
-              "support",
-              "designer",
-              "programmer",
-              "qa"
-            ]
-          }
-        },
-        "city": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "city",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "lastname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "lastname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "QA": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "QA",
-          "relationshipType": "many-to-one",
-          "fieldName": "qaid",
-          "type": "link",
-          "main": true,
-          "_id": "ccb68481c80c34217a4540a2c6c27fe46",
-          "foreignKey": "personid"
-        },
-        "executor": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "executor",
-          "relationshipType": "many-to-one",
-          "fieldName": "executorid",
-          "type": "link",
-          "main": true,
-          "_id": "c89530b9770d94bec851e062b5cff3001",
-          "foreignKey": "personid",
-          "tableName": "persons"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
+    "primary": ["personid"],
+    "name": "persons",
+    "schema": {
+      "year": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "year",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "firstname",
-      "views": {}
-    }
+      "firstname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "firstname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "personid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "personid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "address": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "address",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "age": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "type": {
+        "type": "options",
+        "externalType": "USER-DEFINED",
+        "autocolumn": false,
+        "name": "type",
+        "constraints": {
+          "presence": false,
+          "inclusion": ["support", "designer", "programmer", "qa"]
+        }
+      },
+      "city": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "city",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "lastname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "lastname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "QA": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "QA",
+        "relationshipType": "many-to-one",
+        "fieldName": "qaid",
+        "type": "link",
+        "main": true,
+        "_id": "ccb68481c80c34217a4540a2c6c27fe46",
+        "foreignKey": "personid"
+      },
+      "executor": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "executor",
+        "relationshipType": "many-to-one",
+        "fieldName": "executorid",
+        "type": "link",
+        "main": true,
+        "_id": "c89530b9770d94bec851e062b5cff3001",
+        "foreignKey": "personid",
+        "tableName": "persons"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "firstname",
+    "views": {}
   },
   "tableAliases": {
     "persons": "a",
     "tasks": "b"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/deleteSimple.json b/packages/server/src/integrations/tests/sqlQueryJson/deleteSimple.json
index d6e099c4b6..4a73fc2e8b 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/deleteSimple.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/deleteSimple.json
@@ -1,15 +1,7 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "compositetable",
-    "operation": "DELETE"
-  },
+  "operation": "DELETE",
   "resource": {
-    "fields": [
-      "a.keyparttwo",
-      "a.keypartone",
-      "a.name"
-    ]
+    "fields": ["a.keyparttwo", "a.keypartone", "a.name"]
   },
   "filters": {
     "equal": {
@@ -26,50 +18,45 @@
       }
     }
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__compositetable",
-      "primary": [
-        "keypartone",
-        "keyparttwo"
-      ],
-      "name": "compositetable",
-      "schema": {
-        "keyparttwo": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "keyparttwo",
-          "constraints": {
-            "presence": true
-          }
-        },
-        "keypartone": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "keypartone",
-          "constraints": {
-            "presence": true
-          }
-        },
-        "name": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "name",
-          "constraints": {
-            "presence": false
-          }
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__compositetable",
+    "primary": ["keypartone", "keyparttwo"],
+    "name": "compositetable",
+    "schema": {
+      "keyparttwo": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "keyparttwo",
+        "constraints": {
+          "presence": true
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "keypartone"
-    }
+      "keypartone": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "keypartone",
+        "constraints": {
+          "presence": true
+        }
+      },
+      "name": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "name",
+        "constraints": {
+          "presence": false
+        }
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "keypartone"
   },
   "tableAliases": {
     "compositetable": "a"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/enrichRelationship.json b/packages/server/src/integrations/tests/sqlQueryJson/enrichRelationship.json
index d71f0552c6..3972982168 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/enrichRelationship.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/enrichRelationship.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-    "entityId": "tasks",
-    "operation": "READ"
-  },
+  "operation": "READ",
   "resource": {
     "fields": [
       "a.executorid",
@@ -17,10 +13,7 @@
   },
   "filters": {
     "oneOf": {
-      "taskid": [
-        1,
-        2
-      ]
+      "taskid": [1, 2]
     }
   },
   "relationships": [
@@ -42,82 +35,78 @@
   "extra": {
     "idFilter": {}
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
-      "primary": [
-        "taskid"
-      ],
-      "name": "tasks",
-      "schema": {
-        "executorid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "executorid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "taskname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "taskname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "taskid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "taskid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "completed": {
-          "type": "boolean",
-          "externalType": "boolean",
-          "autocolumn": false,
-          "name": "completed",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "qaid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "qaid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "products": {
-          "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
-          "name": "products",
-          "relationshipType": "many-to-many",
-          "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
-          "type": "link",
-          "_id": "c3b91d00cd36c4cc1a347794725b9adbd",
-          "fieldName": "productid",
-          "throughFrom": "productid",
-          "throughTo": "taskid"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
+    "primary": ["taskid"],
+    "name": "tasks",
+    "schema": {
+      "executorid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "executorid",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-      "sourceType": "external",
-      "primaryDisplay": "taskname",
-      "sql": true,
-      "views": {}
-    }
+      "taskname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "taskname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "taskid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "taskid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "completed": {
+        "type": "boolean",
+        "externalType": "boolean",
+        "autocolumn": false,
+        "name": "completed",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "qaid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "qaid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "products": {
+        "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
+        "name": "products",
+        "relationshipType": "many-to-many",
+        "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
+        "type": "link",
+        "_id": "c3b91d00cd36c4cc1a347794725b9adbd",
+        "fieldName": "productid",
+        "throughFrom": "productid",
+        "throughTo": "taskid"
+      }
+    },
+    "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
+    "sourceType": "external",
+    "primaryDisplay": "taskname",
+    "sql": true,
+    "views": {}
   },
   "tableAliases": {
     "tasks": "a",
     "products": "b",
     "products_tasks": "c"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/fetchManyToMany.json b/packages/server/src/integrations/tests/sqlQueryJson/fetchManyToMany.json
index d81c8cf6d0..55ddde917f 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/fetchManyToMany.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/fetchManyToMany.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-    "entityId": "products",
-    "operation": "READ"
-  },
+  "operation": "READ",
   "resource": {
     "fields": [
       "a.productname",
@@ -56,48 +52,46 @@
   "extra": {
     "idFilter": {}
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
-      "primary": ["productid"],
-      "name": "products",
-      "schema": {
-        "productname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "productname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "productid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "productid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "tasks": {
-          "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
-          "name": "tasks",
-          "relationshipType": "many-to-many",
-          "fieldName": "taskid",
-          "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
-          "throughFrom": "taskid",
-          "throughTo": "productid",
-          "type": "link",
-          "main": true,
-          "_id": "c3b91d00cd36c4cc1a347794725b9adbd"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
+    "primary": ["productid"],
+    "name": "products",
+    "schema": {
+      "productname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "productname",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-      "sourceType": "external",
-      "primaryDisplay": "productname"
-    }
+      "productid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "productid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "tasks": {
+        "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
+        "name": "tasks",
+        "relationshipType": "many-to-many",
+        "fieldName": "taskid",
+        "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
+        "throughFrom": "taskid",
+        "throughTo": "productid",
+        "type": "link",
+        "main": true,
+        "_id": "c3b91d00cd36c4cc1a347794725b9adbd"
+      }
+    },
+    "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
+    "sourceType": "external",
+    "primaryDisplay": "productname"
   },
   "tableAliases": {
     "products": "a",
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/filterByRelationship.json b/packages/server/src/integrations/tests/sqlQueryJson/filterByRelationship.json
index 36010bf61d..6930c900a2 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/filterByRelationship.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/filterByRelationship.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "products",
-    "operation": "READ"
-  },
+  "operation": "READ",
   "resource": {
     "fields": [
       "a.productname",
@@ -46,47 +42,45 @@
     "tasks": "b",
     "products": "a"
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__products",
-      "primary": ["productid"],
-      "name": "products",
-      "schema": {
-        "productname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "productname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "productid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "productid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "tasks": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "tasks",
-          "relationshipType": "many-to-many",
-          "fieldName": "taskid",
-          "through": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__products_tasks",
-          "throughFrom": "taskid",
-          "throughTo": "productid",
-          "type": "link",
-          "main": true,
-          "_id": "ca6862d9ba09146dd8a68e3b5b7055a09"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__products",
+    "primary": ["productid"],
+    "name": "products",
+    "schema": {
+      "productname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "productname",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "productname"
-    }
+      "productid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "productid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "tasks": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "tasks",
+        "relationshipType": "many-to-many",
+        "fieldName": "taskid",
+        "through": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__products_tasks",
+        "throughFrom": "taskid",
+        "throughTo": "productid",
+        "type": "link",
+        "main": true,
+        "_id": "ca6862d9ba09146dd8a68e3b5b7055a09"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "productname"
   }
 }
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/manyRelationshipFilters.json b/packages/server/src/integrations/tests/sqlQueryJson/manyRelationshipFilters.json
index 01b85f433f..5f5ebb95f3 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/manyRelationshipFilters.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/manyRelationshipFilters.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-    "entityId": "tasks",
-    "operation": "READ"
-  },
+  "operation": "READ",
   "resource": {
     "fields": [
       "a.executorid",
@@ -102,94 +98,92 @@
   "extra": {
     "idFilter": {}
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
-      "primary": ["taskid"],
-      "name": "tasks",
-      "schema": {
-        "executorid": {
-          "type": "number",
-          "externalType": "integer",
-          "name": "executorid",
-          "constraints": {
-            "presence": false
-          },
-          "autocolumn": true,
-          "autoReason": "foreign_key"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__tasks",
+    "primary": ["taskid"],
+    "name": "tasks",
+    "schema": {
+      "executorid": {
+        "type": "number",
+        "externalType": "integer",
+        "name": "executorid",
+        "constraints": {
+          "presence": false
         },
-        "taskname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "taskname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "taskid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "taskid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "completed": {
-          "type": "boolean",
-          "externalType": "boolean",
-          "autocolumn": false,
-          "name": "completed",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "qaid": {
-          "type": "number",
-          "externalType": "integer",
-          "name": "qaid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "products": {
-          "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
-          "name": "products",
-          "relationshipType": "many-to-many",
-          "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
-          "type": "link",
-          "_id": "c3b91d00cd36c4cc1a347794725b9adbd",
-          "fieldName": "productid",
-          "throughFrom": "productid",
-          "throughTo": "taskid"
-        },
-        "tasksToExecute": {
-          "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__persons",
-          "name": "tasksToExecute",
-          "relationshipType": "one-to-many",
-          "type": "link",
-          "_id": "c0f440590bda04f28846242156c1dd60b",
-          "foreignKey": "executorid",
-          "fieldName": "personid"
-        },
-        "tasksToQA": {
-          "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__persons",
-          "name": "tasksToQA",
-          "relationshipType": "one-to-many",
-          "type": "link",
-          "_id": "c5fdf453a0ba743d58e29491d174c974b",
-          "foreignKey": "qaid",
-          "fieldName": "personid"
+        "autocolumn": true,
+        "autoReason": "foreign_key"
+      },
+      "taskname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "taskname",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
-      "sourceType": "external",
-      "primaryDisplay": "taskname",
-      "sql": true,
-      "views": {}
-    }
+      "taskid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "taskid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "completed": {
+        "type": "boolean",
+        "externalType": "boolean",
+        "autocolumn": false,
+        "name": "completed",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "qaid": {
+        "type": "number",
+        "externalType": "integer",
+        "name": "qaid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "products": {
+        "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products",
+        "name": "products",
+        "relationshipType": "many-to-many",
+        "through": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__products_tasks",
+        "type": "link",
+        "_id": "c3b91d00cd36c4cc1a347794725b9adbd",
+        "fieldName": "productid",
+        "throughFrom": "productid",
+        "throughTo": "taskid"
+      },
+      "tasksToExecute": {
+        "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__persons",
+        "name": "tasksToExecute",
+        "relationshipType": "one-to-many",
+        "type": "link",
+        "_id": "c0f440590bda04f28846242156c1dd60b",
+        "foreignKey": "executorid",
+        "fieldName": "personid"
+      },
+      "tasksToQA": {
+        "tableId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81__persons",
+        "name": "tasksToQA",
+        "relationshipType": "one-to-many",
+        "type": "link",
+        "_id": "c5fdf453a0ba743d58e29491d174c974b",
+        "foreignKey": "qaid",
+        "fieldName": "personid"
+      }
+    },
+    "sourceId": "datasource_plus_44a967caf37a435f84fe01cd6dfe8f81",
+    "sourceType": "external",
+    "primaryDisplay": "taskname",
+    "sql": true,
+    "views": {}
   },
   "tableAliases": {
     "tasks": "a",
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/updateRelationship.json b/packages/server/src/integrations/tests/sqlQueryJson/updateRelationship.json
index 42c2a44335..59a978904f 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/updateRelationship.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/updateRelationship.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "persons",
-    "operation": "UPDATE"
-  },
+  "operation": "UPDATE",
   "resource": {
     "fields": [
       "a.year",
@@ -59,123 +55,114 @@
       }
     }
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
-      "primary": [
-        "personid"
-      ],
-      "name": "persons",
-      "schema": {
-        "year": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "year",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "firstname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "firstname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "personid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "personid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "address": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "address",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "age": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "age",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "type": {
-          "type": "options",
-          "externalType": "USER-DEFINED",
-          "autocolumn": false,
-          "name": "type",
-          "constraints": {
-            "presence": false,
-            "inclusion": [
-              "support",
-              "designer",
-              "programmer",
-              "qa"
-            ]
-          }
-        },
-        "city": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "city",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "lastname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "lastname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "QA": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "QA",
-          "relationshipType": "many-to-one",
-          "fieldName": "qaid",
-          "type": "link",
-          "main": true,
-          "_id": "ccb68481c80c34217a4540a2c6c27fe46",
-          "foreignKey": "personid"
-        },
-        "executor": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "executor",
-          "relationshipType": "many-to-one",
-          "fieldName": "executorid",
-          "type": "link",
-          "main": true,
-          "_id": "c89530b9770d94bec851e062b5cff3001",
-          "foreignKey": "personid",
-          "tableName": "persons"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
+    "primary": ["personid"],
+    "name": "persons",
+    "schema": {
+      "year": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "year",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "firstname",
-      "views": {}
-    }
+      "firstname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "firstname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "personid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "personid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "address": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "address",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "age": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "type": {
+        "type": "options",
+        "externalType": "USER-DEFINED",
+        "autocolumn": false,
+        "name": "type",
+        "constraints": {
+          "presence": false,
+          "inclusion": ["support", "designer", "programmer", "qa"]
+        }
+      },
+      "city": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "city",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "lastname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "lastname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "QA": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "QA",
+        "relationshipType": "many-to-one",
+        "fieldName": "qaid",
+        "type": "link",
+        "main": true,
+        "_id": "ccb68481c80c34217a4540a2c6c27fe46",
+        "foreignKey": "personid"
+      },
+      "executor": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "executor",
+        "relationshipType": "many-to-one",
+        "fieldName": "executorid",
+        "type": "link",
+        "main": true,
+        "_id": "c89530b9770d94bec851e062b5cff3001",
+        "foreignKey": "personid",
+        "tableName": "persons"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "firstname",
+    "views": {}
   },
   "tableAliases": {
     "persons": "a",
     "tasks": "b"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/sqlQueryJson/updateSimple.json b/packages/server/src/integrations/tests/sqlQueryJson/updateSimple.json
index 42c2a44335..59a978904f 100644
--- a/packages/server/src/integrations/tests/sqlQueryJson/updateSimple.json
+++ b/packages/server/src/integrations/tests/sqlQueryJson/updateSimple.json
@@ -1,9 +1,5 @@
 {
-  "endpoint": {
-    "datasourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-    "entityId": "persons",
-    "operation": "UPDATE"
-  },
+  "operation": "UPDATE",
   "resource": {
     "fields": [
       "a.year",
@@ -59,123 +55,114 @@
       }
     }
   },
-  "meta": {
-    "table": {
-      "type": "table",
-      "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
-      "primary": [
-        "personid"
-      ],
-      "name": "persons",
-      "schema": {
-        "year": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "year",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "firstname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "firstname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "personid": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": true,
-          "name": "personid",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "address": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "address",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "age": {
-          "type": "number",
-          "externalType": "integer",
-          "autocolumn": false,
-          "name": "age",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "type": {
-          "type": "options",
-          "externalType": "USER-DEFINED",
-          "autocolumn": false,
-          "name": "type",
-          "constraints": {
-            "presence": false,
-            "inclusion": [
-              "support",
-              "designer",
-              "programmer",
-              "qa"
-            ]
-          }
-        },
-        "city": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "city",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "lastname": {
-          "type": "string",
-          "externalType": "character varying",
-          "autocolumn": false,
-          "name": "lastname",
-          "constraints": {
-            "presence": false
-          }
-        },
-        "QA": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "QA",
-          "relationshipType": "many-to-one",
-          "fieldName": "qaid",
-          "type": "link",
-          "main": true,
-          "_id": "ccb68481c80c34217a4540a2c6c27fe46",
-          "foreignKey": "personid"
-        },
-        "executor": {
-          "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
-          "name": "executor",
-          "relationshipType": "many-to-one",
-          "fieldName": "executorid",
-          "type": "link",
-          "main": true,
-          "_id": "c89530b9770d94bec851e062b5cff3001",
-          "foreignKey": "personid",
-          "tableName": "persons"
+  "table": {
+    "type": "table",
+    "_id": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__persons",
+    "primary": ["personid"],
+    "name": "persons",
+    "schema": {
+      "year": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "year",
+        "constraints": {
+          "presence": false
         }
       },
-      "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
-      "sourceType": "external",
-      "primaryDisplay": "firstname",
-      "views": {}
-    }
+      "firstname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "firstname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "personid": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": true,
+        "name": "personid",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "address": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "address",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "age": {
+        "type": "number",
+        "externalType": "integer",
+        "autocolumn": false,
+        "name": "age",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "type": {
+        "type": "options",
+        "externalType": "USER-DEFINED",
+        "autocolumn": false,
+        "name": "type",
+        "constraints": {
+          "presence": false,
+          "inclusion": ["support", "designer", "programmer", "qa"]
+        }
+      },
+      "city": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "city",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "lastname": {
+        "type": "string",
+        "externalType": "character varying",
+        "autocolumn": false,
+        "name": "lastname",
+        "constraints": {
+          "presence": false
+        }
+      },
+      "QA": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "QA",
+        "relationshipType": "many-to-one",
+        "fieldName": "qaid",
+        "type": "link",
+        "main": true,
+        "_id": "ccb68481c80c34217a4540a2c6c27fe46",
+        "foreignKey": "personid"
+      },
+      "executor": {
+        "tableId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7__tasks",
+        "name": "executor",
+        "relationshipType": "many-to-one",
+        "fieldName": "executorid",
+        "type": "link",
+        "main": true,
+        "_id": "c89530b9770d94bec851e062b5cff3001",
+        "foreignKey": "personid",
+        "tableName": "persons"
+      }
+    },
+    "sourceId": "datasource_plus_8066e56456784eb2a00129d31be5c3e7",
+    "sourceType": "external",
+    "primaryDisplay": "firstname",
+    "views": {}
   },
   "tableAliases": {
     "persons": "a",
     "tasks": "b"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/server/src/integrations/tests/utils/images.ts b/packages/server/src/integrations/tests/utils/images.ts
index 8c2bb9b220..00686412c6 100644
--- a/packages/server/src/integrations/tests/utils/images.ts
+++ b/packages/server/src/integrations/tests/utils/images.ts
@@ -9,5 +9,6 @@ dotenv.config({
 export const MSSQL_IMAGE = `mcr.microsoft.com/mssql/server@${process.env.MSSQL_SHA}`
 export const MYSQL_IMAGE = `mysql@${process.env.MYSQL_SHA}`
 export const POSTGRES_IMAGE = `postgres@${process.env.POSTGRES_SHA}`
+export const POSTGRES_LEGACY_IMAGE = `postgres:9.5.25`
 export const MONGODB_IMAGE = `mongo@${process.env.MONGODB_SHA}`
 export const MARIADB_IMAGE = `mariadb@${process.env.MARIADB_SHA}`
diff --git a/packages/server/src/integrations/tests/utils/index.ts b/packages/server/src/integrations/tests/utils/index.ts
index 5e7316c39a..9e2c4f7e70 100644
--- a/packages/server/src/integrations/tests/utils/index.ts
+++ b/packages/server/src/integrations/tests/utils/index.ts
@@ -16,6 +16,7 @@ export const { startContainer } = testContainerUtils
 
 export enum DatabaseName {
   POSTGRES = "postgres",
+  POSTGRES_LEGACY = "postgres_legacy",
   MONGODB = "mongodb",
   MYSQL = "mysql",
   SQL_SERVER = "mssql",
@@ -26,6 +27,7 @@ export enum DatabaseName {
 
 const providers: Record<DatabaseName, DatasourceProvider> = {
   [DatabaseName.POSTGRES]: postgres.getDatasource,
+  [DatabaseName.POSTGRES_LEGACY]: postgres.getLegacyDatasource,
   [DatabaseName.MONGODB]: mongodb.getDatasource,
   [DatabaseName.MYSQL]: mysql.getDatasource,
   [DatabaseName.SQL_SERVER]: mssql.getDatasource,
@@ -35,7 +37,6 @@ const providers: Record<DatabaseName, DatasourceProvider> = {
 }
 
 export interface DatasourceDescribeOpts {
-  name: string
   only?: DatabaseName[]
   exclude?: DatabaseName[]
 }
@@ -102,16 +103,15 @@ function createDummyTest() {
   })
 }
 
-export function datasourceDescribe(
-  opts: DatasourceDescribeOpts,
-  cb: (args: DatasourceDescribeReturn) => void
-) {
+export function datasourceDescribe(opts: DatasourceDescribeOpts) {
+  // tests that call this need a lot longer timeouts
+  jest.setTimeout(120000)
+
   if (process.env.DATASOURCE === "none") {
     createDummyTest()
-    return
   }
 
-  const { name, only, exclude } = opts
+  const { only, exclude } = opts
 
   if (only && exclude) {
     throw new Error("you can only supply one of 'only' or 'exclude'")
@@ -130,36 +130,33 @@ export function datasourceDescribe(
 
   if (databases.length === 0) {
     createDummyTest()
-    return
   }
 
-  describe.each(databases)(name, name => {
-    const config = new TestConfiguration()
-
-    afterAll(() => {
-      config.end()
-    })
-
-    cb({
-      name,
-      config,
-      dsProvider: () => createDatasources(config, name),
-      isInternal: name === DatabaseName.SQS,
-      isExternal: name !== DatabaseName.SQS,
-      isSql: [
-        DatabaseName.MARIADB,
-        DatabaseName.MYSQL,
-        DatabaseName.POSTGRES,
-        DatabaseName.SQL_SERVER,
-        DatabaseName.ORACLE,
-      ].includes(name),
-      isMySQL: name === DatabaseName.MYSQL,
-      isPostgres: name === DatabaseName.POSTGRES,
-      isMongodb: name === DatabaseName.MONGODB,
-      isMSSQL: name === DatabaseName.SQL_SERVER,
-      isOracle: name === DatabaseName.ORACLE,
-    })
-  })
+  const config = new TestConfiguration()
+  return databases.map(dbName => ({
+    dbName,
+    config,
+    dsProvider: () => createDatasources(config, dbName),
+    isInternal: dbName === DatabaseName.SQS,
+    isExternal: dbName !== DatabaseName.SQS,
+    isSql: [
+      DatabaseName.MARIADB,
+      DatabaseName.MYSQL,
+      DatabaseName.POSTGRES,
+      DatabaseName.SQL_SERVER,
+      DatabaseName.ORACLE,
+    ].includes(dbName),
+    isMySQL: dbName === DatabaseName.MYSQL,
+    isPostgres:
+      dbName === DatabaseName.POSTGRES ||
+      dbName === DatabaseName.POSTGRES_LEGACY,
+    // check if any of the legacy tags
+    isLegacy: dbName === DatabaseName.POSTGRES_LEGACY,
+    isMongodb: dbName === DatabaseName.MONGODB,
+    isMSSQL: dbName === DatabaseName.SQL_SERVER,
+    isOracle: dbName === DatabaseName.ORACLE,
+    isMariaDB: dbName === DatabaseName.MARIADB,
+  }))
 }
 
 function getDatasource(
@@ -168,19 +165,19 @@ function getDatasource(
   return providers[sourceName]()
 }
 
-export async function knexClient(ds: Datasource) {
+export async function knexClient(ds: Datasource, opts?: Knex.Config) {
   switch (ds.source) {
     case SourceName.POSTGRES: {
-      return postgres.knexClient(ds)
+      return postgres.knexClient(ds, opts)
     }
     case SourceName.MYSQL: {
-      return mysql.knexClient(ds)
+      return mysql.knexClient(ds, opts)
     }
     case SourceName.SQL_SERVER: {
-      return mssql.knexClient(ds)
+      return mssql.knexClient(ds, opts)
     }
     case SourceName.ORACLE: {
-      return oracle.knexClient(ds)
+      return oracle.knexClient(ds, opts)
     }
     default: {
       throw new Error(`Unsupported source: ${ds.source}`)
diff --git a/packages/server/src/integrations/tests/utils/mssql.ts b/packages/server/src/integrations/tests/utils/mssql.ts
index 28a7928f3b..548631a987 100644
--- a/packages/server/src/integrations/tests/utils/mssql.ts
+++ b/packages/server/src/integrations/tests/utils/mssql.ts
@@ -2,7 +2,7 @@ import { Datasource, SourceName } from "@budibase/types"
 import { GenericContainer, Wait } from "testcontainers"
 import { generator, testContainerUtils } from "@budibase/backend-core/tests"
 import { startContainer } from "."
-import knex from "knex"
+import knex, { Knex } from "knex"
 import { MSSQL_IMAGE } from "./images"
 
 let ports: Promise<testContainerUtils.Port[]>
@@ -57,7 +57,7 @@ export async function getDatasource(): Promise<Datasource> {
   return datasource
 }
 
-export async function knexClient(ds: Datasource) {
+export async function knexClient(ds: Datasource, opts?: Knex.Config) {
   if (!ds.config) {
     throw new Error("Datasource config is missing")
   }
@@ -68,5 +68,6 @@ export async function knexClient(ds: Datasource) {
   return knex({
     client: "mssql",
     connection: ds.config,
+    ...opts,
   })
 }
diff --git a/packages/server/src/integrations/tests/utils/mysql.ts b/packages/server/src/integrations/tests/utils/mysql.ts
index 5fa4e4f46d..be3835c0e3 100644
--- a/packages/server/src/integrations/tests/utils/mysql.ts
+++ b/packages/server/src/integrations/tests/utils/mysql.ts
@@ -3,7 +3,7 @@ import { GenericContainer, Wait } from "testcontainers"
 import { AbstractWaitStrategy } from "testcontainers/build/wait-strategies/wait-strategy"
 import { generator, testContainerUtils } from "@budibase/backend-core/tests"
 import { startContainer } from "."
-import knex from "knex"
+import knex, { Knex } from "knex"
 import { MYSQL_IMAGE } from "./images"
 
 let ports: Promise<testContainerUtils.Port[]>
@@ -63,7 +63,7 @@ export async function getDatasource(): Promise<Datasource> {
   return datasource
 }
 
-export async function knexClient(ds: Datasource) {
+export async function knexClient(ds: Datasource, opts?: Knex.Config) {
   if (!ds.config) {
     throw new Error("Datasource config is missing")
   }
@@ -74,5 +74,6 @@ export async function knexClient(ds: Datasource) {
   return knex({
     client: "mysql2",
     connection: ds.config,
+    ...opts,
   })
 }
diff --git a/packages/server/src/integrations/tests/utils/oracle.ts b/packages/server/src/integrations/tests/utils/oracle.ts
index 8e7fd6c900..3292ed5856 100644
--- a/packages/server/src/integrations/tests/utils/oracle.ts
+++ b/packages/server/src/integrations/tests/utils/oracle.ts
@@ -2,7 +2,7 @@ import { Datasource, SourceName } from "@budibase/types"
 import { GenericContainer, Wait } from "testcontainers"
 import { generator, testContainerUtils } from "@budibase/backend-core/tests"
 import { startContainer } from "."
-import knex from "knex"
+import knex, { Knex } from "knex"
 
 let ports: Promise<testContainerUtils.Port[]>
 
@@ -25,7 +25,7 @@ export async function getDatasource(): Promise<Datasource> {
         })
         .withWaitStrategy(
           Wait.forLogMessage("DATABASE IS READY TO USE!").withStartupTimeout(
-            20000
+            60000
           )
         )
     )
@@ -58,7 +58,7 @@ export async function getDatasource(): Promise<Datasource> {
   return datasource
 }
 
-export async function knexClient(ds: Datasource) {
+export async function knexClient(ds: Datasource, opts?: Knex.Config) {
   if (!ds.config) {
     throw new Error("Datasource config is missing")
   }
@@ -76,6 +76,7 @@ export async function knexClient(ds: Datasource) {
       user: ds.config.user,
       password: ds.config.password,
     },
+    ...opts,
   })
 
   return c
diff --git a/packages/server/src/integrations/tests/utils/postgres.ts b/packages/server/src/integrations/tests/utils/postgres.ts
index cc77226ff6..cca127e84f 100644
--- a/packages/server/src/integrations/tests/utils/postgres.ts
+++ b/packages/server/src/integrations/tests/utils/postgres.ts
@@ -2,15 +2,15 @@ import { Datasource, SourceName } from "@budibase/types"
 import { GenericContainer, Wait } from "testcontainers"
 import { generator, testContainerUtils } from "@budibase/backend-core/tests"
 import { startContainer } from "."
-import knex from "knex"
-import { POSTGRES_IMAGE } from "./images"
+import knex, { Knex } from "knex"
+import { POSTGRES_IMAGE, POSTGRES_LEGACY_IMAGE } from "./images"
 
 let ports: Promise<testContainerUtils.Port[]>
 
-export async function getDatasource(): Promise<Datasource> {
+async function datasourceWithImage(image: string): Promise<Datasource> {
   if (!ports) {
     ports = startContainer(
-      new GenericContainer(POSTGRES_IMAGE)
+      new GenericContainer(image)
         .withExposedPorts(5432)
         .withEnvironment({ POSTGRES_PASSWORD: "password" })
         .withWaitStrategy(
@@ -51,7 +51,18 @@ export async function getDatasource(): Promise<Datasource> {
   return datasource
 }
 
-export async function knexClient(ds: Datasource) {
+export async function getDatasource(): Promise<Datasource> {
+  return datasourceWithImage(POSTGRES_IMAGE)
+}
+
+export async function getLegacyDatasource(): Promise<Datasource> {
+  return datasourceWithImage(POSTGRES_LEGACY_IMAGE)
+}
+
+export async function knexClient(
+  ds: Datasource,
+  opts?: Knex.Config
+): Promise<Knex> {
   if (!ds.config) {
     throw new Error("Datasource config is missing")
   }
@@ -62,5 +73,6 @@ export async function knexClient(ds: Datasource) {
   return knex({
     client: "pg",
     connection: ds.config,
+    ...opts,
   })
 }
diff --git a/packages/server/src/integrations/utils/utils.ts b/packages/server/src/integrations/utils/utils.ts
index 73b2f637f8..315a8010e8 100644
--- a/packages/server/src/integrations/utils/utils.ts
+++ b/packages/server/src/integrations/utils/utils.ts
@@ -138,12 +138,22 @@ export function generateColumnDefinition(config: {
   let { externalType, autocolumn, name, presence, options } = config
   let foundType = FieldType.STRING
   const lowerCaseType = externalType.toLowerCase()
-  let matchingTypes = []
-  for (let [external, internal] of Object.entries(SQL_TYPE_MAP)) {
-    if (lowerCaseType.includes(external)) {
-      matchingTypes.push({ external, internal })
+  let matchingTypes: { external: string; internal: PrimitiveTypes }[] = []
+
+  // In at least MySQL, the external type of an ENUM column is "enum('option1',
+  // 'option2', ...)", which can potentially contain any type name as a
+  // substring. To get around this interfering with the loop below, we first
+  // check for an enum column and handle that separately.
+  if (lowerCaseType.startsWith("enum")) {
+    matchingTypes.push({ external: "enum", internal: FieldType.OPTIONS })
+  } else {
+    for (let [external, internal] of Object.entries(SQL_TYPE_MAP)) {
+      if (lowerCaseType.includes(external)) {
+        matchingTypes.push({ external, internal })
+      }
     }
   }
+
   // Set the foundType based the longest match
   if (matchingTypes.length > 0) {
     foundType = matchingTypes.reduce((acc, val) => {
diff --git a/packages/server/src/jsRunner/index.ts b/packages/server/src/jsRunner/index.ts
index e17529a687..a29e952b6d 100644
--- a/packages/server/src/jsRunner/index.ts
+++ b/packages/server/src/jsRunner/index.ts
@@ -4,12 +4,17 @@ import {
   JsTimeoutError,
   setJSRunner,
   setOnErrorLog,
+  setTestingBackendJS,
 } from "@budibase/string-templates"
 import { context, logging } from "@budibase/backend-core"
 import tracer from "dd-trace"
 import { IsolatedVM } from "./vm"
 
 export function init() {
+  // enforce that if we're using isolated-VM runner then we are running backend JS
+  if (env.isTest()) {
+    setTestingBackendJS()
+  }
   setJSRunner((js: string, ctx: Record<string, any>) => {
     return tracer.trace("runJS", {}, () => {
       try {
diff --git a/packages/server/src/jsRunner/vm/isolated-vm.ts b/packages/server/src/jsRunner/vm/isolated-vm.ts
index b8ed90aa23..3863be742d 100644
--- a/packages/server/src/jsRunner/vm/isolated-vm.ts
+++ b/packages/server/src/jsRunner/vm/isolated-vm.ts
@@ -72,7 +72,7 @@ export class IsolatedVM implements VM {
 
     this.addToContext({
       helpersStripProtocol: new ivm.Callback((str: string) => {
-        var parsed = url.parse(str) as any
+        let parsed = url.parse(str) as any
         parsed.protocol = ""
         return parsed.format()
       }),
diff --git a/packages/server/src/middleware/appInfo.ts b/packages/server/src/middleware/appInfo.ts
index 75e40ed473..b62047ec5b 100644
--- a/packages/server/src/middleware/appInfo.ts
+++ b/packages/server/src/middleware/appInfo.ts
@@ -1,5 +1,5 @@
 import { isDevAppID, isProdAppID } from "../db/utils"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 export enum AppType {
   DEV = "dev",
@@ -7,7 +7,7 @@ export enum AppType {
 }
 
 export function middleware({ appType }: { appType?: AppType } = {}) {
-  return (ctx: BBContext, next: any) => {
+  return (ctx: Ctx, next: any) => {
     const appId = ctx.appId
     if (appType === AppType.DEV && appId && !isDevAppID(appId)) {
       ctx.throw(400, "Only apps in development support this endpoint")
diff --git a/packages/server/src/middleware/appMigrations.ts b/packages/server/src/middleware/appMigrations.ts
index 6ad356427b..2ebd522add 100644
--- a/packages/server/src/middleware/appMigrations.ts
+++ b/packages/server/src/middleware/appMigrations.ts
@@ -1,8 +1,9 @@
 import { UserCtx } from "@budibase/types"
 import { checkMissingMigrations } from "../appMigrations"
 import env from "../environment"
+import type { Middleware, Next } from "koa"
 
-export default async (ctx: UserCtx, next: any) => {
+const middleware = (async (ctx: UserCtx, next: Next) => {
   const { appId } = ctx
 
   // migrations can be disabled via environment variable if you
@@ -16,4 +17,6 @@ export default async (ctx: UserCtx, next: any) => {
   }
 
   return checkMissingMigrations(ctx, next, appId)
-}
+}) as Middleware
+
+export default middleware
diff --git a/packages/server/src/middleware/builder.ts b/packages/server/src/middleware/builder.ts
index 87c7eef51f..90bbd368ef 100644
--- a/packages/server/src/middleware/builder.ts
+++ b/packages/server/src/middleware/builder.ts
@@ -50,7 +50,7 @@ async function updateAppUpdatedAt(ctx: UserCtx) {
       const metadata = await db.get<any>(DocumentType.APP_METADATA)
       metadata.updatedAt = new Date().toISOString()
 
-      metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user?.userId!)
+      metadata.updatedBy = getGlobalIDFromUserMetadataID(ctx.user!.userId!)
 
       const response = await db.put(metadata)
       metadata._rev = response.rev
@@ -59,9 +59,7 @@ async function updateAppUpdatedAt(ctx: UserCtx) {
       await setDebounce(appId, DEBOUNCE_TIME_SEC)
     } catch (err: any) {
       // if a 409 occurs, then multiple clients connected at the same time - ignore
-      if (err?.status === 409) {
-        return
-      } else {
+      if (err && err.status !== 409) {
         throw err
       }
     }
diff --git a/packages/server/src/middleware/cleanup.ts b/packages/server/src/middleware/cleanup.ts
index fa04743cee..443eacc52d 100644
--- a/packages/server/src/middleware/cleanup.ts
+++ b/packages/server/src/middleware/cleanup.ts
@@ -1,8 +1,9 @@
 import { Ctx } from "@budibase/types"
 import { context } from "@budibase/backend-core"
 import { tracer } from "dd-trace"
+import type { Middleware, Next } from "koa"
 
-export default async (ctx: Ctx, next: any) => {
+const middleware = (async (ctx: Ctx, next: Next) => {
   const resp = await next()
 
   const current = context.getCurrentContext()
@@ -30,4 +31,6 @@ export default async (ctx: Ctx, next: any) => {
   }
 
   return resp
-}
+}) as Middleware
+
+export default middleware
diff --git a/packages/server/src/middleware/currentapp.ts b/packages/server/src/middleware/currentapp.ts
index 6b44e56a66..866730297a 100644
--- a/packages/server/src/middleware/currentapp.ts
+++ b/packages/server/src/middleware/currentapp.ts
@@ -13,8 +13,9 @@ import env from "../environment"
 import { isWebhookEndpoint, isBrowser, isApiKey } from "./utils"
 import { UserCtx, ContextUser } from "@budibase/types"
 import tracer from "dd-trace"
+import type { Middleware, Next } from "koa"
 
-export default async (ctx: UserCtx, next: any) => {
+const middleware = (async (ctx: UserCtx, next: Next) => {
   // try to get the appID from the request
   let requestAppId = await utils.getAppIdFromCtx(ctx)
   if (!requestAppId) {
@@ -116,4 +117,6 @@ export default async (ctx: UserCtx, next: any) => {
 
     return next()
   })
-}
+}) as Middleware
+
+export default middleware
diff --git a/packages/server/src/middleware/joi-validator.ts b/packages/server/src/middleware/joi-validator.ts
index 5d783acc80..df09c3efa7 100644
--- a/packages/server/src/middleware/joi-validator.ts
+++ b/packages/server/src/middleware/joi-validator.ts
@@ -1,9 +1,9 @@
 import Joi from "joi"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 function validate(schema: Joi.Schema, property: string) {
   // Return a Koa middleware function
-  return (ctx: BBContext, next: any) => {
+  return (ctx: Ctx, next: any) => {
     if (!schema) {
       return next()
     }
diff --git a/packages/server/src/middleware/publicApi.ts b/packages/server/src/middleware/publicApi.ts
index e3897d1a49..da10dd3539 100644
--- a/packages/server/src/middleware/publicApi.ts
+++ b/packages/server/src/middleware/publicApi.ts
@@ -1,8 +1,8 @@
 import { constants, utils } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 export default function ({ requiresAppId }: { requiresAppId?: boolean } = {}) {
-  return async (ctx: BBContext, next: any) => {
+  return async (ctx: Ctx, next: any) => {
     const appId = await utils.getAppIdFromCtx(ctx)
     if (requiresAppId && !appId) {
       ctx.throw(
diff --git a/packages/server/src/middleware/resourceId.ts b/packages/server/src/middleware/resourceId.ts
index 1ad0b2a0c1..b57a8c2d85 100644
--- a/packages/server/src/middleware/resourceId.ts
+++ b/packages/server/src/middleware/resourceId.ts
@@ -1,4 +1,4 @@
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 export class ResourceIdGetter {
   parameter: string
@@ -26,7 +26,7 @@ export class ResourceIdGetter {
     const parameter = this.parameter,
       main = this.main,
       sub = this.sub
-    return (ctx: BBContext, next: any) => {
+    return (ctx: Ctx, next: any) => {
       // @ts-ignore
       const request = ctx.request[parameter] || ctx[parameter]
       if (request == null) {
diff --git a/packages/server/src/middleware/selfhost.ts b/packages/server/src/middleware/selfhost.ts
index fd2ca6517b..3571931835 100644
--- a/packages/server/src/middleware/selfhost.ts
+++ b/packages/server/src/middleware/selfhost.ts
@@ -1,9 +1,9 @@
 import env from "../environment"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
 // if added as a middleware will stop requests unless builder is in self host mode
 // or cloud is in self host
-export default async (ctx: BBContext, next: any) => {
+export default async (ctx: Ctx, next: any) => {
   if (env.SELF_HOSTED) {
     await next()
     return
diff --git a/packages/server/src/middleware/zod-validator.ts b/packages/server/src/middleware/zod-validator.ts
new file mode 100644
index 0000000000..d57e1c48ff
--- /dev/null
+++ b/packages/server/src/middleware/zod-validator.ts
@@ -0,0 +1,43 @@
+import { features } from "@budibase/backend-core"
+import { Ctx, FeatureFlag } from "@budibase/types"
+
+import { AnyZodObject } from "zod"
+import { fromZodError } from "zod-validation-error"
+
+function validate(schema: AnyZodObject, property: "body" | "params") {
+  // Return a Koa middleware function
+  return async (ctx: Ctx, next: any) => {
+    if (!(await features.isEnabled(FeatureFlag.USE_ZOD_VALIDATOR))) {
+      return next()
+    }
+
+    if (!schema) {
+      return next()
+    }
+    let params = null
+    let setClean: ((data: any) => void) | undefined
+    if (ctx[property] != null) {
+      params = ctx[property]
+      setClean = data => (ctx[property] = data)
+    } else if (property === "body" && ctx.request[property] != null) {
+      params = ctx.request[property]
+      setClean = data => (ctx.request[property] = data)
+    } else if (property === "params") {
+      params = ctx.request.query
+      setClean = data => (ctx.request.query = data)
+    }
+
+    const result = schema.safeParse(params)
+    if (!result.success) {
+      ctx.throw(400, fromZodError(result.error))
+    } else {
+      setClean?.(result.data)
+    }
+
+    return next()
+  }
+}
+
+export function validateBody(schema: AnyZodObject) {
+  return validate(schema, "body")
+}
diff --git a/packages/server/src/migrations/functions/appUrls.ts b/packages/server/src/migrations/functions/appUrls.ts
deleted file mode 100644
index be03d3c81e..0000000000
--- a/packages/server/src/migrations/functions/appUrls.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { db as dbCore } from "@budibase/backend-core"
-import sdk from "../../sdk"
-
-/**
- * Date:
- * January 2022
- *
- * Description:
- * Add the url to the app metadata if it doesn't exist
- */
-export const run = async (appDb: any) => {
-  let metadata
-  try {
-    metadata = await appDb.get(dbCore.DocumentType.APP_METADATA)
-  } catch (e) {
-    // sometimes the metadata document doesn't exist
-    // exit early instead of failing the migration
-    console.error("Error retrieving app metadata. Skipping", e)
-    return
-  }
-
-  if (!metadata.url) {
-    metadata.url = sdk.applications.getAppUrl({ name: metadata.name })
-    console.log(`Adding url to app: ${metadata.url}`)
-    await appDb.put(metadata)
-  }
-}
diff --git a/packages/server/src/migrations/functions/backfill/app.ts b/packages/server/src/migrations/functions/backfill/app.ts
deleted file mode 100644
index 51a37108b0..0000000000
--- a/packages/server/src/migrations/functions/backfill/app.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-import * as automations from "./app/automations"
-import * as datasources from "./app/datasources"
-import * as layouts from "./app/layouts"
-import * as queries from "./app/queries"
-import * as roles from "./app/roles"
-import * as tables from "./app/tables"
-import * as screens from "./app/screens"
-import * as global from "./global"
-import { App, AppBackfillSucceededEvent, Event } from "@budibase/types"
-import { db as dbUtils, events } from "@budibase/backend-core"
-import env from "../../../environment"
-import { DEFAULT_TIMESTAMP } from "."
-
-const failGraceful = env.SELF_HOSTED && !env.isDev()
-
-const handleError = (e: any, errors?: any) => {
-  if (failGraceful) {
-    if (errors) {
-      errors.push(e)
-    }
-    return
-  }
-  console.trace(e)
-  throw e
-}
-
-const EVENTS = [
-  Event.AUTOMATION_CREATED,
-  Event.AUTOMATION_STEP_CREATED,
-  Event.DATASOURCE_CREATED,
-  Event.LAYOUT_CREATED,
-  Event.QUERY_CREATED,
-  Event.ROLE_CREATED,
-  Event.SCREEN_CREATED,
-  Event.TABLE_CREATED,
-  Event.VIEW_CREATED,
-  Event.VIEW_CALCULATION_CREATED,
-  Event.VIEW_FILTER_CREATED,
-  Event.APP_PUBLISHED,
-  Event.APP_CREATED,
-]
-
-/**
- * Date:
- * May 2022
- *
- * Description:
- * Backfill app events.
- */
-
-export const run = async (appDb: any) => {
-  try {
-    if (await global.isComplete()) {
-      // make sure new apps aren't backfilled
-      // return if the global migration for this tenant is complete
-      // which runs after the app migrations
-      return
-    }
-
-    // tell the event pipeline to start caching
-    // events for this tenant
-    await events.backfillCache.start(EVENTS)
-
-    let timestamp: string | number = DEFAULT_TIMESTAMP
-    const app: App = await appDb.get(dbUtils.DocumentType.APP_METADATA)
-    if (app.createdAt) {
-      timestamp = app.createdAt as string
-    }
-
-    if (dbUtils.isProdAppID(app.appId)) {
-      await events.app.published(app, timestamp)
-    }
-
-    const totals: any = {}
-    const errors: any = []
-
-    if (dbUtils.isDevAppID(app.appId)) {
-      await events.app.created(app, timestamp)
-      try {
-        totals.automations = await automations.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.datasources = await datasources.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.layouts = await layouts.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.queries = await queries.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.roles = await roles.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.screens = await screens.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-
-      try {
-        totals.tables = await tables.backfill(appDb, timestamp)
-      } catch (e) {
-        handleError(e, errors)
-      }
-    }
-
-    const properties: AppBackfillSucceededEvent = {
-      appId: app.appId,
-      automations: totals.automations,
-      datasources: totals.datasources,
-      layouts: totals.layouts,
-      queries: totals.queries,
-      roles: totals.roles,
-      tables: totals.tables,
-      screens: totals.screens,
-    }
-
-    if (errors.length) {
-      properties.errors = errors.map((e: any) =>
-        JSON.stringify(e, Object.getOwnPropertyNames(e))
-      )
-      properties.errorCount = errors.length
-    } else {
-      properties.errorCount = 0
-    }
-
-    await events.backfill.appSucceeded(properties)
-    // tell the event pipeline to stop caching events for this tenant
-    await events.backfillCache.end()
-  } catch (e) {
-    handleError(e)
-    await events.backfill.appFailed(e)
-  }
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/automations.ts b/packages/server/src/migrations/functions/backfill/app/automations.ts
deleted file mode 100644
index 20da8fd3c0..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/automations.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getAutomationParams } from "../../../../db/utils"
-import { Automation } from "@budibase/types"
-
-const getAutomations = async (appDb: any): Promise<Automation[]> => {
-  const response = await appDb.allDocs(
-    getAutomationParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const automations = await getAutomations(appDb)
-
-  for (const automation of automations) {
-    await events.automation.created(automation, timestamp)
-
-    for (const step of automation.definition.steps) {
-      await events.automation.stepCreated(automation, step, timestamp)
-    }
-  }
-
-  return automations.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/datasources.ts b/packages/server/src/migrations/functions/backfill/app/datasources.ts
deleted file mode 100644
index 5d7e1ad866..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/datasources.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getDatasourceParams } from "../../../../db/utils"
-import { Datasource } from "@budibase/types"
-
-const getDatasources = async (appDb: any): Promise<Datasource[]> => {
-  const response = await appDb.allDocs(
-    getDatasourceParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const datasources: Datasource[] = await getDatasources(appDb)
-
-  for (const datasource of datasources) {
-    await events.datasource.created(datasource, timestamp)
-  }
-
-  return datasources.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/layouts.ts b/packages/server/src/migrations/functions/backfill/app/layouts.ts
deleted file mode 100644
index ee5806459b..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/layouts.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getLayoutParams } from "../../../../db/utils"
-import { Layout } from "@budibase/types"
-
-const getLayouts = async (appDb: any): Promise<Layout[]> => {
-  const response = await appDb.allDocs(
-    getLayoutParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const layouts: Layout[] = await getLayouts(appDb)
-
-  for (const layout of layouts) {
-    // exclude default layouts
-    if (
-      layout._id === "layout_private_master" ||
-      layout._id === "layout_public_master"
-    ) {
-      continue
-    }
-    await events.layout.created(layout, timestamp)
-  }
-
-  return layouts.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/queries.ts b/packages/server/src/migrations/functions/backfill/app/queries.ts
deleted file mode 100644
index e028721bce..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/queries.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getQueryParams } from "../../../../db/utils"
-import { Query, Datasource, SourceName } from "@budibase/types"
-
-const getQueries = async (appDb: any): Promise<Query[]> => {
-  const response = await appDb.allDocs(
-    getQueryParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-const getDatasource = async (
-  appDb: any,
-  datasourceId: string
-): Promise<Datasource> => {
-  return appDb.get(datasourceId)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const queries: Query[] = await getQueries(appDb)
-
-  for (const query of queries) {
-    let datasource: Datasource
-
-    try {
-      datasource = await getDatasource(appDb, query.datasourceId)
-    } catch (e: any) {
-      // handle known bug where a datasource has been deleted
-      // and the query has not
-      if (e.status === 404) {
-        datasource = {
-          type: "unknown",
-          _id: query.datasourceId,
-          source: "unknown" as SourceName,
-        }
-      } else {
-        throw e
-      }
-    }
-
-    await events.query.created(datasource, query, timestamp)
-  }
-
-  return queries.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/roles.ts b/packages/server/src/migrations/functions/backfill/app/roles.ts
deleted file mode 100644
index 494b6f6923..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/roles.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getRoleParams } from "../../../../db/utils"
-import { Role } from "@budibase/types"
-
-const getRoles = async (appDb: any): Promise<Role[]> => {
-  const response = await appDb.allDocs(
-    getRoleParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const roles = await getRoles(appDb)
-
-  for (const role of roles) {
-    await events.role.created(role, timestamp)
-  }
-
-  return roles.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/screens.ts b/packages/server/src/migrations/functions/backfill/app/screens.ts
deleted file mode 100644
index ab3b4b9d3c..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/screens.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { getScreenParams } from "../../../../db/utils"
-import { Screen } from "@budibase/types"
-
-const getScreens = async (appDb: any): Promise<Screen[]> => {
-  const response = await appDb.allDocs(
-    getScreenParams(null, {
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (appDb: any, timestamp: string | number) => {
-  const screens = await getScreens(appDb)
-
-  for (const screen of screens) {
-    await events.screen.created(screen, timestamp)
-  }
-
-  return screens.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/app/tables.ts b/packages/server/src/migrations/functions/backfill/app/tables.ts
deleted file mode 100644
index 081b81ede5..0000000000
--- a/packages/server/src/migrations/functions/backfill/app/tables.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { events } from "@budibase/backend-core"
-import { Database } from "@budibase/types"
-import sdk from "../../../../sdk"
-
-export const backfill = async (appDb: Database, timestamp: string | number) => {
-  const tables = await sdk.tables.getAllInternalTables(appDb)
-
-  for (const table of tables) {
-    await events.table.created(table, timestamp)
-
-    if (table.views) {
-      for (const view of Object.values(table.views)) {
-        if (sdk.views.isV2(view)) {
-          continue
-        }
-
-        await events.view.created(view, timestamp)
-
-        if (view.calculation) {
-          await events.view.calculationCreated(view, timestamp)
-        }
-
-        if (view.filters?.length) {
-          await events.view.filterCreated(view, timestamp)
-        }
-      }
-    }
-  }
-
-  return tables.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/global.ts b/packages/server/src/migrations/functions/backfill/global.ts
deleted file mode 100644
index a56c92492b..0000000000
--- a/packages/server/src/migrations/functions/backfill/global.ts
+++ /dev/null
@@ -1,213 +0,0 @@
-import * as users from "./global/users"
-import * as configs from "./global/configs"
-import * as quotas from "./global/quotas"
-import {
-  tenancy,
-  events,
-  migrations,
-  accounts,
-  db as dbUtils,
-} from "@budibase/backend-core"
-import {
-  QuotaUsage,
-  CloudAccount,
-  App,
-  TenantBackfillSucceededEvent,
-  Event,
-  User,
-} from "@budibase/types"
-import env from "../../../environment"
-import { DEFAULT_TIMESTAMP } from "."
-
-const failGraceful = env.SELF_HOSTED && !env.isDev()
-
-const handleError = (e: any, errors?: any) => {
-  if (failGraceful) {
-    if (errors) {
-      errors.push(e)
-    }
-    return
-  }
-  throw e
-}
-
-const formatUsage = (usage: QuotaUsage) => {
-  let maxAutomations = 0
-  let maxQueries = 0
-  let rows = 0
-
-  if (usage) {
-    if (usage.usageQuota) {
-      rows = usage.usageQuota.rows
-    }
-
-    if (usage.monthly) {
-      for (const value of Object.values(usage.monthly)) {
-        if (value.automations > maxAutomations) {
-          maxAutomations = value.automations
-        }
-        if (value.queries > maxQueries) {
-          maxQueries = value.queries
-        }
-      }
-    }
-  }
-
-  return {
-    maxAutomations,
-    maxQueries,
-    rows,
-  }
-}
-
-const EVENTS = [
-  Event.EMAIL_SMTP_CREATED,
-  Event.AUTH_SSO_CREATED,
-  Event.AUTH_SSO_ACTIVATED,
-  Event.ORG_NAME_UPDATED,
-  Event.ORG_LOGO_UPDATED,
-  Event.ORG_PLATFORM_URL_UPDATED,
-  Event.USER_CREATED,
-  Event.USER_PERMISSION_ADMIN_ASSIGNED,
-  Event.USER_PERMISSION_BUILDER_ASSIGNED,
-  Event.ROLE_ASSIGNED,
-  Event.ROWS_CREATED,
-  Event.QUERIES_RUN,
-  Event.AUTOMATIONS_RUN,
-]
-
-/**
- * Date:
- * May 2022
- *
- * Description:
- * Backfill global events.
- */
-
-export const run = async (db: any) => {
-  try {
-    const tenantId = tenancy.getTenantId()
-    let timestamp: string | number = DEFAULT_TIMESTAMP
-
-    const totals: any = {}
-    const errors: any = []
-
-    let allUsers: User[] = []
-    try {
-      allUsers = await users.getUsers(db)
-    } catch (e: any) {
-      handleError(e, errors)
-    }
-
-    if (!allUsers || allUsers.length === 0) {
-      // first time startup - we don't need to backfill anything
-      // tenant will be identified when admin user is created
-      if (env.SELF_HOSTED) {
-        await events.installation.firstStartup()
-      }
-      return
-    }
-
-    try {
-      const installTimestamp = await getInstallTimestamp(db, allUsers)
-      if (installTimestamp) {
-        timestamp = installTimestamp
-      }
-    } catch (e) {
-      handleError(e, errors)
-    }
-
-    let account: CloudAccount | undefined
-    if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-      account = await accounts.getAccountByTenantId(tenantId)
-    }
-
-    try {
-      await events.identification.identifyTenantGroup(
-        tenantId,
-        account,
-        timestamp
-      )
-    } catch (e) {
-      handleError(e, errors)
-    }
-
-    // tell the event pipeline to start caching
-    // events for this tenant
-    await events.backfillCache.start(EVENTS)
-
-    try {
-      await configs.backfill(db, timestamp)
-    } catch (e) {
-      handleError(e, errors)
-    }
-
-    try {
-      totals.users = await users.backfill(db, account)
-    } catch (e) {
-      handleError(e, errors)
-    }
-
-    try {
-      const allApps = (await dbUtils.getAllApps({ dev: true })) as App[]
-      totals.apps = allApps.length
-
-      totals.usage = await quotas.backfill(allApps)
-    } catch (e) {
-      handleError(e, errors)
-    }
-
-    const properties: TenantBackfillSucceededEvent = {
-      apps: totals.apps,
-      users: totals.users,
-      ...formatUsage(totals.usage),
-      usage: totals.usage,
-    }
-
-    if (errors.length) {
-      properties.errors = errors.map((e: any) =>
-        JSON.stringify(e, Object.getOwnPropertyNames(e))
-      )
-      properties.errorCount = errors.length
-    } else {
-      properties.errorCount = 0
-    }
-
-    await events.backfill.tenantSucceeded(properties)
-    // tell the event pipeline to stop caching events for this tenant
-    await events.backfillCache.end()
-  } catch (e) {
-    handleError(e)
-    await events.backfill.tenantFailed(e)
-  }
-}
-
-export const isComplete = async (): Promise<boolean> => {
-  const globalDb = tenancy.getGlobalDB()
-  const migrationsDoc = await migrations.getMigrationsDoc(globalDb)
-  return !!migrationsDoc.event_global_backfill
-}
-
-export const getInstallTimestamp = async (
-  globalDb: any,
-  allUsers?: User[]
-): Promise<number | undefined> => {
-  if (!allUsers) {
-    allUsers = await users.getUsers(globalDb)
-  }
-
-  // get the oldest user timestamp
-  if (allUsers) {
-    const timestamps = allUsers
-      .map(user => user.createdAt)
-      .filter(timestamp => !!timestamp)
-      .sort(
-        (a, b) =>
-          new Date(a as number).getTime() - new Date(b as number).getTime()
-      )
-
-    if (timestamps.length) {
-      return timestamps[0]
-    }
-  }
-}
diff --git a/packages/server/src/migrations/functions/backfill/global/configs.ts b/packages/server/src/migrations/functions/backfill/global/configs.ts
deleted file mode 100644
index 04eb9caff2..0000000000
--- a/packages/server/src/migrations/functions/backfill/global/configs.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-import {
-  events,
-  DocumentType,
-  SEPARATOR,
-  UNICODE_MAX,
-} from "@budibase/backend-core"
-import {
-  Config,
-  isSMTPConfig,
-  isGoogleConfig,
-  isOIDCConfig,
-  isSettingsConfig,
-  ConfigType,
-  DatabaseQueryOpts,
-} from "@budibase/types"
-import env from "./../../../../environment"
-
-export function getConfigParams(): DatabaseQueryOpts {
-  return {
-    include_docs: true,
-    startkey: `${DocumentType.CONFIG}${SEPARATOR}`,
-    endkey: `${DocumentType.CONFIG}${SEPARATOR}${UNICODE_MAX}`,
-  }
-}
-
-const getConfigs = async (globalDb: any): Promise<Config[]> => {
-  const response = await globalDb.allDocs(getConfigParams())
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (
-  globalDb: any,
-  timestamp: string | number | undefined
-) => {
-  const configs = await getConfigs(globalDb)
-
-  for (const config of configs) {
-    if (isSMTPConfig(config)) {
-      await events.email.SMTPCreated(timestamp)
-    }
-    if (isGoogleConfig(config)) {
-      await events.auth.SSOCreated(ConfigType.GOOGLE, timestamp)
-      if (config.config.activated) {
-        await events.auth.SSOActivated(ConfigType.GOOGLE, timestamp)
-      }
-    }
-    if (isOIDCConfig(config)) {
-      await events.auth.SSOCreated(ConfigType.OIDC, timestamp)
-      if (config.config.configs[0].activated) {
-        await events.auth.SSOActivated(ConfigType.OIDC, timestamp)
-      }
-    }
-    if (isSettingsConfig(config)) {
-      const company = config.config.company
-      if (company && company !== "Budibase") {
-        await events.org.nameUpdated(timestamp)
-      }
-
-      const logoUrl = config.config.logoUrl
-      if (logoUrl) {
-        await events.org.logoUpdated(timestamp)
-      }
-
-      const platformUrl = config.config.platformUrl
-      if (
-        platformUrl &&
-        platformUrl !== "http://localhost:10000" &&
-        env.SELF_HOSTED
-      ) {
-        await events.org.platformURLUpdated(timestamp)
-      }
-    }
-  }
-}
diff --git a/packages/server/src/migrations/functions/backfill/global/quotas.ts b/packages/server/src/migrations/functions/backfill/global/quotas.ts
deleted file mode 100644
index 505274a318..0000000000
--- a/packages/server/src/migrations/functions/backfill/global/quotas.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { DEFAULT_TIMESTAMP } from "./../index"
-import { events } from "@budibase/backend-core"
-import { quotas } from "@budibase/pro"
-import { App } from "@budibase/types"
-
-const getOldestCreatedAt = (allApps: App[]): string | undefined => {
-  const timestamps = allApps
-    .filter(app => !!app.createdAt)
-    .map(app => app.createdAt as string)
-    .sort((a, b) => new Date(a).getTime() - new Date(b).getTime())
-
-  if (timestamps.length) {
-    return timestamps[0]
-  }
-}
-
-const getMonthTimestamp = (monthString: string): number => {
-  const parts = monthString.split("-")
-  const month = parseInt(parts[0]) - 1 // we already do +1 in month string calculation
-  const year = parseInt(parts[1])
-
-  // using 0 as the day in next month gives us last day in previous month
-  const date = new Date(year, month + 1, 0).getTime()
-  const now = new Date().getTime()
-
-  if (date > now) {
-    return now
-  } else {
-    return date
-  }
-}
-
-export const backfill = async (allApps: App[]) => {
-  const usage = await quotas.getQuotaUsage()
-
-  const rows = usage.usageQuota.rows
-  let timestamp: string | number = DEFAULT_TIMESTAMP
-
-  const oldestAppTimestamp = getOldestCreatedAt(allApps)
-  if (oldestAppTimestamp) {
-    timestamp = oldestAppTimestamp
-  }
-
-  await events.rows.created(rows, timestamp)
-
-  for (const [monthString, quotas] of Object.entries(usage.monthly)) {
-    if (monthString === "current") {
-      continue
-    }
-    const monthTimestamp = getMonthTimestamp(monthString)
-
-    const queries = quotas.queries
-    await events.query.run(queries, monthTimestamp)
-
-    const automations = quotas.automations
-    await events.automation.run(automations, monthTimestamp)
-  }
-
-  return usage
-}
diff --git a/packages/server/src/migrations/functions/backfill/global/users.ts b/packages/server/src/migrations/functions/backfill/global/users.ts
deleted file mode 100644
index b3dae822d7..0000000000
--- a/packages/server/src/migrations/functions/backfill/global/users.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import {
-  events,
-  db as dbUtils,
-  users as usersCore,
-} from "@budibase/backend-core"
-import { User, CloudAccount } from "@budibase/types"
-import { DEFAULT_TIMESTAMP } from ".."
-
-// manually define user doc params - normally server doesn't read users from the db
-const getUserParams = (props: any) => {
-  return dbUtils.getDocParams(dbUtils.DocumentType.USER, null, props)
-}
-
-export const getUsers = async (globalDb: any): Promise<User[]> => {
-  const response = await globalDb.allDocs(
-    getUserParams({
-      include_docs: true,
-    })
-  )
-  return response.rows.map((row: any) => row.doc)
-}
-
-export const backfill = async (
-  globalDb: any,
-  account: CloudAccount | undefined
-) => {
-  const users = await getUsers(globalDb)
-
-  for (const user of users) {
-    let timestamp: string | number = DEFAULT_TIMESTAMP
-    if (user.createdAt) {
-      timestamp = user.createdAt
-    }
-    await events.identification.identifyUser(user, account, timestamp)
-    await events.user.created(user, timestamp)
-
-    if (usersCore.hasAdminPermissions(user)) {
-      await events.user.permissionAdminAssigned(user, timestamp)
-    }
-
-    if (usersCore.hasBuilderPermissions(user)) {
-      await events.user.permissionBuilderAssigned(user, timestamp)
-    }
-
-    if (user.roles) {
-      for (const [, role] of Object.entries(user.roles)) {
-        await events.role.assigned(user, role, timestamp)
-      }
-    }
-  }
-
-  return users.length
-}
diff --git a/packages/server/src/migrations/functions/backfill/index.ts b/packages/server/src/migrations/functions/backfill/index.ts
deleted file mode 100644
index 00c04722b4..0000000000
--- a/packages/server/src/migrations/functions/backfill/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * as app from "./app"
-export * as global from "./global"
-export * as installation from "./installation"
-
-// historical events are free in posthog - make sure we default to a
-// historical time if no other can be found
-export const DEFAULT_TIMESTAMP = new Date(2022, 0, 1).getTime()
diff --git a/packages/server/src/migrations/functions/backfill/installation.ts b/packages/server/src/migrations/functions/backfill/installation.ts
deleted file mode 100644
index 3c2b8bd3fc..0000000000
--- a/packages/server/src/migrations/functions/backfill/installation.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { DEFAULT_TIMESTAMP } from "./index"
-import { events, tenancy, installation } from "@budibase/backend-core"
-import { Installation } from "@budibase/types"
-import * as global from "./global"
-import env from "../../../environment"
-
-const failGraceful = env.SELF_HOSTED
-
-const handleError = (e: any, errors?: any) => {
-  if (failGraceful) {
-    if (errors) {
-      errors.push(e)
-    }
-    return
-  }
-  throw e
-}
-
-/**
- * Date:
- * May 2022
- *
- * Description:
- * Backfill installation events.
- */
-
-export const run = async () => {
-  try {
-    // need to use the default tenant to try to get the installation time
-    await tenancy.doInTenant(tenancy.DEFAULT_TENANT_ID, async () => {
-      const db = tenancy.getGlobalDB()
-      let timestamp: string | number = DEFAULT_TIMESTAMP
-
-      const installTimestamp = await global.getInstallTimestamp(db)
-      if (installTimestamp) {
-        timestamp = installTimestamp
-      }
-
-      const install: Installation = await installation.getInstall()
-      await events.identification.identifyInstallationGroup(
-        install.installId,
-        timestamp
-      )
-    })
-    await events.backfill.installationSucceeded()
-  } catch (e) {
-    handleError(e)
-    await events.backfill.installationFailed(e)
-  }
-}
diff --git a/packages/server/src/migrations/functions/syncQuotas.ts b/packages/server/src/migrations/functions/syncQuotas.ts
deleted file mode 100644
index 83a7670e78..0000000000
--- a/packages/server/src/migrations/functions/syncQuotas.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { runQuotaMigration } from "./usageQuotas"
-import * as syncApps from "./usageQuotas/syncApps"
-import * as syncRows from "./usageQuotas/syncRows"
-import * as syncPlugins from "./usageQuotas/syncPlugins"
-import * as syncUsers from "./usageQuotas/syncUsers"
-import * as syncCreators from "./usageQuotas/syncCreators"
-
-/**
- * Synchronise quotas to the state of the db.
- */
-export const run = async () => {
-  await runQuotaMigration(async () => {
-    await syncApps.run()
-    await syncRows.run()
-    await syncPlugins.run()
-    await syncUsers.run()
-    await syncCreators.run()
-  })
-}
diff --git a/packages/server/src/migrations/functions/tableSettings.ts b/packages/server/src/migrations/functions/tableSettings.ts
deleted file mode 100644
index 2db3df0d0f..0000000000
--- a/packages/server/src/migrations/functions/tableSettings.ts
+++ /dev/null
@@ -1,145 +0,0 @@
-import { getScreenParams } from "../../db/utils"
-import { Screen } from "@budibase/types"
-import { makePropSafe as safe } from "@budibase/string-templates"
-/**
- * Date:
- * November 2022
- *
- * Description:
- * Update table settings to use actions instead of links. We do not remove the
- * legacy values here as we cannot guarantee that their apps are up-t-date.
- * It is safe to simply save both the new and old structure in the definition.
- *
- * Migration 1:
- * Legacy "linkRows", "linkURL", "linkPeek" and "linkColumn" settings on tables
- * and table blocks are migrated into a "Navigate To" action under the new
- * "onClick" setting.
- *
- * Migration 2:
- * Legacy "titleButtonURL" and "titleButtonPeek" settings on table blocks are
- * migrated into a "Navigate To" action under the new "onClickTitleButton"
- * setting.
- */
-export const run = async (appDb: any) => {
-  // Get all app screens
-  let screens: Screen[]
-  try {
-    screens = (
-      await appDb.allDocs(
-        getScreenParams(null, {
-          include_docs: true,
-        })
-      )
-    ).rows.map((row: any) => row.doc)
-  } catch (e) {
-    // sometimes the metadata document doesn't exist
-    // exit early instead of failing the migration
-    console.error("Error retrieving app metadata. Skipping", e)
-    return
-  }
-
-  // Recursively update any relevant components and mutate the screen docs
-  for (let screen of screens) {
-    const changed = migrateTableSettings(screen.props)
-
-    // Save screen if we updated it
-    if (changed) {
-      await appDb.put(screen)
-      console.log(
-        `Screen ${screen.routing?.route} contained table settings which were migrated`
-      )
-    }
-  }
-}
-
-// Recursively searches and mutates a screen doc to migrate table component
-// and table block settings
-const migrateTableSettings = (component: any) => {
-  let changed = false
-  if (!component) {
-    return changed
-  }
-
-  // Migration 1: migrate table row click settings
-  if (
-    component._component.endsWith("/table") ||
-    component._component.endsWith("/tableblock")
-  ) {
-    const { linkRows, linkURL, linkPeek, linkColumn, onClick } = component
-    if (linkRows && !onClick) {
-      const column = linkColumn || "_id"
-      const action = convertLinkSettingToAction(linkURL, !!linkPeek, column)
-      if (action) {
-        changed = true
-        component.onClick = action
-        if (component._component.endsWith("/tableblock")) {
-          component.clickBehaviour = "actions"
-        }
-      }
-    }
-  }
-
-  // Migration 2: migrate table block title button settings
-  if (component._component.endsWith("/tableblock")) {
-    const {
-      showTitleButton,
-      titleButtonURL,
-      titleButtonPeek,
-      onClickTitleButton,
-    } = component
-    if (showTitleButton && !onClickTitleButton) {
-      const action = convertLinkSettingToAction(
-        titleButtonURL,
-        !!titleButtonPeek
-      )
-      if (action) {
-        changed = true
-        component.onClickTitleButton = action
-        component.titleButtonClickBehaviour = "actions"
-      }
-    }
-  }
-
-  // Recurse down the tree as needed
-  component._children?.forEach((child: any) => {
-    const childChanged = migrateTableSettings(child)
-    changed = changed || childChanged
-  })
-  return changed
-}
-
-// Util ti convert the legacy settings into a navigation action structure
-const convertLinkSettingToAction = (
-  linkURL: string,
-  linkPeek: boolean,
-  linkColumn?: string
-) => {
-  // Sanity check we have a URL
-  if (!linkURL) {
-    return null
-  }
-
-  // Default URL to the old URL setting
-  let url = linkURL
-
-  // If we enriched the old URL with a column, update the url
-  if (linkColumn && linkURL.includes("/:")) {
-    // Convert old link URL setting, which is a screen URL, into a valid
-    // binding using the new clicked row binding
-    const split = linkURL.split("/:")
-    const col = linkColumn || "_id"
-    const binding = `{{ ${safe("eventContext")}.${safe("row")}.${safe(col)} }}`
-    url = `${split[0]}/${binding}`
-  }
-
-  // Create action structure
-  return [
-    {
-      "##eventHandlerType": "Navigate To",
-      parameters: {
-        url,
-        peek: linkPeek,
-      },
-    },
-  ]
-}
diff --git a/packages/server/src/migrations/functions/tests/appUrls.spec.js b/packages/server/src/migrations/functions/tests/appUrls.spec.js
deleted file mode 100644
index 7a2f324552..0000000000
--- a/packages/server/src/migrations/functions/tests/appUrls.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-const { db: dbCore } = require("@budibase/backend-core")
-const TestConfig = require("../../../tests/utilities/TestConfiguration")
-
-const migration = require("../appUrls")
-
-describe("run", () => {
-  let config = new TestConfig(false)
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("runs successfully", async () => {
-    const app = await config.createApp("testApp")
-    const metadata = await dbCore.doWithDB(app.appId, async db => {
-      const metadataDoc = await db.get(dbCore.DocumentType.APP_METADATA)
-      delete metadataDoc.url
-      await db.put(metadataDoc)
-      await migration.run(db)
-      return await db.get(dbCore.DocumentType.APP_METADATA)
-    })
-    expect(metadata.url).toEqual("/testapp")
-  })
-})
diff --git a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts b/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
deleted file mode 100644
index 8d28a43322..0000000000
--- a/packages/server/src/migrations/functions/tests/tableSettings.spec.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { App, Screen } from "@budibase/types"
-
-import { db as dbCore } from "@budibase/backend-core"
-import TestConfig from "../../../tests/utilities/TestConfiguration"
-import { run as runMigration } from "../tableSettings"
-
-describe("run", () => {
-  const config = new TestConfig(false)
-  let app: App
-  let screen: Screen
-
-  beforeAll(async () => {
-    await config.init()
-    app = await config.createApp("testApp")
-    screen = await config.createScreen()
-  })
-
-  afterAll(config.end)
-
-  it("migrates table block row on click settings", async () => {
-    // Add legacy table block as first child
-    screen.props._children = [
-      {
-        _instanceName: "Table Block",
-        _styles: {},
-        _component: "@budibase/standard-components/tableblock",
-        _id: "foo",
-        linkRows: true,
-        linkURL: "/rows/:id",
-        linkPeek: true,
-        linkColumn: "name",
-      },
-    ]
-    await config.createScreen(screen)
-
-    // Run migration
-    screen = await dbCore.doWithDB(app.appId, async (db: any) => {
-      await runMigration(db)
-      return await db.get(screen._id)
-    })
-
-    // Verify new "onClick" setting
-    const onClick = screen.props._children?.[0].onClick
-    expect(onClick).toBeDefined()
-    expect(onClick.length).toBe(1)
-    expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To")
-    expect(onClick[0].parameters.url).toBe(
-      `/rows/{{ [eventContext].[row].[name] }}`
-    )
-    expect(onClick[0].parameters.peek).toBeTruthy()
-  })
-
-  it("migrates table row on click settings", async () => {
-    // Add legacy table block as first child
-    screen.props._children = [
-      {
-        _instanceName: "Table",
-        _styles: {},
-        _component: "@budibase/standard-components/table",
-        _id: "foo",
-        linkRows: true,
-        linkURL: "/rows/:id",
-        linkPeek: true,
-        linkColumn: "name",
-      },
-    ]
-    await config.createScreen(screen)
-
-    // Run migration
-    screen = await dbCore.doWithDB(app.appId, async (db: any) => {
-      await runMigration(db)
-      return await db.get(screen._id)
-    })
-
-    // Verify new "onClick" setting
-    const onClick = screen.props._children?.[0].onClick
-    expect(onClick).toBeDefined()
-    expect(onClick.length).toBe(1)
-    expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To")
-    expect(onClick[0].parameters.url).toBe(
-      `/rows/{{ [eventContext].[row].[name] }}`
-    )
-    expect(onClick[0].parameters.peek).toBeTruthy()
-  })
-
-  it("migrates table block title button settings", async () => {
-    // Add legacy table block as first child
-    screen.props._children = [
-      {
-        _instanceName: "Table Block",
-        _styles: {},
-        _component: "@budibase/standard-components/tableblock",
-        _id: "foo",
-        showTitleButton: true,
-        titleButtonURL: "/url",
-        titleButtonPeek: true,
-      },
-    ]
-    await config.createScreen(screen)
-
-    // Run migration
-    screen = await dbCore.doWithDB(app.appId, async (db: any) => {
-      await runMigration(db)
-      return await db.get(screen._id)
-    })
-
-    // Verify new "onClickTitleButton" setting
-    const onClick = screen.props._children?.[0].onClickTitleButton
-    expect(onClick).toBeDefined()
-    expect(onClick.length).toBe(1)
-    expect(onClick[0]["##eventHandlerType"]).toBe("Navigate To")
-    expect(onClick[0].parameters.url).toBe("/url")
-    expect(onClick[0].parameters.peek).toBeTruthy()
-  })
-
-  it("ignores components that have already been migrated", async () => {
-    // Add legacy table block as first child
-    screen.props._children = [
-      {
-        _instanceName: "Table Block",
-        _styles: {},
-        _component: "@budibase/standard-components/tableblock",
-        _id: "foo",
-        linkRows: true,
-        linkURL: "/rows/:id",
-        linkPeek: true,
-        linkColumn: "name",
-        onClick: "foo",
-      },
-    ]
-    const initialDefinition = JSON.stringify(screen.props._children?.[0])
-    await config.createScreen(screen)
-
-    // Run migration
-    screen = await dbCore.doWithDB(app.appId, async (db: any) => {
-      await runMigration(db)
-      return await db.get(screen._id)
-    })
-
-    // Verify new "onClick" setting
-    const newDefinition = JSON.stringify(screen.props._children?.[0])
-    expect(initialDefinition).toEqual(newDefinition)
-  })
-})
diff --git a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js b/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
deleted file mode 100644
index f0da25893c..0000000000
--- a/packages/server/src/migrations/functions/tests/userEmailViewCasing.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-jest.mock("@budibase/backend-core", () => {
-  const core = jest.requireActual("@budibase/backend-core")
-  return {
-    ...core,
-    db: {
-      ...core.db,
-      createNewUserEmailView: jest.fn(),
-    },
-  }
-})
-const { context, db: dbCore } = require("@budibase/backend-core")
-const TestConfig = require("../../../tests/utilities/TestConfiguration")
-
-// mock email view creation
-
-const migration = require("../userEmailViewCasing")
-
-describe("run", () => {
-  let config = new TestConfig(false)
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("runs successfully", async () => {
-    await config.doInTenant(async () => {
-      const globalDb = context.getGlobalDB()
-      await migration.run(globalDb)
-      expect(dbCore.createNewUserEmailView).toHaveBeenCalledTimes(1)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/functions/usageQuotas/index.ts b/packages/server/src/migrations/functions/usageQuotas/index.ts
deleted file mode 100644
index ed1a765551..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const runQuotaMigration = async (migration: Function) => {
-  await migration()
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/syncApps.ts b/packages/server/src/migrations/functions/usageQuotas/syncApps.ts
deleted file mode 100644
index 80ed1953d3..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/syncApps.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { db as dbCore } from "@budibase/backend-core"
-import { quotas } from "@budibase/pro"
-import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-
-export const run = async () => {
-  // get app count
-  const devApps = await dbCore.getAllApps({ dev: true })
-  const appCount = devApps ? devApps.length : 0
-
-  // sync app count
-  console.log(`Syncing app count: ${appCount}`)
-  await quotas.setUsage(appCount, StaticQuotaName.APPS, QuotaUsageType.STATIC)
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/syncCreators.ts b/packages/server/src/migrations/functions/usageQuotas/syncCreators.ts
deleted file mode 100644
index ce53be925a..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/syncCreators.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { users } from "@budibase/backend-core"
-import { quotas } from "@budibase/pro"
-import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-
-export const run = async () => {
-  const creatorCount = await users.getCreatorCount()
-  console.log(`Syncing creator count: ${creatorCount}`)
-  await quotas.setUsage(
-    creatorCount,
-    StaticQuotaName.CREATORS,
-    QuotaUsageType.STATIC
-  )
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/syncPlugins.ts b/packages/server/src/migrations/functions/usageQuotas/syncPlugins.ts
deleted file mode 100644
index b00970aea2..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/syncPlugins.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { logging } from "@budibase/backend-core"
-import { plugins } from "@budibase/pro"
-
-export const run = async () => {
-  try {
-    await plugins.checkPluginQuotas()
-  } catch (err) {
-    logging.logAlert("Failed to update plugin quotas", err)
-  }
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/syncRows.ts b/packages/server/src/migrations/functions/usageQuotas/syncRows.ts
deleted file mode 100644
index 506218a41f..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/syncRows.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { db as dbCore } from "@budibase/backend-core"
-import { getUniqueRows } from "../../../utilities/usageQuota/rows"
-import { quotas } from "@budibase/pro"
-import { StaticQuotaName, QuotaUsageType, App } from "@budibase/types"
-
-export const run = async () => {
-  // get all rows in all apps
-  const allApps = (await dbCore.getAllApps({ all: true })) as App[]
-  const appIds = allApps ? allApps.map((app: { appId: any }) => app.appId) : []
-  const { appRows } = await getUniqueRows(appIds)
-
-  // get the counts per app
-  const counts: { [key: string]: number } = {}
-  let rowCount = 0
-  Object.entries(appRows).forEach(([appId, rows]) => {
-    counts[appId] = rows.length
-    rowCount += rows.length
-  })
-
-  // sync row count
-  console.log(`Syncing row count: ${rowCount}`)
-  await quotas.setUsagePerApp(
-    counts,
-    StaticQuotaName.ROWS,
-    QuotaUsageType.STATIC
-  )
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/syncUsers.ts b/packages/server/src/migrations/functions/usageQuotas/syncUsers.ts
deleted file mode 100644
index c9913dced8..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/syncUsers.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { users } from "@budibase/backend-core"
-import { quotas } from "@budibase/pro"
-import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-
-export const run = async () => {
-  const userCount = await users.getUserCount()
-  console.log(`Syncing user count: ${userCount}`)
-  await quotas.setUsage(userCount, StaticQuotaName.USERS, QuotaUsageType.STATIC)
-}
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
deleted file mode 100644
index 1d4d4d0f71..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncApps.spec.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import TestConfig from "../../../../tests/utilities/TestConfiguration"
-import * as syncApps from "../syncApps"
-import { quotas } from "@budibase/pro"
-import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-
-describe("syncApps", () => {
-  let config = new TestConfig(false)
-
-  beforeEach(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("runs successfully", async () => {
-    return config.doInContext(undefined, async () => {
-      // create the usage quota doc and mock usages
-      await quotas.getQuotaUsage()
-      await quotas.setUsage(3, StaticQuotaName.APPS, QuotaUsageType.STATIC)
-
-      let usageDoc = await quotas.getQuotaUsage()
-      expect(usageDoc.usageQuota.apps).toEqual(3)
-
-      // create an extra app to test the migration
-      await config.createApp("quota-test")
-
-      // migrate
-      await syncApps.run()
-
-      // assert the migration worked
-      usageDoc = await quotas.getQuotaUsage()
-      expect(usageDoc.usageQuota.apps).toEqual(2)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncCreators.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncCreators.spec.ts
deleted file mode 100644
index 93b7d4949b..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncCreators.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import TestConfig from "../../../../tests/utilities/TestConfiguration"
-import * as syncCreators from "../syncCreators"
-import { quotas } from "@budibase/pro"
-
-describe("syncCreators", () => {
-  let config = new TestConfig(false)
-
-  beforeEach(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("syncs creators", async () => {
-    return config.doInContext(undefined, async () => {
-      await config.createUser({ admin: { global: true } })
-
-      await syncCreators.run()
-
-      const usageDoc = await quotas.getQuotaUsage()
-      // default + additional creator
-      const creatorsCount = 2
-      expect(usageDoc.usageQuota.creators).toBe(creatorsCount)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
deleted file mode 100644
index 730278683c..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncRows.spec.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import TestConfig from "../../../../tests/utilities/TestConfiguration"
-import * as syncRows from "../syncRows"
-import { quotas } from "@budibase/pro"
-import { QuotaUsageType, StaticQuotaName } from "@budibase/types"
-import { db as dbCore, context } from "@budibase/backend-core"
-
-describe("syncRows", () => {
-  const config = new TestConfig()
-
-  beforeEach(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("runs successfully", async () => {
-    return config.doInContext(undefined, async () => {
-      // create the usage quota doc and mock usages
-      await quotas.getQuotaUsage()
-      await quotas.setUsage(300, StaticQuotaName.ROWS, QuotaUsageType.STATIC)
-
-      let usageDoc = await quotas.getQuotaUsage()
-      expect(usageDoc.usageQuota.rows).toEqual(300)
-
-      // app 1
-      const app1 = config.app
-      await context.doInAppContext(app1!.appId, async () => {
-        await config.createTable()
-        await config.createRow()
-      })
-      // app 2
-      const app2 = await config.createApp("second-app")
-      await context.doInAppContext(app2.appId, async () => {
-        await config.createTable()
-        await config.createRow()
-        await config.createRow()
-      })
-
-      // migrate
-      await syncRows.run()
-
-      // assert the migration worked
-      usageDoc = await quotas.getQuotaUsage()
-      expect(usageDoc.usageQuota.rows).toEqual(3)
-      expect(
-        usageDoc.apps?.[dbCore.getProdAppID(app1!.appId)].usageQuota.rows
-      ).toEqual(1)
-      expect(
-        usageDoc.apps?.[dbCore.getProdAppID(app2.appId)].usageQuota.rows
-      ).toEqual(2)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/functions/usageQuotas/tests/syncUsers.spec.ts b/packages/server/src/migrations/functions/usageQuotas/tests/syncUsers.spec.ts
deleted file mode 100644
index 2731cc041d..0000000000
--- a/packages/server/src/migrations/functions/usageQuotas/tests/syncUsers.spec.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import TestConfig from "../../../../tests/utilities/TestConfiguration"
-import * as syncUsers from "../syncUsers"
-import { quotas } from "@budibase/pro"
-
-describe("syncUsers", () => {
-  let config = new TestConfig(false)
-
-  beforeEach(async () => {
-    await config.init()
-  })
-
-  afterAll(config.end)
-
-  it("syncs users", async () => {
-    return config.doInContext(undefined, async () => {
-      await config.createUser()
-
-      await syncUsers.run()
-
-      const usageDoc = await quotas.getQuotaUsage()
-      // default + additional user
-      const userCount = 2
-      expect(usageDoc.usageQuota.users).toBe(userCount)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/functions/userEmailViewCasing.ts b/packages/server/src/migrations/functions/userEmailViewCasing.ts
deleted file mode 100644
index 078289cddf..0000000000
--- a/packages/server/src/migrations/functions/userEmailViewCasing.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { db as dbCore } from "@budibase/backend-core"
-
-/**
- * Date:
- * October 2021
- *
- * Description:
- * Recreate the user email view to include latest changes i.e. lower casing the email address
- */
-
-export const run = async () => {
-  await dbCore.createNewUserEmailView()
-}
diff --git a/packages/server/src/migrations/index.ts b/packages/server/src/migrations/index.ts
deleted file mode 100644
index a66d793142..0000000000
--- a/packages/server/src/migrations/index.ts
+++ /dev/null
@@ -1,115 +0,0 @@
-import { locks, migrations } from "@budibase/backend-core"
-import {
-  Migration,
-  MigrationOptions,
-  MigrationName,
-  LockType,
-  LockName,
-} from "@budibase/types"
-import env from "../environment"
-
-// migration functions
-import * as userEmailViewCasing from "./functions/userEmailViewCasing"
-import * as syncQuotas from "./functions/syncQuotas"
-import * as appUrls from "./functions/appUrls"
-import * as tableSettings from "./functions/tableSettings"
-import * as backfill from "./functions/backfill"
-/**
- * Populate the migration function and additional configuration from
- * the static migration definitions.
- */
-export const buildMigrations = () => {
-  const definitions = migrations.DEFINITIONS
-  const serverMigrations: Migration[] = []
-
-  for (const definition of definitions) {
-    switch (definition.name) {
-      case MigrationName.USER_EMAIL_VIEW_CASING: {
-        serverMigrations.push({
-          ...definition,
-          fn: userEmailViewCasing.run,
-        })
-        break
-      }
-      case MigrationName.SYNC_QUOTAS: {
-        serverMigrations.push({
-          ...definition,
-          fn: syncQuotas.run,
-        })
-        break
-      }
-      case MigrationName.APP_URLS: {
-        serverMigrations.push({
-          ...definition,
-          appOpts: { all: true },
-          fn: appUrls.run,
-        })
-        break
-      }
-      case MigrationName.EVENT_APP_BACKFILL: {
-        serverMigrations.push({
-          ...definition,
-          appOpts: { all: true },
-          fn: backfill.app.run,
-          silent: !!env.SELF_HOSTED, // reduce noisy logging
-          preventRetry: !!env.SELF_HOSTED, // only ever run once
-        })
-        break
-      }
-      case MigrationName.EVENT_GLOBAL_BACKFILL: {
-        serverMigrations.push({
-          ...definition,
-          fn: backfill.global.run,
-          silent: !!env.SELF_HOSTED, // reduce noisy logging
-          preventRetry: !!env.SELF_HOSTED, // only ever run once
-        })
-        break
-      }
-      case MigrationName.EVENT_INSTALLATION_BACKFILL: {
-        serverMigrations.push({
-          ...definition,
-          fn: backfill.installation.run,
-          silent: !!env.SELF_HOSTED, // reduce noisy logging
-          preventRetry: !!env.SELF_HOSTED, // only ever run once
-        })
-        break
-      }
-      case MigrationName.TABLE_SETTINGS_LINKS_TO_ACTIONS: {
-        serverMigrations.push({
-          ...definition,
-          appOpts: { dev: true },
-          fn: tableSettings.run,
-        })
-        break
-      }
-    }
-  }
-
-  return serverMigrations
-}
-
-export const MIGRATIONS = buildMigrations()
-
-export const migrate = async (options?: MigrationOptions) => {
-  if (env.SELF_HOSTED) {
-    // self host runs migrations on startup
-    // make sure only a single instance runs them
-    await migrateWithLock(options)
-  } else {
-    await migrations.runMigrations(MIGRATIONS, options)
-  }
-}
-
-const migrateWithLock = async (options?: MigrationOptions) => {
-  await locks.doWithLock(
-    {
-      type: LockType.TRY_ONCE,
-      name: LockName.MIGRATIONS,
-      ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
-      systemLock: true,
-    },
-    async () => {
-      await migrations.runMigrations(MIGRATIONS, options)
-    }
-  )
-}
diff --git a/packages/server/src/migrations/tests/helpers.ts b/packages/server/src/migrations/tests/helpers.ts
deleted file mode 100644
index 35831a2fd0..0000000000
--- a/packages/server/src/migrations/tests/helpers.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-// Mimic configs test configuration from worker, creation configs directly in database
-
-import * as structures from "./structures"
-import { configs } from "@budibase/backend-core"
-import { Config } from "@budibase/types"
-
-export const saveSettingsConfig = async (globalDb: any) => {
-  const config = structures.settings()
-  await saveConfig(config, globalDb)
-}
-
-export const saveGoogleConfig = async (globalDb: any) => {
-  const config = structures.google()
-  await saveConfig(config, globalDb)
-}
-
-export const saveOIDCConfig = async (globalDb: any) => {
-  const config = structures.oidc()
-  await saveConfig(config, globalDb)
-}
-
-export const saveSmtpConfig = async (globalDb: any) => {
-  const config = structures.smtp()
-  await saveConfig(config, globalDb)
-}
-
-const saveConfig = async (config: Config, globalDb: any) => {
-  config._id = configs.generateConfigID(config.type)
-
-  let response
-  try {
-    response = await globalDb.get(config._id)
-    config._rev = response._rev
-    await globalDb.put(config)
-  } catch (e: any) {
-    if (e.status === 404) {
-      await globalDb.put(config)
-    }
-  }
-}
diff --git a/packages/server/src/migrations/tests/index.spec.ts b/packages/server/src/migrations/tests/index.spec.ts
deleted file mode 100644
index 6b3f3314ba..0000000000
--- a/packages/server/src/migrations/tests/index.spec.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import {
-  events,
-  migrations,
-  tenancy,
-  DocumentType,
-  context,
-} from "@budibase/backend-core"
-import TestConfig from "../../tests/utilities/TestConfiguration"
-import * as structures from "../../tests/utilities/structures"
-import { MIGRATIONS } from "../"
-import * as helpers from "./helpers"
-
-import tk from "timekeeper"
-import { View } from "@budibase/types"
-
-const timestamp = new Date().toISOString()
-tk.freeze(timestamp)
-
-const clearMigrations = async () => {
-  const dbs = [context.getDevAppDB(), context.getProdAppDB()]
-  for (const db of dbs) {
-    const doc = await db.get<any>(DocumentType.MIGRATIONS)
-    const newDoc = { _id: doc._id, _rev: doc._rev }
-    await db.put(newDoc)
-  }
-}
-
-describe("migrations", () => {
-  const config = new TestConfig()
-
-  beforeAll(async () => {
-    await config.init()
-  })
-
-  afterAll(() => {
-    config.end()
-  })
-
-  describe("backfill", () => {
-    it("runs app db migration", async () => {
-      await config.doInContext(undefined, async () => {
-        await clearMigrations()
-        await config.createAutomation()
-        await config.createAutomation(structures.newAutomation())
-        await config.createDatasource()
-        await config.createDatasource()
-        await config.createLayout()
-        await config.createQuery()
-        await config.createQuery()
-        await config.createRole()
-        await config.createRole()
-        await config.createTable()
-        await config.createLegacyView()
-        await config.createTable()
-        await config.createLegacyView(
-          structures.view(config.table!._id!) as View
-        )
-        await config.createScreen()
-        await config.createScreen()
-
-        jest.clearAllMocks()
-        const migration = MIGRATIONS.filter(
-          m => m.name === "event_app_backfill"
-        )[0]
-        await migrations.runMigration(migration)
-
-        expect(events.app.created).toHaveBeenCalledTimes(1)
-        expect(events.app.published).toHaveBeenCalledTimes(1)
-        expect(events.automation.created).toHaveBeenCalledTimes(2)
-        expect(events.automation.stepCreated).toHaveBeenCalledTimes(1)
-        expect(events.datasource.created).toHaveBeenCalledTimes(2)
-        expect(events.layout.created).toHaveBeenCalledTimes(1)
-        expect(events.query.created).toHaveBeenCalledTimes(2)
-        expect(events.role.created).toHaveBeenCalledTimes(3) // created roles + admin (created on table creation)
-        expect(events.table.created).toHaveBeenCalledTimes(3)
-        expect(events.view.created).toHaveBeenCalledTimes(2)
-        expect(events.view.calculationCreated).toHaveBeenCalledTimes(1)
-        expect(events.view.filterCreated).toHaveBeenCalledTimes(1)
-        expect(events.screen.created).toHaveBeenCalledTimes(2)
-        expect(events.backfill.appSucceeded).toHaveBeenCalledTimes(2)
-
-        // to make sure caching is working as expected
-        expect(
-          events.processors.analyticsProcessor.processEvent
-        ).toHaveBeenCalledTimes(24) // Addtion of of the events above
-      })
-    })
-  })
-
-  it("runs global db migration", async () => {
-    await config.doInContext(undefined, async () => {
-      await clearMigrations()
-      const appId = config.getProdAppId()
-      const roles = { [appId]: "role_12345" }
-      await config.createUser({
-        builder: { global: false },
-        admin: { global: true },
-        roles,
-      }) // admin only
-      await config.createUser({
-        builder: { global: false },
-        admin: { global: false },
-        roles,
-      }) // non admin non builder
-      await config.createTable()
-      await config.createRow()
-      await config.createRow()
-
-      const db = tenancy.getGlobalDB()
-      await helpers.saveGoogleConfig(db)
-      await helpers.saveOIDCConfig(db)
-      await helpers.saveSettingsConfig(db)
-      await helpers.saveSmtpConfig(db)
-
-      jest.clearAllMocks()
-      const migration = MIGRATIONS.filter(
-        m => m.name === "event_global_backfill"
-      )[0]
-      await migrations.runMigration(migration)
-
-      expect(events.user.created).toHaveBeenCalledTimes(3)
-      expect(events.role.assigned).toHaveBeenCalledTimes(2)
-      expect(events.user.permissionBuilderAssigned).toHaveBeenCalledTimes(1) // default test user
-      expect(events.user.permissionAdminAssigned).toHaveBeenCalledTimes(1) // admin from above
-      expect(events.rows.created).toHaveBeenCalledTimes(1)
-      expect(events.rows.created).toHaveBeenCalledWith(2, timestamp)
-      expect(events.email.SMTPCreated).toHaveBeenCalledTimes(1)
-      expect(events.auth.SSOCreated).toHaveBeenCalledTimes(2)
-      expect(events.auth.SSOActivated).toHaveBeenCalledTimes(2)
-      expect(events.org.logoUpdated).toHaveBeenCalledTimes(1)
-      expect(events.org.nameUpdated).toHaveBeenCalledTimes(1)
-      expect(events.org.platformURLUpdated).toHaveBeenCalledTimes(1)
-      expect(events.backfill.tenantSucceeded).toHaveBeenCalledTimes(1)
-
-      // to make sure caching is working as expected
-      expect(
-        events.processors.analyticsProcessor.processEvent
-      ).toHaveBeenCalledTimes(19)
-    })
-  })
-})
diff --git a/packages/server/src/migrations/tests/structures.ts b/packages/server/src/migrations/tests/structures.ts
deleted file mode 100644
index e2113e6a7c..0000000000
--- a/packages/server/src/migrations/tests/structures.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { utils } from "@budibase/backend-core"
-import {
-  SMTPConfig,
-  OIDCConfig,
-  GoogleConfig,
-  SettingsConfig,
-  ConfigType,
-} from "@budibase/types"
-
-export const oidc = (conf?: OIDCConfig): OIDCConfig => {
-  return {
-    type: ConfigType.OIDC,
-    config: {
-      configs: [
-        {
-          configUrl: "http://someconfigurl",
-          clientID: "clientId",
-          clientSecret: "clientSecret",
-          logo: "Microsoft",
-          name: "Active Directory",
-          uuid: utils.newid(),
-          activated: true,
-          scopes: [],
-          ...conf,
-        },
-      ],
-    },
-  }
-}
-
-export const google = (conf?: GoogleConfig): GoogleConfig => {
-  return {
-    type: ConfigType.GOOGLE,
-    config: {
-      clientID: "clientId",
-      clientSecret: "clientSecret",
-      activated: true,
-      ...conf,
-    },
-  }
-}
-
-export const smtp = (conf?: SMTPConfig): SMTPConfig => {
-  return {
-    type: ConfigType.SMTP,
-    config: {
-      port: 12345,
-      host: "smtptesthost.com",
-      from: "testfrom@example.com",
-      subject: "Hello!",
-      secure: false,
-      ...conf,
-    },
-  }
-}
-
-export const settings = (conf?: SettingsConfig): SettingsConfig => {
-  return {
-    type: ConfigType.SETTINGS,
-    config: {
-      platformUrl: "http://mycustomdomain.com",
-      logoUrl: "http://mylogourl,com",
-      company: "mycompany",
-      ...conf,
-    },
-  }
-}
diff --git a/packages/server/src/sdk/app/applications/sync.ts b/packages/server/src/sdk/app/applications/sync.ts
index 37450acf1d..3bbd72c12b 100644
--- a/packages/server/src/sdk/app/applications/sync.ts
+++ b/packages/server/src/sdk/app/applications/sync.ts
@@ -113,7 +113,7 @@ export async function syncUsersToAllApps(userIds: string[]) {
 export async function syncApp(
   appId: string,
   opts?: { automationOnly?: boolean }
-) {
+): Promise<{ message: string }> {
   if (env.DISABLE_AUTO_PROD_APP_SYNC) {
     return {
       message:
diff --git a/packages/server/src/sdk/app/automations/crud.ts b/packages/server/src/sdk/app/automations/crud.ts
index b982d5b45e..d16ae2d042 100644
--- a/packages/server/src/sdk/app/automations/crud.ts
+++ b/packages/server/src/sdk/app/automations/crud.ts
@@ -3,10 +3,10 @@ import {
   RequiredKeys,
   Webhook,
   WebhookActionType,
+  MetadataType,
 } from "@budibase/types"
 import { generateAutomationID, getAutomationParams } from "../../../db/utils"
 import { deleteEntityMetadata } from "../../../utilities"
-import { MetadataTypes } from "../../../constants"
 import {
   context,
   events,
@@ -161,7 +161,7 @@ export async function update(automation: Automation) {
   if (oldAutoTrigger && oldAutoTrigger.id !== newAutoTrigger?.id) {
     await events.automation.triggerUpdated(automation)
     await deleteEntityMetadata(
-      MetadataTypes.AUTOMATION_TEST_INPUT,
+      MetadataType.AUTOMATION_TEST_INPUT,
       automation._id!
     )
   }
@@ -183,11 +183,8 @@ export async function remove(automationId: string, rev: string) {
   })
 
   // delete metadata first
-  await deleteEntityMetadata(MetadataTypes.AUTOMATION_TEST_INPUT, automationId)
-  await deleteEntityMetadata(
-    MetadataTypes.AUTOMATION_TEST_HISTORY,
-    automationId
-  )
+  await deleteEntityMetadata(MetadataType.AUTOMATION_TEST_INPUT, automationId)
+  await deleteEntityMetadata(MetadataType.AUTOMATION_TEST_HISTORY, automationId)
 
   const result = await db.remove(automationId, rev)
 
diff --git a/packages/server/src/sdk/app/backups/imports.ts b/packages/server/src/sdk/app/backups/imports.ts
index 3ec0e8833b..85f5b030bd 100644
--- a/packages/server/src/sdk/app/backups/imports.ts
+++ b/packages/server/src/sdk/app/backups/imports.ts
@@ -187,6 +187,20 @@ export async function importApp(
       await decryptFiles(tmpPath, template.file.password)
     }
     const contents = await fsp.readdir(tmpPath)
+    const stillEncrypted = !!contents.find(name => name.endsWith(".enc"))
+    if (stillEncrypted) {
+      throw new Error("Files are encrypted but no password has been supplied.")
+    }
+    const isPlugin = !!contents.find(name => name === "plugin.min.js")
+    if (isPlugin) {
+      throw new Error("Supplied file is a plugin - cannot import as app.")
+    }
+    const isInvalid = !contents.find(name => name === DB_EXPORT_FILE)
+    if (isInvalid) {
+      throw new Error(
+        "App export does not appear to be valid - no DB file found."
+      )
+    }
     // have to handle object import
     if (contents.length && opts.importObjStoreContents) {
       let promises = []
diff --git a/packages/server/src/sdk/app/permissions/index.ts b/packages/server/src/sdk/app/permissions/index.ts
index 7c385864f4..6e912a0235 100644
--- a/packages/server/src/sdk/app/permissions/index.ts
+++ b/packages/server/src/sdk/app/permissions/index.ts
@@ -104,8 +104,6 @@ export async function getDependantResources(
       return p
     }, {} as Record<string, number>)
   }
-
-  return
 }
 
 export async function updatePermissionOnRole(
diff --git a/packages/server/src/sdk/app/rows/search/internal/sqs.ts b/packages/server/src/sdk/app/rows/search/internal/sqs.ts
index a160bfbb3e..84162a67af 100644
--- a/packages/server/src/sdk/app/rows/search/internal/sqs.ts
+++ b/packages/server/src/sdk/app/rows/search/internal/sqs.ts
@@ -1,8 +1,8 @@
 import {
   Aggregation,
   CalculationType,
-  Datasource,
   DocumentType,
+  EnrichedQueryJson,
   FieldType,
   isLogicalSearchOperator,
   Operation,
@@ -38,7 +38,7 @@ import { generateJunctionTableID } from "../../../../../db/utils"
 import AliasTables from "../../sqlAlias"
 import { outputProcessing } from "../../../../../utilities/rowProcessor"
 import pick from "lodash/pick"
-import { processRowCountResponse } from "../../utils"
+import { enrichQueryJson, processRowCountResponse } from "../../utils"
 import {
   dataFilters,
   helpers,
@@ -55,32 +55,44 @@ const MISSING_COLUMN_REGEX = new RegExp(`no such column: .+`)
 const MISSING_TABLE_REGX = new RegExp(`no such table: .+`)
 const DUPLICATE_COLUMN_REGEX = new RegExp(`duplicate column name: .+`)
 
-async function buildInternalFieldList(
+export async function buildInternalFieldList(
   source: Table | ViewV2,
   tables: Table[],
-  opts?: { relationships?: RelationshipsJson[]; allowedFields?: string[] }
+  opts?: {
+    relationships?: RelationshipsJson[]
+    allowedFields?: string[]
+    includeHiddenFields?: boolean
+  }
 ) {
-  const { relationships, allowedFields } = opts || {}
+  const { relationships, allowedFields, includeHiddenFields } = opts || {}
   let schemaFields: string[] = []
-  if (sdk.views.isView(source)) {
-    schemaFields = Object.keys(helpers.views.basicFields(source))
-  } else {
-    schemaFields = Object.keys(source.schema).filter(
-      key => source.schema[key].visible !== false
-    )
-  }
-
-  if (allowedFields) {
-    schemaFields = schemaFields.filter(field => allowedFields.includes(field))
-  }
 
+  const isView = sdk.views.isView(source)
   let table: Table
-  if (sdk.views.isView(source)) {
+  if (isView) {
     table = await sdk.views.getTable(source.id)
   } else {
     table = source
   }
 
+  if (isView) {
+    schemaFields = Object.keys(helpers.views.basicFields(source))
+  } else {
+    schemaFields = Object.keys(source.schema).filter(
+      key => includeHiddenFields || source.schema[key].visible !== false
+    )
+  }
+
+  const containsFormula = schemaFields.some(
+    f => table.schema[f]?.type === FieldType.FORMULA
+  )
+  // If are requesting for a formula field, we need to retrieve all fields
+  if (containsFormula) {
+    schemaFields = Object.keys(table.schema)
+  } else if (allowedFields) {
+    schemaFields = schemaFields.filter(field => allowedFields.includes(field))
+  }
+
   let fieldList: string[] = []
   const getJunctionFields = (relatedTable: Table, fields: string[]) => {
     const junctionFields: string[] = []
@@ -101,10 +113,12 @@ async function buildInternalFieldList(
   }
   for (let key of schemaFields) {
     const col = table.schema[key]
+
     const isRelationship = col.type === FieldType.LINK
     if (!relationships && isRelationship) {
       continue
     }
+
     if (!isRelationship) {
       fieldList.push(`${table._id}.${mapToUserColumn(key)}`)
     } else {
@@ -113,8 +127,17 @@ async function buildInternalFieldList(
       if (!relatedTable) {
         continue
       }
+
+      // a quirk of how junction documents work in Budibase, refer to the "LinkDocument" type to see the full
+      // structure - essentially all relationships between two tables will be inserted into a single "table"
+      // we don't use an independent junction table ID for each separate relationship between two tables. For
+      // example if we have table A and B, with two relationships between them, all the junction documents will
+      // end up in the same junction table ID. We need to retrieve the field name property of the junction documents
+      // as part of the relationship to tell us which relationship column the junction is related to.
       const relatedFields = (
-        await buildInternalFieldList(relatedTable, tables)
+        await buildInternalFieldList(relatedTable, tables, {
+          includeHiddenFields: containsFormula,
+        })
       ).concat(
         getJunctionFields(relatedTable, ["doc1.fieldName", "doc2.fieldName"])
       )
@@ -125,6 +148,13 @@ async function buildInternalFieldList(
       fieldList = fieldList.concat(relatedFields)
     }
   }
+
+  if (!isView || !helpers.views.isCalculationView(source)) {
+    for (const field of PROTECTED_INTERNAL_COLUMNS) {
+      fieldList.push(`${table._id}.${field}`)
+    }
+  }
+
   return [...new Set(fieldList)]
 }
 
@@ -180,19 +210,6 @@ function cleanupFilters(filters: SearchFilters, allTables: Table[]) {
   return filters
 }
 
-function buildTableMap(tables: Table[]) {
-  const tableMap: Record<string, Table> = {}
-  for (let table of tables) {
-    // update the table name, should never query by name for SQLite
-    table.originalName = table.name
-    table.name = table._id!
-    // need a primary for sorting, lookups etc
-    table.primary = ["_id"]
-    tableMap[table._id!] = table
-  }
-  return tableMap
-}
-
 // table is only needed to handle relationships
 function reverseUserColumnMapping(rows: Row[], table?: Table) {
   const prefixLength = USER_COLUMN_PREFIX.length
@@ -223,30 +240,30 @@ function reverseUserColumnMapping(rows: Row[], table?: Table) {
 }
 
 function runSqlQuery(
-  json: QueryJson,
+  json: EnrichedQueryJson,
   tables: Table[],
   relationships: RelationshipsJson[]
 ): Promise<Row[]>
 function runSqlQuery(
-  json: QueryJson,
+  json: EnrichedQueryJson,
   tables: Table[],
   relationships: RelationshipsJson[],
   opts: { countTotalRows: true }
 ): Promise<number>
 async function runSqlQuery(
-  json: QueryJson,
+  json: EnrichedQueryJson,
   tables: Table[],
   relationships: RelationshipsJson[],
   opts?: { countTotalRows?: boolean }
 ) {
   const relationshipJunctionTableIds = relationships.map(rel => rel.through!)
   const alias = new AliasTables(
-    tables.map(table => table.name).concat(relationshipJunctionTableIds)
+    tables.map(table => table._id!).concat(relationshipJunctionTableIds)
   )
   if (opts?.countTotalRows) {
-    json.endpoint.operation = Operation.COUNT
+    json.operation = Operation.COUNT
   }
-  const processSQLQuery = async (_: Datasource, json: QueryJson) => {
+  const processSQLQuery = async (json: EnrichedQueryJson) => {
     const query = builder._query(json, {
       disableReturning: true,
     })
@@ -281,7 +298,7 @@ async function runSqlQuery(
   if (opts?.countTotalRows) {
     return processRowCountResponse(response)
   } else if (Array.isArray(response)) {
-    return reverseUserColumnMapping(response, json.meta.table)
+    return reverseUserColumnMapping(response, json.table)
   }
   return response
 }
@@ -315,7 +332,11 @@ export async function search(
   }
 
   const allTables = await sdk.tables.getAllInternalTables()
-  const allTablesMap = buildTableMap(allTables)
+  const allTablesMap = allTables.reduce((acc, table) => {
+    acc[table._id!] = table
+    return acc
+  }, {} as Record<string, Table>)
+
   // make sure we have the mapped/latest table
   if (table._id) {
     table = allTablesMap[table._id]
@@ -332,8 +353,9 @@ export async function search(
   }
 
   let aggregations: Aggregation[] = []
-  if (sdk.views.isView(source)) {
+  if (sdk.views.isView(source) && helpers.views.isCalculationView(source)) {
     const calculationFields = helpers.views.calculationFields(source)
+
     for (const [key, field] of Object.entries(calculationFields)) {
       if (options.fields && !options.fields.includes(key)) {
         continue
@@ -372,10 +394,7 @@ export async function search(
       operation: Operation.READ,
     },
     filters: searchFilters,
-    table,
     meta: {
-      table,
-      tables: allTablesMap,
       columnPrefix: USER_COLUMN_PREFIX,
     },
     resource: {
@@ -427,11 +446,13 @@ export async function search(
     }
   }
 
+  const enrichedRequest = await enrichQueryJson(request)
+
   try {
     const [rows, totalRows] = await Promise.all([
-      runSqlQuery(request, allTables, relationships),
+      runSqlQuery(enrichedRequest, allTables, relationships),
       options.countRows
-        ? runSqlQuery(request, allTables, relationships, {
+        ? runSqlQuery(enrichedRequest, allTables, relationships, {
             countTotalRows: true,
           })
         : Promise.resolve(undefined),
@@ -447,7 +468,7 @@ export async function search(
     )
 
     // check for pagination final row
-    let nextRow: boolean = false
+    let nextRow = false
     if (paginate && params.limit && rows.length > params.limit) {
       // remove the extra row that confirmed if there is another row to move to
       nextRow = true
diff --git a/packages/server/src/sdk/app/rows/search/internal/test/sqs.spec.ts b/packages/server/src/sdk/app/rows/search/internal/test/sqs.spec.ts
new file mode 100644
index 0000000000..91674089dc
--- /dev/null
+++ b/packages/server/src/sdk/app/rows/search/internal/test/sqs.spec.ts
@@ -0,0 +1,618 @@
+import {
+  AIOperationEnum,
+  CalculationType,
+  FieldType,
+  RelationshipType,
+  SourceName,
+  Table,
+  ViewV2,
+  ViewV2Type,
+} from "@budibase/types"
+import { buildInternalFieldList } from "../sqs"
+import { structures } from "../../../../../../api/routes/tests/utilities"
+import { sql } from "@budibase/backend-core"
+import { generator } from "@budibase/backend-core/tests"
+import {
+  generateJunctionTableID,
+  generateViewID,
+} from "../../../../../../db/utils"
+
+import sdk from "../../../../../../sdk"
+import { cloneDeep } from "lodash"
+import { utils } from "@budibase/shared-core"
+
+jest.mock("../../../../../../sdk/app/views", () => ({
+  ...jest.requireActual("../../../../../../sdk/app/views"),
+  getTable: jest.fn(),
+}))
+const getTableMock = sdk.views.getTable as jest.MockedFunction<
+  typeof sdk.views.getTable
+>
+
+describe("buildInternalFieldList", () => {
+  let allTables: Table[]
+
+  class TableConfig {
+    private _table: Table & { _id: string }
+
+    constructor() {
+      const name = generator.word()
+      this._table = {
+        ...structures.tableForDatasource({
+          type: "datasource",
+          source: SourceName.POSTGRES,
+        }),
+        name,
+        _id: sql.utils.buildExternalTableId("ds_id", name),
+        schema: {
+          name: {
+            name: "name",
+            type: FieldType.STRING,
+          },
+          description: {
+            name: "description",
+            type: FieldType.STRING,
+          },
+          amount: {
+            name: "amount",
+            type: FieldType.NUMBER,
+          },
+        },
+      }
+
+      allTables.push(this._table)
+    }
+
+    withHiddenField(field: string) {
+      this._table.schema[field].visible = false
+      return this
+    }
+
+    withField(
+      name: string,
+      type:
+        | FieldType.STRING
+        | FieldType.NUMBER
+        | FieldType.FORMULA
+        | FieldType.AI,
+      options?: { visible: boolean }
+    ) {
+      switch (type) {
+        case FieldType.NUMBER:
+        case FieldType.STRING:
+          this._table.schema[name] = {
+            name,
+            type,
+            ...options,
+          }
+          break
+        case FieldType.FORMULA:
+          this._table.schema[name] = {
+            name,
+            type,
+            formula: "any",
+            ...options,
+          }
+          break
+        case FieldType.AI:
+          this._table.schema[name] = {
+            name,
+            type,
+            operation: AIOperationEnum.PROMPT,
+            ...options,
+          }
+          break
+        default:
+          utils.unreachable(type)
+      }
+      return this
+    }
+
+    withRelation(name: string, toTableId: string) {
+      this._table.schema[name] = {
+        name,
+        type: FieldType.LINK,
+        relationshipType: RelationshipType.ONE_TO_MANY,
+        fieldName: "link",
+        tableId: toTableId,
+      }
+      return this
+    }
+
+    withEmptySchema() {
+      this._table.schema = {}
+      return this
+    }
+
+    create() {
+      return cloneDeep(this._table)
+    }
+  }
+
+  class ViewConfig {
+    private _table: Table
+    private _view: ViewV2
+
+    constructor(table: Table) {
+      this._table = table
+      this._view = {
+        version: 2,
+        id: generateViewID(table._id!),
+        name: generator.word(),
+        tableId: table._id!,
+      }
+    }
+
+    withVisible(field: string) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].visible = true
+      return this
+    }
+
+    withHidden(field: string) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].visible = false
+      return this
+    }
+
+    withRelationshipColumns(
+      field: string,
+      columns: Record<string, { visible: boolean }>
+    ) {
+      this._view.schema ??= {}
+      this._view.schema[field] ??= {}
+      this._view.schema[field].columns = columns
+      return this
+    }
+
+    withCalculation(
+      name: string,
+      field: string,
+      calculationType: CalculationType
+    ) {
+      this._view.type = ViewV2Type.CALCULATION
+      this._view.schema ??= {}
+      this._view.schema[name] = {
+        field,
+        calculationType,
+        visible: true,
+      }
+      return this
+    }
+
+    create() {
+      getTableMock.mockResolvedValueOnce(this._table)
+      return cloneDeep(this._view)
+    }
+  }
+
+  beforeEach(() => {
+    jest.clearAllMocks()
+    allTables = []
+  })
+
+  describe("table", () => {
+    it("includes internal columns by default", async () => {
+      const table = new TableConfig().withEmptySchema().create()
+      const result = await buildInternalFieldList(table, [])
+      expect(result).toEqual([
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("extracts fields from table schema", async () => {
+      const table = new TableConfig().create()
+      const result = await buildInternalFieldList(table, [])
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_description`,
+        `${table._id}.data_amount`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("excludes hidden fields", async () => {
+      const table = new TableConfig().withHiddenField("description").create()
+      const result = await buildInternalFieldList(table, [])
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_amount`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("includes hidden fields if there is a formula column", async () => {
+      const table = new TableConfig()
+        .withHiddenField("description")
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const result = await buildInternalFieldList(table, [])
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_description`,
+        `${table._id}.data_amount`,
+        `${table._id}.data_formula`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("includes relationships fields when flagged", async () => {
+      const otherTable = new TableConfig()
+        .withHiddenField("description")
+        .create()
+
+      const table = new TableConfig()
+        .withHiddenField("amount")
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+
+      const result = await buildInternalFieldList(table, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_description`,
+        `${otherTable._id}.data_name`,
+        `${otherTable._id}.data_amount`,
+        `${otherTable._id}._id`,
+        `${otherTable._id}._rev`,
+        `${otherTable._id}.type`,
+        `${otherTable._id}.createdAt`,
+        `${otherTable._id}.updatedAt`,
+        `${otherTable._id}.tableId`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc1.fieldName`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc2.fieldName`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("includes all relationship fields if there is a formula column", async () => {
+      const otherTable = new TableConfig()
+        .withField("hidden", FieldType.STRING, { visible: false })
+        .create()
+
+      const table = new TableConfig()
+        .withRelation("link", otherTable._id)
+        .withHiddenField("description")
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+      const result = await buildInternalFieldList(table, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_description`,
+        `${table._id}.data_amount`,
+        `${otherTable._id}.data_name`,
+        `${otherTable._id}.data_description`,
+        `${otherTable._id}.data_amount`,
+        `${otherTable._id}.data_hidden`,
+        `${otherTable._id}._id`,
+        `${otherTable._id}._rev`,
+        `${otherTable._id}.type`,
+        `${otherTable._id}.createdAt`,
+        `${otherTable._id}.updatedAt`,
+        `${otherTable._id}.tableId`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc1.fieldName`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc2.fieldName`,
+        `${table._id}.data_formula`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+  })
+
+  describe("view", () => {
+    it("includes internal columns by default", async () => {
+      const view = new ViewConfig(new TableConfig().create()).create()
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([
+        `${view.tableId}._id`,
+        `${view.tableId}._rev`,
+        `${view.tableId}.type`,
+        `${view.tableId}.createdAt`,
+        `${view.tableId}.updatedAt`,
+        `${view.tableId}.tableId`,
+      ])
+    })
+
+    it("extracts fields from table schema", async () => {
+      const view = new ViewConfig(new TableConfig().create())
+        .withVisible("amount")
+        .withHidden("name")
+        .create()
+
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([
+        `${view.tableId}.data_amount`,
+        `${view.tableId}._id`,
+        `${view.tableId}._rev`,
+        `${view.tableId}.type`,
+        `${view.tableId}.createdAt`,
+        `${view.tableId}.updatedAt`,
+        `${view.tableId}.tableId`,
+      ])
+    })
+
+    it("includes all fields if there is a formula column", async () => {
+      const table = new TableConfig()
+        .withField("formula", FieldType.FORMULA)
+        .create()
+      const view = new ViewConfig(table)
+        .withHidden("name")
+        .withVisible("amount")
+        .withVisible("formula")
+        .create()
+
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([
+        `${view.tableId}.data_name`,
+        `${view.tableId}.data_description`,
+        `${view.tableId}.data_amount`,
+        `${view.tableId}.data_formula`,
+        `${view.tableId}._id`,
+        `${view.tableId}._rev`,
+        `${view.tableId}.type`,
+        `${view.tableId}.createdAt`,
+        `${view.tableId}.updatedAt`,
+        `${view.tableId}.tableId`,
+      ])
+    })
+
+    it("does not includes all fields if the formula column is not included", async () => {
+      const table = new TableConfig()
+        .withField("formula", FieldType.FORMULA)
+        .create()
+      const view = new ViewConfig(table)
+        .withHidden("name")
+        .withVisible("amount")
+        .withHidden("formula")
+        .create()
+
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([
+        `${view.tableId}.data_amount`,
+        `${view.tableId}._id`,
+        `${view.tableId}._rev`,
+        `${view.tableId}.type`,
+        `${view.tableId}.createdAt`,
+        `${view.tableId}.updatedAt`,
+        `${view.tableId}.tableId`,
+      ])
+    })
+
+    it("includes relationships fields", async () => {
+      const otherTable = new TableConfig().create()
+
+      const table = new TableConfig()
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withVisible("link")
+        .withHidden("amount")
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+      const result = await buildInternalFieldList(view, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${otherTable._id}.data_name`,
+        `${otherTable._id}.data_description`,
+        `${otherTable._id}.data_amount`,
+        `${otherTable._id}._id`,
+        `${otherTable._id}._rev`,
+        `${otherTable._id}.type`,
+        `${otherTable._id}.createdAt`,
+        `${otherTable._id}.updatedAt`,
+        `${otherTable._id}.tableId`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc1.fieldName`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc2.fieldName`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("includes relationships columns", async () => {
+      const otherTable = new TableConfig()
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const table = new TableConfig()
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withVisible("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+      const result = await buildInternalFieldList(view, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${otherTable._id}.data_name`,
+        `${otherTable._id}.data_description`,
+        `${otherTable._id}.data_amount`,
+        `${otherTable._id}.data_formula`,
+        `${otherTable._id}._id`,
+        `${otherTable._id}._rev`,
+        `${otherTable._id}.type`,
+        `${otherTable._id}.createdAt`,
+        `${otherTable._id}.updatedAt`,
+        `${otherTable._id}.tableId`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc1.fieldName`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc2.fieldName`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("does not include relationships columns for hidden links", async () => {
+      const otherTable = new TableConfig()
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const table = new TableConfig()
+        .withRelation("link", otherTable._id)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withHidden("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+      const result = await buildInternalFieldList(view, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+
+    it("includes all relationship fields if there is a formula column", async () => {
+      const otherTable = new TableConfig()
+        .withField("hidden", FieldType.STRING, { visible: false })
+        .withField("formula", FieldType.FORMULA)
+        .withField("ai", FieldType.AI)
+        .withRelation("link", "otherTableId")
+        .create()
+
+      const table = new TableConfig()
+        .withRelation("link", otherTable._id)
+        .withField("formula", FieldType.FORMULA)
+        .create()
+
+      const view = new ViewConfig(table)
+        .withVisible("name")
+        .withVisible("formula")
+        .withHidden("link")
+        .withRelationshipColumns("link", {
+          name: { visible: false },
+          amount: { visible: true },
+          formula: { visible: false },
+        })
+        .create()
+
+      const relationships = [{ tableName: otherTable.name, column: "link" }]
+      const result = await buildInternalFieldList(view, allTables, {
+        relationships,
+      })
+      expect(result).toEqual([
+        `${table._id}.data_name`,
+        `${table._id}.data_description`,
+        `${table._id}.data_amount`,
+        `${otherTable._id}.data_name`,
+        `${otherTable._id}.data_description`,
+        `${otherTable._id}.data_amount`,
+        `${otherTable._id}.data_hidden`,
+        `${otherTable._id}.data_formula`,
+        `${otherTable._id}.data_ai`,
+        `${otherTable._id}._id`,
+        `${otherTable._id}._rev`,
+        `${otherTable._id}.type`,
+        `${otherTable._id}.createdAt`,
+        `${otherTable._id}.updatedAt`,
+        `${otherTable._id}.tableId`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc1.fieldName`,
+        `${generateJunctionTableID(table._id, otherTable._id)}.doc2.fieldName`,
+        `${table._id}.data_formula`,
+        `${table._id}._id`,
+        `${table._id}._rev`,
+        `${table._id}.type`,
+        `${table._id}.createdAt`,
+        `${table._id}.updatedAt`,
+        `${table._id}.tableId`,
+      ])
+    })
+  })
+
+  describe("calculation view", () => {
+    it("does not include calculation fields", async () => {
+      const view = new ViewConfig(new TableConfig().create())
+        .withCalculation("average", "amount", CalculationType.AVG)
+        .create()
+
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([])
+    })
+
+    it("includes visible fields calculation fields", async () => {
+      const view = new ViewConfig(new TableConfig().create())
+        .withCalculation("average", "amount", CalculationType.AVG)
+        .withHidden("name")
+        .withVisible("amount")
+        .create()
+
+      const result = await buildInternalFieldList(view, [])
+      expect(result).toEqual([`${view.tableId}.data_amount`])
+    })
+  })
+})
diff --git a/packages/server/src/sdk/app/rows/search/tests/search.spec.ts b/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
index 78e5ffa30b..b424c3707d 100644
--- a/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
+++ b/packages/server/src/sdk/app/rows/search/tests/search.spec.ts
@@ -19,202 +19,206 @@ import { tableForDatasource } from "../../../../../tests/utilities/structures"
 // These test cases are only for things that cannot be tested through the API
 // (e.g. limiting searches to returning specific fields). If it's possible to
 // test through the API, it should be done there instead.
-datasourceDescribe(
-  { name: "search sdk (%s)", exclude: [DatabaseName.MONGODB] },
-  ({ config, dsProvider, isInternal }) => {
-    let datasource: Datasource | undefined
-    let table: Table
+const descriptions = datasourceDescribe({ exclude: [DatabaseName.MONGODB] })
 
-    beforeAll(async () => {
-      const ds = await dsProvider()
-      datasource = ds.datasource
-    })
+if (descriptions.length) {
+  describe.each(descriptions)(
+    "search sdk ($dbName)",
+    ({ config, dsProvider, isInternal }) => {
+      let datasource: Datasource | undefined
+      let table: Table
 
-    beforeEach(async () => {
-      const idFieldSchema: NumberFieldMetadata | AutoColumnFieldMetadata =
-        isInternal
-          ? {
-              name: "id",
-              type: FieldType.AUTO,
-              subtype: AutoFieldSubType.AUTO_ID,
-              autocolumn: true,
-            }
-          : {
-              name: "id",
-              type: FieldType.NUMBER,
-              autocolumn: true,
-            }
-
-      table = await config.api.table.save(
-        tableForDatasource(datasource, {
-          primary: ["id"],
-          schema: {
-            id: idFieldSchema,
-            name: {
-              name: "name",
-              type: FieldType.STRING,
-            },
-            surname: {
-              name: "surname",
-              type: FieldType.STRING,
-            },
-            age: {
-              name: "age",
-              type: FieldType.NUMBER,
-            },
-            address: {
-              name: "address",
-              type: FieldType.STRING,
-            },
-          },
-        })
-      )
-
-      for (let i = 0; i < 10; i++) {
-        await config.api.row.save(table._id!, {
-          name: generator.first(),
-          surname: generator.last(),
-          age: generator.age(),
-          address: generator.address(),
-        })
-      }
-    })
-
-    afterAll(async () => {
-      config.end()
-    })
-
-    it("querying by fields will always return data attribute columns", async () => {
-      await config.doInContext(config.appId, async () => {
-        const { rows } = await search({
-          tableId: table._id!,
-          query: {},
-          fields: ["name", "age"],
-        })
-
-        expect(rows).toHaveLength(10)
-        for (const row of rows) {
-          const keys = Object.keys(row)
-          expect(keys).toContain("name")
-          expect(keys).toContain("age")
-          expect(keys).not.toContain("surname")
-          expect(keys).not.toContain("address")
-        }
+      beforeAll(async () => {
+        const ds = await dsProvider()
+        datasource = ds.datasource
       })
-    })
 
-    !isInternal &&
-      it("will decode _id in oneOf query", async () => {
-        await config.doInContext(config.appId, async () => {
-          const result = await search({
-            tableId: table._id!,
-            query: {
-              oneOf: {
-                _id: ["%5B1%5D", "%5B4%5D", "%5B8%5D"],
+      beforeEach(async () => {
+        const idFieldSchema: NumberFieldMetadata | AutoColumnFieldMetadata =
+          isInternal
+            ? {
+                name: "id",
+                type: FieldType.AUTO,
+                subtype: AutoFieldSubType.AUTO_ID,
+                autocolumn: true,
+              }
+            : {
+                name: "id",
+                type: FieldType.NUMBER,
+                autocolumn: true,
+              }
+
+        table = await config.api.table.save(
+          tableForDatasource(datasource, {
+            primary: ["id"],
+            schema: {
+              id: idFieldSchema,
+              name: {
+                name: "name",
+                type: FieldType.STRING,
+              },
+              surname: {
+                name: "surname",
+                type: FieldType.STRING,
+              },
+              age: {
+                name: "age",
+                type: FieldType.NUMBER,
+              },
+              address: {
+                name: "address",
+                type: FieldType.STRING,
               },
             },
           })
+        )
 
-          expect(result.rows).toHaveLength(3)
-          expect(result.rows.map(row => row.id)).toEqual(
-            expect.arrayContaining([1, 4, 8])
-          )
-        })
-      })
-
-    it("does not allow accessing hidden fields", async () => {
-      await config.doInContext(config.appId, async () => {
-        await config.api.table.save({
-          ...table,
-          schema: {
-            ...table.schema,
-            name: {
-              ...table.schema.name,
-              visible: true,
-            },
-            age: {
-              ...table.schema.age,
-              visible: false,
-            },
-          },
-        })
-        const result = await search({
-          tableId: table._id!,
-          query: {},
-        })
-        expect(result.rows).toHaveLength(10)
-        for (const row of result.rows) {
-          const keys = Object.keys(row)
-          expect(keys).toContain("name")
-          expect(keys).toContain("surname")
-          expect(keys).toContain("address")
-          expect(keys).not.toContain("age")
+        for (let i = 0; i < 10; i++) {
+          await config.api.row.save(table._id!, {
+            name: generator.first(),
+            surname: generator.last(),
+            age: generator.age(),
+            address: generator.address(),
+          })
         }
       })
-    })
 
-    it("does not allow accessing hidden fields even if requested", async () => {
-      await config.doInContext(config.appId, async () => {
-        await config.api.table.save({
-          ...table,
-          schema: {
-            ...table.schema,
-            name: {
-              ...table.schema.name,
-              visible: true,
-            },
-            age: {
-              ...table.schema.age,
-              visible: false,
-            },
-          },
-        })
-        const result = await search({
-          tableId: table._id!,
-          query: {},
-          fields: ["name", "age"],
-        })
-        expect(result.rows).toHaveLength(10)
-        for (const row of result.rows) {
-          const keys = Object.keys(row)
-          expect(keys).toContain("name")
-          expect(keys).not.toContain("age")
-          expect(keys).not.toContain("surname")
-          expect(keys).not.toContain("address")
-        }
+      afterAll(async () => {
+        config.end()
       })
-    })
 
-    it.each([
-      [["id", "name", "age"], 3],
-      [["name", "age"], 10],
-    ])(
-      "cannot query by non search fields (fields: %s)",
-      async (queryFields, expectedRows) => {
+      it("querying by fields will always return data attribute columns", async () => {
         await config.doInContext(config.appId, async () => {
           const { rows } = await search({
             tableId: table._id!,
-            query: {
-              $or: {
-                conditions: [
-                  {
-                    $and: {
-                      conditions: [
-                        { range: { id: { low: 2, high: 4 } } },
-                        { range: { id: { low: 3, high: 5 } } },
-                      ],
-                    },
-                  },
-                  { equal: { id: 7 } },
-                ],
-              },
-            },
-            fields: queryFields,
+            query: {},
+            fields: ["name", "age"],
           })
 
-          expect(rows).toHaveLength(expectedRows)
+          expect(rows).toHaveLength(10)
+          for (const row of rows) {
+            const keys = Object.keys(row)
+            expect(keys).toContain("name")
+            expect(keys).toContain("age")
+            expect(keys).not.toContain("surname")
+            expect(keys).not.toContain("address")
+          }
         })
-      }
-    )
-  }
-)
+      })
+
+      !isInternal &&
+        it("will decode _id in oneOf query", async () => {
+          await config.doInContext(config.appId, async () => {
+            const result = await search({
+              tableId: table._id!,
+              query: {
+                oneOf: {
+                  _id: ["%5B1%5D", "%5B4%5D", "%5B8%5D"],
+                },
+              },
+            })
+
+            expect(result.rows).toHaveLength(3)
+            expect(result.rows.map(row => row.id)).toEqual(
+              expect.arrayContaining([1, 4, 8])
+            )
+          })
+        })
+
+      it("does not allow accessing hidden fields", async () => {
+        await config.doInContext(config.appId, async () => {
+          await config.api.table.save({
+            ...table,
+            schema: {
+              ...table.schema,
+              name: {
+                ...table.schema.name,
+                visible: true,
+              },
+              age: {
+                ...table.schema.age,
+                visible: false,
+              },
+            },
+          })
+          const result = await search({
+            tableId: table._id!,
+            query: {},
+          })
+          expect(result.rows).toHaveLength(10)
+          for (const row of result.rows) {
+            const keys = Object.keys(row)
+            expect(keys).toContain("name")
+            expect(keys).toContain("surname")
+            expect(keys).toContain("address")
+            expect(keys).not.toContain("age")
+          }
+        })
+      })
+
+      it("does not allow accessing hidden fields even if requested", async () => {
+        await config.doInContext(config.appId, async () => {
+          await config.api.table.save({
+            ...table,
+            schema: {
+              ...table.schema,
+              name: {
+                ...table.schema.name,
+                visible: true,
+              },
+              age: {
+                ...table.schema.age,
+                visible: false,
+              },
+            },
+          })
+          const result = await search({
+            tableId: table._id!,
+            query: {},
+            fields: ["name", "age"],
+          })
+          expect(result.rows).toHaveLength(10)
+          for (const row of result.rows) {
+            const keys = Object.keys(row)
+            expect(keys).toContain("name")
+            expect(keys).not.toContain("age")
+            expect(keys).not.toContain("surname")
+            expect(keys).not.toContain("address")
+          }
+        })
+      })
+
+      it.each([
+        [["id", "name", "age"], 3],
+        [["name", "age"], 10],
+      ])(
+        "cannot query by non search fields (fields: %s)",
+        async (queryFields, expectedRows) => {
+          await config.doInContext(config.appId, async () => {
+            const { rows } = await search({
+              tableId: table._id!,
+              query: {
+                $or: {
+                  conditions: [
+                    {
+                      $and: {
+                        conditions: [
+                          { range: { id: { low: 2, high: 4 } } },
+                          { range: { id: { low: 3, high: 5 } } },
+                        ],
+                      },
+                    },
+                    { equal: { id: 7 } },
+                  ],
+                },
+              },
+              fields: queryFields,
+            })
+
+            expect(rows).toHaveLength(expectedRows)
+          })
+        }
+      )
+    }
+  )
+}
diff --git a/packages/server/src/sdk/app/rows/sqlAlias.ts b/packages/server/src/sdk/app/rows/sqlAlias.ts
index 535709791d..f3c3edc053 100644
--- a/packages/server/src/sdk/app/rows/sqlAlias.ts
+++ b/packages/server/src/sdk/app/rows/sqlAlias.ts
@@ -1,22 +1,19 @@
 import {
   Datasource,
   DatasourcePlusQueryResponse,
+  EnrichedQueryJson,
   Operation,
-  QueryJson,
   Row,
   SearchFilters,
   SqlClient,
+  Table,
 } from "@budibase/types"
-import { SQS_DATASOURCE_INTERNAL } from "@budibase/backend-core"
 import { getSQLClient } from "./utils"
 import { cloneDeep } from "lodash"
-import datasources from "../datasources"
-import { BudibaseInternalDB } from "../../../db/utils"
 import { dataFilters } from "@budibase/shared-core"
 
 type PerformQueryFunction = (
-  datasource: Datasource,
-  json: QueryJson
+  json: EnrichedQueryJson
 ) => Promise<DatasourcePlusQueryResponse>
 
 const WRITE_OPERATIONS: Operation[] = [
@@ -71,13 +68,12 @@ export default class AliasTables {
     this.charSeq = new CharSequence()
   }
 
-  isAliasingEnabled(json: QueryJson, datasource?: Datasource) {
-    const operation = json.endpoint.operation
+  isAliasingEnabled(json: EnrichedQueryJson, datasource?: Datasource) {
     const fieldLength = json.resource?.fields?.length
     if (
       !fieldLength ||
       fieldLength <= 0 ||
-      DISABLED_OPERATIONS.includes(operation)
+      DISABLED_OPERATIONS.includes(json.operation)
     ) {
       return false
     }
@@ -87,7 +83,7 @@ export default class AliasTables {
     }
     try {
       const sqlClient = getSQLClient(datasource)
-      const isWrite = WRITE_OPERATIONS.includes(operation)
+      const isWrite = WRITE_OPERATIONS.includes(json.operation)
       const isDisabledClient = DISABLED_WRITE_CLIENTS.includes(sqlClient)
       if (isWrite && isDisabledClient) {
         return false
@@ -99,7 +95,11 @@ export default class AliasTables {
     return true
   }
 
-  getAlias(tableName: string) {
+  getAlias(tableName: string | Table) {
+    if (typeof tableName === "object") {
+      tableName = tableName.name
+    }
+
     if (this.aliases[tableName]) {
       return this.aliases[tableName]
     }
@@ -177,17 +177,15 @@ export default class AliasTables {
   }
 
   async queryWithAliasing(
-    json: QueryJson,
+    json: EnrichedQueryJson,
     queryFn: PerformQueryFunction
   ): Promise<DatasourcePlusQueryResponse> {
-    const datasourceId = json.endpoint.datasourceId
-    const isSqs = datasourceId === SQS_DATASOURCE_INTERNAL
-    let aliasingEnabled: boolean, datasource: Datasource
+    const datasource = json.datasource
+    const isSqs = datasource === undefined
+    let aliasingEnabled: boolean
     if (isSqs) {
       aliasingEnabled = this.isAliasingEnabled(json)
-      datasource = BudibaseInternalDB
     } else {
-      datasource = await datasources.get(datasourceId)
       aliasingEnabled = this.isAliasingEnabled(json, datasource)
     }
 
@@ -215,24 +213,23 @@ export default class AliasTables {
         }
         json.filters = aliasFilters(json.filters)
       }
-      if (json.meta?.table) {
-        this.getAlias(json.meta.table.name)
-      }
-      if (json.meta?.tables) {
-        Object.keys(json.meta.tables).forEach(tableName =>
-          this.getAlias(tableName)
-        )
-      }
+
       if (json.relationships) {
         json.relationships = json.relationships.map(relationship => ({
           ...relationship,
           aliases: this.aliasMap([
             relationship.through,
             relationship.tableName,
-            json.endpoint.entityId,
+            json.table.name,
           ]),
         }))
       }
+
+      this.getAlias(json.table)
+      for (const tableName of Object.keys(json.tables)) {
+        this.getAlias(tableName)
+      }
+
       // invert and return
       const invertedTableAliases: Record<string, string> = {}
       for (let [key, value] of Object.entries(this.tableAliases)) {
@@ -241,7 +238,7 @@ export default class AliasTables {
       json.tableAliases = invertedTableAliases
     }
 
-    let response: DatasourcePlusQueryResponse = await queryFn(datasource, json)
+    let response = await queryFn(json)
     if (Array.isArray(response) && aliasingEnabled) {
       return this.reverse(response)
     } else {
diff --git a/packages/server/src/sdk/app/rows/utils.ts b/packages/server/src/sdk/app/rows/utils.ts
index bded6a7a18..c19654d817 100644
--- a/packages/server/src/sdk/app/rows/utils.ts
+++ b/packages/server/src/sdk/app/rows/utils.ts
@@ -14,13 +14,13 @@ import {
   SqlClient,
   ArrayOperator,
   ViewV2,
+  EnrichedQueryJson,
 } from "@budibase/types"
-import { makeExternalQuery } from "../../../integrations/base/query"
 import { Format } from "../../../api/controllers/view/exporters"
 import sdk from "../.."
 import { extractViewInfoFromID, isRelationshipColumn } from "../../../db/utils"
 import { isSQL } from "../../../integrations/utils"
-import { docIds, sql } from "@budibase/backend-core"
+import { docIds, sql, SQS_DATASOURCE_INTERNAL } from "@budibase/backend-core"
 import { getTableFromSource } from "../../../api/controllers/row/utils"
 import env from "../../../environment"
 
@@ -73,18 +73,58 @@ export function processRowCountResponse(
   }
 }
 
-export async function getDatasourceAndQuery(
-  json: QueryJson
-): Promise<DatasourcePlusQueryResponse> {
-  const datasourceId = json.endpoint.datasourceId
-  const datasource = await sdk.datasources.get(datasourceId)
-  const table = datasource.entities?.[json.endpoint.entityId]
-  if (!json.meta && table) {
-    json.meta = {
-      table,
-    }
+function processInternalTables(tables: Table[]) {
+  const tableMap: Record<string, Table> = {}
+  for (let table of tables) {
+    // update the table name, should never query by name for SQLite
+    table.originalName = table.name
+    table.name = table._id!
+    tableMap[table._id!] = table
+  }
+  return tableMap
+}
+
+export async function enrichQueryJson(
+  json: QueryJson
+): Promise<EnrichedQueryJson> {
+  let datasource: Datasource | undefined = undefined
+
+  if (typeof json.endpoint.datasourceId === "string") {
+    if (json.endpoint.datasourceId !== SQS_DATASOURCE_INTERNAL) {
+      datasource = await sdk.datasources.get(json.endpoint.datasourceId, {
+        enriched: true,
+      })
+    }
+  } else {
+    datasource = await sdk.datasources.enrich(json.endpoint.datasourceId)
+  }
+
+  let tables: Record<string, Table>
+  if (datasource) {
+    tables = datasource.entities || {}
+  } else {
+    tables = processInternalTables(await sdk.tables.getAllInternalTables())
+  }
+
+  let table: Table
+  if (typeof json.endpoint.entityId === "string") {
+    let entityId = json.endpoint.entityId
+    if (docIds.isDatasourceId(entityId)) {
+      entityId = sql.utils.breakExternalTableId(entityId).tableName
+    }
+    table = tables[entityId]
+  } else {
+    table = json.endpoint.entityId
+  }
+
+  return {
+    operation: json.endpoint.operation,
+    table,
+    tables,
+    datasource,
+    schema: json.endpoint.schema,
+    ...json,
   }
-  return makeExternalQuery(datasource, json)
 }
 
 export function cleanExportRows(
diff --git a/packages/server/src/sdk/app/tables/external/index.ts b/packages/server/src/sdk/app/tables/external/index.ts
index 941d193b94..7883a912b5 100644
--- a/packages/server/src/sdk/app/tables/external/index.ts
+++ b/packages/server/src/sdk/app/tables/external/index.ts
@@ -245,7 +245,6 @@ export async function save(
     datasource,
     operation,
     tableToSave,
-    tables,
     oldTable,
     opts?.renaming
   )
@@ -253,7 +252,7 @@ export async function save(
   for (let extraTable of extraTablesToUpdate) {
     const oldExtraTable = oldTables[extraTable.name]
     let op = oldExtraTable ? Operation.UPDATE_TABLE : Operation.CREATE_TABLE
-    await makeTableRequest(datasource, op, extraTable, tables, oldExtraTable)
+    await makeTableRequest(datasource, op, extraTable, oldExtraTable)
   }
 
   // make sure the constrained list, all still exist
@@ -282,7 +281,7 @@ export async function save(
     tableToSave.sql = true
   }
 
-  return { datasource: updatedDatasource, table: tableToSave }
+  return { datasource: updatedDatasource, table: tableToSave, oldTable }
 }
 
 export async function destroy(datasourceId: string, table: Table) {
@@ -292,7 +291,7 @@ export async function destroy(datasourceId: string, table: Table) {
 
   const operation = Operation.DELETE_TABLE
   if (tables) {
-    await makeTableRequest(datasource, operation, table, tables)
+    await makeTableRequest(datasource, operation, table)
     cleanupRelationships(table, tables, { deleting: true })
     delete tables[table.name]
     datasource.entities = tables
diff --git a/packages/server/src/sdk/app/tables/getters.ts b/packages/server/src/sdk/app/tables/getters.ts
index c59298faf1..f32150c63d 100644
--- a/packages/server/src/sdk/app/tables/getters.ts
+++ b/packages/server/src/sdk/app/tables/getters.ts
@@ -9,7 +9,7 @@ import {
   Database,
   INTERNAL_TABLE_SOURCE_ID,
   Table,
-  TableResponse,
+  FindTableResponse,
   TableSourceType,
   TableViewsResponse,
 } from "@budibase/types"
@@ -46,6 +46,7 @@ export async function processTable(table: Table): Promise<Table> {
     const processed: Table = {
       ...table,
       type: "table",
+      primary: ["_id"], // internal tables must always use _id as primary key
       sourceId: table.sourceId || INTERNAL_TABLE_SOURCE_ID,
       sourceType: TableSourceType.INTERNAL,
       sql: true,
@@ -78,8 +79,11 @@ export async function getAllInternalTables(db?: Database): Promise<Table[]> {
 }
 
 async function getAllExternalTables(): Promise<Table[]> {
+  // this is all datasources, we'll need to filter out internal
   const datasources = await sdk.datasources.fetch({ enriched: true })
-  const allEntities = datasources.map(datasource => datasource.entities)
+  const allEntities = datasources
+    .filter(datasource => datasource._id !== INTERNAL_TABLE_SOURCE_ID)
+    .map(datasource => datasource.entities)
   let final: Table[] = []
   for (let entities of allEntities) {
     if (entities) {
@@ -169,7 +173,9 @@ export async function getTables(tableIds: string[]): Promise<Table[]> {
   return await processTables(tables)
 }
 
-export async function enrichViewSchemas(table: Table): Promise<TableResponse> {
+export async function enrichViewSchemas(
+  table: Table
+): Promise<FindTableResponse> {
   const views = []
   for (const view of Object.values(table.views ?? [])) {
     if (sdk.views.isV2(view)) {
diff --git a/packages/server/src/sdk/app/tables/internal/index.ts b/packages/server/src/sdk/app/tables/internal/index.ts
index fbcbed03dc..5b9f346e93 100644
--- a/packages/server/src/sdk/app/tables/internal/index.ts
+++ b/packages/server/src/sdk/app/tables/internal/index.ts
@@ -171,7 +171,7 @@ export async function save(
   }
   // has to run after, make sure it has _id
   await runStaticFormulaChecks(table, { oldTable, deletion: false })
-  return { table }
+  return { table, oldTable }
 }
 
 export async function destroy(table: Table) {
diff --git a/packages/server/src/sdk/app/views/external.ts b/packages/server/src/sdk/app/views/external.ts
index bee153a910..fabee903fe 100644
--- a/packages/server/src/sdk/app/views/external.ts
+++ b/packages/server/src/sdk/app/views/external.ts
@@ -22,7 +22,9 @@ export async function get(viewId: string): Promise<ViewV2> {
   return ensureQueryUISet(found)
 }
 
-export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
+export async function getEnriched(
+  viewId: string
+): Promise<ViewV2Enriched | undefined> {
   const { tableId } = utils.extractViewInfoFromID(viewId)
 
   const { datasourceId, tableName } = breakExternalTableId(tableId)
@@ -32,7 +34,7 @@ export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
   const views = Object.values(table.views!).filter(isV2)
   const found = views.find(v => v.id === viewId)
   if (!found) {
-    throw new Error("No view found")
+    return
   }
   return await enrichSchema(ensureQueryUISet(found), table.schema)
 }
@@ -63,7 +65,7 @@ export async function create(
 export async function update(
   tableId: string,
   view: Readonly<ViewV2>
-): Promise<ViewV2> {
+): Promise<{ view: Readonly<ViewV2>; existingView: ViewV2 }> {
   const db = context.getAppDB()
 
   const { datasourceId, tableName } = breakExternalTableId(tableId)
@@ -87,7 +89,7 @@ export async function update(
   delete views[existingView.name]
   views[view.name] = view
   await db.put(ds)
-  return view
+  return { view, existingView } as { view: ViewV2; existingView: ViewV2 }
 }
 
 export async function remove(viewId: string): Promise<ViewV2> {
diff --git a/packages/server/src/sdk/app/views/index.ts b/packages/server/src/sdk/app/views/index.ts
index 9c111ff079..157e741acd 100644
--- a/packages/server/src/sdk/app/views/index.ts
+++ b/packages/server/src/sdk/app/views/index.ts
@@ -26,6 +26,7 @@ import { isExternalTableID } from "../../../integrations/utils"
 import * as internal from "./internal"
 import * as external from "./external"
 import sdk from "../../../sdk"
+import { ensureQueryUISet } from "./utils"
 
 function pickApi(tableId: any) {
   if (isExternalTableID(tableId)) {
@@ -39,11 +40,31 @@ export async function get(viewId: string): Promise<ViewV2> {
   return pickApi(tableId).get(viewId)
 }
 
-export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
+export async function getEnriched(
+  viewId: string
+): Promise<ViewV2Enriched | undefined> {
   const { tableId } = utils.extractViewInfoFromID(viewId)
   return pickApi(tableId).getEnriched(viewId)
 }
 
+export async function getAllEnriched(): Promise<ViewV2Enriched[]> {
+  const tables = await sdk.tables.getAllTables()
+  let views: ViewV2Enriched[] = []
+  for (let table of tables) {
+    if (!table.views || Object.keys(table.views).length === 0) {
+      continue
+    }
+    const v2Views = Object.values(table.views).filter(isV2)
+    const enrichedViews = await Promise.all(
+      v2Views.map(view =>
+        enrichSchema(ensureQueryUISet(view), table.schema, tables)
+      )
+    )
+    views = views.concat(enrichedViews)
+  }
+  return views
+}
+
 export async function getTable(view: string | ViewV2): Promise<Table> {
   const viewId = typeof view === "string" ? view : view.id
   const cached = context.getTableForView(viewId)
@@ -296,14 +317,17 @@ export async function create(
   return view
 }
 
-export async function update(tableId: string, view: ViewV2): Promise<ViewV2> {
+export async function update(
+  tableId: string,
+  view: ViewV2
+): Promise<{ view: ViewV2; existingView: ViewV2 }> {
   await guardViewSchema(tableId, view)
 
   return pickApi(tableId).update(tableId, view)
 }
 
-export function isV2(view: View | ViewV2): view is ViewV2 {
-  return (view as ViewV2).version === 2
+export function isV2(view: View | ViewV2) {
+  return helpers.views.isV2(view)
 }
 
 export async function remove(viewId: string): Promise<ViewV2> {
@@ -333,13 +357,19 @@ export function allowedFields(
 
 export async function enrichSchema(
   view: ViewV2,
-  tableSchema: TableSchema
+  tableSchema: TableSchema,
+  tables?: Table[]
 ): Promise<ViewV2Enriched> {
   async function populateRelTableSchema(
     tableId: string,
     viewFields: Record<string, RelationSchemaField>
   ) {
-    const relTable = await sdk.tables.getTable(tableId)
+    let relTable = tables
+      ? tables?.find(t => t._id === tableId)
+      : await sdk.tables.getTable(tableId)
+    if (!relTable) {
+      throw new Error("Cannot enrich relationship, table not found")
+    }
     const result: Record<string, ViewV2ColumnEnriched> = {}
     for (const relTableFieldName of Object.keys(relTable.schema)) {
       const relTableField = relTable.schema[relTableFieldName]
@@ -404,6 +434,21 @@ export async function enrichSchema(
       ...tableSchema[key],
       ...ui,
       order: anyViewOrder ? ui?.order ?? undefined : tableSchema[key]?.order,
+      // When this was written, the only column types in FieldSchema to have columns
+      // field were the relationship columns. We blank this out here to make sure it's
+      // not set on non-relationship columns, then below we populate it by calling
+      // populateRelSchema.
+      //
+      // For Budibase 3.0 we introduced the FieldType.AI fields. Some of these fields
+      // have `columns: string[]` and it flew under the radar here because the
+      // AIFieldMetadata type isn't a union on its subtypes, it has a collection of
+      // optional fields. So columns is `columns?: string[]` which allows undefined,
+      // and doesn't fail this type check.
+      //
+      // What this means in practice is when FieldType.AI fields get enriched, we
+      // delete their `columns`. At the time of writing, I don't believe anything in
+      // the frontend depends on this, but it is odd and will probably bite us at
+      // some point.
       columns: undefined,
     }
 
diff --git a/packages/server/src/sdk/app/views/internal.ts b/packages/server/src/sdk/app/views/internal.ts
index 63807bcfd4..9eeebc4cc4 100644
--- a/packages/server/src/sdk/app/views/internal.ts
+++ b/packages/server/src/sdk/app/views/internal.ts
@@ -17,13 +17,15 @@ export async function get(viewId: string): Promise<ViewV2> {
   return ensureQueryUISet(found)
 }
 
-export async function getEnriched(viewId: string): Promise<ViewV2Enriched> {
+export async function getEnriched(
+  viewId: string
+): Promise<ViewV2Enriched | undefined> {
   const { tableId } = utils.extractViewInfoFromID(viewId)
   const table = await sdk.tables.getTable(tableId)
   const views = Object.values(table.views!).filter(isV2)
   const found = views.find(v => v.id === viewId)
   if (!found) {
-    throw new Error("No view found")
+    return
   }
   return await enrichSchema(ensureQueryUISet(found), table.schema)
 }
@@ -54,7 +56,7 @@ export async function create(
 export async function update(
   tableId: string,
   view: Readonly<ViewV2>
-): Promise<ViewV2> {
+): Promise<{ view: ViewV2; existingView: ViewV2 }> {
   const db = context.getAppDB()
   const table = await sdk.tables.getTable(tableId)
   table.views ??= {}
@@ -76,7 +78,7 @@ export async function update(
   delete table.views[existingView.name]
   table.views[view.name] = view
   await db.put(table)
-  return view
+  return { view, existingView } as { view: ViewV2; existingView: ViewV2 }
 }
 
 export async function remove(viewId: string): Promise<ViewV2> {
diff --git a/packages/server/src/sdk/plugins/plugins.ts b/packages/server/src/sdk/plugins/plugins.ts
index f6c26ca339..63f2f22cd9 100644
--- a/packages/server/src/sdk/plugins/plugins.ts
+++ b/packages/server/src/sdk/plugins/plugins.ts
@@ -1,4 +1,4 @@
-import { FileType, Plugin, PluginSource, PluginType } from "@budibase/types"
+import { KoaFile, Plugin, PluginSource, PluginType } from "@budibase/types"
 import {
   db as dbCore,
   objectStore,
@@ -10,7 +10,7 @@ import env from "../../environment"
 import { clientAppSocket } from "../../websockets"
 import { sdk as pro } from "@budibase/pro"
 
-export async function fetch(type?: PluginType) {
+export async function fetch(type?: PluginType): Promise<Plugin[]> {
   const db = tenancy.getGlobalDB()
   const response = await db.allDocs(
     dbCore.getPluginParams(null, {
@@ -26,7 +26,7 @@ export async function fetch(type?: PluginType) {
   }
 }
 
-export async function processUploaded(plugin: FileType, source?: PluginSource) {
+export async function processUploaded(plugin: KoaFile, source?: PluginSource) {
   const { metadata, directory } = await fileUpload(plugin)
   pluginCore.validate(metadata?.schema)
 
diff --git a/packages/server/src/startup/index.ts b/packages/server/src/startup/index.ts
index edca64db7d..54e982ae56 100644
--- a/packages/server/src/startup/index.ts
+++ b/packages/server/src/startup/index.ts
@@ -15,7 +15,6 @@ import { watch } from "../watch"
 import * as automations from "../automations"
 import * as fileSystem from "../utilities/fileSystem"
 import { default as eventEmitter, init as eventInit } from "../events"
-import * as migrations from "../migrations"
 import * as bullboard from "../automations/bullboard"
 import * as appMigrations from "../appMigrations/queue"
 import * as pro from "@budibase/pro"
@@ -106,18 +105,6 @@ export async function startup(
     initialiseWebsockets(app, server)
   }
 
-  // run migrations on startup if not done via http
-  // not recommended in a clustered environment
-  if (!env.HTTP_MIGRATIONS && !env.isTest()) {
-    console.log("Running migrations")
-    try {
-      await migrations.migrate()
-    } catch (e) {
-      logging.logAlert("Error performing migrations. Exiting.", e)
-      shutdown(server)
-    }
-  }
-
   // monitor plugin directory if required
   if (
     env.SELF_HOSTED &&
diff --git a/packages/server/src/startup/tests/startup.spec.ts b/packages/server/src/startup/tests/startup.spec.ts
index 7209033db8..ffc29655e1 100644
--- a/packages/server/src/startup/tests/startup.spec.ts
+++ b/packages/server/src/startup/tests/startup.spec.ts
@@ -47,7 +47,7 @@ describe("check BB_ADMIN environment variables", () => {
               })
               expect(user).toBeDefined()
               expect(user?.password).toBeDefined()
-              expect(await utils.compare(PASSWORD, user?.password!)).toEqual(
+              expect(await utils.compare(PASSWORD, user!.password!)).toEqual(
                 true
               )
             }
diff --git a/packages/server/src/tests/utilities/TestConfiguration.ts b/packages/server/src/tests/utilities/TestConfiguration.ts
index abecf6df44..2d36e7855b 100644
--- a/packages/server/src/tests/utilities/TestConfiguration.ts
+++ b/packages/server/src/tests/utilities/TestConfiguration.ts
@@ -621,7 +621,7 @@ export default class TestConfiguration {
   }
 
   async unpublish() {
-    const response = await this._req(appController.unpublish, {
+    const response = await this._req(appController.unpublish, undefined, {
       appId: this.appId,
     })
     this.prodAppId = undefined
diff --git a/packages/server/src/tests/utilities/api/application.ts b/packages/server/src/tests/utilities/api/application.ts
index 9dabc8cfe8..1fe9840c1d 100644
--- a/packages/server/src/tests/utilities/api/application.ts
+++ b/packages/server/src/tests/utilities/api/application.ts
@@ -48,7 +48,7 @@ export class ApplicationAPI extends TestAPI {
 
   unpublish = async (appId: string): Promise<void> => {
     await this._post(`/api/applications/${appId}/unpublish`, {
-      expectations: { status: 204 },
+      expectations: { status: 200 },
     })
   }
 
diff --git a/packages/server/src/tests/utilities/api/automation.ts b/packages/server/src/tests/utilities/api/automation.ts
index 9d9a27e891..3f51385251 100644
--- a/packages/server/src/tests/utilities/api/automation.ts
+++ b/packages/server/src/tests/utilities/api/automation.ts
@@ -1,4 +1,9 @@
-import { Automation, FetchAutomationResponse } from "@budibase/types"
+import {
+  Automation,
+  FetchAutomationResponse,
+  TestAutomationRequest,
+  TestAutomationResponse,
+} from "@budibase/types"
 import { Expectations, TestAPI } from "./base"
 
 export class AutomationAPI extends TestAPI {
@@ -33,4 +38,18 @@ export class AutomationAPI extends TestAPI {
     })
     return result
   }
+
+  test = async (
+    id: string,
+    body: TestAutomationRequest,
+    expectations?: Expectations
+  ): Promise<TestAutomationResponse> => {
+    return await this._post<TestAutomationResponse>(
+      `/api/automations/${id}/test`,
+      {
+        body,
+        expectations,
+      }
+    )
+  }
 }
diff --git a/packages/server/src/tests/utilities/api/datasource.ts b/packages/server/src/tests/utilities/api/datasource.ts
index 67484a688a..be4e6d2de2 100644
--- a/packages/server/src/tests/utilities/api/datasource.ts
+++ b/packages/server/src/tests/utilities/api/datasource.ts
@@ -1,14 +1,17 @@
 import {
-  Datasource,
-  VerifyDatasourceRequest,
-  CreateDatasourceResponse,
-  UpdateDatasourceResponse,
-  UpdateDatasourceRequest,
-  QueryJson,
   BuildSchemaFromSourceResponse,
+  CreateDatasourceResponse,
+  Datasource,
   FetchDatasourceInfoResponse,
+  FetchExternalSchemaResponse,
+  FieldType,
+  RelationshipType,
+  UpdateDatasourceRequest,
+  UpdateDatasourceResponse,
+  VerifyDatasourceRequest,
 } from "@budibase/types"
 import { Expectations, TestAPI } from "./base"
+import { sql } from "@budibase/backend-core"
 
 export class DatasourceAPI extends TestAPI {
   create = async (
@@ -66,16 +69,6 @@ export class DatasourceAPI extends TestAPI {
     return await this._get<Datasource[]>(`/api/datasources`, { expectations })
   }
 
-  query = async (
-    query: Omit<QueryJson, "meta"> & Partial<Pick<QueryJson, "meta">>,
-    expectations?: Expectations
-  ) => {
-    return await this._post<any>(`/api/datasources/query`, {
-      body: query,
-      expectations,
-    })
-  }
-
   fetchSchema = async (
     {
       datasourceId,
@@ -103,4 +96,63 @@ export class DatasourceAPI extends TestAPI {
       }
     )
   }
+
+  externalSchema = async (
+    datasource: Datasource | string,
+    expectations?: Expectations
+  ): Promise<FetchExternalSchemaResponse> => {
+    const id = typeof datasource === "string" ? datasource : datasource._id
+    return await this._get<FetchExternalSchemaResponse>(
+      `/api/datasources/${id}/schema/external`,
+      {
+        expectations,
+      }
+    )
+  }
+
+  addExistingRelationship = async (
+    {
+      one,
+      many,
+    }: {
+      one: { tableId: string; relationshipName: string; foreignKey: string }
+      many: { tableId: string; relationshipName: string; primaryKey: string }
+    },
+    expectations?: Expectations
+  ) => {
+    const oneTableInfo = sql.utils.breakExternalTableId(one.tableId),
+      manyTableInfo = sql.utils.breakExternalTableId(many.tableId)
+    if (oneTableInfo.datasourceId !== manyTableInfo.datasourceId) {
+      throw new Error(
+        "Tables are in different datasources, cannot create relationship."
+      )
+    }
+    const datasource = await this.get(oneTableInfo.datasourceId)
+    const oneTable = datasource.entities?.[oneTableInfo.tableName],
+      manyTable = datasource.entities?.[manyTableInfo.tableName]
+    if (!oneTable || !manyTable) {
+      throw new Error(
+        "Both tables not found in datasource, cannot create relationship."
+      )
+    }
+
+    manyTable.schema[many.relationshipName] = {
+      type: FieldType.LINK,
+      name: many.relationshipName,
+      tableId: oneTable._id!,
+      relationshipType: RelationshipType.MANY_TO_ONE,
+      fieldName: one.foreignKey,
+      foreignKey: many.primaryKey,
+      main: true,
+    }
+    oneTable.schema[one.relationshipName] = {
+      type: FieldType.LINK,
+      name: one.relationshipName,
+      tableId: manyTable._id!,
+      relationshipType: RelationshipType.ONE_TO_MANY,
+      fieldName: many.primaryKey,
+      foreignKey: one.foreignKey,
+    }
+    return await this.update(datasource, expectations)
+  }
 }
diff --git a/packages/server/src/tests/utilities/api/index.ts b/packages/server/src/tests/utilities/api/index.ts
index 79514d4ece..c5eede18d6 100644
--- a/packages/server/src/tests/utilities/api/index.ts
+++ b/packages/server/src/tests/utilities/api/index.ts
@@ -16,6 +16,7 @@ import { TemplateAPI } from "./template"
 import { RowActionAPI } from "./rowAction"
 import { AutomationAPI } from "./automation"
 import { PluginAPI } from "./plugin"
+import { WebhookAPI } from "./webhook"
 
 export default class API {
   table: TableAPI
@@ -35,6 +36,7 @@ export default class API {
   rowAction: RowActionAPI
   automation: AutomationAPI
   plugin: PluginAPI
+  webhook: WebhookAPI
 
   constructor(config: TestConfiguration) {
     this.table = new TableAPI(config)
@@ -54,5 +56,6 @@ export default class API {
     this.rowAction = new RowActionAPI(config)
     this.automation = new AutomationAPI(config)
     this.plugin = new PluginAPI(config)
+    this.webhook = new WebhookAPI(config)
   }
 }
diff --git a/packages/server/src/tests/utilities/api/query.ts b/packages/server/src/tests/utilities/api/query.ts
index 2d5f7970cd..fc81fc4561 100644
--- a/packages/server/src/tests/utilities/api/query.ts
+++ b/packages/server/src/tests/utilities/api/query.ts
@@ -1,7 +1,7 @@
 import {
   Query,
   ExecuteQueryRequest,
-  ExecuteQueryResponse,
+  ExecuteV2QueryResponse,
   PreviewQueryRequest,
   PreviewQueryResponse,
 } from "@budibase/types"
@@ -17,8 +17,8 @@ export class QueryAPI extends TestAPI {
     queryId: string,
     body?: ExecuteQueryRequest,
     expectations?: Expectations
-  ): Promise<ExecuteQueryResponse> => {
-    return await this._post<ExecuteQueryResponse>(
+  ): Promise<ExecuteV2QueryResponse> => {
+    return await this._post<ExecuteV2QueryResponse>(
       `/api/v2/queries/${queryId}`,
       {
         body,
diff --git a/packages/server/src/tests/utilities/api/row.ts b/packages/server/src/tests/utilities/api/row.ts
index 52317e142a..f68b41aca9 100644
--- a/packages/server/src/tests/utilities/api/row.ts
+++ b/packages/server/src/tests/utilities/api/row.ts
@@ -2,7 +2,7 @@ import {
   PatchRowRequest,
   SaveRowRequest,
   Row,
-  ValidateResponse,
+  ValidateRowResponse,
   ExportRowsRequest,
   BulkImportRequest,
   BulkImportResponse,
@@ -51,8 +51,8 @@ export class RowAPI extends TestAPI {
     sourceId: string,
     row: SaveRowRequest,
     expectations?: Expectations
-  ): Promise<ValidateResponse> => {
-    return await this._post<ValidateResponse>(
+  ): Promise<ValidateRowResponse> => {
+    return await this._post<ValidateRowResponse>(
       `/api/${sourceId}/rows/validate`,
       {
         body: row,
diff --git a/packages/server/src/tests/utilities/api/table.ts b/packages/server/src/tests/utilities/api/table.ts
index baaf890b52..86c9002c03 100644
--- a/packages/server/src/tests/utilities/api/table.ts
+++ b/packages/server/src/tests/utilities/api/table.ts
@@ -3,8 +3,8 @@ import {
   BulkImportResponse,
   CsvToJsonRequest,
   CsvToJsonResponse,
-  MigrateRequest,
-  MigrateResponse,
+  MigrateTableRequest,
+  MigrateTableResponse,
   SaveTableRequest,
   SaveTableResponse,
   Table,
@@ -38,13 +38,16 @@ export class TableAPI extends TestAPI {
 
   migrate = async (
     tableId: string,
-    data: MigrateRequest,
+    data: MigrateTableRequest,
     expectations?: Expectations
-  ): Promise<MigrateResponse> => {
-    return await this._post<MigrateResponse>(`/api/tables/${tableId}/migrate`, {
-      body: data,
-      expectations,
-    })
+  ): Promise<MigrateTableResponse> => {
+    return await this._post<MigrateTableResponse>(
+      `/api/tables/${tableId}/migrate`,
+      {
+        body: data,
+        expectations,
+      }
+    )
   }
 
   import = async (
diff --git a/packages/server/src/tests/utilities/api/viewV2.ts b/packages/server/src/tests/utilities/api/viewV2.ts
index 9741240f27..d0350a5521 100644
--- a/packages/server/src/tests/utilities/api/viewV2.ts
+++ b/packages/server/src/tests/utilities/api/viewV2.ts
@@ -5,6 +5,7 @@ import {
   SearchViewRowRequest,
   PaginatedSearchRowResponse,
   ViewResponseEnriched,
+  ViewFetchResponseEnriched,
 } from "@budibase/types"
 import { Expectations, TestAPI } from "./base"
 
@@ -45,8 +46,17 @@ export class ViewV2API extends TestAPI {
   }
 
   get = async (viewId: string) => {
-    return (await this._get<ViewResponseEnriched>(`/api/v2/views/${viewId}`))
-      .data
+    return (
+      await this._get<ViewResponseEnriched>(
+        `/api/v2/views/${encodeURIComponent(viewId)}`
+      )
+    ).data
+  }
+
+  fetch = async (expectations?: Expectations) => {
+    return await this._get<ViewFetchResponseEnriched>(`/api/v2/views`, {
+      expectations,
+    })
   }
 
   search = async (
diff --git a/packages/server/src/tests/utilities/api/webhook.ts b/packages/server/src/tests/utilities/api/webhook.ts
new file mode 100644
index 0000000000..be1ff6aa4c
--- /dev/null
+++ b/packages/server/src/tests/utilities/api/webhook.ts
@@ -0,0 +1,58 @@
+import { Expectations, TestAPI } from "./base"
+import {
+  BuildWebhookSchemaResponse,
+  SaveWebhookResponse,
+  TriggerWebhookResponse,
+  Webhook,
+} from "@budibase/types"
+
+export class WebhookAPI extends TestAPI {
+  save = async (webhook: Webhook, expectations?: Expectations) => {
+    const resp = await this._put<SaveWebhookResponse>("/api/webhooks", {
+      body: webhook,
+      expectations: {
+        status: 200,
+        ...expectations,
+      },
+    })
+    return resp.webhook
+  }
+
+  buildSchema = async (
+    appId: string,
+    webhookId: string,
+    fields: Record<string, any>,
+    expectations?: Expectations
+  ) => {
+    const resp = await this._post<BuildWebhookSchemaResponse>(
+      `/api/webhooks/schema/${appId}/${webhookId}`,
+      {
+        body: fields,
+        expectations: {
+          status: 200,
+          ...expectations,
+        },
+      }
+    )
+    return resp.id
+  }
+
+  trigger = async (
+    appId: string,
+    webhookId: string,
+    fields: Record<string, any>,
+    expectations?: Expectations
+  ) => {
+    const resp = await this._post<TriggerWebhookResponse>(
+      `/api/webhooks/trigger/${appId}/${webhookId}`,
+      {
+        body: fields,
+        expectations: {
+          status: 200,
+          ...expectations,
+        },
+      }
+    )
+    return resp
+  }
+}
diff --git a/packages/server/src/tests/utilities/mocks/openai.ts b/packages/server/src/tests/utilities/mocks/openai.ts
new file mode 100644
index 0000000000..b17491808c
--- /dev/null
+++ b/packages/server/src/tests/utilities/mocks/openai.ts
@@ -0,0 +1,46 @@
+import nock from "nock"
+
+let chatID = 1
+
+export function mockChatGPTResponse(
+  response: string | ((prompt: string) => string)
+) {
+  return nock("https://api.openai.com")
+    .post("/v1/chat/completions")
+    .reply(200, (uri, requestBody) => {
+      let content = response
+      if (typeof response === "function") {
+        const messages = (requestBody as any).messages
+        content = response(messages[0].content)
+      }
+
+      chatID++
+
+      return {
+        id: `chatcmpl-${chatID}`,
+        object: "chat.completion",
+        created: Math.floor(Date.now() / 1000),
+        model: "gpt-4o-mini",
+        system_fingerprint: `fp_${chatID}`,
+        choices: [
+          {
+            index: 0,
+            message: { role: "assistant", content },
+            logprobs: null,
+            finish_reason: "stop",
+          },
+        ],
+        usage: {
+          prompt_tokens: 0,
+          completion_tokens: 0,
+          total_tokens: 0,
+          completion_tokens_details: {
+            reasoning_tokens: 0,
+            accepted_prediction_tokens: 0,
+            rejected_prediction_tokens: 0,
+          },
+        },
+      }
+    })
+    .persist()
+}
diff --git a/packages/server/src/tests/utilities/structures.ts b/packages/server/src/tests/utilities/structures.ts
index beb03ecf08..3058a706c1 100644
--- a/packages/server/src/tests/utilities/structures.ts
+++ b/packages/server/src/tests/utilities/structures.ts
@@ -456,7 +456,7 @@ export function filterAutomation(appId: string, tableId?: string): Automation {
         icon: "Icon",
         id: "a",
         type: AutomationStepType.TRIGGER,
-        event: "row:save",
+        event: AutomationEventType.ROW_SAVE,
         stepId: AutomationTriggerStepId.ROW_SAVED,
         inputs: {
           tableId: tableId!,
@@ -498,7 +498,7 @@ export function updateRowAutomationWithFilters(
         icon: "Icon",
         id: "a",
         type: AutomationStepType.TRIGGER,
-        event: "row:update",
+        event: AutomationEventType.ROW_UPDATE,
         stepId: AutomationTriggerStepId.ROW_UPDATED,
         inputs: { tableId },
         schema: TRIGGER_DEFINITIONS.ROW_UPDATED.schema,
@@ -513,7 +513,7 @@ export function basicAutomationResults(
   return {
     automationId,
     status: AutomationStatus.SUCCESS,
-    trigger: "trigger",
+    trigger: "trigger" as any,
     steps: [
       {
         stepId: AutomationActionStepId.SERVER_LOG,
@@ -535,7 +535,7 @@ export function basicRow(tableId: string) {
 export function basicLinkedRow(
   tableId: string,
   linkedRowId: string,
-  linkField: string = "link"
+  linkField = "link"
 ) {
   // this is based on the basic linked tables you get from the test configuration
   return {
@@ -586,14 +586,14 @@ export function basicUser(role: string) {
   }
 }
 
-export function basicScreen(route: string = "/") {
+export function basicScreen(route = "/") {
   return createHomeScreen({
     roleId: BUILTIN_ROLE_IDS.BASIC,
     route,
   })
 }
 
-export function powerScreen(route: string = "/") {
+export function powerScreen(route = "/") {
   return createHomeScreen({
     roleId: BUILTIN_ROLE_IDS.POWER,
     route,
diff --git a/packages/server/src/threads/automation.ts b/packages/server/src/threads/automation.ts
index 91bf4a211f..2790d8fda6 100644
--- a/packages/server/src/threads/automation.ts
+++ b/packages/server/src/threads/automation.ts
@@ -29,8 +29,13 @@ import {
   LoopStep,
   UserBindings,
   isBasicSearchOperator,
+  ContextEmitter,
 } from "@budibase/types"
-import { AutomationContext, TriggerOutput } from "../definitions/automations"
+import {
+  AutomationContext,
+  AutomationResponse,
+  TriggerOutput,
+} from "../definitions/automations"
 import { WorkerCallback } from "./definitions"
 import { context, logging, configs } from "@budibase/backend-core"
 import {
@@ -67,6 +72,24 @@ function getLoopIterations(loopStep: LoopStep) {
   return 0
 }
 
+export async function enrichBaseContext(context: Record<string, any>) {
+  context.env = await sdkUtils.getEnvironmentVariables()
+
+  try {
+    const { config } = await configs.getSettingsConfigDoc()
+    context.settings = {
+      url: config.platformUrl,
+      logo: config.logoUrl,
+      company: config.company,
+    }
+  } catch (e) {
+    // if settings doc doesn't exist, make the settings blank
+    context.settings = {}
+  }
+
+  return context
+}
+
 /**
  * The automation orchestrator is a class responsible for executing automations.
  * It handles the context of the automation and makes sure each step gets the correct
@@ -76,12 +99,12 @@ class Orchestrator {
   private chainCount: number
   private appId: string
   private automation: Automation
-  private emitter: any
+  private emitter: ContextEmitter
   private context: AutomationContext
   private job: Job
   private loopStepOutputs: LoopStep[]
   private stopped: boolean
-  private executionOutput: Omit<AutomationContext, "stepsByName" | "stepsById">
+  private executionOutput: AutomationResponse
   private currentUser: UserBindings | undefined
 
   constructor(job: AutomationJob) {
@@ -257,7 +280,7 @@ class Orchestrator {
     })
   }
 
-  async execute(): Promise<any> {
+  async execute(): Promise<AutomationResponse | undefined> {
     return tracer.trace(
       "Orchestrator.execute",
       { resource: "automation" },
@@ -266,20 +289,9 @@ class Orchestrator {
           appId: this.appId,
           automationId: this.automation._id,
         })
-        this.context.env = await sdkUtils.getEnvironmentVariables()
-        this.context.user = this.currentUser
 
-        try {
-          const { config } = await configs.getSettingsConfigDoc()
-          this.context.settings = {
-            url: config.platformUrl,
-            logo: config.logoUrl,
-            company: config.company,
-          }
-        } catch (e) {
-          // if settings doc doesn't exist, make the settings blank
-          this.context.settings = {}
-        }
+        await enrichBaseContext(this.context)
+        this.context.user = this.currentUser
 
         let metadata
 
@@ -385,13 +397,14 @@ class Orchestrator {
     stepIdx: number,
     pathIdx?: number
   ): Promise<number> {
-    await processObject(loopStep.inputs, this.processContext(this.context))
+    await processObject(loopStep.inputs, this.mergeContexts(this.context))
     const iterations = getLoopIterations(loopStep)
     let stepToLoopIndex = stepIdx + 1
     let pathStepIdx = (pathIdx || stepIdx) + 1
 
     let iterationCount = 0
     let shouldCleanup = true
+    let reachedMaxIterations = false
 
     for (let loopStepIndex = 0; loopStepIndex < iterations; loopStepIndex++) {
       try {
@@ -419,19 +432,8 @@ class Orchestrator {
         loopStepIndex === env.AUTOMATION_MAX_ITERATIONS ||
         (loopStep.inputs.iterations && loopStepIndex === maxIterations)
       ) {
-        this.updateContextAndOutput(
-          pathStepIdx + 1,
-          steps[stepToLoopIndex],
-          {
-            items: this.loopStepOutputs,
-            iterations: loopStepIndex,
-          },
-          {
-            status: AutomationErrors.MAX_ITERATIONS,
-            success: true,
-          }
-        )
-        shouldCleanup = false
+        reachedMaxIterations = true
+        shouldCleanup = true
         break
       }
 
@@ -485,6 +487,10 @@ class Orchestrator {
               iterations: iterationCount,
             }
 
+      if (reachedMaxIterations && iterations !== 0) {
+        tempOutput.status = AutomationStepStatus.MAX_ITERATIONS
+      }
+
       // Loop Step clean up
       this.executionOutput.steps.splice(pathStepIdx, 0, {
         id: steps[stepToLoopIndex].id,
@@ -573,14 +579,14 @@ class Orchestrator {
           for (const [field, value] of Object.entries(filters[filterKey])) {
             const fromContext = processStringSync(
               field,
-              this.processContext(this.context)
+              this.mergeContexts(this.context)
             )
             toFilter[field] = fromContext
 
             if (typeof value === "string" && findHBSBlocks(value).length > 0) {
               const processedVal = processStringSync(
                 value,
-                this.processContext(this.context)
+                this.mergeContexts(this.context)
               )
 
               filters[filterKey][field] = processedVal
@@ -637,7 +643,7 @@ class Orchestrator {
         const stepFn = await this.getStepFunctionality(step.stepId)
         let inputs = await processObject(
           originalStepInput,
-          this.processContext(this.context)
+          this.mergeContexts(this.context)
         )
         inputs = automationUtils.cleanInputValues(inputs, step.schema.inputs)
 
@@ -645,7 +651,7 @@ class Orchestrator {
           inputs: inputs,
           appId: this.appId,
           emitter: this.emitter,
-          context: this.context,
+          context: this.mergeContexts(this.context),
         })
         this.handleStepOutput(step, outputs, loopIteration)
       }
@@ -665,8 +671,8 @@ class Orchestrator {
     return null
   }
 
-  private processContext(context: AutomationContext) {
-    const processContext = {
+  private mergeContexts(context: AutomationContext) {
+    const mergeContexts = {
       ...context,
       steps: {
         ...context.steps,
@@ -674,7 +680,7 @@ class Orchestrator {
         ...context.stepsByName,
       },
     }
-    return processContext
+    return mergeContexts
   }
 
   private handleStepOutput(
@@ -729,7 +735,9 @@ export function execute(job: Job<AutomationData>, callback: WorkerCallback) {
   })
 }
 
-export async function executeInThread(job: Job<AutomationData>) {
+export async function executeInThread(
+  job: Job<AutomationData>
+): Promise<AutomationResponse> {
   const appId = job.data.event.appId
   if (!appId) {
     throw new Error("Unable to execute, event doesn't contain app ID.")
@@ -741,7 +749,7 @@ export async function executeInThread(job: Job<AutomationData>) {
     }, job.data.event.timeout || env.AUTOMATION_THREAD_TIMEOUT)
   })
 
-  return await context.doInAppContext(appId, async () => {
+  return (await context.doInAppContext(appId, async () => {
     await context.ensureSnippetContext()
     const envVars = await sdkUtils.getEnvironmentVariables()
     // put into automation thread for whole context
@@ -752,7 +760,7 @@ export async function executeInThread(job: Job<AutomationData>) {
         timeoutPromise,
       ])
     })
-  })
+  })) as AutomationResponse
 }
 
 export const removeStalled = async (job: Job) => {
diff --git a/packages/server/src/threads/definitions.ts b/packages/server/src/threads/definitions.ts
index 85e546280d..44a76a60a3 100644
--- a/packages/server/src/threads/definitions.ts
+++ b/packages/server/src/threads/definitions.ts
@@ -3,7 +3,10 @@ import { Datasource, Row, Query } from "@budibase/types"
 export type WorkerCallback = (error: any, response?: any) => void
 
 export interface QueryEvent
-  extends Omit<Query, "datasourceId" | "name" | "parameters" | "readable"> {
+  extends Omit<
+    Query,
+    "datasourceId" | "name" | "parameters" | "readable" | "nestedSchemaFields"
+  > {
   appId?: string
   datasource: Datasource
   pagination?: any
diff --git a/packages/server/src/threads/query.ts b/packages/server/src/threads/query.ts
index facdd20642..3ba4995b2c 100644
--- a/packages/server/src/threads/query.ts
+++ b/packages/server/src/threads/query.ts
@@ -174,7 +174,9 @@ class QueryRunner {
     }
 
     // needs to an array for next step
-    if (!Array.isArray(rows)) {
+    if (rows === null) {
+      rows = []
+    } else if (!Array.isArray(rows)) {
       rows = [rows]
     }
 
diff --git a/packages/server/src/utilities/fileSystem/processor.ts b/packages/server/src/utilities/fileSystem/processor.ts
index a32a7568f4..03fbf4ad0a 100644
--- a/packages/server/src/utilities/fileSystem/processor.ts
+++ b/packages/server/src/utilities/fileSystem/processor.ts
@@ -1,4 +1,4 @@
-import jimp from "jimp"
+import { Jimp } from "jimp"
 
 const FORMATS = {
   IMAGES: ["png", "jpg", "jpeg", "gif", "bmp", "tiff"],
@@ -6,8 +6,8 @@ const FORMATS = {
 
 function processImage(file: { path: string }) {
   // this will overwrite the temp file
-  return jimp.read(file.path).then(img => {
-    return img.resize(300, jimp.AUTO).write(file.path)
+  return Jimp.read(file.path).then(img => {
+    return img.resize({ w: 256 }).write(file.path as `${string}.${string}`)
   })
 }
 
diff --git a/packages/server/src/utilities/global.ts b/packages/server/src/utilities/global.ts
index c1fcf35634..975dfbded5 100644
--- a/packages/server/src/utilities/global.ts
+++ b/packages/server/src/utilities/global.ts
@@ -78,7 +78,7 @@ export async function getCachedSelf(
   // this has to be tenant aware, can't depend on the context to find it out
   // running some middlewares before the tenancy causes context to break
   const user = await cache.user.getUser({
-    userId: ctx.user?._id!,
+    userId: ctx.user!._id!,
   })
   return processUser(user, { appId })
 }
diff --git a/packages/server/src/utilities/index.ts b/packages/server/src/utilities/index.ts
index 331a8e266f..f1b32c81f3 100644
--- a/packages/server/src/utilities/index.ts
+++ b/packages/server/src/utilities/index.ts
@@ -58,57 +58,32 @@ export function checkSlashesInUrl(url: string) {
 export async function updateEntityMetadata(
   type: string,
   entityId: string,
-  updateFn: any
+  updateFn: (metadata: Document) => Document
 ) {
   const db = context.getAppDB()
   const id = generateMetadataID(type, entityId)
-  // read it to see if it exists, we'll overwrite it no matter what
-  let rev, metadata: Document
-  try {
-    const oldMetadata = await db.get<any>(id)
-    rev = oldMetadata._rev
-    metadata = updateFn(oldMetadata)
-  } catch (err) {
-    rev = null
-    metadata = updateFn({})
-  }
+  const metadata = updateFn((await db.tryGet(id)) || {})
   metadata._id = id
-  if (rev) {
-    metadata._rev = rev
-  }
   const response = await db.put(metadata)
-  return {
-    ...metadata,
-    _id: id,
-    _rev: response.rev,
-  }
+  return { ...metadata, _id: id, _rev: response.rev }
 }
 
 export async function saveEntityMetadata(
   type: string,
   entityId: string,
   metadata: Document
-) {
-  return updateEntityMetadata(type, entityId, () => {
-    return metadata
-  })
+): Promise<Document> {
+  return updateEntityMetadata(type, entityId, () => metadata)
 }
 
 export async function deleteEntityMetadata(type: string, entityId: string) {
   const db = context.getAppDB()
   const id = generateMetadataID(type, entityId)
-  let rev
-  try {
-    const metadata = await db.get<any>(id)
-    if (metadata) {
-      rev = metadata._rev
-    }
-  } catch (err) {
-    // don't need to error if it doesn't exist
-  }
-  if (id && rev) {
-    await db.remove(id, rev)
+  const metadata = await db.tryGet(id)
+  if (!metadata) {
+    return
   }
+  await db.remove(metadata)
 }
 
 export function escapeDangerousCharacters(string: string) {
diff --git a/packages/server/src/utilities/redis.ts b/packages/server/src/utilities/redis.ts
index a4154b7b95..a3ce655316 100644
--- a/packages/server/src/utilities/redis.ts
+++ b/packages/server/src/utilities/redis.ts
@@ -89,17 +89,22 @@ export async function setDebounce(id: string, seconds: number) {
   await debounceClient.store(id, "debouncing", seconds)
 }
 
-export async function setTestFlag(id: string) {
-  await flagClient.store(id, { testing: true }, AUTOMATION_TEST_FLAG_SECONDS)
-}
-
 export async function checkTestFlag(id: string) {
   const flag = await flagClient?.get(id)
   return !!(flag && flag.testing)
 }
 
-export async function clearTestFlag(id: string) {
-  await devAppClient.delete(id)
+export async function withTestFlag<R>(id: string, fn: () => Promise<R>) {
+  // TODO(samwho): this has a bit of a problem where if 2 automations are tested
+  // at the same time, the second one will overwrite the first one's flag. We
+  // should instead use an atomic counter and only clear the flag when the
+  // counter reaches 0.
+  await flagClient.store(id, { testing: true }, AUTOMATION_TEST_FLAG_SECONDS)
+  try {
+    return await fn()
+  } finally {
+    await devAppClient.delete(id)
+  }
 }
 
 export function getSocketPubSubClients() {
diff --git a/packages/server/src/utilities/retry.ts b/packages/server/src/utilities/retry.ts
index af5d4d7cb5..f6e8cbd0e5 100644
--- a/packages/server/src/utilities/retry.ts
+++ b/packages/server/src/utilities/retry.ts
@@ -1,6 +1,6 @@
 export async function retry<T extends (...arg0: any[]) => any>(
   fn: T,
-  maxTry: number = 5,
+  maxTry = 5,
   retryCount = 1
 ): Promise<Awaited<ReturnType<T>>> {
   const currRetry = typeof retryCount === "number" ? retryCount : 1
diff --git a/packages/server/src/utilities/routing/index.ts b/packages/server/src/utilities/routing/index.ts
index 82d45743ce..f0086daa72 100644
--- a/packages/server/src/utilities/routing/index.ts
+++ b/packages/server/src/utilities/routing/index.ts
@@ -1,24 +1,19 @@
 import { createRoutingView } from "../../db/views/staticViews"
 import { ViewName, getQueryIndex, UNICODE_MAX } from "../../db/utils"
 import { context } from "@budibase/backend-core"
-import { ScreenRouting, Document } from "@budibase/types"
+import { ScreenRoutesViewOutput } from "@budibase/types"
 
-interface ScreenRoutesView extends Document {
-  id: string
-  routing: ScreenRouting
-}
-
-export async function getRoutingInfo(): Promise<ScreenRoutesView[]> {
+export async function getRoutingInfo(): Promise<ScreenRoutesViewOutput[]> {
   const db = context.getAppDB()
   try {
-    const allRouting = await db.query<ScreenRoutesView>(
+    const allRouting = await db.query<ScreenRoutesViewOutput>(
       getQueryIndex(ViewName.ROUTING),
       {
         startkey: "",
         endkey: UNICODE_MAX,
       }
     )
-    return allRouting.rows.map(row => row.value as ScreenRoutesView)
+    return allRouting.rows.map(row => row.value)
   } catch (err: any) {
     // check if the view doesn't exist, it should for all new instances
     /* istanbul ignore next */
diff --git a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
index b02ea2ff60..6c8ecc3167 100644
--- a/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
+++ b/packages/server/src/utilities/rowProcessor/bbReferenceProcessor.ts
@@ -153,10 +153,10 @@ export async function processOutputBBReference(
 }
 
 export async function processOutputBBReferences(
-  value: string | null | undefined,
+  value: string | string[] | null | undefined,
   subtype: BBReferenceFieldSubType
 ): Promise<UserReferenceInfo[] | undefined> {
-  if (!value) {
+  if (!value || (Array.isArray(value) && value.length === 0)) {
     return undefined
   }
   const ids =
diff --git a/packages/server/src/utilities/rowProcessor/index.ts b/packages/server/src/utilities/rowProcessor/index.ts
index 7d6d537302..8595a3483e 100644
--- a/packages/server/src/utilities/rowProcessor/index.ts
+++ b/packages/server/src/utilities/rowProcessor/index.ts
@@ -29,6 +29,8 @@ import {
 import { isExternalTableID } from "../../integrations/utils"
 import {
   helpers,
+  isExternalColumnName,
+  isInternalColumnName,
   PROTECTED_EXTERNAL_COLUMNS,
   PROTECTED_INTERNAL_COLUMNS,
 } from "@budibase/shared-core"
@@ -200,14 +202,17 @@ export async function inputProcessing(
   const clonedRow = cloneDeep(row)
   const table = await getTableFromSource(source)
 
-  const dontCleanseKeys = ["type", "_id", "_rev", "tableId"]
   for (const [key, value] of Object.entries(clonedRow)) {
     const field = table.schema[key]
+    const isBuiltinColumn = isExternalTableID(table._id!)
+      ? isExternalColumnName(key)
+      : isInternalColumnName(key)
     // cleanse fields that aren't in the schema
+    if (!field && !isBuiltinColumn) {
+      delete clonedRow[key]
+    }
+    // field isn't found - might be a built-in column, skip over it
     if (!field) {
-      if (dontCleanseKeys.indexOf(key) === -1) {
-        delete clonedRow[key]
-      }
       continue
     }
     // remove any formula values, they are to be generated
@@ -406,6 +411,15 @@ export async function coreOutputProcessing(
           row[property] = `${hours}:${minutes}:${seconds}`
         }
       }
+    } else if (column.type === FieldType.DATETIME && column.dateOnly) {
+      for (const row of rows) {
+        if (typeof row[property] === "string") {
+          row[property] = new Date(row[property])
+        }
+        if (row[property] instanceof Date) {
+          row[property] = row[property].toISOString().slice(0, 10)
+        }
+      }
     } else if (column.type === FieldType.LINK) {
       for (let row of rows) {
         // if relationship is empty - remove the array, this has been part of the API for some time
diff --git a/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts b/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
index 3638b62892..fa674fcc52 100644
--- a/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
+++ b/packages/server/src/utilities/rowProcessor/tests/utils.spec.ts
@@ -18,7 +18,7 @@ jest.mock("@budibase/pro", () => ({
   ai: {
     LargeLanguageModel: {
       forCurrentTenant: async () => ({
-        initialised: true,
+        llm: {},
         run: jest.fn(() => "response from LLM"),
         buildPromptFromAIOperation: buildPromptMock,
       }),
diff --git a/packages/server/src/utilities/rowProcessor/utils.ts b/packages/server/src/utilities/rowProcessor/utils.ts
index 9dbeb8ebb2..7d2f8b49f4 100644
--- a/packages/server/src/utilities/rowProcessor/utils.ts
+++ b/packages/server/src/utilities/rowProcessor/utils.ts
@@ -126,8 +126,10 @@ export async function processAIColumns<T extends Row | Row[]>(
     const numRows = Array.isArray(inputRows) ? inputRows.length : 1
     span?.addTags({ table_id: table._id, numRows })
     const rows = Array.isArray(inputRows) ? inputRows : [inputRows]
-    const llm = await pro.ai.LargeLanguageModel.forCurrentTenant("gpt-4o-mini")
-    if (rows && llm.initialised) {
+    const llmWrapper = await pro.ai.LargeLanguageModel.forCurrentTenant(
+      "gpt-4o-mini"
+    )
+    if (rows && llmWrapper.llm) {
       // Ensure we have snippet context
       await context.ensureSnippetContext()
 
@@ -151,14 +153,14 @@ export async function processAIColumns<T extends Row | Row[]>(
             }
           }
 
-          const prompt = llm.buildPromptFromAIOperation({
+          const prompt = llmWrapper.buildPromptFromAIOperation({
             schema: aiSchema,
             row,
           })
 
           return tracer.trace("processAIColumn", {}, async span => {
             span?.addTags({ table_id: table._id, column })
-            const llmResponse = await llm.run(prompt!)
+            const llmResponse = await llmWrapper.run(prompt)
             return {
               ...row,
               [column]: llmResponse,
diff --git a/packages/server/src/utilities/schema.ts b/packages/server/src/utilities/schema.ts
index cfdd0d753a..b13999c842 100644
--- a/packages/server/src/utilities/schema.ts
+++ b/packages/server/src/utilities/schema.ts
@@ -7,7 +7,7 @@ import {
   Table,
 } from "@budibase/types"
 import { ValidColumnNameRegex, helpers, utils } from "@budibase/shared-core"
-import { db } from "@budibase/backend-core"
+import { db, HTTPError, sql } from "@budibase/backend-core"
 
 type Rows = Array<Row>
 
@@ -175,15 +175,27 @@ export function parse(rows: Rows, table: Table): Rows {
       if ([FieldType.NUMBER].includes(columnType)) {
         // If provided must be a valid number
         parsedRow[columnName] = columnData ? Number(columnData) : columnData
-      } else if (
-        columnType === FieldType.DATETIME &&
-        !columnSchema.timeOnly &&
-        !columnSchema.dateOnly
-      ) {
-        // If provided must be a valid date
+      } else if (columnType === FieldType.DATETIME) {
+        if (columnData && !columnSchema.timeOnly) {
+          if (!sql.utils.isValidISODateString(columnData)) {
+            let message = `Invalid format for field "${columnName}": "${columnData}".`
+            if (columnSchema.dateOnly) {
+              message += ` Date-only fields must be in the format "YYYY-MM-DD".`
+            } else {
+              message += ` Datetime fields must be in ISO format, e.g. "YYYY-MM-DDTHH:MM:SSZ".`
+            }
+            throw new HTTPError(message, 400)
+          }
+        }
+        if (columnData && columnSchema.timeOnly) {
+          if (!sql.utils.isValidTime(columnData)) {
+            throw new HTTPError(
+              `Invalid format for field "${columnName}": "${columnData}". Time-only fields must be in the format "HH:MM:SS".`,
+              400
+            )
+          }
+        }
         parsedRow[columnName] = columnData
-          ? new Date(columnData).toISOString()
-          : columnData
       } else if (
         columnType === FieldType.JSON &&
         typeof columnData === "string"
diff --git a/packages/server/src/websockets/builder.ts b/packages/server/src/websockets/builder.ts
index cf92d68ef3..c4a8ca2955 100644
--- a/packages/server/src/websockets/builder.ts
+++ b/packages/server/src/websockets/builder.ts
@@ -92,7 +92,7 @@ export default class BuilderSocket extends BaseSocket {
     }
   }
 
-  async updateUser(socket: Socket, patch: Object) {
+  async updateUser(socket: Socket, patch: object) {
     await super.updateUser(socket, {
       builderMetadata: {
         ...socket.data.builderMetadata,
diff --git a/packages/server/src/websockets/grid.ts b/packages/server/src/websockets/grid.ts
index 3911313cc3..205c2896a3 100644
--- a/packages/server/src/websockets/grid.ts
+++ b/packages/server/src/websockets/grid.ts
@@ -1,7 +1,7 @@
 import authorized from "../middleware/authorized"
 import currentApp from "../middleware/currentapp"
 import { BaseSocket } from "./websocket"
-import { auth, permissions } from "@budibase/backend-core"
+import { auth, permissions, context } from "@budibase/backend-core"
 import http from "http"
 import Koa from "koa"
 import { getSourceId } from "../api/controllers/row/utils"
@@ -10,6 +10,12 @@ import { Socket } from "socket.io"
 import { GridSocketEvent } from "@budibase/shared-core"
 import { userAgent } from "koa-useragent"
 import { createContext, runMiddlewares } from "./middleware"
+import sdk from "../sdk"
+import {
+  findHBSBlocks,
+  isJSBinding,
+  decodeJSBinding,
+} from "@budibase/string-templates"
 
 const { PermissionType, PermissionLevel } = permissions
 
@@ -18,15 +24,46 @@ export default class GridSocket extends BaseSocket {
     super(app, server, "/socket/grid")
   }
 
+  // Checks if a view's query contains any current user bindings
+  containsCurrentUserBinding(view: ViewV2): boolean {
+    return findHBSBlocks(JSON.stringify(view.query))
+      .map(binding => {
+        const sanitizedBinding = binding.replace(/\\"/g, '"')
+        if (isJSBinding(sanitizedBinding)) {
+          return decodeJSBinding(sanitizedBinding)
+        } else {
+          return sanitizedBinding
+        }
+      })
+      .some(binding => binding?.includes("[user]"))
+  }
+
   async onConnect(socket: Socket) {
     // Initial identification of connected spreadsheet
     socket.on(GridSocketEvent.SelectDatasource, async (payload, callback) => {
       const ds = payload.datasource
       const appId = payload.appId
       const resourceId = ds?.type === "table" ? ds?.tableId : ds?.id
+      let valid = true
 
-      // Ignore if no table or app specified
+      // Validate datasource
       if (!resourceId || !appId) {
+        // Ignore if no table or app specified
+        valid = false
+      } else if (ds.type === "viewV2") {
+        // If this is a view filtered by current user, don't sync changes
+        try {
+          await context.doInAppContext(appId, async () => {
+            const view = await sdk.views.get(ds.id)
+            if (this.containsCurrentUserBinding(view)) {
+              valid = false
+            }
+          })
+        } catch (err) {
+          valid = false
+        }
+      }
+      if (!valid) {
         socket.disconnect(true)
         return
       }
@@ -70,7 +107,7 @@ export default class GridSocket extends BaseSocket {
     })
   }
 
-  async updateUser(socket: Socket, patch: Object) {
+  async updateUser(socket: Socket, patch: object) {
     await super.updateUser(socket, {
       gridMetadata: {
         ...socket.data.gridMetadata,
diff --git a/packages/server/src/websockets/middleware.ts b/packages/server/src/websockets/middleware.ts
index 0a52dcbdeb..7962149cd8 100644
--- a/packages/server/src/websockets/middleware.ts
+++ b/packages/server/src/websockets/middleware.ts
@@ -58,7 +58,7 @@ export const createContext = (
 export const runMiddlewares = async (
   ctx: any,
   middlewares: any[],
-  callback: Function
+  callback: () => Promise<void>
 ) => {
   if (!middlewares[0]) {
     await callback()
diff --git a/packages/server/src/websockets/websocket.ts b/packages/server/src/websockets/websocket.ts
index 5dcf8c8f6f..607cf12b78 100644
--- a/packages/server/src/websockets/websocket.ts
+++ b/packages/server/src/websockets/websocket.ts
@@ -33,7 +33,7 @@ export class BaseSocket {
   constructor(
     app: Koa,
     server: http.Server,
-    path: string = "/",
+    path = "/",
     additionalMiddlewares?: any[]
   ) {
     this.app = app
@@ -57,7 +57,7 @@ export class BaseSocket {
       const ctx = createContext(this.app, socket)
 
       try {
-        await runMiddlewares(ctx, middlewares, () => {
+        await runMiddlewares(ctx, middlewares, async () => {
           // Middlewares are finished
           // Extract some data from our enriched koa context to persist
           // as metadata for the socket
@@ -250,7 +250,7 @@ export class BaseSocket {
   }
 
   // Updates a connected user's metadata, assuming a room change is not required.
-  async updateUser(socket: Socket, patch: Object) {
+  async updateUser(socket: Socket, patch: object) {
     socket.data = {
       ...socket.data,
       ...patch,
diff --git a/packages/server/tsconfig.build.json b/packages/server/tsconfig.build.json
index c4b9b8788e..d8ba3806b9 100644
--- a/packages/server/tsconfig.build.json
+++ b/packages/server/tsconfig.build.json
@@ -1,27 +1,9 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "types": ["node", "jest"],
-    "outDir": "dist/src",
-    "skipLibCheck": true,
-    "baseUrl": ".",
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/backend-core": ["../backend-core/src"],
-      "@budibase/backend-core/*": ["../backend-core/*"],
-      "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/src"],
-      "@budibase/string-templates": ["../string-templates/src"],
-      "@budibase/string-templates/*": ["../string-templates/*"]
-    },
-    "allowArbitraryExtensions": true
+    "target": "es2020",
+    "allowArbitraryExtensions": true,
+    "isolatedModules": false
   },
   "include": ["src/**/*"],
   "exclude": [
diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
index 9d633c6455..c962785810 100644
--- a/packages/server/tsconfig.json
+++ b/packages/server/tsconfig.json
@@ -1,10 +1,5 @@
 {
   "extends": "./tsconfig.build.json",
-  "compilerOptions": {
-    "lib": ["es2020", "dom"],
-    "composite": true,
-    "baseUrl": "."
-  },
   "ts-node": {
     "require": ["tsconfig-paths/register"],
     "swc": true
diff --git a/packages/shared-core/package.json b/packages/shared-core/package.json
index da74d090b6..d76849c9a2 100644
--- a/packages/shared-core/package.json
+++ b/packages/shared-core/package.json
@@ -10,18 +10,17 @@
     "prebuild": "rimraf dist/",
     "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly --paths null",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
     "test": "jest",
     "test:watch": "yarn test --watchAll"
   },
   "dependencies": {
-    "@budibase/types": "0.0.0",
+    "@budibase/types": "*",
     "cron-validate": "1.4.5"
   },
   "devDependencies": {
     "rimraf": "3.0.2",
-    "typescript": "5.5.2"
+    "typescript": "5.7.2"
   },
   "nx": {
     "targets": {
@@ -34,16 +33,6 @@
             "target": "build"
           }
         ]
-      },
-      "dev": {
-        "dependsOn": [
-          {
-            "projects": [
-              "@budibase/types"
-            ],
-            "target": "build"
-          }
-        ]
       }
     }
   }
diff --git a/packages/shared-core/src/automations/index.ts b/packages/shared-core/src/automations/index.ts
new file mode 100644
index 0000000000..064796845e
--- /dev/null
+++ b/packages/shared-core/src/automations/index.ts
@@ -0,0 +1 @@
+export * as steps from "./steps/index"
diff --git a/packages/shared-core/src/automations/steps/bash.ts b/packages/shared-core/src/automations/steps/bash.ts
new file mode 100644
index 0000000000..2980e18f0e
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/bash.ts
@@ -0,0 +1,47 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Bash Scripting",
+  tagline: "Execute a bash command",
+  icon: "JourneyEvent",
+  description: "Run a bash script",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.EXECUTE_BASH,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        code: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.CODE,
+          title: "Code",
+        },
+      },
+      required: ["code"],
+    },
+    outputs: {
+      properties: {
+        stdout: {
+          type: AutomationIOType.STRING,
+          description: "Standard output of your bash command or script",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the command was successful",
+        },
+      },
+      required: ["stdout"],
+    },
+  },
+}
diff --git a/packages/server/src/automations/steps/branch.ts b/packages/shared-core/src/automations/steps/branch.ts
similarity index 100%
rename from packages/server/src/automations/steps/branch.ts
rename to packages/shared-core/src/automations/steps/branch.ts
diff --git a/packages/shared-core/src/automations/steps/collect.ts b/packages/shared-core/src/automations/steps/collect.ts
new file mode 100644
index 0000000000..d4a6f6ec98
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/collect.ts
@@ -0,0 +1,43 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Collect Data",
+  tagline: "Collect data to be sent to design",
+  icon: "Collection",
+  description:
+    "Collects specified data so it can be provided to the design section",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {},
+  stepId: AutomationActionStepId.COLLECT,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        collection: {
+          type: AutomationIOType.STRING,
+          title: "What to Collect",
+        },
+      },
+      required: ["collection"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        value: {
+          type: AutomationIOType.STRING,
+          description: "Collected data",
+        },
+      },
+      required: ["success", "value"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/createRow.ts b/packages/shared-core/src/automations/steps/createRow.ts
new file mode 100644
index 0000000000..f51fdabb67
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/createRow.ts
@@ -0,0 +1,67 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Create Row",
+  tagline: "Create a {{inputs.enriched.table.name}} row",
+  icon: "TableRowAddBottom",
+  description: "Add a row to your database",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.CREATE_ROW,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        row: {
+          type: AutomationIOType.OBJECT,
+          properties: {
+            tableId: {
+              type: AutomationIOType.STRING,
+              customType: AutomationCustomIOType.TABLE,
+            },
+          },
+          customType: AutomationCustomIOType.ROW,
+          title: "Table",
+          required: ["tableId"],
+        },
+      },
+      required: ["row"],
+    },
+    outputs: {
+      properties: {
+        row: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.ROW,
+          description: "The new row",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The response from the table",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the row creation was successful",
+        },
+        id: {
+          type: AutomationIOType.STRING,
+          description: "The identifier of the new row",
+        },
+        revision: {
+          type: AutomationIOType.STRING,
+          description: "The revision of the new row",
+        },
+      },
+      required: ["success", "id", "revision"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/delay.ts b/packages/shared-core/src/automations/steps/delay.ts
new file mode 100644
index 0000000000..627bc9ed2f
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/delay.ts
@@ -0,0 +1,38 @@
+import {
+  AutomationActionStepId,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Delay",
+  icon: "Clock",
+  tagline: "Delay for {{inputs.time}} milliseconds",
+  description: "Delay the automation until an amount of time has passed",
+  stepId: AutomationActionStepId.DELAY,
+  internal: true,
+  features: {},
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        time: {
+          type: AutomationIOType.NUMBER,
+          title: "Delay in milliseconds",
+        },
+      },
+      required: ["time"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the delay was successful",
+        },
+      },
+      required: ["success"],
+    },
+  },
+  type: AutomationStepType.LOGIC,
+}
diff --git a/packages/shared-core/src/automations/steps/deleteRow.ts b/packages/shared-core/src/automations/steps/deleteRow.ts
new file mode 100644
index 0000000000..5a9de74392
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/deleteRow.ts
@@ -0,0 +1,56 @@
+import {
+  AutomationActionStepId,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationStepDefinition,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  description: "Delete a row from your database",
+  icon: "TableRowRemoveCenter",
+  name: "Delete Row",
+  tagline: "Delete a {{inputs.enriched.table.name}} row",
+  type: AutomationStepType.ACTION,
+  stepId: AutomationActionStepId.DELETE_ROW,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        tableId: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.TABLE,
+          title: "Table",
+        },
+        id: {
+          type: AutomationIOType.STRING,
+          title: "Row ID",
+        },
+      },
+      required: ["tableId", "id"],
+    },
+    outputs: {
+      properties: {
+        row: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.ROW,
+          description: "The deleted row",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The response from the table",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the deletion was successful",
+        },
+      },
+      required: ["row", "success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/discord.ts b/packages/shared-core/src/automations/steps/discord.ts
new file mode 100644
index 0000000000..906b970e1d
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/discord.ts
@@ -0,0 +1,60 @@
+import {
+  AutomationActionStepId,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+  AutomationStepDefinition,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Discord Message",
+  tagline: "Send a message to a Discord server",
+  description: "Send a message to a Discord server",
+  icon: "ri-discord-line",
+  stepId: AutomationActionStepId.discord,
+  type: AutomationStepType.ACTION,
+  internal: false,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        url: {
+          type: AutomationIOType.STRING,
+          title: "Discord Webhook URL",
+        },
+        username: {
+          type: AutomationIOType.STRING,
+          title: "Bot Name",
+        },
+        avatar_url: {
+          type: AutomationIOType.STRING,
+          title: "Bot Avatar URL",
+        },
+        content: {
+          type: AutomationIOType.STRING,
+          title: "Message",
+        },
+      },
+      required: ["url", "content"],
+    },
+    outputs: {
+      properties: {
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code of the request",
+        },
+        response: {
+          type: AutomationIOType.STRING,
+          description: "The response from the Discord Webhook",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the message sent successfully",
+        },
+      },
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/executeQuery.ts b/packages/shared-core/src/automations/steps/executeQuery.ts
new file mode 100644
index 0000000000..bbb8b93d6b
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/executeQuery.ts
@@ -0,0 +1,59 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "External Data Connector",
+  tagline: "Execute Data Connector",
+  icon: "Data",
+  description: "Execute a query in an external data connector",
+  type: AutomationStepType.ACTION,
+  stepId: AutomationActionStepId.EXECUTE_QUERY,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        query: {
+          type: AutomationIOType.OBJECT,
+          properties: {
+            queryId: {
+              type: AutomationIOType.STRING,
+              customType: AutomationCustomIOType.QUERY,
+            },
+          },
+          customType: AutomationCustomIOType.QUERY_PARAMS,
+          title: "Parameters",
+          required: ["queryId"],
+        },
+      },
+      required: ["query"],
+    },
+    outputs: {
+      properties: {
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The response from the datasource execution",
+        },
+        info: {
+          type: AutomationIOType.OBJECT,
+          description:
+            "Some query types may return extra data, like headers from a REST query",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["response", "success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/executeScript.ts b/packages/shared-core/src/automations/steps/executeScript.ts
new file mode 100644
index 0000000000..dcc52f2905
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/executeScript.ts
@@ -0,0 +1,47 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "JS Scripting",
+  tagline: "Execute JavaScript Code",
+  icon: "Code",
+  description: "Run a piece of JavaScript code in your automation",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  stepId: AutomationActionStepId.EXECUTE_SCRIPT,
+  inputs: {},
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  schema: {
+    inputs: {
+      properties: {
+        code: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.CODE,
+          title: "Code",
+        },
+      },
+      required: ["code"],
+    },
+    outputs: {
+      properties: {
+        value: {
+          type: AutomationIOType.STRING,
+          description: "The result of the return statement",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/filter.ts b/packages/shared-core/src/automations/steps/filter.ts
new file mode 100644
index 0000000000..70dcb6f66e
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/filter.ts
@@ -0,0 +1,69 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+} from "@budibase/types"
+
+export const FilterConditions = {
+  EQUAL: "EQUAL",
+  NOT_EQUAL: "NOT_EQUAL",
+  GREATER_THAN: "GREATER_THAN",
+  LESS_THAN: "LESS_THAN",
+}
+
+export const PrettyFilterConditions = {
+  [FilterConditions.EQUAL]: "Equals",
+  [FilterConditions.NOT_EQUAL]: "Not equals",
+  [FilterConditions.GREATER_THAN]: "Greater than",
+  [FilterConditions.LESS_THAN]: "Less than",
+}
+
+export const definition: AutomationStepDefinition = {
+  name: "Condition",
+  tagline: "{{inputs.field}} {{inputs.condition}} {{inputs.value}}",
+  icon: "Branch2",
+  description:
+    "Conditionally halt automations which do not meet certain conditions",
+  type: AutomationStepType.LOGIC,
+  internal: true,
+  features: {},
+  stepId: AutomationActionStepId.FILTER,
+  inputs: {
+    condition: FilterConditions.EQUAL,
+  },
+  schema: {
+    inputs: {
+      properties: {
+        field: {
+          type: AutomationIOType.STRING,
+          title: "Reference Value",
+        },
+        condition: {
+          type: AutomationIOType.STRING,
+          title: "Condition",
+          enum: Object.values(FilterConditions),
+          pretty: Object.values(PrettyFilterConditions),
+        },
+        value: {
+          type: AutomationIOType.STRING,
+          title: "Comparison Value",
+        },
+      },
+      required: ["field", "condition", "value"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        result: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the logic block passed",
+        },
+      },
+      required: ["success", "result"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/index.ts b/packages/shared-core/src/automations/steps/index.ts
new file mode 100644
index 0000000000..d23c5622b8
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/index.ts
@@ -0,0 +1,22 @@
+export * as bash from "./bash"
+export * as branch from "./branch"
+export * as collect from "./collect"
+export * as createRow from "./createRow"
+export * as delay from "./delay"
+export * as deleteRow from "./deleteRow"
+export * as discord from "./discord"
+export * as executeQuery from "./executeQuery"
+export * as executeScript from "./executeScript"
+export * as filter from "./filter"
+export * as loop from "./loop"
+export * as make from "./make"
+export * as n8n from "./n8n"
+export * as openai from "./openai"
+export * as outgoingWebhook from "./outgoingWebhook"
+export * as queryRows from "./queryRows"
+export * as sendSmtpEmail from "./sendSmtpEmail"
+export * as serverLog from "./serverLog"
+export * as slack from "./slack"
+export * as triggerAutomationRun from "./triggerAutomationRun"
+export * as updateRow from "./updateRow"
+export * as zapier from "./zapier"
diff --git a/packages/server/src/automations/steps/loop.ts b/packages/shared-core/src/automations/steps/loop.ts
similarity index 100%
rename from packages/server/src/automations/steps/loop.ts
rename to packages/shared-core/src/automations/steps/loop.ts
diff --git a/packages/shared-core/src/automations/steps/make.ts b/packages/shared-core/src/automations/steps/make.ts
new file mode 100644
index 0000000000..4f9e6c40ad
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/make.ts
@@ -0,0 +1,55 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Make Integration",
+  stepTitle: "Make",
+  tagline: "Trigger a Make scenario",
+  description:
+    "Performs a webhook call to Make and gets the response (if configured)",
+  icon: "ri-shut-down-line",
+  stepId: AutomationActionStepId.integromat,
+  type: AutomationStepType.ACTION,
+  internal: false,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        url: {
+          type: AutomationIOType.STRING,
+          title: "Webhook URL",
+        },
+        body: {
+          type: AutomationIOType.JSON,
+          title: "Payload",
+        },
+      },
+      required: ["url", "body"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether call was successful",
+        },
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code returned",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The webhook response - this can have properties",
+        },
+      },
+      required: ["success", "response"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/n8n.ts b/packages/shared-core/src/automations/steps/n8n.ts
new file mode 100644
index 0000000000..fcb407bcbf
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/n8n.ts
@@ -0,0 +1,65 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+  HttpMethod,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "n8n Integration",
+  stepTitle: "n8n",
+  tagline: "Trigger an n8n workflow",
+  description:
+    "Performs a webhook call to n8n and gets the response (if configured)",
+  icon: "ri-shut-down-line",
+  stepId: AutomationActionStepId.n8n,
+  type: AutomationStepType.ACTION,
+  internal: false,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        url: {
+          type: AutomationIOType.STRING,
+          title: "Webhook URL",
+        },
+        method: {
+          type: AutomationIOType.STRING,
+          title: "Method",
+          enum: Object.values(HttpMethod),
+        },
+        authorization: {
+          type: AutomationIOType.STRING,
+          title: "Authorization",
+        },
+        body: {
+          type: AutomationIOType.JSON,
+          title: "Payload",
+        },
+      },
+      required: ["url", "method"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether call was successful",
+        },
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code returned",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The webhook response - this can have properties",
+        },
+      },
+      required: ["success", "response"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/openai.ts b/packages/shared-core/src/automations/steps/openai.ts
new file mode 100644
index 0000000000..dc25e62f96
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/openai.ts
@@ -0,0 +1,56 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+} from "@budibase/types"
+
+enum Model {
+  GPT_4O_MINI = "gpt-4o-mini",
+  GPT_4O = "gpt-4o",
+  GPT_4 = "gpt-4",
+  GPT_35_TURBO = "gpt-3.5-turbo",
+}
+
+export const definition: AutomationStepDefinition = {
+  name: "OpenAI",
+  tagline: "Send prompts to ChatGPT",
+  icon: "Algorithm",
+  description: "Interact with the OpenAI ChatGPT API.",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {},
+  stepId: AutomationActionStepId.OPENAI,
+  inputs: {
+    prompt: "",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        prompt: {
+          type: AutomationIOType.STRING,
+          title: "Prompt",
+        },
+        model: {
+          type: AutomationIOType.STRING,
+          title: "Model",
+          enum: Object.values(Model),
+        },
+      },
+      required: ["prompt", "model"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        response: {
+          type: AutomationIOType.STRING,
+          description: "What was output",
+        },
+      },
+      required: ["success", "response"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/outgoingWebhook.ts b/packages/shared-core/src/automations/steps/outgoingWebhook.ts
new file mode 100644
index 0000000000..9e0b1b375b
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/outgoingWebhook.ts
@@ -0,0 +1,79 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+enum RequestType {
+  POST = "POST",
+  GET = "GET",
+  PUT = "PUT",
+  DELETE = "DELETE",
+  PATCH = "PATCH",
+}
+
+export const definition: AutomationStepDefinition = {
+  deprecated: true,
+  name: "Outgoing webhook",
+  tagline: "Send a {{inputs.requestMethod}} request",
+  icon: "Send",
+  description: "Send a request of specified method to a URL",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.OUTGOING_WEBHOOK,
+  inputs: {
+    requestMethod: "POST",
+    url: "http://",
+    requestBody: "{}",
+    headers: "{}",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        requestMethod: {
+          type: AutomationIOType.STRING,
+          enum: Object.values(RequestType),
+          title: "Request method",
+        },
+        url: {
+          type: AutomationIOType.STRING,
+          title: "URL",
+        },
+        requestBody: {
+          type: AutomationIOType.STRING,
+          title: "JSON Body",
+          customType: AutomationCustomIOType.WIDE,
+        },
+        headers: {
+          type: AutomationIOType.STRING,
+          title: "Headers",
+          customType: AutomationCustomIOType.WIDE,
+        },
+      },
+      required: ["requestMethod", "url"],
+    },
+    outputs: {
+      properties: {
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The response from the webhook",
+        },
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code returned",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+      },
+      required: ["response", "success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/queryRows.ts b/packages/shared-core/src/automations/steps/queryRows.ts
new file mode 100644
index 0000000000..31fec1e112
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/queryRows.ts
@@ -0,0 +1,75 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+  SortOrder,
+} from "@budibase/types"
+
+const SortOrderPretty = {
+  [SortOrder.ASCENDING]: "Ascending",
+  [SortOrder.DESCENDING]: "Descending",
+}
+
+export const definition: AutomationStepDefinition = {
+  description: "Query rows from the database",
+  icon: "Search",
+  name: "Query rows",
+  tagline: "Query rows from {{inputs.enriched.table.name}} table",
+  type: AutomationStepType.ACTION,
+  stepId: AutomationActionStepId.QUERY_ROWS,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        tableId: {
+          type: AutomationIOType.STRING,
+          customType: AutomationCustomIOType.TABLE,
+          title: "Table",
+        },
+        filters: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.FILTERS,
+          title: "Filtering",
+        },
+        sortColumn: {
+          type: AutomationIOType.STRING,
+          title: "Sort Column",
+          customType: AutomationCustomIOType.COLUMN,
+        },
+        sortOrder: {
+          type: AutomationIOType.STRING,
+          title: "Sort Order",
+          enum: Object.values(SortOrder),
+          pretty: Object.values(SortOrderPretty),
+        },
+        limit: {
+          type: AutomationIOType.NUMBER,
+          title: "Limit",
+          customType: AutomationCustomIOType.QUERY_LIMIT,
+        },
+      },
+      required: ["tableId"],
+    },
+    outputs: {
+      properties: {
+        rows: {
+          type: AutomationIOType.ARRAY,
+          customType: AutomationCustomIOType.ROWS,
+          description: "The rows that were found",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the query was successful",
+        },
+      },
+      required: ["rows", "success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/sendSmtpEmail.ts b/packages/shared-core/src/automations/steps/sendSmtpEmail.ts
new file mode 100644
index 0000000000..99ded7fdb3
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/sendSmtpEmail.ts
@@ -0,0 +1,95 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+  AutomationCustomIOType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  description: "Send an email using SMTP",
+  tagline: "Send SMTP email to {{inputs.to}}",
+  icon: "Email",
+  name: "Send Email (SMTP)",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.SEND_EMAIL_SMTP,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        to: {
+          type: AutomationIOType.STRING,
+          title: "Send To",
+        },
+        from: {
+          type: AutomationIOType.STRING,
+          title: "Send From",
+        },
+        cc: {
+          type: AutomationIOType.STRING,
+          title: "CC",
+        },
+        bcc: {
+          type: AutomationIOType.STRING,
+          title: "BCC",
+        },
+        subject: {
+          type: AutomationIOType.STRING,
+          title: "Email Subject",
+        },
+        contents: {
+          type: AutomationIOType.STRING,
+          title: "HTML Contents",
+        },
+        addInvite: {
+          type: AutomationIOType.BOOLEAN,
+          title: "Add calendar invite",
+        },
+        startTime: {
+          type: AutomationIOType.DATE,
+          title: "Start Time",
+          dependsOn: "addInvite",
+        },
+        endTime: {
+          type: AutomationIOType.DATE,
+          title: "End Time",
+          dependsOn: "addInvite",
+        },
+        summary: {
+          type: AutomationIOType.STRING,
+          title: "Meeting Summary",
+          dependsOn: "addInvite",
+        },
+        location: {
+          type: AutomationIOType.STRING,
+          title: "Location",
+          dependsOn: "addInvite",
+        },
+        attachments: {
+          type: AutomationIOType.ATTACHMENT,
+          customType: AutomationCustomIOType.MULTI_ATTACHMENTS,
+          title: "Attachments",
+        },
+      },
+      required: ["to", "from", "subject", "contents"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the email was sent",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "A response from the email client, this may be an error",
+        },
+      },
+      required: ["success"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/serverLog.ts b/packages/shared-core/src/automations/steps/serverLog.ts
new file mode 100644
index 0000000000..44ffb84049
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/serverLog.ts
@@ -0,0 +1,47 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Backend log",
+  tagline: "Console log a value in the backend",
+  icon: "Monitoring",
+  description: "Logs the given text to the server (using console.log)",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.SERVER_LOG,
+  inputs: {
+    text: "",
+  },
+  schema: {
+    inputs: {
+      properties: {
+        text: {
+          type: AutomationIOType.STRING,
+          title: "Log",
+        },
+      },
+      required: ["text"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        message: {
+          type: AutomationIOType.STRING,
+          description: "What was output",
+        },
+      },
+      required: ["success", "message"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/slack.ts b/packages/shared-core/src/automations/steps/slack.ts
new file mode 100644
index 0000000000..185e00a8ed
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/slack.ts
@@ -0,0 +1,52 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Slack Message",
+  tagline: "Send a message to Slack",
+  description: "Send a message to Slack",
+  icon: "ri-slack-line",
+  stepId: AutomationActionStepId.slack,
+  type: AutomationStepType.ACTION,
+  internal: false,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        url: {
+          type: AutomationIOType.STRING,
+          title: "Incoming Webhook URL",
+        },
+        text: {
+          type: AutomationIOType.STRING,
+          title: "Message",
+        },
+      },
+      required: ["url", "text"],
+    },
+    outputs: {
+      properties: {
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code of the request",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the message sent successfully",
+        },
+        response: {
+          type: AutomationIOType.STRING,
+          description: "The response from the Slack Webhook",
+        },
+      },
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/triggerAutomationRun.ts b/packages/shared-core/src/automations/steps/triggerAutomationRun.ts
new file mode 100644
index 0000000000..3aa78b6015
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/triggerAutomationRun.ts
@@ -0,0 +1,55 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationCustomIOType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Trigger an automation",
+  tagline: "Triggers an automation synchronously",
+  icon: "Sync",
+  description: "Triggers an automation synchronously",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {},
+  stepId: AutomationActionStepId.TRIGGER_AUTOMATION_RUN,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        automation: {
+          type: AutomationIOType.OBJECT,
+          properties: {
+            automationId: {
+              type: AutomationIOType.STRING,
+              customType: AutomationCustomIOType.AUTOMATION,
+            },
+          },
+          customType: AutomationCustomIOType.AUTOMATION_FIELDS,
+          title: "automatioFields",
+          required: ["automationId"],
+        },
+        timeout: {
+          type: AutomationIOType.NUMBER,
+          title: "Timeout (ms)",
+        },
+      },
+      required: ["automationId"],
+    },
+    outputs: {
+      properties: {
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the automation was successful",
+        },
+        value: {
+          type: AutomationIOType.OBJECT,
+          description: "Automation Result",
+        },
+      },
+      required: ["success", "value"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/updateRow.ts b/packages/shared-core/src/automations/steps/updateRow.ts
new file mode 100644
index 0000000000..30f86214bb
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/updateRow.ts
@@ -0,0 +1,68 @@
+import {
+  AutomationActionStepId,
+  AutomationCustomIOType,
+  AutomationFeature,
+  AutomationIOType,
+  AutomationStepDefinition,
+  AutomationStepType,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Update Row",
+  tagline: "Update a {{inputs.enriched.table.name}} row",
+  icon: "Refresh",
+  description: "Update a row in your database",
+  type: AutomationStepType.ACTION,
+  internal: true,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  stepId: AutomationActionStepId.UPDATE_ROW,
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        meta: {
+          type: AutomationIOType.OBJECT,
+          title: "Field settings",
+        },
+        row: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.ROW,
+          title: "Table",
+        },
+        rowId: {
+          type: AutomationIOType.STRING,
+          title: "Row ID",
+        },
+      },
+      required: ["row", "rowId"],
+    },
+    outputs: {
+      properties: {
+        row: {
+          type: AutomationIOType.OBJECT,
+          customType: AutomationCustomIOType.ROW,
+          description: "The updated row",
+        },
+        response: {
+          type: AutomationIOType.OBJECT,
+          description: "The response from the table",
+        },
+        success: {
+          type: AutomationIOType.BOOLEAN,
+          description: "Whether the action was successful",
+        },
+        id: {
+          type: AutomationIOType.STRING,
+          description: "The identifier of the updated row",
+        },
+        revision: {
+          type: AutomationIOType.STRING,
+          description: "The revision of the updated row",
+        },
+      },
+      required: ["success", "id", "revision"],
+    },
+  },
+}
diff --git a/packages/shared-core/src/automations/steps/zapier.ts b/packages/shared-core/src/automations/steps/zapier.ts
new file mode 100644
index 0000000000..b1afd31def
--- /dev/null
+++ b/packages/shared-core/src/automations/steps/zapier.ts
@@ -0,0 +1,48 @@
+import {
+  AutomationActionStepId,
+  AutomationStepDefinition,
+  AutomationStepType,
+  AutomationIOType,
+  AutomationFeature,
+} from "@budibase/types"
+
+export const definition: AutomationStepDefinition = {
+  name: "Zapier Webhook",
+  stepId: AutomationActionStepId.zapier,
+  type: AutomationStepType.ACTION,
+  internal: false,
+  features: {
+    [AutomationFeature.LOOPING]: true,
+  },
+  description: "Trigger a Zapier Zap via webhooks",
+  tagline: "Trigger a Zapier Zap",
+  icon: "ri-flashlight-line",
+  inputs: {},
+  schema: {
+    inputs: {
+      properties: {
+        url: {
+          type: AutomationIOType.STRING,
+          title: "Webhook URL",
+        },
+        body: {
+          type: AutomationIOType.JSON,
+          title: "Payload",
+        },
+      },
+      required: ["url"],
+    },
+    outputs: {
+      properties: {
+        httpStatus: {
+          type: AutomationIOType.NUMBER,
+          description: "The HTTP status code of the request",
+        },
+        response: {
+          type: AutomationIOType.STRING,
+          description: "The response from Zapier",
+        },
+      },
+    },
+  },
+}
diff --git a/packages/shared-core/src/constants/rows.ts b/packages/shared-core/src/constants/rows.ts
index 03663a4014..23c123aaf4 100644
--- a/packages/shared-core/src/constants/rows.ts
+++ b/packages/shared-core/src/constants/rows.ts
@@ -12,3 +12,7 @@ export const PROTECTED_EXTERNAL_COLUMNS = ["_id", "_rev", "tableId"] as const
 export function isInternalColumnName(name: string): boolean {
   return (PROTECTED_INTERNAL_COLUMNS as readonly string[]).includes(name)
 }
+
+export function isExternalColumnName(name: string): boolean {
+  return (PROTECTED_EXTERNAL_COLUMNS as readonly string[]).includes(name)
+}
diff --git a/packages/shared-core/src/filters.ts b/packages/shared-core/src/filters.ts
index 61950fd523..afe99d9565 100644
--- a/packages/shared-core/src/filters.ts
+++ b/packages/shared-core/src/filters.ts
@@ -298,7 +298,8 @@ export class ColumnSplitter {
 function buildCondition(filter: undefined): undefined
 function buildCondition(filter: SearchFilter): SearchFilters
 function buildCondition(filter?: SearchFilter): SearchFilters | undefined {
-  if (!filter) {
+  // Ignore empty or invalid filters
+  if (!filter || !filter?.operator || !filter?.field) {
     return
   }
 
@@ -475,7 +476,6 @@ export function buildQuery(
       if (group.logicalOperator) {
         operator = logicalOperatorFromUI(group.logicalOperator)
       }
-
       return {
         [operator]: { conditions: filters.map(buildCondition).filter(f => f) },
       }
@@ -699,7 +699,27 @@ export function runQuery<T extends Record<string, any>>(
       return docValue._id === testValue
     }
 
-    return docValue === testValue
+    if (docValue === testValue) {
+      return true
+    }
+
+    if (docValue == null && testValue != null) {
+      return false
+    }
+
+    if (docValue != null && testValue == null) {
+      return false
+    }
+
+    const leftDate = dayjs(docValue)
+    if (leftDate.isValid()) {
+      const rightDate = dayjs(testValue)
+      if (rightDate.isValid()) {
+        return leftDate.isSame(rightDate)
+      }
+    }
+
+    return false
   }
 
   const not =
@@ -911,8 +931,8 @@ export function sort<T extends Record<string, any>>(
  * @param docs the data
  * @param limit the number of docs to limit to
  */
-export function limit<T>(docs: T[], limit: string): T[] {
-  const numLimit = parseFloat(limit)
+export function limit<T>(docs: T[], limit: string | number): T[] {
+  const numLimit = typeof limit === "number" ? limit : parseFloat(limit)
   if (isNaN(numLimit)) {
     return docs
   }
diff --git a/packages/shared-core/src/helpers/cron.ts b/packages/shared-core/src/helpers/cron.ts
index a13c19c265..dab45ebcab 100644
--- a/packages/shared-core/src/helpers/cron.ts
+++ b/packages/shared-core/src/helpers/cron.ts
@@ -33,7 +33,7 @@ function improveErrors(errors: string[]): string[] {
 
 export function getNextExecutionDates(
   cronExpression: string,
-  limit: number = 4
+  limit = 4
 ): string[] {
   const parsed = cronParser.parseExpression(cronExpression)
   const nextRuns = []
diff --git a/packages/shared-core/src/helpers/views.ts b/packages/shared-core/src/helpers/views.ts
index f0407eeec9..106f8cb6eb 100644
--- a/packages/shared-core/src/helpers/views.ts
+++ b/packages/shared-core/src/helpers/views.ts
@@ -1,5 +1,6 @@
 import {
   BasicViewFieldMetadata,
+  View,
   ViewCalculationFieldMetadata,
   ViewFieldMetadata,
   ViewV2,
@@ -43,3 +44,7 @@ export function basicFields(view: UnsavedViewV2, opts?: { visible?: boolean }) {
     return !isCalculationField(field) && (!visible || isVisible(field))
   })
 }
+
+export function isV2(view: View | ViewV2): view is ViewV2 {
+  return (view as ViewV2).version === 2
+}
diff --git a/packages/shared-core/src/index.ts b/packages/shared-core/src/index.ts
index 0833f999ee..a4f4208f4a 100644
--- a/packages/shared-core/src/index.ts
+++ b/packages/shared-core/src/index.ts
@@ -5,3 +5,4 @@ export * as utils from "./utils"
 export * as sdk from "./sdk"
 export * from "./table"
 export * from "./themes"
+export * as automations from "./automations"
diff --git a/packages/shared-core/src/sdk/documents/automations.ts b/packages/shared-core/src/sdk/documents/automations.ts
index 86cbee75f7..9fe69677fd 100644
--- a/packages/shared-core/src/sdk/documents/automations.ts
+++ b/packages/shared-core/src/sdk/documents/automations.ts
@@ -1,13 +1,17 @@
 import { Automation, AutomationTriggerStepId } from "@budibase/types"
 
 export function isRowAction(automation: Automation) {
-  const result =
+  return (
     automation.definition.trigger?.stepId === AutomationTriggerStepId.ROW_ACTION
-  return result
+  )
+}
+
+export function isWebhookAction(automation: Automation) {
+  return (
+    automation.definition.trigger?.stepId === AutomationTriggerStepId.WEBHOOK
+  )
 }
 
 export function isAppAction(automation: Automation) {
-  const result =
-    automation.definition.trigger?.stepId === AutomationTriggerStepId.APP
-  return result
+  return automation.definition.trigger?.stepId === AutomationTriggerStepId.APP
 }
diff --git a/packages/shared-core/src/table.ts b/packages/shared-core/src/table.ts
index 5402439d9c..070ee6c760 100644
--- a/packages/shared-core/src/table.ts
+++ b/packages/shared-core/src/table.ts
@@ -12,8 +12,8 @@ const allowDisplayColumnByType: Record<FieldType, boolean> = {
   [FieldType.AUTO]: true,
   [FieldType.INTERNAL]: true,
   [FieldType.BARCODEQR]: true,
-
   [FieldType.BIGINT]: true,
+
   [FieldType.BOOLEAN]: false,
   [FieldType.ARRAY]: false,
   [FieldType.ATTACHMENTS]: false,
diff --git a/packages/shared-core/src/utils.ts b/packages/shared-core/src/utils.ts
index e2c40a8849..fac8fa61ee 100644
--- a/packages/shared-core/src/utils.ts
+++ b/packages/shared-core/src/utils.ts
@@ -109,7 +109,9 @@ export function trimOtherProps(object: any, allowedProps: string[]) {
   return result
 }
 
-export function isSupportedUserSearch(query: SearchFilters) {
+export function isSupportedUserSearch(
+  query: SearchFilters
+): query is SearchFilters {
   const allowed = [
     { op: BasicOperator.STRING, key: "email" },
     { op: BasicOperator.EQUAL, key: "_id" },
diff --git a/packages/shared-core/tsconfig.build.json b/packages/shared-core/tsconfig.build.json
index c1d5bc96e8..9598938197 100644
--- a/packages/shared-core/tsconfig.build.json
+++ b/packages/shared-core/tsconfig.build.json
@@ -1,22 +1,8 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "sourceMap": true,
-    "declaration": true,
-    "types": ["node"],
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "paths": {
-      "@budibase/types": ["../types/src"]
-    },
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "rootDir": "src/",
+    "outDir": "dist"
   },
   "include": ["src/**/*.ts"],
   "exclude": ["**/*.spec.ts", "**/*.spec.js", "__mocks__", "src/tests"]
diff --git a/packages/string-templates/.npmignore b/packages/string-templates/.npmignore
index fb547825eb..5eb98cf496 100644
--- a/packages/string-templates/.npmignore
+++ b/packages/string-templates/.npmignore
@@ -1,4 +1,4 @@
 *
 !dist/**/*
-dist/tsconfig.build.tsbuildinfo
+dist/tsconfig.tsbuildinfo
 !package.json
\ No newline at end of file
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 7fe0c25679..b1b4b9ef55 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -17,12 +17,13 @@
   "scripts": {
     "build": "tsc --emitDeclarationOnly && rollup -c",
     "dev": "rollup -cw",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
     "test": "jest",
     "manifest": "ts-node ./scripts/gen-collection-info.ts"
   },
   "dependencies": {
     "@budibase/handlebars-helpers": "^0.13.2",
+    "@budibase/vm-browserify": "^1.1.4",
     "dayjs": "^1.10.8",
     "handlebars": "^4.7.8",
     "lodash.clonedeep": "^4.5.0"
@@ -31,17 +32,15 @@
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-inject": "^5.0.5",
     "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "8.3.0",
     "doctrine": "^3.0.0",
     "jest": "29.7.0",
     "marked": "^4.0.10",
     "rollup": "^2.36.2",
-    "rollup-plugin-inject-process-env": "^1.3.1",
-    "rollup-plugin-node-builtins": "^2.1.2",
-    "rollup-plugin-node-globals": "^1.4.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "rollup-plugin-polyfill-node": "^0.13.0",
     "rollup-plugin-terser": "^7.0.2",
     "ts-jest": "29.1.1",
-    "typescript": "5.5.2"
+    "typescript": "5.7.2"
   }
 }
diff --git a/packages/string-templates/rollup.config.js b/packages/string-templates/rollup.config.js
index b745e97d91..cfe78aee57 100644
--- a/packages/string-templates/rollup.config.js
+++ b/packages/string-templates/rollup.config.js
@@ -1,12 +1,10 @@
 import commonjs from "@rollup/plugin-commonjs"
-import resolve from "rollup-plugin-node-resolve"
+import resolve from "@rollup/plugin-node-resolve"
 import json from "@rollup/plugin-json"
-import { terser } from "rollup-plugin-terser"
-import builtins from "rollup-plugin-node-builtins"
-import globals from "rollup-plugin-node-globals"
 import typescript from "@rollup/plugin-typescript"
-import injectProcessEnv from "rollup-plugin-inject-process-env"
+import polyfillNode from "rollup-plugin-polyfill-node"
 import inject from "@rollup/plugin-inject"
+import { terser } from "rollup-plugin-terser"
 
 const production = !process.env.ROLLUP_WATCH
 
@@ -24,19 +22,17 @@ const config = (input, outputFile, format) => ({
     warn(warning)
   },
   plugins: [
-    typescript(),
+    typescript({
+      moduleResolution: "node",
+    }),
+    polyfillNode(),
     resolve({
       preferBuiltins: true,
       browser: true,
     }),
     commonjs(),
-    globals(),
-    inject({ Buffer: ["buffer", "Buffer"] }),
-    builtins(),
     json(),
-    injectProcessEnv({
-      NO_JS: process.env.NO_JS,
-    }),
+    inject({ Buffer: ["buffer", "Buffer"], process: "process/browser" }),
     production && terser(),
   ],
 })
@@ -44,5 +40,4 @@ const config = (input, outputFile, format) => ({
 export default [
   config("src/index.ts", "./dist/bundle.cjs", "cjs"),
   config("src/index.ts", "./dist/bundle.mjs", "esm"),
-  config("src/iife.ts", "./dist/iife.mjs", "esm"),
 ]
diff --git a/packages/string-templates/src/environment.ts b/packages/string-templates/src/environment.ts
new file mode 100644
index 0000000000..6bee6fd3a9
--- /dev/null
+++ b/packages/string-templates/src/environment.ts
@@ -0,0 +1,23 @@
+function isJest() {
+  return (
+    process.env.NODE_ENV === "jest" ||
+    (process.env.JEST_WORKER_ID != null &&
+      process.env.JEST_WORKER_ID !== "null")
+  )
+}
+
+export function isTest() {
+  return isJest()
+}
+
+export const isJSAllowed = () => {
+  return process && !process.env.NO_JS
+}
+
+export const isTestingBackendJS = () => {
+  return process && process.env.BACKEND_JS
+}
+
+export const setTestingBackendJS = () => {
+  process.env.BACKEND_JS = "1"
+}
diff --git a/packages/string-templates/src/helpers/javascript.ts b/packages/string-templates/src/helpers/javascript.ts
index 4fb1329196..6132adf892 100644
--- a/packages/string-templates/src/helpers/javascript.ts
+++ b/packages/string-templates/src/helpers/javascript.ts
@@ -1,9 +1,16 @@
-import { atob, isBackendService, isJSAllowed } from "../utilities"
+import {
+  atob,
+  frontendWrapJS,
+  isBackendService,
+  isJSAllowed,
+} from "../utilities"
 import { LITERAL_MARKER } from "../helpers/constants"
 import { getJsHelperList } from "./list"
 import { iifeWrapper } from "../iife"
 import { JsTimeoutError, UserScriptError } from "../errors"
 import { cloneDeep } from "lodash/fp"
+import { Log, LogType } from "../types"
+import { isTest } from "../environment"
 
 // The method of executing JS scripts depends on the bundle being built.
 // This setter is used in the entrypoint (either index.js or index.mjs).
@@ -81,7 +88,7 @@ export function processJS(handlebars: string, context: any) {
 
     let clonedContext: Record<string, any>
     if (isBackendService()) {
-      // On the backned, values are copied across the isolated-vm boundary and
+      // On the backend, values are copied across the isolated-vm boundary and
       // so we don't need to do any cloning here. This does create a fundamental
       // difference in how JS executes on the frontend vs the backend, e.g.
       // consider this snippet:
@@ -96,10 +103,9 @@ export function processJS(handlebars: string, context: any) {
       clonedContext = cloneDeep(context)
     }
 
-    const sandboxContext = {
+    const sandboxContext: Record<string, any> = {
       $: (path: string) => getContextValue(path, clonedContext),
       helpers: getJsHelperList(),
-
       // Proxy to evaluate snippets when running in the browser
       snippets: new Proxy(
         {},
@@ -114,8 +120,49 @@ export function processJS(handlebars: string, context: any) {
       ),
     }
 
+    const logs: Log[] = []
+    // logging only supported on frontend
+    if (!isBackendService()) {
+      // this counts the lines in the wrapped JS *before* the user's code, so that we can minus it
+      const jsLineCount = frontendWrapJS(js).split(js)[0].split("\n").length
+      const buildLogResponse = (type: LogType) => {
+        return (...props: any[]) => {
+          if (!isTest()) {
+            console[type](...props)
+          }
+          props.forEach((prop, index) => {
+            if (typeof prop === "object") {
+              props[index] = JSON.stringify(prop)
+            }
+          })
+          // quick way to find out what line this is being called from
+          // its an anonymous function and we look for the overall length to find the
+          // line number we care about (from the users function)
+          // JS stack traces are in the format function:line:column
+          const lineNumber = new Error().stack?.match(
+            /<anonymous>:(\d+):\d+/
+          )?.[1]
+          logs.push({
+            log: props,
+            line: lineNumber ? parseInt(lineNumber) - jsLineCount : undefined,
+            type,
+          })
+        }
+      }
+      sandboxContext.console = {
+        log: buildLogResponse("log"),
+        info: buildLogResponse("info"),
+        debug: buildLogResponse("debug"),
+        warn: buildLogResponse("warn"),
+        error: buildLogResponse("error"),
+        // table should be treated differently, but works the same
+        // as the rest of the logs for now
+        table: buildLogResponse("table"),
+      }
+    }
+
     // Create a sandbox with our context and run the JS
-    const res = { data: runJS(js, sandboxContext) }
+    const res = { data: runJS(js, sandboxContext), logs }
     return `{{${LITERAL_MARKER} js_result-${JSON.stringify(res)}}}`
   } catch (error: any) {
     onErrorLog && onErrorLog(error)
diff --git a/packages/string-templates/src/index.ts b/packages/string-templates/src/index.ts
index 7246bc4942..79b0aa0699 100644
--- a/packages/string-templates/src/index.ts
+++ b/packages/string-templates/src/index.ts
@@ -1,23 +1,27 @@
-import { createContext, runInNewContext } from "vm"
+import browserVM from "@budibase/vm-browserify"
+import vm from "vm"
 import { create, TemplateDelegate } from "handlebars"
 import { registerAll, registerMinimum } from "./helpers/index"
-import { postprocess, preprocess } from "./processors"
+import { postprocess, postprocessWithLogs, preprocess } from "./processors"
 import {
   atob,
   btoa,
   FIND_ANY_HBS_REGEX,
   FIND_HBS_REGEX,
   findDoubleHbsInstances,
+  frontendWrapJS,
   isBackendService,
   prefixStrings,
 } from "./utilities"
 import { convertHBSBlock } from "./conversion"
 import { removeJSRunner, setJSRunner } from "./helpers/javascript"
-
 import manifest from "./manifest.json"
-import { ProcessOptions } from "./types"
+import { Log, ProcessOptions } from "./types"
 import { UserScriptError } from "./errors"
+import { isTest } from "./environment"
 
+export type { Log, LogType } from "./types"
+export { setTestingBackendJS } from "./environment"
 export { helpersToRemoveForJs, getJsHelperList } from "./helpers/list"
 export { FIND_ANY_HBS_REGEX } from "./utilities"
 export { setJSRunner, setOnErrorLog } from "./helpers/javascript"
@@ -187,23 +191,27 @@ export function processObjectSync(
   return object
 }
 
-/**
- * This will process a single handlebars containing string. If the string passed in has no valid handlebars statements
- * then nothing will occur. This is a pure sync call and therefore does not have the full functionality of the async call.
- * @param {string} string The template string which is the filled from the context object.
- * @param {object} context An object of information which will be used to enrich the string.
- * @param {object|undefined} [opts] optional - specify some options for processing.
- * @returns {string} The enriched string, all templates should have been replaced if they can be.
- */
-export function processStringSync(
+// keep the logging function internal, don't want to add this to the process options directly
+// as it can't be used for object processing etc.
+function processStringSyncInternal(
+  str: string,
+  context?: object,
+  opts?: ProcessOptions & { logging: false }
+): string
+function processStringSyncInternal(
+  str: string,
+  context?: object,
+  opts?: ProcessOptions & { logging: true }
+): { result: string; logs: Log[] }
+function processStringSyncInternal(
   string: string,
   context?: object,
-  opts?: ProcessOptions
-): string {
+  opts?: ProcessOptions & { logging: boolean }
+): string | { result: string; logs: Log[] } {
   // Take a copy of input in case of error
   const input = string
   if (typeof string !== "string") {
-    throw "Cannot process non-string types."
+    throw new Error("Cannot process non-string types.")
   }
   function process(stringPart: string) {
     // context is needed to check for overlap between helpers and context
@@ -217,16 +225,24 @@ export function processStringSync(
       },
       ...context,
     })
-    return postprocess(processedString)
+    return opts?.logging
+      ? postprocessWithLogs(processedString)
+      : postprocess(processedString)
   }
   try {
     if (opts && opts.onlyFound) {
+      let logs: Log[] = []
       const blocks = findHBSBlocks(string)
       for (let block of blocks) {
         const outcome = process(block)
-        string = string.replace(block, outcome)
+        if (typeof outcome === "object" && "result" in outcome) {
+          logs = logs.concat(outcome.logs || [])
+          string = string.replace(block, outcome.result)
+        } else {
+          string = string.replace(block, outcome)
+        }
       }
-      return string
+      return !opts?.logging ? string : { result: string, logs }
     } else {
       return process(string)
     }
@@ -239,6 +255,42 @@ export function processStringSync(
   }
 }
 
+/**
+ * This will process a single handlebars containing string. If the string passed in has no valid handlebars statements
+ * then nothing will occur. This is a pure sync call and therefore does not have the full functionality of the async call.
+ * @param {string} string The template string which is the filled from the context object.
+ * @param {object} context An object of information which will be used to enrich the string.
+ * @param {object|undefined} [opts] optional - specify some options for processing.
+ * @returns {string} The enriched string, all templates should have been replaced if they can be.
+ */
+export function processStringSync(
+  string: string,
+  context?: object,
+  opts?: ProcessOptions
+): string {
+  return processStringSyncInternal(string, context, {
+    ...opts,
+    logging: false,
+  })
+}
+
+/**
+ * Same as function above, but allows logging to be returned - this is only for JS bindings.
+ */
+export function processStringWithLogsSync(
+  string: string,
+  context?: object,
+  opts?: ProcessOptions
+): { result: string; logs: Log[] } {
+  if (isBackendService()) {
+    throw new Error("Logging disabled for backend bindings")
+  }
+  return processStringSyncInternal(string, context, {
+    ...opts,
+    logging: true,
+  })
+}
+
 /**
  * By default with expressions like {{ name }} handlebars will escape various
  * characters, which can be problematic. To fix this we use the syntax {{{ name }}},
@@ -456,28 +508,15 @@ export function convertToJS(hbs: string) {
 export { JsTimeoutError, UserScriptError } from "./errors"
 
 export function browserJSSetup() {
-  /**
-   * Use polyfilled vm to run JS scripts in a browser Env
-   */
+  // tests are in jest - we need to use node VM for these
+  const jsSandbox = isTest() ? vm : browserVM
+  // Use polyfilled vm to run JS scripts in a browser Env
   setJSRunner((js: string, context: Record<string, any>) => {
-    createContext(context)
+    jsSandbox.createContext(context)
 
-    const wrappedJs = `
-        result = {
-          result: null,
-          error: null,
-        };
+    const wrappedJs = frontendWrapJS(js)
 
-        try {
-          result.result = ${js};
-        } catch (e) {
-          result.error = e;
-        }
-
-        result;
-      `
-
-    const result = runInNewContext(wrappedJs, context, { timeout: 1000 })
+    const result = jsSandbox.runInNewContext(wrappedJs, context)
     if (result.error) {
       throw new UserScriptError(result.error)
     }
diff --git a/packages/string-templates/src/processors/index.ts b/packages/string-templates/src/processors/index.ts
index 79085b0dfe..0916c791cd 100644
--- a/packages/string-templates/src/processors/index.ts
+++ b/packages/string-templates/src/processors/index.ts
@@ -1,9 +1,16 @@
 import { FIND_HBS_REGEX } from "../utilities"
 import * as preprocessor from "./preprocessor"
+import type { Preprocessor } from "./preprocessor"
 import * as postprocessor from "./postprocessor"
-import { ProcessOptions } from "../types"
+import type { Postprocessor } from "./postprocessor"
+import { Log, ProcessOptions } from "../types"
 
-function process(output: string, processors: any[], opts?: ProcessOptions) {
+function process(
+  output: string,
+  processors: (Preprocessor | Postprocessor)[],
+  opts?: ProcessOptions
+) {
+  let logs: Log[] = []
   for (let processor of processors) {
     // if a literal statement has occurred stop
     if (typeof output !== "string") {
@@ -16,10 +23,18 @@ function process(output: string, processors: any[], opts?: ProcessOptions) {
       continue
     }
     for (let match of matches) {
-      output = processor.process(output, match, opts)
+      const res = processor.process(output, match, opts || {})
+      if (typeof res === "object") {
+        if ("logs" in res && res.logs) {
+          logs = logs.concat(res.logs)
+        }
+        output = res.result
+      } else {
+        output = res as string
+      }
     }
   }
-  return output
+  return { result: output, logs }
 }
 
 export function preprocess(string: string, opts: ProcessOptions) {
@@ -30,8 +45,13 @@ export function preprocess(string: string, opts: ProcessOptions) {
     )
   }
 
-  return process(string, processors, opts)
+  return process(string, processors, opts).result
 }
+
 export function postprocess(string: string) {
+  return process(string, postprocessor.processors).result
+}
+
+export function postprocessWithLogs(string: string) {
   return process(string, postprocessor.processors)
 }
diff --git a/packages/string-templates/src/processors/postprocessor.ts b/packages/string-templates/src/processors/postprocessor.ts
index 6ddc0e67cd..49d5f7d1cf 100644
--- a/packages/string-templates/src/processors/postprocessor.ts
+++ b/packages/string-templates/src/processors/postprocessor.ts
@@ -1,12 +1,16 @@
 import { LITERAL_MARKER } from "../helpers/constants"
+import { Log } from "../types"
 
 export enum PostProcessorNames {
   CONVERT_LITERALS = "convert-literals",
 }
 
-type PostprocessorFn = (statement: string) => string
+export type PostprocessorFn = (statement: string) => {
+  result: any
+  logs?: Log[]
+}
 
-class Postprocessor {
+export class Postprocessor {
   name: PostProcessorNames
   private readonly fn: PostprocessorFn
 
@@ -23,12 +27,12 @@ class Postprocessor {
 export const processors = [
   new Postprocessor(
     PostProcessorNames.CONVERT_LITERALS,
-    (statement: string) => {
+    (statement: string): { result: any; logs?: Log[] } => {
       if (
         typeof statement !== "string" ||
         !statement.includes(LITERAL_MARKER)
       ) {
-        return statement
+        return { result: statement }
       }
       const splitMarkerIndex = statement.indexOf("-")
       const type = statement.substring(12, splitMarkerIndex)
@@ -38,20 +42,22 @@ export const processors = [
       )
       switch (type) {
         case "string":
-          return value
+          return { result: value }
         case "number":
-          return parseFloat(value)
+          return { result: parseFloat(value) }
         case "boolean":
-          return value === "true"
+          return { result: value === "true" }
         case "object":
-          return JSON.parse(value)
-        case "js_result":
+          return { result: JSON.parse(value) }
+        case "js_result": {
           // We use the literal helper to process the result of JS expressions
           // as we want to be able to return any types.
           // We wrap the value in an abject to be able to use undefined properly.
-          return JSON.parse(value).data
+          const parsed = JSON.parse(value)
+          return { result: parsed.data, logs: parsed.logs }
+        }
       }
-      return value
+      return { result: value }
     }
   ),
 ]
diff --git a/packages/string-templates/src/processors/preprocessor.ts b/packages/string-templates/src/processors/preprocessor.ts
index 97e5c56fcc..37981f31a8 100644
--- a/packages/string-templates/src/processors/preprocessor.ts
+++ b/packages/string-templates/src/processors/preprocessor.ts
@@ -11,9 +11,12 @@ export enum PreprocessorNames {
   NORMALIZE_SPACES = "normalize-spaces",
 }
 
-type PreprocessorFn = (statement: string, opts?: ProcessOptions) => string
+export type PreprocessorFn = (
+  statement: string,
+  opts?: ProcessOptions
+) => string
 
-class Preprocessor {
+export class Preprocessor {
   name: string
   private readonly fn: PreprocessorFn
 
diff --git a/packages/string-templates/src/types.ts b/packages/string-templates/src/types.ts
index 2a7a430bee..f6ec7098f9 100644
--- a/packages/string-templates/src/types.ts
+++ b/packages/string-templates/src/types.ts
@@ -8,3 +8,11 @@ export interface ProcessOptions {
   onlyFound?: boolean
   disabledHelpers?: string[]
 }
+
+export type LogType = "log" | "info" | "debug" | "warn" | "error" | "table"
+
+export interface Log {
+  log: any[]
+  line?: number
+  type?: LogType
+}
diff --git a/packages/string-templates/src/utilities.ts b/packages/string-templates/src/utilities.ts
index 779bef3735..b05945f075 100644
--- a/packages/string-templates/src/utilities.ts
+++ b/packages/string-templates/src/utilities.ts
@@ -1,15 +1,20 @@
+import { isTest, isTestingBackendJS } from "./environment"
+
 const ALPHA_NUMERIC_REGEX = /^[A-Za-z0-9]+$/g
 
 export const FIND_HBS_REGEX = /{{([^{].*?)}}/g
 export const FIND_ANY_HBS_REGEX = /{?{{([^{].*?)}}}?/g
 export const FIND_TRIPLE_HBS_REGEX = /{{{([^{].*?)}}}/g
 
-const isJest = () => typeof jest !== "undefined"
-
 export const isBackendService = () => {
+  // allow configuring backend JS mode when testing - we default to assuming
+  // frontend, but need a method to control this
+  if (isTest() && isTestingBackendJS()) {
+    return true
+  }
   // We consider the tests for string-templates to be frontend, so that they
   // test the frontend JS functionality.
-  if (isJest()) {
+  if (isTest()) {
     return false
   }
   return typeof window === "undefined"
@@ -86,3 +91,20 @@ export const prefixStrings = (
   const regexPattern = new RegExp(`\\b(${escapedStrings.join("|")})\\b`, "g")
   return baseString.replace(regexPattern, `${prefix}$1`)
 }
+
+export function frontendWrapJS(js: string) {
+  return `
+        result = {
+          result: null,
+          error: null,
+        };
+
+        try {
+          result.result = ${js};
+        } catch (e) {
+          result.error = e;
+        }
+
+        result;
+      `
+}
diff --git a/packages/string-templates/test/hbsToJs.spec.ts b/packages/string-templates/test/hbsToJs.spec.ts
index ae071cfe37..51fba083aa 100644
--- a/packages/string-templates/test/hbsToJs.spec.ts
+++ b/packages/string-templates/test/hbsToJs.spec.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-template-curly-in-string */
 import { convertToJS } from "../src/index"
 
 function checkLines(response: string, lines: string[]) {
diff --git a/packages/string-templates/test/javascript.spec.ts b/packages/string-templates/test/javascript.spec.ts
index 9134005acb..631fe828ae 100644
--- a/packages/string-templates/test/javascript.spec.ts
+++ b/packages/string-templates/test/javascript.spec.ts
@@ -125,11 +125,6 @@ describe("Javascript", () => {
       expect(processJS(`throw "Error"`)).toEqual("Error")
     })
 
-    it("should timeout after one second", () => {
-      const output = processJS(`while (true) {}`)
-      expect(output).toBe("Timed out while executing JS")
-    })
-
     it("should prevent access to the process global", async () => {
       expect(processJS(`return process`)).toEqual(
         "ReferenceError: process is not defined"
diff --git a/packages/string-templates/test/jsLogging.spec.ts b/packages/string-templates/test/jsLogging.spec.ts
new file mode 100644
index 0000000000..44b3b392ba
--- /dev/null
+++ b/packages/string-templates/test/jsLogging.spec.ts
@@ -0,0 +1,53 @@
+import {
+  processStringWithLogsSync,
+  encodeJSBinding,
+  defaultJSSetup,
+} from "../src/index"
+
+const processJS = (js: string, context?: object) => {
+  return processStringWithLogsSync(encodeJSBinding(js), context)
+}
+
+describe("Javascript", () => {
+  beforeAll(() => {
+    defaultJSSetup()
+  })
+
+  describe("Test logging in JS bindings", () => {
+    it("should execute a simple expression", () => {
+      const output = processJS(
+        `console.log("hello"); 
+         console.log("world"); 
+         console.log("foo"); 
+         return "hello"`
+      )
+      expect(output.result).toEqual("hello")
+      expect(output.logs[0].log).toEqual(["hello"])
+      expect(output.logs[0].line).toEqual(1)
+      expect(output.logs[1].log).toEqual(["world"])
+      expect(output.logs[1].line).toEqual(2)
+      expect(output.logs[2].log).toEqual(["foo"])
+      expect(output.logs[2].line).toEqual(3)
+    })
+  })
+
+  it("should log comma separated values", () => {
+    const output = processJS(`console.log(1, { a: 1 }); return 1`)
+    expect(output.logs[0].log).toEqual([1, JSON.stringify({ a: 1 })])
+    expect(output.logs[0].line).toEqual(1)
+  })
+
+  it("should return the type working with warn", () => {
+    const output = processJS(`console.warn("warning"); return 1`)
+    expect(output.logs[0].log).toEqual(["warning"])
+    expect(output.logs[0].line).toEqual(1)
+    expect(output.logs[0].type).toEqual("warn")
+  })
+
+  it("should return the type working with error", () => {
+    const output = processJS(`console.error("error"); return 1`)
+    expect(output.logs[0].log).toEqual(["error"])
+    expect(output.logs[0].line).toEqual(1)
+    expect(output.logs[0].type).toEqual("error")
+  })
+})
diff --git a/packages/string-templates/test/utils.ts b/packages/string-templates/test/utils.ts
index 957366fc59..4934567788 100644
--- a/packages/string-templates/test/utils.ts
+++ b/packages/string-templates/test/utils.ts
@@ -11,7 +11,7 @@ function tryParseJson(str: string) {
   try {
     return JSON.parse(str.replace(/'/g, '"'))
   } catch (e) {
-    return
+    // do nothing
   }
 }
 
diff --git a/packages/string-templates/tsconfig.json b/packages/string-templates/tsconfig.json
index 7fc13ace8e..a3d8890deb 100644
--- a/packages/string-templates/tsconfig.json
+++ b/packages/string-templates/tsconfig.json
@@ -1,15 +1,9 @@
 {
-  "include": ["src/**/*"],
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "declaration": true,
-    "target": "es6",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "incremental": true,
     "lib": ["dom"],
-    "outDir": "dist",
-    "esModuleInterop": true,
-    "types": ["node", "jest"],
-    "resolveJsonModule": true
-  }
+    "baseUrl": ".",
+    "outDir": "dist"
+  },
+  "include": ["src/**/*"]
 }
diff --git a/packages/types/package.json b/packages/types/package.json
index d132383081..ee3c059bc9 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -10,17 +10,18 @@
     "prebuild": "rimraf dist/",
     "build": "node ../../scripts/build.js && tsc -p tsconfig.build.json --emitDeclarationOnly",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
-    "dev": "tsc -p tsconfig.json --watch --preserveWatchOutput",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020"
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null"
   },
   "jest": {},
   "devDependencies": {
     "@budibase/nano": "10.1.5",
+    "@types/json-schema": "^7.0.15",
     "@types/koa": "2.13.4",
     "@types/redlock": "4.0.7",
+    "koa-useragent": "^4.1.0",
     "rimraf": "3.0.2",
-    "typescript": "5.5.2",
-    "koa-useragent": "^4.1.0"
+    "typescript": "5.7.2",
+    "zod": "^3.23.8"
   },
   "dependencies": {
     "scim-patch": "^0.8.1"
diff --git a/packages/types/src/api/account/index.ts b/packages/types/src/api/account/index.ts
index 1f46e364d8..e5bdd6da54 100644
--- a/packages/types/src/api/account/index.ts
+++ b/packages/types/src/api/account/index.ts
@@ -1,4 +1,3 @@
 export * from "./accounts"
-export * from "./user"
 export * from "./license"
 export * from "./status"
diff --git a/packages/types/src/api/account/user.ts b/packages/types/src/api/account/user.ts
deleted file mode 100644
index 0a0ab0aeb8..0000000000
--- a/packages/types/src/api/account/user.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export interface PostAccountUserActivity {
-  timestamp: number
-}
-
-export interface PostAccountUserActivityResponse {
-  userId: string
-  timestamp: number
-}
diff --git a/packages/types/src/api/web/analytics.ts b/packages/types/src/api/web/analytics.ts
index 172aeb8dd4..3195da5df4 100644
--- a/packages/types/src/api/web/analytics.ts
+++ b/packages/types/src/api/web/analytics.ts
@@ -3,8 +3,16 @@ export enum PingSource {
   APP = "app",
 }
 
+export interface AnalyticsEnabledResponse {
+  enabled: boolean
+}
+
 export interface AnalyticsPingRequest {
   source: PingSource
   timezone: string
   embedded?: boolean
 }
+export interface AnalyticsPingResponse {
+  message: string
+  source?: PingSource
+}
diff --git a/packages/types/src/api/web/apikeys.ts b/packages/types/src/api/web/apikeys.ts
new file mode 100644
index 0000000000..1d089cd0ac
--- /dev/null
+++ b/packages/types/src/api/web/apikeys.ts
@@ -0,0 +1,10 @@
+export type ApiKeyFetchResponse = Record<string, string>
+
+export interface UpdateApiKeyRequest {
+  value: string
+}
+
+export interface UpdateApiKeyResponse {
+  _id: string
+  _rev: string
+}
diff --git a/packages/types/src/api/web/app/application.ts b/packages/types/src/api/web/app/application.ts
new file mode 100644
index 0000000000..a0f53a6ba4
--- /dev/null
+++ b/packages/types/src/api/web/app/application.ts
@@ -0,0 +1,91 @@
+import type { PlanType } from "../../../sdk"
+import type { Layout, App, Screen } from "../../../documents"
+import { ReadStream } from "fs"
+
+export interface SyncAppResponse {
+  message: string
+}
+
+export interface CreateAppRequest {
+  name: string
+  url?: string
+  useTemplate?: string
+  templateName?: string
+  templateKey?: string
+  fileToImport?: string
+  encryptionPassword?: string
+  file?: { path: string }
+}
+
+export interface CreateAppResponse extends App {}
+
+export interface DuplicateAppRequest {
+  name: string
+  url?: string
+}
+
+export interface DuplicateAppResponse {
+  duplicateAppId: string
+  sourceAppId: string
+}
+
+export interface FetchAppDefinitionResponse {
+  layouts: Layout[]
+  screens: Screen[]
+  libraries: string[]
+}
+
+export interface FetchAppPackageResponse {
+  application: App
+  licenseType: PlanType
+  screens: Screen[]
+  layouts: Layout[]
+  clientLibPath: string
+  hasLock: boolean
+}
+
+export interface AddAppSampleDataResponse {
+  message: string
+}
+
+export type FetchAppsResponse = App[]
+
+export interface PublishResponse {
+  _id: string
+  status: string
+  appUrl: string
+}
+
+export interface UpdateAppRequest extends Partial<App> {}
+export interface UpdateAppResponse extends App {}
+export interface UpdateAppClientResponse extends App {}
+export interface RevertAppClientResponse extends App {}
+
+export interface DeleteAppResponse {
+  ok: boolean
+}
+
+export interface UnpublishAppResponse {
+  message: string
+}
+
+export interface ImportToUpdateAppRequest {
+  encryptionPassword?: string
+}
+export interface ImportToUpdateAppResponse {
+  message: string
+}
+
+export interface SetRevertableAppVersionRequest {
+  revertableVersion: string
+}
+export interface SetRevertableAppVersionResponse {
+  message: string
+}
+
+export interface ExportAppDumpRequest {
+  excludeRows: boolean
+  encryptPassword?: string
+}
+
+export type ExportAppDumpResponse = ReadStream
diff --git a/packages/types/src/api/web/app/automation.ts b/packages/types/src/api/web/app/automation.ts
new file mode 100644
index 0000000000..b97dee0baf
--- /dev/null
+++ b/packages/types/src/api/web/app/automation.ts
@@ -0,0 +1,85 @@
+import {
+  Automation,
+  AutomationActionStepId,
+  AutomationLogPage,
+  AutomationResults,
+  AutomationStatus,
+  AutomationStepDefinition,
+  AutomationTriggerDefinition,
+  AutomationTriggerStepId,
+  DidNotTriggerResponse,
+  Row,
+} from "../../../documents"
+import { DocumentDestroyResponse } from "@budibase/nano"
+
+export type GetAutomationTriggerDefinitionsResponse = Record<
+  keyof typeof AutomationTriggerStepId,
+  AutomationTriggerDefinition
+>
+
+export type GetAutomationActionDefinitionsResponse = Record<
+  keyof typeof AutomationActionStepId,
+  AutomationStepDefinition
+>
+
+export interface GetAutomationStepDefinitionsResponse {
+  trigger: GetAutomationTriggerDefinitionsResponse
+  action: GetAutomationActionDefinitionsResponse
+}
+
+export interface DeleteAutomationResponse extends DocumentDestroyResponse {}
+
+export interface FetchAutomationResponse {
+  automations: Automation[]
+}
+
+export interface FindAutomationResponse extends Automation {}
+
+export interface UpdateAutomationRequest extends Automation {}
+export interface UpdateAutomationResponse {
+  message: string
+  automation: Automation
+}
+
+export interface CreateAutomationRequest extends Automation {}
+export interface CreateAutomationResponse {
+  message: string
+  automation: Automation
+}
+
+export interface SearchAutomationLogsRequest {
+  startDate?: string
+  status?: AutomationStatus
+  automationId?: string
+  page?: string
+}
+export interface SearchAutomationLogsResponse extends AutomationLogPage {}
+
+export interface ClearAutomationLogRequest {
+  automationId: string
+  appId: string
+}
+export interface ClearAutomationLogResponse {
+  message: string
+}
+
+export interface TriggerAutomationRequest {
+  fields: Record<string, any>
+  // time in seconds
+  timeout: number
+}
+export type TriggerAutomationResponse = Record<string, any> | undefined
+
+export interface TestAutomationRequest {
+  id?: string
+  revision?: string
+  fields: Record<string, any>
+  row?: Row
+}
+export type TestAutomationResponse = AutomationResults | DidNotTriggerResponse
+
+export function isDidNotTriggerResponse(
+  response: TestAutomationResponse
+): response is DidNotTriggerResponse {
+  return !!("message" in response && response.message)
+}
diff --git a/packages/types/src/api/web/app/component.ts b/packages/types/src/api/web/app/component.ts
new file mode 100644
index 0000000000..486809a6b1
--- /dev/null
+++ b/packages/types/src/api/web/app/component.ts
@@ -0,0 +1,4 @@
+export type FetchComponentDefinitionResponse = Record<
+  string,
+  Record<string, any>
+>
diff --git a/packages/types/src/api/web/app/datasource.ts b/packages/types/src/api/web/app/datasource.ts
index f931665917..77c47c02d6 100644
--- a/packages/types/src/api/web/app/datasource.ts
+++ b/packages/types/src/api/web/app/datasource.ts
@@ -12,7 +12,7 @@ export interface UpdateDatasourceResponse {
 export interface CreateDatasourceRequest {
   datasource: Datasource
   fetchSchema?: boolean
-  tablesFilter: string[]
+  tablesFilter?: string[]
 }
 
 export interface VerifyDatasourceRequest {
@@ -42,3 +42,14 @@ export interface BuildSchemaFromSourceResponse {
   datasource: Datasource
   errors: Record<string, string>
 }
+
+export type FetchDatasourcesResponse = Datasource[]
+export type FindDatasourcesResponse = Datasource
+
+export interface DeleteDatasourceResponse {
+  message: string
+}
+
+export interface FetchExternalSchemaResponse {
+  schema: string
+}
diff --git a/packages/types/src/api/web/app/deployment.ts b/packages/types/src/api/web/app/deployment.ts
new file mode 100644
index 0000000000..eed3f6eb77
--- /dev/null
+++ b/packages/types/src/api/web/app/deployment.ts
@@ -0,0 +1,12 @@
+import { DeploymentDoc, DeploymentStatus } from "../../../documents"
+
+export interface PublishAppResponse extends DeploymentDoc {}
+
+export interface DeploymentProgressResponse {
+  _id: string
+  appId: string
+  status?: DeploymentStatus
+  updatedAt: number
+}
+
+export type FetchDeploymentResponse = DeploymentProgressResponse[]
diff --git a/packages/types/src/api/web/app/index.ts b/packages/types/src/api/web/app/index.ts
index 55e1428fb9..e2f8532dfe 100644
--- a/packages/types/src/api/web/app/index.ts
+++ b/packages/types/src/api/web/app/index.ts
@@ -1,6 +1,5 @@
 export * from "./backup"
 export * from "./datasource"
-export * from "./row"
 export * from "./view"
 export * from "./rows"
 export * from "./table"
@@ -8,3 +7,15 @@ export * from "./permission"
 export * from "./attachment"
 export * from "./user"
 export * from "./rowAction"
+export * from "./automation"
+export * from "./component"
+export * from "./integration"
+export * from "./metadata"
+export * from "./query"
+export * from "./screen"
+export * from "./application"
+export * from "./layout"
+export * from "./deployment"
+export * from "./role"
+export * from "./webhook"
+export * from "./static"
diff --git a/packages/types/src/api/web/app/integration.ts b/packages/types/src/api/web/app/integration.ts
new file mode 100644
index 0000000000..8e52a32ba9
--- /dev/null
+++ b/packages/types/src/api/web/app/integration.ts
@@ -0,0 +1,8 @@
+import { Integration, SourceName } from "../../../sdk"
+
+export type FetchIntegrationsResponse = Record<
+  SourceName,
+  Integration | undefined
+>
+
+export type FindIntegrationResponse = Integration
diff --git a/packages/types/src/api/web/layout.ts b/packages/types/src/api/web/app/layout.ts
similarity index 50%
rename from packages/types/src/api/web/layout.ts
rename to packages/types/src/api/web/app/layout.ts
index 50512777ef..3067a1f49f 100644
--- a/packages/types/src/api/web/layout.ts
+++ b/packages/types/src/api/web/app/layout.ts
@@ -1,5 +1,9 @@
-import { Layout } from "../../documents"
+import { Layout } from "../../../documents"
 
 export interface SaveLayoutRequest extends Layout {}
 
 export interface SaveLayoutResponse extends Layout {}
+
+export interface DeleteLayoutResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/app/metadata.ts b/packages/types/src/api/web/app/metadata.ts
new file mode 100644
index 0000000000..5940f8e3d0
--- /dev/null
+++ b/packages/types/src/api/web/app/metadata.ts
@@ -0,0 +1,14 @@
+import { MetadataType, Document } from "../../../documents"
+
+export interface GetMetadataTypesResponse {
+  types: typeof MetadataType
+}
+
+export interface SaveMetadataRequest extends Document {}
+export interface SaveMetadataResponse extends Document {}
+
+export interface DeleteMetadataResponse {
+  message: string
+}
+
+export interface FindMetadataResponse extends Document {}
diff --git a/packages/types/src/api/web/app/permission.ts b/packages/types/src/api/web/app/permission.ts
index b40310f21c..b449516eed 100644
--- a/packages/types/src/api/web/app/permission.ts
+++ b/packages/types/src/api/web/app/permission.ts
@@ -1,4 +1,8 @@
-import { PermissionLevel } from "../../../sdk"
+import { BuiltinPermission, PermissionLevel } from "../../../sdk"
+
+export type FetchBuiltinPermissionsResponse = BuiltinPermission[]
+
+export type FetchPermissionLevelsRequest = string[]
 
 export interface FetchResourcePermissionInfoResponse {
   [key: string]: Record<string, string>
@@ -25,7 +29,9 @@ export interface AddedPermission {
   reason?: string
 }
 
-export interface AddPermissionResponse {}
+export interface AddPermissionResponse {
+  message: string
+}
 
 export interface AddPermissionRequest {
   roleId: string
@@ -34,4 +40,6 @@ export interface AddPermissionRequest {
 }
 
 export interface RemovePermissionRequest extends AddPermissionRequest {}
-export interface RemovePermissionResponse {}
+export interface RemovePermissionResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/app/query.ts b/packages/types/src/api/web/app/query.ts
new file mode 100644
index 0000000000..75cc37e1a9
--- /dev/null
+++ b/packages/types/src/api/web/app/query.ts
@@ -0,0 +1,51 @@
+import {
+  Datasource,
+  Query,
+  QueryPreview,
+  QuerySchema,
+} from "../../../documents"
+
+export type FetchQueriesResponse = Query[]
+
+export interface SaveQueryRequest extends Query {}
+export interface SaveQueryResponse extends Query {}
+
+export interface ImportRestQueryRequest {
+  datasourceId: string
+  data: string
+  datasource: Datasource
+}
+export interface ImportRestQueryResponse {
+  errorQueries: Query[]
+  queries: Query[]
+  datasourceId: string
+}
+
+export interface FindQueryResponse extends Query {}
+
+export interface PreviewQueryRequest extends QueryPreview {}
+
+export interface PreviewQueryResponse {
+  rows: any[]
+  nestedSchemaFields: { [key: string]: { [key: string]: string | QuerySchema } }
+  schema: { [key: string]: string | QuerySchema }
+  info: any
+  extra: any
+}
+
+export interface ExecuteQueryRequest {
+  parameters?: Record<string, string>
+  pagination?: any
+}
+export type ExecuteV1QueryResponse = Record<string, any>[]
+export interface ExecuteV2QueryResponse {
+  data: Record<string, any>[]
+  pagination?: {
+    page: number
+    cursor: string
+  }
+}
+
+export interface DeleteQueryResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/role.ts b/packages/types/src/api/web/app/role.ts
similarity index 73%
rename from packages/types/src/api/web/role.ts
rename to packages/types/src/api/web/app/role.ts
index f1c573c849..f23b2fd232 100644
--- a/packages/types/src/api/web/role.ts
+++ b/packages/types/src/api/web/app/role.ts
@@ -1,5 +1,5 @@
-import { Role, RoleUIMetadata } from "../../documents"
-import { PermissionLevel, BuiltinPermissionID } from "../../sdk"
+import { Role, RoleUIMetadata } from "../../../documents"
+import { PermissionLevel, BuiltinPermissionID } from "../../../sdk"
 
 export interface SaveRoleRequest {
   _id?: string
@@ -18,7 +18,7 @@ export interface FindRoleResponse extends Role {}
 
 export type FetchRolesResponse = Role[]
 
-export interface DestroyRoleResponse {
+export interface DeleteRoleResponse {
   message: string
 }
 
diff --git a/packages/types/src/api/web/app/row.ts b/packages/types/src/api/web/app/row.ts
deleted file mode 100644
index 4ab4090461..0000000000
--- a/packages/types/src/api/web/app/row.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import { Row } from "../../../documents/app/row"
-
-export interface GetRowResponse extends Row {}
-
-export interface DeleteRows {
-  rows: (Row | string)[]
-}
-
-export interface DeleteRow {
-  _id: string
-}
-
-export type DeleteRowRequest = DeleteRows | DeleteRow
-
-export interface ValidateResponse {
-  valid: boolean
-  errors: Record<string, any>
-}
diff --git a/packages/types/src/api/web/app/rowAction.ts b/packages/types/src/api/web/app/rowAction.ts
index 84e4e529ed..b4ff5538b5 100644
--- a/packages/types/src/api/web/app/rowAction.ts
+++ b/packages/types/src/api/web/app/rowAction.ts
@@ -21,6 +21,9 @@ export interface RowActionsResponse {
 export interface RowActionTriggerRequest {
   rowId: string
 }
+export interface RowActionTriggerResponse {
+  message: string
+}
 
 export interface RowActionPermissionsResponse
   extends RowActionPermissionsData {}
diff --git a/packages/types/src/api/web/app/rows.ts b/packages/types/src/api/web/app/rows.ts
deleted file mode 100644
index ce6f6f672d..0000000000
--- a/packages/types/src/api/web/app/rows.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { SearchFilters, RowSearchParams } from "../../../sdk"
-import { Row } from "../../../documents"
-import { PaginationResponse, SortOrder } from "../../../api"
-import { ReadStream } from "fs"
-
-export interface SaveRowRequest extends Row {}
-
-export interface PatchRowRequest extends Row {
-  _id: string
-  _rev: string
-  tableId: string
-}
-
-export interface PatchRowResponse extends Row {}
-
-export interface SearchRowRequest extends Omit<RowSearchParams, "tableId"> {}
-
-export interface SearchViewRowRequest
-  extends Pick<
-    SearchRowRequest,
-    | "sort"
-    | "sortOrder"
-    | "sortType"
-    | "limit"
-    | "bookmark"
-    | "paginate"
-    | "query"
-    | "countRows"
-  > {}
-
-export interface SearchRowResponse {
-  rows: any[]
-}
-
-export interface PaginatedSearchRowResponse
-  extends SearchRowResponse,
-    PaginationResponse {}
-
-export interface ExportRowsRequest {
-  rows?: string[]
-  columns?: string[]
-  query?: SearchFilters
-  sort?: string
-  sortOrder?: SortOrder
-  delimiter?: string
-  customHeaders?: { [key: string]: string }
-}
-
-export type ExportRowsResponse = ReadStream
diff --git a/packages/types/src/api/web/app/rows/index.ts b/packages/types/src/api/web/app/rows/index.ts
new file mode 100644
index 0000000000..7994f9736b
--- /dev/null
+++ b/packages/types/src/api/web/app/rows/index.ts
@@ -0,0 +1,54 @@
+import { SearchFilters } from "../../../../sdk"
+import { Row } from "../../../../documents"
+import { SortOrder } from "../../pagination"
+import { ReadStream } from "fs"
+import stream from "node:stream"
+
+export * from "./search"
+
+export interface FetchEnrichedRowResponse extends Row {}
+
+export type FetchRowsResponse = Row[]
+
+export interface SaveRowRequest extends Row {}
+export interface SaveRowResponse extends Row {}
+
+export interface PatchRowRequest extends Row {
+  _id: string
+  _rev: string
+  tableId: string
+}
+
+export interface PatchRowResponse extends Row {}
+
+export interface ExportRowsRequest {
+  rows?: string[]
+  columns?: string[]
+  query?: SearchFilters
+  sort?: string
+  sortOrder?: SortOrder
+  delimiter?: string
+  customHeaders?: { [key: string]: string }
+}
+
+export type ExportRowsResponse = ReadStream
+
+export type DownloadAttachmentResponse = stream.PassThrough | stream.Readable
+
+export interface FindRowResponse extends Row {}
+
+export interface DeleteRows {
+  rows: (Row | string)[]
+}
+
+export interface DeleteRow {
+  _id: string
+}
+
+export type DeleteRowRequest = DeleteRows | DeleteRow
+
+export interface ValidateRowRequest extends Row {}
+export interface ValidateRowResponse {
+  valid: boolean
+  errors: Record<string, any>
+}
diff --git a/packages/types/src/api/web/app/rows/search.ts b/packages/types/src/api/web/app/rows/search.ts
new file mode 100644
index 0000000000..7ba23bceca
--- /dev/null
+++ b/packages/types/src/api/web/app/rows/search.ts
@@ -0,0 +1,100 @@
+import {
+  ArrayOperator,
+  BasicOperator,
+  EmptyFilterOption,
+  InternalSearchFilterOperator,
+  LogicalOperator,
+  RangeOperator,
+  SearchFilterKey,
+} from "../../../../sdk"
+import { Row } from "../../../../documents"
+import {
+  PaginationResponse,
+  SortOrder,
+  SortType,
+} from "../../../../api/web/pagination"
+import { z } from "zod"
+
+const fieldKey = z
+  .string()
+  .refine(s => s !== InternalSearchFilterOperator.COMPLEX_ID_OPERATOR, {
+    message: `Key '${InternalSearchFilterOperator.COMPLEX_ID_OPERATOR}' is not allowed`,
+  })
+
+const stringBasicFilter = z.record(fieldKey, z.string())
+const basicFilter = z.record(fieldKey, z.any())
+const arrayFilter = z.record(fieldKey, z.union([z.any().array(), z.string()]))
+const logicFilter = z.lazy(() =>
+  z.object({
+    conditions: z.array(z.object(queryFilterValidation)),
+  })
+)
+
+const stringOrNumber = z.union([z.string(), z.number()])
+
+const queryFilterValidation: Record<SearchFilterKey, z.ZodTypeAny> = {
+  [BasicOperator.STRING]: stringBasicFilter.optional(),
+  [BasicOperator.FUZZY]: stringBasicFilter.optional(),
+  [RangeOperator.RANGE]: z
+    .record(
+      fieldKey,
+      z.union([
+        z.object({ high: stringOrNumber, low: stringOrNumber }),
+        z.object({ high: stringOrNumber }),
+        z.object({ low: stringOrNumber }),
+      ])
+    )
+    .optional(),
+  [BasicOperator.EQUAL]: basicFilter.optional(),
+  [BasicOperator.NOT_EQUAL]: basicFilter.optional(),
+  [BasicOperator.EMPTY]: basicFilter.optional(),
+  [BasicOperator.NOT_EMPTY]: basicFilter.optional(),
+  [ArrayOperator.ONE_OF]: arrayFilter.optional(),
+  [ArrayOperator.CONTAINS]: arrayFilter.optional(),
+  [ArrayOperator.NOT_CONTAINS]: arrayFilter.optional(),
+  [ArrayOperator.CONTAINS_ANY]: arrayFilter.optional(),
+  [LogicalOperator.AND]: logicFilter.optional(),
+  [LogicalOperator.OR]: logicFilter.optional(),
+}
+
+const searchRowRequest = z.object({
+  query: z
+    .object({
+      allOr: z.boolean().optional(),
+      onEmptyFilter: z.nativeEnum(EmptyFilterOption).optional(),
+      ...queryFilterValidation,
+    })
+    .optional(),
+  paginate: z.boolean().optional(),
+  bookmark: z.union([z.string(), z.number()]).nullish(),
+  limit: z.number().optional(),
+  sort: z.string().nullish(),
+  sortOrder: z.nativeEnum(SortOrder).optional(),
+  sortType: z.nativeEnum(SortType).nullish(),
+  version: z.string().optional(),
+  disableEscaping: z.boolean().optional(),
+  countRows: z.boolean().optional(),
+})
+
+export const searchRowRequestValidator = searchRowRequest
+
+export type SearchRowRequest = z.infer<typeof searchRowRequest>
+export type SearchViewRowRequest = Pick<
+  SearchRowRequest,
+  | "sort"
+  | "sortOrder"
+  | "sortType"
+  | "limit"
+  | "bookmark"
+  | "paginate"
+  | "query"
+  | "countRows"
+>
+
+export interface SearchRowResponse {
+  rows: Row[]
+}
+
+export interface PaginatedSearchRowResponse
+  extends SearchRowResponse,
+    PaginationResponse {}
diff --git a/packages/types/src/api/web/app/screen.ts b/packages/types/src/api/web/app/screen.ts
new file mode 100644
index 0000000000..372d1ba2ea
--- /dev/null
+++ b/packages/types/src/api/web/app/screen.ts
@@ -0,0 +1,17 @@
+import { ScreenRoutingJson, Screen } from "../../../documents"
+
+export interface FetchScreenRoutingResponse {
+  routes: ScreenRoutingJson
+}
+
+export interface FetchClientScreenRoutingResponse
+  extends FetchScreenRoutingResponse {}
+
+export type FetchScreenResponse = Screen[]
+
+export interface SaveScreenRequest extends Screen {}
+export interface SaveScreenResponse extends Screen {}
+
+export interface DeleteScreenResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/app/static.ts b/packages/types/src/api/web/app/static.ts
new file mode 100644
index 0000000000..bcd901d1e1
--- /dev/null
+++ b/packages/types/src/api/web/app/static.ts
@@ -0,0 +1,25 @@
+import { App } from "../../../documents"
+import stream from "node:stream"
+
+export interface ToggleBetaFeatureResponse {
+  message: string
+}
+
+export type ServeAppResponse = string
+
+interface BuilderPreview extends App {
+  builderPreview: boolean
+}
+
+export type ServeBuilderPreviewResponse = BuilderPreview | string
+
+export type ServeClientLibraryResponse = stream.Readable
+
+export interface GetSignedUploadUrlRequest {
+  bucket: string
+  key: string
+}
+export interface GetSignedUploadUrlResponse {
+  signedUrl?: string
+  publicUrl?: string
+}
diff --git a/packages/types/src/api/web/app/table.ts b/packages/types/src/api/web/app/table.ts
index bb9329f6c1..f5d0d71560 100644
--- a/packages/types/src/api/web/app/table.ts
+++ b/packages/types/src/api/web/app/table.ts
@@ -3,33 +3,30 @@ import { ViewV2Enriched } from "../../../sdk"
 
 export type TableViewsResponse = { [key: string]: View | ViewV2Enriched }
 
-export interface TableResponse extends Table {
+export interface FindTableResponse extends Table {
   views?: TableViewsResponse
 }
 
-export type FetchTablesResponse = TableResponse[]
+export type FetchTablesResponse = FindTableResponse[]
 
 export interface SaveTableRequest extends TableRequest {
   rows?: Row[]
 }
-
 export type SaveTableResponse = Table
 
 export interface BulkImportRequest {
   rows: Row[]
   identifierFields?: Array<string>
 }
-
 export interface BulkImportResponse {
   message: string
 }
 
-export interface MigrateRequest {
+export interface MigrateTableRequest {
   oldColumn: string
   newColumn: string
 }
-
-export interface MigrateResponse {
+export interface MigrateTableResponse {
   message: string
 }
 
@@ -37,12 +34,10 @@ export interface ValidateNewTableImportRequest {
   rows: Row[]
   schema: TableSchema
 }
-
 export interface ValidateTableImportRequest {
   tableId?: string
   rows: Row[]
 }
-
 export interface ValidateTableImportResponse {
   schemaValidation: {
     [field: string]: boolean
@@ -55,5 +50,8 @@ export interface ValidateTableImportResponse {
 export interface CsvToJsonRequest {
   csvString: string
 }
-
 export type CsvToJsonResponse = any[]
+
+export interface DeleteTableResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/app/user.ts b/packages/types/src/api/web/app/user.ts
index 7faec83e9c..ebdc43ea27 100644
--- a/packages/types/src/api/web/app/user.ts
+++ b/packages/types/src/api/web/app/user.ts
@@ -1,9 +1,27 @@
-import { ContextUserMetadata } from "../../../"
+import { ContextUserMetadata, Flags, UserMetadata } from "../../../"
+import { DocumentInsertResponse } from "@budibase/nano"
 
 export type FetchUserMetadataResponse = ContextUserMetadata[]
 export type FindUserMetadataResponse = ContextUserMetadata
 
-export interface SetFlagRequest {
+export interface SetUserFlagRequest {
   flag: string
   value: any
 }
+export interface SetUserFlagResponse {
+  message: string
+}
+
+export interface GetUserFlagsResponse extends Flags {}
+
+export type AppSelfResponse = ContextUserMetadata | {}
+
+export interface UpdateSelfMetadataRequest extends UserMetadata {}
+export interface UpdateSelfMetadataResponse extends DocumentInsertResponse {}
+
+export interface UpdateUserMetadataRequest extends UserMetadata {}
+export interface UpdateUserMetadataResponse extends DocumentInsertResponse {}
+
+export interface DeleteUserMetadataResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/app/view.ts b/packages/types/src/api/web/app/view.ts
index a6be5e2986..8ce7d5ca9e 100644
--- a/packages/types/src/api/web/app/view.ts
+++ b/packages/types/src/api/web/app/view.ts
@@ -9,6 +9,12 @@ export interface ViewResponseEnriched {
   data: ViewV2Enriched
 }
 
+export interface ViewFetchResponseEnriched {
+  data: ViewV2Enriched[]
+}
+
 export interface CreateViewRequest extends Omit<ViewV2, "version" | "id"> {}
+export interface CreateViewResponse extends ViewResponse {}
 
 export interface UpdateViewRequest extends ViewV2 {}
+export interface UpdateViewResponse extends ViewResponse {}
diff --git a/packages/types/src/api/web/app/webhook.ts b/packages/types/src/api/web/app/webhook.ts
new file mode 100644
index 0000000000..a75b6a1515
--- /dev/null
+++ b/packages/types/src/api/web/app/webhook.ts
@@ -0,0 +1,21 @@
+import { Webhook } from "../../../documents"
+import { DocumentDestroyResponse, DocumentInsertResponse } from "@budibase/nano"
+
+export type FetchWebhooksResponse = Webhook[]
+
+export interface SaveWebhookRequest extends Webhook {}
+export interface SaveWebhookResponse {
+  message: string
+  webhook: Webhook
+}
+
+export interface DeleteWebhookResponse extends DocumentDestroyResponse {}
+
+export interface BuildWebhookSchemaRequest extends Record<string, any> {}
+export interface BuildWebhookSchemaResponse extends DocumentInsertResponse {}
+
+export interface TriggerWebhookRequest {}
+export type TriggerWebhookResponse =
+  | Record<string, any>
+  | { message: string }
+  | undefined
diff --git a/packages/types/src/api/web/application.ts b/packages/types/src/api/web/application.ts
deleted file mode 100644
index 57422ceabc..0000000000
--- a/packages/types/src/api/web/application.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import type { PlanType } from "../../sdk"
-import type { Layout, App, Screen } from "../../documents"
-
-export interface CreateAppRequest {
-  name: string
-  url?: string
-  useTemplate?: string
-  templateName?: string
-  templateKey?: string
-  fileToImport?: string
-  encryptionPassword?: string
-  file?: { path: string }
-}
-
-export interface DuplicateAppRequest {
-  name: string
-  url?: string
-}
-
-export interface DuplicateAppResponse {
-  duplicateAppId: string
-  sourceAppId: string
-}
-
-export interface FetchAppDefinitionResponse {
-  layouts: Layout[]
-  screens: Screen[]
-  libraries: string[]
-}
-
-export interface FetchAppPackageResponse {
-  application: App
-  licenseType: PlanType
-  screens: Screen[]
-  layouts: Layout[]
-  clientLibPath: string
-  hasLock: boolean
-}
-
-export interface PublishResponse {
-  _id: string
-  status: string
-  appUrl: string
-}
-
-export interface UpdateAppRequest extends Partial<App> {}
-export interface UpdateAppResponse extends App {}
diff --git a/packages/types/src/api/web/auth.ts b/packages/types/src/api/web/auth.ts
index d631762b30..5ef6169086 100644
--- a/packages/types/src/api/web/auth.ts
+++ b/packages/types/src/api/web/auth.ts
@@ -2,15 +2,36 @@ export interface LoginRequest {
   username: string
   password: string
 }
+export interface LoginResponse {
+  message: string
+  userId?: string
+}
+
+export interface LogoutResponse {
+  message: string
+}
+
+export interface SetInitInfoRequest extends Record<string, any> {}
+export interface SetInitInfoResponse {
+  message: string
+}
+
+export interface GetInitInfoResponse extends Record<string, any> {}
 
 export interface PasswordResetRequest {
   email: string
 }
+export interface PasswordResetResponse {
+  message: string
+}
 
 export interface PasswordResetUpdateRequest {
   resetCode: string
   password: string
 }
+export interface PasswordResetUpdateResponse {
+  message: string
+}
 
 export interface UpdateSelfRequest {
   firstName?: string
diff --git a/packages/types/src/api/web/automation.ts b/packages/types/src/api/web/automation.ts
deleted file mode 100644
index 06080fc667..0000000000
--- a/packages/types/src/api/web/automation.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { DocumentDestroyResponse } from "@budibase/nano"
-import { Automation } from "../../documents"
-
-export interface DeleteAutomationResponse extends DocumentDestroyResponse {}
-
-export interface FetchAutomationResponse {
-  automations: Automation[]
-}
diff --git a/packages/types/src/api/web/dev.ts b/packages/types/src/api/web/dev.ts
new file mode 100644
index 0000000000..461676a480
--- /dev/null
+++ b/packages/types/src/api/web/dev.ts
@@ -0,0 +1,11 @@
+export interface GetVersionResponse {
+  version: string
+}
+
+export interface ClearDevLockResponse {
+  message: string
+}
+
+export interface RevertAppResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/global/configs.ts b/packages/types/src/api/web/global/configs.ts
index b36d974904..e16ed3c27f 100644
--- a/packages/types/src/api/web/global/configs.ts
+++ b/packages/types/src/api/web/global/configs.ts
@@ -1,4 +1,10 @@
-import { SettingsConfig, SettingsInnerConfig } from "../../../documents"
+import {
+  Config,
+  ConfigType,
+  SettingsBrandingConfig,
+  SettingsConfig,
+  SettingsInnerConfig,
+} from "../../../documents"
 
 /**
  * Settings that aren't stored in the database - enriched at runtime.
@@ -22,3 +28,34 @@ export interface PublicOIDCConfig {
 }
 
 export type GetPublicOIDCConfigResponse = PublicOIDCConfig[]
+
+export interface SaveConfigRequest extends Config {}
+export interface SaveConfigResponse {
+  type: ConfigType
+  _id: string
+  _rev: string
+}
+
+export interface DeleteConfigResponse {
+  message: string
+}
+
+interface ChecklistItem {
+  checked: boolean
+  label: string
+  link: string
+}
+export interface ConfigChecklistResponse {
+  apps: ChecklistItem
+  smtp: ChecklistItem
+  adminUser: ChecklistItem
+  sso: ChecklistItem
+  branding: SettingsBrandingConfig
+}
+
+export type FindConfigResponse = Config | {}
+
+export interface UploadConfigFileResponse {
+  message: string
+  url: string
+}
diff --git a/packages/types/src/api/web/global/email.ts b/packages/types/src/api/web/global/email.ts
new file mode 100644
index 0000000000..a0ca0e8485
--- /dev/null
+++ b/packages/types/src/api/web/global/email.ts
@@ -0,0 +1,28 @@
+import { EmailAttachment, EmailInvite } from "../../../documents"
+
+export enum EmailTemplatePurpose {
+  CORE = "core",
+  BASE = "base",
+  PASSWORD_RECOVERY = "password_recovery",
+  INVITATION = "invitation",
+  WELCOME = "welcome",
+  CUSTOM = "custom",
+}
+
+export interface SendEmailRequest {
+  workspaceId?: string
+  email: string
+  userId: string
+  purpose: EmailTemplatePurpose
+  contents?: string
+  from?: string
+  subject: string
+  cc?: boolean
+  bcc?: boolean
+  automation?: boolean
+  invite?: EmailInvite
+  attachments?: EmailAttachment[]
+}
+export interface SendEmailResponse extends Record<string, any> {
+  message: string
+}
diff --git a/packages/types/src/api/web/global/environmentVariables.ts b/packages/types/src/api/web/global/environmentVariables.ts
index 6f339eb821..b9399e246b 100644
--- a/packages/types/src/api/web/global/environmentVariables.ts
+++ b/packages/types/src/api/web/global/environmentVariables.ts
@@ -7,12 +7,22 @@ export interface CreateEnvironmentVariableRequest {
   production: string
   development: string
 }
+export interface CreateEnvironmentVariableResponse {
+  message: string
+}
 
 export interface UpdateEnvironmentVariableRequest {
   production: string
   development: string
 }
+export interface UpdateEnvironmentVariableResponse {
+  message: string
+}
 
 export interface GetEnvironmentVariablesResponse {
   variables: string[]
 }
+
+export interface DeleteEnvironmentVariablesResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/global/events.ts b/packages/types/src/api/web/global/events.ts
index 907cfc74aa..e55808bd32 100644
--- a/packages/types/src/api/web/global/events.ts
+++ b/packages/types/src/api/web/global/events.ts
@@ -5,3 +5,6 @@ export enum EventPublishType {
 export interface PostEventPublishRequest {
   type: EventPublishType
 }
+export interface PostEventPublishResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/global/index.ts b/packages/types/src/api/web/global/index.ts
index efcb6dc39c..36dce60b6c 100644
--- a/packages/types/src/api/web/global/index.ts
+++ b/packages/types/src/api/web/global/index.ts
@@ -4,3 +4,8 @@ export * from "./events"
 export * from "./configs"
 export * from "./scim"
 export * from "./license"
+export * from "./oldMigration"
+export * from "./email"
+export * from "./role"
+export * from "./self"
+export * from "./template"
diff --git a/packages/types/src/api/web/global/license.ts b/packages/types/src/api/web/global/license.ts
index 21d8876412..d108880f93 100644
--- a/packages/types/src/api/web/global/license.ts
+++ b/packages/types/src/api/web/global/license.ts
@@ -1,8 +1,13 @@
 // LICENSE KEY
 
+import { QuotaUsage } from "../../../documents"
+
 export interface ActivateLicenseKeyRequest {
   licenseKey: string
 }
+export interface ActivateLicenseKeyResponse {
+  message: string
+}
 
 export interface GetLicenseKeyResponse {
   licenseKey: string
@@ -13,13 +18,24 @@ export interface GetLicenseKeyResponse {
 export interface ActivateOfflineLicenseTokenRequest {
   offlineLicenseToken: string
 }
+export interface ActivateOfflineLicenseTokenResponse {
+  message: string
+}
 
 export interface GetOfflineLicenseTokenResponse {
   offlineLicenseToken: string
 }
 
+// REFRESH
+
+export interface RefreshOfflineLicenseResponse {
+  message: string
+}
+
 // IDENTIFIER
 
 export interface GetOfflineIdentifierResponse {
   identifierBase64: string
 }
+
+export interface GetQuotaUsageResponse extends QuotaUsage {}
diff --git a/packages/types/src/api/web/global/oldMigration.ts b/packages/types/src/api/web/global/oldMigration.ts
new file mode 100644
index 0000000000..f0da6c52f3
--- /dev/null
+++ b/packages/types/src/api/web/global/oldMigration.ts
@@ -0,0 +1,3 @@
+export interface GetMigrationStatus {
+  migrated: boolean
+}
diff --git a/packages/types/src/api/web/global/role.ts b/packages/types/src/api/web/global/role.ts
new file mode 100644
index 0000000000..1d45995fd2
--- /dev/null
+++ b/packages/types/src/api/web/global/role.ts
@@ -0,0 +1,17 @@
+import { Role } from "../../../documents"
+
+interface GlobalRoleResponse {
+  roles: Role[]
+  name: string
+  version: string
+  url?: string
+}
+
+export interface FetchGlobalRolesResponse
+  extends Record<string, GlobalRoleResponse> {}
+
+export interface FindGlobalRoleResponse extends GlobalRoleResponse {}
+
+export interface RemoveAppRoleResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/global/self.ts b/packages/types/src/api/web/global/self.ts
new file mode 100644
index 0000000000..9d99a1f1a5
--- /dev/null
+++ b/packages/types/src/api/web/global/self.ts
@@ -0,0 +1,19 @@
+import { License } from "../../../sdk"
+import { Account, DevInfo, User } from "../../../documents"
+import { FeatureFlags } from "@budibase/types"
+
+export interface GenerateAPIKeyRequest {
+  userId?: string
+}
+export interface GenerateAPIKeyResponse extends DevInfo {}
+
+export interface FetchAPIKeyResponse extends DevInfo {}
+
+export interface GetGlobalSelfResponse extends User {
+  flags?: FeatureFlags
+  account?: Account
+  license: License
+  budibaseAccess: boolean
+  accountPortalAccess: boolean
+  csrfToken: string
+}
diff --git a/packages/types/src/api/web/global/template.ts b/packages/types/src/api/web/global/template.ts
new file mode 100644
index 0000000000..069e6d3d1b
--- /dev/null
+++ b/packages/types/src/api/web/global/template.ts
@@ -0,0 +1,30 @@
+import { Template } from "../../../documents"
+
+export interface GlobalTemplateDefinition {
+  name: string
+  description: string
+  category: string
+}
+
+export interface GlobalTemplateBinding {
+  name: string
+  description: string
+}
+
+export interface FetchGlobalTemplateDefinitionResponse {
+  info: Record<string, GlobalTemplateDefinition>
+  bindings: Record<string, GlobalTemplateBinding[]>
+}
+
+export interface SaveGlobalTemplateRequest extends Template {}
+export interface SaveGlobalTemplateResponse extends Template {}
+
+export type FetchGlobalTemplateResponse = Template[]
+export type FetchGlobalTemplateByTypeResponse = Template[]
+export type FetchGlobalTemplateByOwnerIDResponse = Template[]
+
+export interface FindGlobalTemplateResponse extends Template {}
+
+export interface DeleteGlobalTemplateResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/index.ts b/packages/types/src/api/web/index.ts
index 27d51ce1b7..9fcfb77f4f 100644
--- a/packages/types/src/api/web/index.ts
+++ b/packages/types/src/api/web/index.ts
@@ -1,4 +1,3 @@
-export * from "./application"
 export * from "./analytics"
 export * from "./auth"
 export * from "./user"
@@ -11,8 +10,7 @@ export * from "./global"
 export * from "./pagination"
 export * from "./searchFilter"
 export * from "./cookies"
-export * from "./automation"
-export * from "./layout"
-export * from "./query"
-export * from "./role"
 export * from "./plugins"
+export * from "./apikeys"
+export * from "./dev"
+export * from "./template"
diff --git a/packages/types/src/api/web/pagination.ts b/packages/types/src/api/web/pagination.ts
index 48588bf6a1..f87bc97824 100644
--- a/packages/types/src/api/web/pagination.ts
+++ b/packages/types/src/api/web/pagination.ts
@@ -24,4 +24,5 @@ export interface PaginationRequest extends BasicPaginationRequest {
 export interface PaginationResponse {
   bookmark: string | number | undefined
   hasNextPage?: boolean
+  totalRows?: number
 }
diff --git a/packages/types/src/api/web/plugins.ts b/packages/types/src/api/web/plugins.ts
index 458ad3f6ce..4dd47550e5 100644
--- a/packages/types/src/api/web/plugins.ts
+++ b/packages/types/src/api/web/plugins.ts
@@ -1,4 +1,10 @@
-import { PluginSource } from "../../documents"
+import { PluginSource, Plugin } from "../../documents"
+
+export interface UploadPluginRequest {}
+export interface UploadPluginResponse {
+  message: string
+  plugins: Plugin[]
+}
 
 export interface CreatePluginRequest {
   source: PluginSource
@@ -10,3 +16,9 @@ export interface CreatePluginRequest {
 export interface CreatePluginResponse {
   plugin: any
 }
+
+export type FetchPluginResponse = Plugin[]
+
+export interface DeletePluginResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/query.ts b/packages/types/src/api/web/query.ts
deleted file mode 100644
index 66f0248647..0000000000
--- a/packages/types/src/api/web/query.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { QueryPreview, QuerySchema } from "../../documents"
-
-export interface PreviewQueryRequest extends QueryPreview {}
-
-export interface PreviewQueryResponse {
-  rows: any[]
-  nestedSchemaFields: { [key: string]: { [key: string]: string | QuerySchema } }
-  schema: { [key: string]: string | QuerySchema }
-  info: any
-  extra: any
-}
-
-export interface ExecuteQueryRequest {
-  parameters?: Record<string, string>
-  pagination?: any
-}
-
-export interface ExecuteQueryResponse {
-  data: Record<string, any>[]
-}
diff --git a/packages/types/src/api/web/system/account.ts b/packages/types/src/api/web/system/account.ts
new file mode 100644
index 0000000000..d854a632cb
--- /dev/null
+++ b/packages/types/src/api/web/system/account.ts
@@ -0,0 +1,4 @@
+import { Account, AccountMetadata } from "../../../documents"
+
+export interface SaveAccountRequest extends Account {}
+export interface SaveAccountResponse extends AccountMetadata {}
diff --git a/packages/types/src/api/web/system/environment.ts b/packages/types/src/api/web/system/environment.ts
index e27a1338e2..3b6ee9d983 100644
--- a/packages/types/src/api/web/system/environment.ts
+++ b/packages/types/src/api/web/system/environment.ts
@@ -1,8 +1,11 @@
 export interface GetEnvironmentResponse {
   multiTenancy: boolean
+  offlineMode: boolean
   cloud: boolean
-  accountPortalUrl: string
-  baseUrl: string
+  accountPortalUrl?: string
   disableAccountPortal: boolean
+  baseUrl?: string
   isDev: boolean
+  maintenance: { type: string }[]
+  passwordMinLength?: string
 }
diff --git a/packages/types/src/api/web/system/index.ts b/packages/types/src/api/web/system/index.ts
index 8820bf5cd1..18ed533e9d 100644
--- a/packages/types/src/api/web/system/index.ts
+++ b/packages/types/src/api/web/system/index.ts
@@ -1,2 +1,7 @@
 export * from "./environment"
 export * from "./status"
+export * from "./ops"
+export * from "./account"
+export * from "./log"
+export * from "./restore"
+export * from "./tenant"
diff --git a/packages/types/src/api/web/system/log.ts b/packages/types/src/api/web/system/log.ts
new file mode 100644
index 0000000000..8a8cb6e53d
--- /dev/null
+++ b/packages/types/src/api/web/system/log.ts
@@ -0,0 +1 @@
+export type GetLogResponse = Buffer
diff --git a/packages/types/src/api/web/system/ops.ts b/packages/types/src/api/web/system/ops.ts
new file mode 100644
index 0000000000..390e4db006
--- /dev/null
+++ b/packages/types/src/api/web/system/ops.ts
@@ -0,0 +1,8 @@
+export interface LogOpsRequest {
+  message: string
+  data?: any
+}
+
+export interface ErrorOpsRequest {
+  message: string
+}
diff --git a/packages/types/src/api/web/system/restore.ts b/packages/types/src/api/web/system/restore.ts
new file mode 100644
index 0000000000..b5e8850051
--- /dev/null
+++ b/packages/types/src/api/web/system/restore.ts
@@ -0,0 +1,3 @@
+export interface SystemRestoreResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/system/tenant.ts b/packages/types/src/api/web/system/tenant.ts
new file mode 100644
index 0000000000..00ed883499
--- /dev/null
+++ b/packages/types/src/api/web/system/tenant.ts
@@ -0,0 +1,3 @@
+export interface GetTenantInfoResponse {
+  exists: boolean
+}
diff --git a/packages/types/src/api/web/template.ts b/packages/types/src/api/web/template.ts
new file mode 100644
index 0000000000..c21fcc18ca
--- /dev/null
+++ b/packages/types/src/api/web/template.ts
@@ -0,0 +1,21 @@
+export enum TemplateType {
+  APP = "app",
+}
+
+export interface TemplateMetadata {
+  background: string
+  icon: string
+  category: string
+  description: string
+  name: string
+  url: string
+  type: TemplateType
+  key: string
+  image: string
+}
+
+export type FetchTemplateResponse = TemplateMetadata[]
+
+export interface DownloadTemplateResponse {
+  message: string
+}
diff --git a/packages/types/src/api/web/user.ts b/packages/types/src/api/web/user.ts
index e102f136c3..c1f37fd3f0 100644
--- a/packages/types/src/api/web/user.ts
+++ b/packages/types/src/api/web/user.ts
@@ -1,6 +1,15 @@
-import { User } from "../../documents"
+import { AccountMetadata, PlatformUser, User } from "../../documents"
 import { SearchFilters } from "../../sdk"
 
+export interface Invite {
+  email: string
+  info: any
+}
+
+export interface InviteWithCode extends Invite {
+  code: string
+}
+
 export interface SaveUserResponse {
   _id: string
   _rev: string
@@ -13,6 +22,8 @@ export interface UserDetails {
   password?: string
 }
 
+export type UnsavedUser = Omit<User, "tenantId">
+
 export interface BulkUserRequest {
   delete?: {
     users: Array<{
@@ -22,7 +33,7 @@ export interface BulkUserRequest {
   }
   create?: {
     roles?: any[]
-    users: User[]
+    users: UnsavedUser[]
     groups: any[]
   }
 }
@@ -47,6 +58,11 @@ export interface InviteUserRequest {
   email: string
   userInfo: any
 }
+export interface InviteUserResponse {
+  message: string
+  successful: { email: string }[]
+  unsuccessful: { email: string; reason: string }[]
+}
 
 export interface DeleteInviteUserRequest {
   code: string
@@ -54,6 +70,9 @@ export interface DeleteInviteUserRequest {
 
 export type InviteUsersRequest = InviteUserRequest[]
 export type DeleteInviteUsersRequest = DeleteInviteUserRequest[]
+export interface DeleteInviteUsersResponse {
+  message: string
+}
 
 export interface InviteUsersResponse {
   successful: { email: string }[]
@@ -68,6 +87,17 @@ export interface SearchUsersRequest {
   limit?: number
   paginate?: boolean
 }
+export interface SearchUsersResponse {
+  data: User[]
+  hasNextPage?: boolean
+  nextPage?: string
+}
+
+export type FetchUsersResponse = User[]
+
+export interface FindUserResponse extends User {}
+
+export type LookupTenantUserResponse = PlatformUser
 
 export interface CreateAdminUserRequest {
   email: string
@@ -82,6 +112,9 @@ export interface AddSSoUserRequest {
   ssoId: string
   email: string
 }
+export interface AddSSoUserResponse {
+  message: string
+}
 
 export interface CreateAdminUserResponse {
   _id: string
@@ -93,7 +126,7 @@ export interface AcceptUserInviteRequest {
   inviteCode: string
   password: string
   firstName: string
-  lastName: string
+  lastName?: string
 }
 
 export interface AcceptUserInviteResponse {
@@ -106,3 +139,28 @@ export interface AcceptUserInviteResponse {
 export interface SyncUserRequest {
   previousUser?: User
 }
+
+export interface DeleteUserResponse {
+  message: string
+}
+
+export interface CountUserResponse {
+  userCount: number
+}
+
+export interface CheckInviteResponse {
+  email: string
+}
+
+export type GetUserInvitesResponse = InviteWithCode[]
+
+export interface UpdateInviteRequest extends Omit<Invite, "email"> {
+  email?: string
+  builder?: {
+    apps: string[]
+  }
+  apps: string[]
+}
+export interface UpdateInviteResponse extends Invite {}
+
+export type LookupAccountHolderResponse = AccountMetadata | null
diff --git a/packages/types/src/core/common.ts b/packages/types/src/core/common.ts
new file mode 100644
index 0000000000..c61fc3255d
--- /dev/null
+++ b/packages/types/src/core/common.ts
@@ -0,0 +1,7 @@
+export type JSONValue =
+  | string
+  | number
+  | boolean
+  | null
+  | { [key: string]: JSONValue }
+  | JSONValue[]
diff --git a/packages/types/src/core/index.ts b/packages/types/src/core/index.ts
index 73cc7d35e0..ba9c1b907c 100644
--- a/packages/types/src/core/index.ts
+++ b/packages/types/src/core/index.ts
@@ -1,2 +1,3 @@
 export * from "./installation"
 export * from "./events"
+export * from "./common"
diff --git a/packages/types/src/documents/app/app.ts b/packages/types/src/documents/app/app.ts
index 06fca8307c..46799cb61a 100644
--- a/packages/types/src/documents/app/app.ts
+++ b/packages/types/src/documents/app/app.ts
@@ -1,4 +1,4 @@
-import { User, Document, Plugin, Snippet } from "../"
+import { User, Document, Plugin, Snippet, Theme } from "../"
 import { SocketSession } from "../../sdk"
 
 export type AppMetadataErrors = { [key: string]: string[] }
@@ -14,7 +14,7 @@ export interface App extends Document {
   instance: AppInstance
   tenantId: string
   status: string
-  theme?: string
+  theme?: Theme
   customTheme?: AppCustomTheme
   revertableVersion?: string
   lockedBy?: User
@@ -28,6 +28,7 @@ export interface App extends Document {
   upgradableVersion?: string
   snippets?: Snippet[]
   creationVersion?: string
+  updatedBy?: string
 }
 
 export interface AppInstance {
@@ -36,8 +37,8 @@ export interface AppInstance {
 
 export interface AppNavigation {
   navigation: string
-  title: string
-  navWidth: string
+  title?: string
+  navWidth?: string
   sticky?: boolean
   hideLogo?: boolean
   logoUrl?: string
@@ -45,6 +46,7 @@ export interface AppNavigation {
   navBackground?: string
   navTextColor?: string
   links?: AppNavigationLink[]
+  textAlign?: string
 }
 
 export interface AppNavigationLink {
@@ -52,6 +54,8 @@ export interface AppNavigationLink {
   url: string
   id?: string
   roleId?: string
+  type?: string
+  subLinks?: AppNavigationLink[]
 }
 
 export interface AppCustomTheme {
diff --git a/packages/types/src/documents/app/automation/StepInputsOutputs.ts b/packages/types/src/documents/app/automation/StepInputsOutputs.ts
index 3aadb77108..6f7223300d 100644
--- a/packages/types/src/documents/app/automation/StepInputsOutputs.ts
+++ b/packages/types/src/documents/app/automation/StepInputsOutputs.ts
@@ -150,7 +150,8 @@ export type OpenAIStepInputs = {
   prompt: string
   model: Model
 }
-enum Model {
+
+export enum Model {
   GPT_35_TURBO = "gpt-3.5-turbo",
   // will only work with api keys that have access to the GPT4 API
   GPT_4 = "gpt-4",
@@ -296,3 +297,12 @@ export type RowUpdatedTriggerOutputs = {
   id: string
   revision?: string
 }
+
+export type WebhookTriggerInputs = {
+  schemaUrl: string
+  triggerUrl: string
+}
+
+export type WebhookTriggerOutputs = {
+  fields: Record<string, any>
+}
diff --git a/packages/types/src/documents/app/automation/automation.ts b/packages/types/src/documents/app/automation/automation.ts
index 1af892d8d1..0314701d72 100644
--- a/packages/types/src/documents/app/automation/automation.ts
+++ b/packages/types/src/documents/app/automation/automation.ts
@@ -1,10 +1,10 @@
 import { Document } from "../../document"
-import { EventEmitter } from "events"
 import { User } from "../../global"
 import { ReadStream } from "fs"
 import { Row } from "../row"
 import { Table } from "../table"
 import { AutomationStep, AutomationTrigger } from "./schema"
+import { ContextEmitter } from "../../../sdk"
 
 export enum AutomationIOType {
   OBJECT = "object",
@@ -148,6 +148,7 @@ export interface Automation extends Document {
 
 interface BaseIOStructure {
   type?: AutomationIOType
+  subtype?: AutomationIOType
   customType?: AutomationCustomIOType
   title?: string
   description?: string
@@ -174,6 +175,7 @@ export enum AutomationFeature {
 
 export enum AutomationStepStatus {
   NO_ITERATIONS = "no_iterations",
+  MAX_ITERATIONS = "max_iterations_reached",
 }
 
 export enum AutomationStatus {
@@ -191,7 +193,7 @@ export enum AutomationStoppedReason {
 export interface AutomationResults {
   automationId?: string
   status?: AutomationStatus
-  trigger?: any
+  trigger?: AutomationTrigger
   steps: {
     stepId: AutomationTriggerStepId | AutomationActionStepId
     inputs: {
@@ -203,6 +205,14 @@ export interface AutomationResults {
   }[]
 }
 
+export interface DidNotTriggerResponse {
+  outputs: {
+    success: false
+    status: AutomationStatus.STOPPED
+  }
+  message: AutomationStoppedReason.TRIGGER_FILTER_NOT_MET
+}
+
 export interface AutomationLog extends AutomationResults, Document {
   automationName: string
   _rev?: string
@@ -216,7 +226,7 @@ export interface AutomationLogPage {
 
 export interface AutomationStepInputBase {
   context: Record<string, any>
-  emitter: EventEmitter
+  emitter: ContextEmitter
   appId: string
   apiKey?: string
 }
diff --git a/packages/types/src/documents/app/automation/schema.ts b/packages/types/src/documents/app/automation/schema.ts
index b8a19b7b45..84bfebf6bf 100644
--- a/packages/types/src/documents/app/automation/schema.ts
+++ b/packages/types/src/documents/app/automation/schema.ts
@@ -6,6 +6,7 @@ import {
   AutomationFeature,
   InputOutputBlock,
   AutomationTriggerStepId,
+  AutomationEventType,
 } from "./automation"
 import {
   CollectStepInputs,
@@ -142,6 +143,7 @@ export type ActionImplementations<T extends Hosting> = {
 export interface AutomationStepSchemaBase {
   name: string
   stepTitle?: string
+  event?: AutomationEventType
   tagline: string
   icon: string
   description: string
@@ -311,6 +313,7 @@ export type AutomationStep =
 type EmptyInputs = {}
 export type AutomationStepDefinition = Omit<AutomationStep, "id" | "inputs"> & {
   inputs: EmptyInputs
+  deprecated?: boolean
 }
 
 export type AutomationTriggerDefinition = Omit<
@@ -318,6 +321,7 @@ export type AutomationTriggerDefinition = Omit<
   "id" | "inputs"
 > & {
   inputs: EmptyInputs
+  deprecated?: boolean
 }
 
 export type AutomationTriggerInputs<T extends AutomationTriggerStepId> =
@@ -342,7 +346,7 @@ export interface AutomationTriggerSchema<
 > extends AutomationStepSchemaBase {
   id: string
   type: AutomationStepType.TRIGGER
-  event?: string
+  event?: AutomationEventType
   cronJobId?: string
   stepId: TTrigger
   inputs: AutomationTriggerInputs<TTrigger> & Record<string, any> // The record union to be removed once the types are fixed
diff --git a/packages/types/src/documents/app/deployment.ts b/packages/types/src/documents/app/deployment.ts
new file mode 100644
index 0000000000..3216ebae3d
--- /dev/null
+++ b/packages/types/src/documents/app/deployment.ts
@@ -0,0 +1,22 @@
+export enum DeploymentStatus {
+  SUCCESS = "SUCCESS",
+  PENDING = "PENDING",
+  FAILURE = "FAILURE",
+}
+
+export interface DeploymentDoc {
+  _id: string
+  verification: any
+  status?: DeploymentStatus
+  history?: Record<
+    string,
+    {
+      _id: string
+      appId: string
+      status?: DeploymentStatus
+      updatedAt: number
+    }
+  >
+  err?: any
+  appUrl?: string
+}
diff --git a/packages/types/src/documents/app/index.ts b/packages/types/src/documents/app/index.ts
index bb94c3b4da..d6c4fd8637 100644
--- a/packages/types/src/documents/app/index.ts
+++ b/packages/types/src/documents/app/index.ts
@@ -18,3 +18,5 @@ export * from "./sqlite"
 export * from "./snippet"
 export * from "./rowAction"
 export * from "./theme"
+export * from "./deployment"
+export * from "./metadata"
diff --git a/packages/types/src/documents/app/metadata.ts b/packages/types/src/documents/app/metadata.ts
new file mode 100644
index 0000000000..421e8a2f0d
--- /dev/null
+++ b/packages/types/src/documents/app/metadata.ts
@@ -0,0 +1,4 @@
+export enum MetadataType {
+  AUTOMATION_TEST_INPUT = "automationTestInput",
+  AUTOMATION_TEST_HISTORY = "automationTestHistory",
+}
diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts
index a545ca144e..d287a5b2c3 100644
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@@ -1,4 +1,5 @@
 import { Document } from "../document"
+import { Row } from "./row"
 
 export interface QuerySchema {
   name?: string
@@ -13,6 +14,7 @@ export interface Query extends Document {
   fields: RestQueryFields | any
   transformer: string | null
   schema: Record<string, QuerySchema | string>
+  nestedSchemaFields?: Record<string, Record<string, QuerySchema | string>>
   readable: boolean
   queryVerb: string
   // flag to state whether the default bindings are empty strings (old behaviour) or null
@@ -29,7 +31,7 @@ export interface QueryParameter {
 }
 
 export interface QueryResponse {
-  rows: any[]
+  rows: Row[]
   keys: string[]
   info: any
   extra: any
diff --git a/packages/types/src/documents/app/row.ts b/packages/types/src/documents/app/row.ts
index 6b6b38a5cf..bb58933b65 100644
--- a/packages/types/src/documents/app/row.ts
+++ b/packages/types/src/documents/app/row.ts
@@ -154,6 +154,7 @@ export const GroupByTypes = [
   FieldType.BOOLEAN,
   FieldType.DATETIME,
   FieldType.BIGINT,
+  FieldType.AI,
 ]
 
 export function canGroupBy(type: FieldType) {
diff --git a/packages/types/src/documents/app/screen.ts b/packages/types/src/documents/app/screen.ts
index 4977c79b0b..a8c32118d3 100644
--- a/packages/types/src/documents/app/screen.ts
+++ b/packages/types/src/documents/app/screen.ts
@@ -24,3 +24,15 @@ export interface Screen extends Document {
   name?: string
   pluginAdded?: boolean
 }
+
+export interface ScreenRoutesViewOutput extends Document {
+  id: string
+  routing: ScreenRouting
+}
+
+export type ScreenRoutingJson = Record<
+  string,
+  {
+    subpaths: Record<string, any>
+  }
+>
diff --git a/packages/types/src/documents/app/table/schema.ts b/packages/types/src/documents/app/table/schema.ts
index 771192e2f5..551b1f16a8 100644
--- a/packages/types/src/documents/app/table/schema.ts
+++ b/packages/types/src/documents/app/table/schema.ts
@@ -123,7 +123,7 @@ export interface AIFieldMetadata extends BaseFieldSchema {
   operation: AIOperationEnum
   columns?: string[]
   column?: string
-  categories?: string[]
+  categories?: string
   prompt?: string
   language?: string
 }
@@ -227,6 +227,7 @@ interface OtherFieldMetadata extends BaseFieldSchema {
     | FieldType.OPTIONS
     | FieldType.BOOLEAN
     | FieldType.BIGINT
+    | FieldType.JSON
   >
 }
 
diff --git a/packages/types/src/documents/app/view.ts b/packages/types/src/documents/app/view.ts
index 1212031f24..a7fbf06377 100644
--- a/packages/types/src/documents/app/view.ts
+++ b/packages/types/src/documents/app/view.ts
@@ -6,10 +6,10 @@ import { DBView, SearchFilters } from "../../sdk"
 export type ViewTemplateOpts = {
   field: string
   tableId: string
-  groupBy: string
+  groupBy?: string
   filters: ViewFilter[]
   schema: any
-  calculation: string
+  calculation?: string
   groupByMulti?: boolean
 }
 
@@ -99,6 +99,11 @@ export interface ViewV2 {
     type?: SortType
   }
   schema?: ViewV2Schema
+  rowHeight?: number
+}
+
+export interface PublicAPIView extends Omit<ViewV2, "query" | "queryUI"> {
+  query?: UISearchFilter
 }
 
 export type ViewV2Schema = Record<string, ViewFieldMetadata>
diff --git a/packages/types/src/documents/app/webhook.ts b/packages/types/src/documents/app/webhook.ts
index 1ced8627af..bfec8a9744 100644
--- a/packages/types/src/documents/app/webhook.ts
+++ b/packages/types/src/documents/app/webhook.ts
@@ -1,4 +1,5 @@
 import { Document } from "../document"
+import { JSONSchema7 } from "json-schema"
 
 export enum WebhookActionType {
   AUTOMATION = "automation",
@@ -11,5 +12,5 @@ export interface Webhook extends Document {
     type: WebhookActionType
     target: string
   }
-  bodySchema?: any
+  bodySchema?: JSONSchema7
 }
diff --git a/packages/types/src/documents/global/apikeys.ts b/packages/types/src/documents/global/apikeys.ts
new file mode 100644
index 0000000000..4b46f1d341
--- /dev/null
+++ b/packages/types/src/documents/global/apikeys.ts
@@ -0,0 +1,5 @@
+import { Document } from "../../"
+
+export interface ApiKeyDoc extends Document {
+  apiKeys: Record<string, string>
+}
diff --git a/packages/types/src/documents/global/config.ts b/packages/types/src/documents/global/config.ts
index 33f7e10584..1ad20e291f 100644
--- a/packages/types/src/documents/global/config.ts
+++ b/packages/types/src/documents/global/config.ts
@@ -26,13 +26,11 @@ export interface SMTPConfig extends Config<SMTPInnerConfig> {}
 export interface SettingsBrandingConfig {
   faviconUrl?: string
   faviconUrlEtag?: string
-
   emailBrandingEnabled?: boolean
   testimonialsEnabled?: boolean
   platformTitle?: string
   loginHeading?: string
   loginButton?: string
-
   metaDescription?: string
   metaImageUrl?: string
   metaTitle?: string
@@ -42,6 +40,7 @@ export interface SettingsInnerConfig {
   platformUrl?: string
   company?: string
   logoUrl?: string // Populated on read
+  docsUrl?: string
   logoUrlEtag?: string
   uniqueTenantId?: string
   analyticsEnabled?: boolean
@@ -127,6 +126,9 @@ export interface AIInnerConfig {
 
 export interface AIConfig extends Config<AIInnerConfig> {}
 
+export const isConfig = (config: Object): config is Config =>
+  "type" in config && "config" in config
+
 export const isSettingsConfig = (config: Config): config is SettingsConfig =>
   config.type === ConfigType.SETTINGS
 
diff --git a/packages/types/src/documents/global/devInfo.ts b/packages/types/src/documents/global/devInfo.ts
new file mode 100644
index 0000000000..f993fc5df6
--- /dev/null
+++ b/packages/types/src/documents/global/devInfo.ts
@@ -0,0 +1,6 @@
+import { Document } from "../document"
+
+export interface DevInfo extends Document {
+  userId: string
+  apiKey?: string
+}
diff --git a/packages/types/src/documents/global/index.ts b/packages/types/src/documents/global/index.ts
index b728439dd6..9bf24f078d 100644
--- a/packages/types/src/documents/global/index.ts
+++ b/packages/types/src/documents/global/index.ts
@@ -7,3 +7,5 @@ export * from "./schedule"
 export * from "./templates"
 export * from "./environmentVariables"
 export * from "./auditLogs"
+export * from "./apikeys"
+export * from "./devInfo"
diff --git a/packages/types/src/documents/global/plugin.ts b/packages/types/src/documents/global/plugin.ts
index dd96bc20db..eeddc04e58 100644
--- a/packages/types/src/documents/global/plugin.ts
+++ b/packages/types/src/documents/global/plugin.ts
@@ -12,9 +12,9 @@ export enum PluginSource {
   URL = "URL",
   FILE = "File Upload",
 }
-export interface FileType {
-  path: string
-  name: string
+export interface KoaFile {
+  path: string | null
+  name: string | null
 }
 
 export interface Plugin extends Document {
diff --git a/packages/types/src/documents/global/quotas.ts b/packages/types/src/documents/global/quotas.ts
index 4726dabf0d..a24fc8f9b0 100644
--- a/packages/types/src/documents/global/quotas.ts
+++ b/packages/types/src/documents/global/quotas.ts
@@ -44,7 +44,6 @@ export interface StaticUsage {
 export interface MonthlyUsage {
   [MonthlyQuotaName.QUERIES]: number
   [MonthlyQuotaName.AUTOMATIONS]: number
-  [MonthlyQuotaName.DAY_PASSES]: number
   [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: number
   triggers: {
     [key in MonthlyQuotaName]?: QuotaTriggers
diff --git a/packages/types/src/documents/global/user.ts b/packages/types/src/documents/global/user.ts
index 1b242886b5..1008cd59fe 100644
--- a/packages/types/src/documents/global/user.ts
+++ b/packages/types/src/documents/global/user.ts
@@ -62,7 +62,6 @@ export interface User extends Document {
   password?: string
   status?: UserStatus
   createdAt?: number // override the default createdAt behaviour - users sdk historically set this to Date.now()
-  dayPassRecordedAt?: string
   userGroups?: string[]
   onboardedAt?: string
   freeTrialConfirmedAt?: string
@@ -71,6 +70,8 @@ export interface User extends Document {
   appFavourites?: string[]
   ssoId?: string
   appSort?: string
+  budibaseAccess?: boolean
+  accountPortalAccess?: boolean
 }
 
 export interface UserBindings extends Document {
diff --git a/packages/types/src/documents/pouch.ts b/packages/types/src/documents/pouch.ts
index 6ff851a515..c2ac1599ee 100644
--- a/packages/types/src/documents/pouch.ts
+++ b/packages/types/src/documents/pouch.ts
@@ -8,7 +8,7 @@ export interface RowValue {
 export interface RowResponse<T extends Document | RowValue> {
   id: string
   key: string
-  error: string
+  error?: string
   value: T
   doc?: T
 }
diff --git a/packages/types/src/index.ts b/packages/types/src/index.ts
index a0932829cf..264daa70ad 100644
--- a/packages/types/src/index.ts
+++ b/packages/types/src/index.ts
@@ -3,3 +3,4 @@ export * from "./sdk"
 export * from "./api"
 export * from "./core"
 export * from "./shared"
+export * from "./ui"
diff --git a/packages/types/src/sdk/auth.ts b/packages/types/src/sdk/auth.ts
index 5bc75e8377..94180143f9 100644
--- a/packages/types/src/sdk/auth.ts
+++ b/packages/types/src/sdk/auth.ts
@@ -1,4 +1,4 @@
-import { BBContext } from "./koa"
+import { Ctx } from "./koa"
 import { Hosting } from "./hosting"
 
 export interface AuthToken {
@@ -32,7 +32,7 @@ export interface ScannedSession {
 }
 
 export interface PlatformLogoutOpts {
-  ctx: BBContext
+  ctx: Ctx
   userId: string
   keepActiveSession?: boolean
 }
diff --git a/packages/types/src/sdk/datasources.ts b/packages/types/src/sdk/datasources.ts
index bdad9c4825..1f2a4d2127 100644
--- a/packages/types/src/sdk/datasources.ts
+++ b/packages/types/src/sdk/datasources.ts
@@ -1,5 +1,5 @@
 import { Table, Row } from "../documents"
-import { QueryJson } from "./search"
+import { EnrichedQueryJson } from "./search"
 
 export const PASSWORD_REPLACEMENT = "--secret-value--"
 
@@ -119,6 +119,7 @@ interface DatasourceBasicFieldConfig {
   default?: any
   deprecated?: boolean
   hidden?: string
+  placeholder?: string
 }
 
 interface DatasourceSelectFieldConfig extends DatasourceBasicFieldConfig {
@@ -207,7 +208,7 @@ export interface DatasourcePlus extends IntegrationBase {
   // this returns the format of the identifier
   getBindingIdentifier(): string
   getStringConcat(parts: string[]): string
-  query(json: QueryJson): Promise<DatasourcePlusQueryResponse>
+  query(json: EnrichedQueryJson): Promise<DatasourcePlusQueryResponse>
   buildSchema(
     datasourceId: string,
     entities: Record<string, Table>
diff --git a/packages/types/src/sdk/db.ts b/packages/types/src/sdk/db.ts
index 9797715329..eb922bd81e 100644
--- a/packages/types/src/sdk/db.ts
+++ b/packages/types/src/sdk/db.ts
@@ -128,13 +128,13 @@ export interface Database {
   name: string
 
   exists(): Promise<boolean>
+  exists(docId: string): Promise<boolean>
   /**
    * @deprecated the plan is to get everything using `tryGet` instead, then rename
    * `tryGet` to `get`.
    */
   get<T extends Document>(id?: string): Promise<T>
   tryGet<T extends Document>(id?: string): Promise<T | undefined>
-  exists(docId: string): Promise<boolean>
   getMultiple<T extends Document>(
     ids: string[],
     opts?: { allowMissing?: boolean; excludeDocs?: boolean }
@@ -163,8 +163,8 @@ export interface Database {
     viewName: string,
     params: DatabaseQueryOpts
   ): Promise<AllDocsResponse<T>>
-  destroy(): Promise<Nano.OkResponse | void>
-  compact(): Promise<Nano.OkResponse | void>
+  destroy(): Promise<Nano.OkResponse>
+  compact(): Promise<Nano.OkResponse>
   // these are all PouchDB related functions that are rarely used - in future
   // should be replaced by better typed/non-pouch implemented methods
   dump(stream: Writable, opts?: DatabaseDumpOpts): Promise<any>
diff --git a/packages/types/src/sdk/events/event.ts b/packages/types/src/sdk/events/event.ts
index 242b182dec..23c0eb0cbd 100644
--- a/packages/types/src/sdk/events/event.ts
+++ b/packages/types/src/sdk/events/event.ts
@@ -118,6 +118,7 @@ export enum Event {
   VIEW_CALCULATION_CREATED = "view:calculation:created",
   VIEW_CALCULATION_UPDATED = "view:calculation:updated",
   VIEW_CALCULATION_DELETED = "view:calculation:deleted",
+  VIEW_JOIN_CREATED = "view:join:created",
 
   // ROWS
   ROWS_CREATED = "rows:created",
@@ -192,6 +193,9 @@ export enum Event {
   // AUDIT LOG
   AUDIT_LOGS_FILTERED = "audit_log:filtered",
   AUDIT_LOGS_DOWNLOADED = "audit_log:downloaded",
+
+  // ROW ACTION
+  ROW_ACTION_CREATED = "row_action:created",
 }
 
 export const UserGroupSyncEvents: Event[] = [
@@ -376,6 +380,7 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   [Event.VIEW_CALCULATION_CREATED]: undefined,
   [Event.VIEW_CALCULATION_UPDATED]: undefined,
   [Event.VIEW_CALCULATION_DELETED]: undefined,
+  [Event.VIEW_JOIN_CREATED]: undefined,
 
   // SERVED - NOT AUDITED
   [Event.SERVED_BUILDER]: undefined,
@@ -395,6 +400,9 @@ export const AuditedEventFriendlyName: Record<Event, string | undefined> = {
   // AUDIT LOG - NOT AUDITED
   [Event.AUDIT_LOGS_FILTERED]: undefined,
   [Event.AUDIT_LOGS_DOWNLOADED]: undefined,
+
+  // ROW ACTIONS - NOT AUDITED
+  [Event.ROW_ACTION_CREATED]: undefined,
 }
 
 // properties added at the final stage of the event pipeline
diff --git a/packages/types/src/sdk/events/index.ts b/packages/types/src/sdk/events/index.ts
index 043e62faa4..7a067fd202 100644
--- a/packages/types/src/sdk/events/index.ts
+++ b/packages/types/src/sdk/events/index.ts
@@ -24,3 +24,4 @@ export * from "./plugin"
 export * from "./backup"
 export * from "./environmentVariable"
 export * from "./auditLog"
+export * from "./rowAction"
diff --git a/packages/types/src/sdk/events/rowAction.ts b/packages/types/src/sdk/events/rowAction.ts
new file mode 100644
index 0000000000..924f11cf76
--- /dev/null
+++ b/packages/types/src/sdk/events/rowAction.ts
@@ -0,0 +1,6 @@
+import { BaseEvent } from "./event"
+
+export interface RowActionCreatedEvent extends BaseEvent {
+  name: string
+  automationId: string
+}
diff --git a/packages/types/src/sdk/events/table.ts b/packages/types/src/sdk/events/table.ts
index 8df2a95796..4a5880b1db 100644
--- a/packages/types/src/sdk/events/table.ts
+++ b/packages/types/src/sdk/events/table.ts
@@ -1,4 +1,5 @@
 import { BaseEvent, TableExportFormat } from "./event"
+import { AIOperationEnum } from "../ai"
 
 export interface TableCreatedEvent extends BaseEvent {
   tableId: string
@@ -9,6 +10,8 @@ export interface TableCreatedEvent extends BaseEvent {
 
 export interface TableUpdatedEvent extends BaseEvent {
   tableId: string
+  defaultValues: boolean | undefined
+  aiColumn: AIOperationEnum | undefined
   audited: {
     name: string
   }
diff --git a/packages/types/src/sdk/events/view.ts b/packages/types/src/sdk/events/view.ts
index 452094d2f4..0ea153ad9d 100644
--- a/packages/types/src/sdk/events/view.ts
+++ b/packages/types/src/sdk/events/view.ts
@@ -1,7 +1,9 @@
-import { ViewCalculation } from "../../documents"
+import { CalculationType, ViewCalculation, ViewV2Type } from "../../documents"
 import { BaseEvent, TableExportFormat } from "./event"
 
 export interface ViewCreatedEvent extends BaseEvent {
+  name: string
+  type?: ViewV2Type
   tableId: string
 }
 
@@ -20,10 +22,12 @@ export interface ViewExportedEvent extends BaseEvent {
 
 export interface ViewFilterCreatedEvent extends BaseEvent {
   tableId: string
+  filterGroups: number
 }
 
 export interface ViewFilterUpdatedEvent extends BaseEvent {
   tableId: string
+  filterGroups: number
 }
 
 export interface ViewFilterDeletedEvent extends BaseEvent {
@@ -32,7 +36,7 @@ export interface ViewFilterDeletedEvent extends BaseEvent {
 
 export interface ViewCalculationCreatedEvent extends BaseEvent {
   tableId: string
-  calculation: ViewCalculation
+  calculation: CalculationType
 }
 
 export interface ViewCalculationUpdatedEvent extends BaseEvent {
@@ -44,3 +48,7 @@ export interface ViewCalculationDeletedEvent extends BaseEvent {
   tableId: string
   calculation: ViewCalculation
 }
+
+export interface ViewJoinCreatedEvent extends BaseEvent {
+  tableId: string
+}
diff --git a/packages/types/src/sdk/featureFlag.ts b/packages/types/src/sdk/featureFlag.ts
index 64a7362e9f..d9f092c80a 100644
--- a/packages/types/src/sdk/featureFlag.ts
+++ b/packages/types/src/sdk/featureFlag.ts
@@ -1,13 +1,17 @@
 export enum FeatureFlag {
-  PER_CREATOR_PER_USER_PRICE = "PER_CREATOR_PER_USER_PRICE",
-  PER_CREATOR_PER_USER_PRICE_ALERT = "PER_CREATOR_PER_USER_PRICE_ALERT",
-  AUTOMATION_BRANCHING = "AUTOMATION_BRANCHING",
-  AI_CUSTOM_CONFIGS = "AI_CUSTOM_CONFIGS",
-  DEFAULT_VALUES = "DEFAULT_VALUES",
+  USE_ZOD_VALIDATOR = "USE_ZOD_VALIDATOR",
+  CHECK_SCREEN_COMPONENT_SETTINGS_ERRORS = "CHECK_SCREEN_COMPONENT_SETTINGS_ERRORS",
 
-  BUDIBASE_AI = "BUDIBASE_AI",
+  // Account-portal
+  DIRECT_LOGIN_TO_ACCOUNT_PORTAL = "DIRECT_LOGIN_TO_ACCOUNT_PORTAL",
 }
 
-export interface TenantFeatureFlags {
-  [key: string]: FeatureFlag[]
+export const FeatureFlagDefaults = {
+  [FeatureFlag.USE_ZOD_VALIDATOR]: false,
+  [FeatureFlag.CHECK_SCREEN_COMPONENT_SETTINGS_ERRORS]: false,
+
+  // Account-portal
+  [FeatureFlag.DIRECT_LOGIN_TO_ACCOUNT_PORTAL]: false,
 }
+
+export type FeatureFlags = typeof FeatureFlagDefaults
diff --git a/packages/types/src/sdk/index.ts b/packages/types/src/sdk/index.ts
index 86eb5b1a24..eb9e23b3d1 100644
--- a/packages/types/src/sdk/index.ts
+++ b/packages/types/src/sdk/index.ts
@@ -4,7 +4,6 @@ export * from "./hosting"
 export * from "./context"
 export * from "./events"
 export * from "./licensing"
-export * from "./migrations"
 export * from "./datasources"
 export * from "./search"
 export * from "./koa"
diff --git a/packages/types/src/sdk/licensing/plan.ts b/packages/types/src/sdk/licensing/plan.ts
index af682cbad1..8cdd72dd5d 100644
--- a/packages/types/src/sdk/licensing/plan.ts
+++ b/packages/types/src/sdk/licensing/plan.ts
@@ -38,7 +38,6 @@ export interface AvailablePrice {
 export enum PlanModel {
   PER_USER = "perUser",
   PER_CREATOR_PER_USER = "per_creator_per_user",
-  DAY_PASS = "dayPass",
 }
 
 export interface PurchasedPlan {
@@ -49,7 +48,6 @@ export interface PurchasedPlan {
 }
 
 export interface PurchasedPrice extends AvailablePrice {
-  dayPasses: number | undefined
   /** @deprecated - now at the plan level via model */
   isPerUser: boolean
 }
diff --git a/packages/types/src/sdk/licensing/quota.ts b/packages/types/src/sdk/licensing/quota.ts
index 75fc18e8e6..ed541d2974 100644
--- a/packages/types/src/sdk/licensing/quota.ts
+++ b/packages/types/src/sdk/licensing/quota.ts
@@ -23,7 +23,6 @@ export enum StaticQuotaName {
 export enum MonthlyQuotaName {
   QUERIES = "queries",
   AUTOMATIONS = "automations",
-  DAY_PASSES = "dayPasses",
   BUDIBASE_AI_CREDITS = "budibaseAICredits",
 }
 
@@ -63,7 +62,6 @@ export type PlanQuotas = { [key in PlanType]: Quotas | undefined }
 export type MonthlyQuotas = {
   [MonthlyQuotaName.QUERIES]: Quota
   [MonthlyQuotaName.AUTOMATIONS]: Quota
-  [MonthlyQuotaName.DAY_PASSES]: Quota
   [MonthlyQuotaName.BUDIBASE_AI_CREDITS]: Quota
 }
 
diff --git a/packages/types/src/sdk/migrations.ts b/packages/types/src/sdk/migrations.ts
deleted file mode 100644
index 0692b27f8e..0000000000
--- a/packages/types/src/sdk/migrations.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-export interface Migration extends MigrationDefinition {
-  appOpts?: object
-  fn: Function
-  silent?: boolean
-  preventRetry?: boolean
-}
-
-export enum MigrationType {
-  // run once per tenant, recorded in global db, global db is provided as an argument
-  GLOBAL = "global",
-  // run per app, recorded in each app db, app db is provided as an argument
-  APP = "app",
-  // run once, recorded in global info db, global info db is provided as an argument
-  INSTALLATION = "installation",
-}
-
-export interface MigrationNoOpOptions {
-  type: MigrationType
-  tenantId: string
-  appId?: string
-}
-
-/**
- * e.g.
- * {
- *   tenantIds: ['bb'],
- *   force: {
- *    global: ['quota_1']
- *   }
- * }
- */
-export interface MigrationOptions {
-  tenantIds?: string[]
-  force?: {
-    [type: string]: string[]
-  }
-  noOp?: MigrationNoOpOptions
-}
-
-export enum MigrationName {
-  USER_EMAIL_VIEW_CASING = "user_email_view_casing",
-  APP_URLS = "app_urls",
-  EVENT_APP_BACKFILL = "event_app_backfill",
-  EVENT_GLOBAL_BACKFILL = "event_global_backfill",
-  EVENT_INSTALLATION_BACKFILL = "event_installation_backfill",
-  GLOBAL_INFO_SYNC_USERS = "global_info_sync_users",
-  TABLE_SETTINGS_LINKS_TO_ACTIONS = "table_settings_links_to_actions",
-  // increment this number to re-activate this migration
-  SYNC_QUOTAS = "sync_quotas_2",
-}
-
-export interface MigrationDefinition {
-  type: MigrationType
-  name: MigrationName
-}
diff --git a/packages/types/src/sdk/permissions.ts b/packages/types/src/sdk/permissions.ts
index bb36af4170..43336a3317 100644
--- a/packages/types/src/sdk/permissions.ts
+++ b/packages/types/src/sdk/permissions.ts
@@ -36,3 +36,22 @@ export enum PermissionSource {
   INHERITED = "INHERITED",
   BASE = "BASE",
 }
+
+export interface Permission {
+  type: PermissionType
+  level: PermissionLevel
+}
+
+export interface BuiltinPermission {
+  _id: BuiltinPermissionID
+  name: string
+  permissions: Permission[]
+}
+
+export type BuiltinPermissions = {
+  [key in keyof typeof BuiltinPermissionID]: {
+    _id: (typeof BuiltinPermissionID)[key]
+    name: string
+    permissions: Permission[]
+  }
+}
diff --git a/packages/types/src/sdk/search.ts b/packages/types/src/sdk/search.ts
index d6dcb0a2fa..fdc2fafe57 100644
--- a/packages/types/src/sdk/search.ts
+++ b/packages/types/src/sdk/search.ts
@@ -1,5 +1,5 @@
 import { Operation } from "./datasources"
-import { Row, Table, DocumentType } from "../documents"
+import { Row, DocumentType, Table, Datasource } from "../documents"
 import { SortOrder, SortType } from "../api"
 import { Knex } from "knex"
 import { Aggregation } from "./row"
@@ -158,8 +158,8 @@ export interface ManyToManyRelationshipJson {
 
 export interface QueryJson {
   endpoint: {
-    datasourceId: string
-    entityId: string
+    datasourceId: string | Datasource
+    entityId: string | Table
     operation: Operation
     schema?: string
   }
@@ -171,11 +171,9 @@ export interface QueryJson {
   sort?: SortJson
   paginate?: PaginationJson
   body?: Row | Row[]
-  table?: Table
-  meta: {
-    table: Table
-    tables?: Record<string, Table>
+  meta?: {
     renamed?: RenameColumn
+    oldTable?: Table
     // can specify something that columns could be prefixed with
     columnPrefix?: string
   }
@@ -186,6 +184,14 @@ export interface QueryJson {
   tableAliases?: Record<string, string>
 }
 
+export interface EnrichedQueryJson extends Omit<QueryJson, "endpoint"> {
+  operation: Operation
+  table: Table
+  tables: Record<string, Table>
+  datasource?: Datasource
+  schema?: string
+}
+
 export interface QueryOptions {
   disableReturning?: boolean
   disableBindings?: boolean
diff --git a/packages/types/src/ui/bindings/binding.ts b/packages/types/src/ui/bindings/binding.ts
new file mode 100644
index 0000000000..a770a25a3e
--- /dev/null
+++ b/packages/types/src/ui/bindings/binding.ts
@@ -0,0 +1,41 @@
+export interface BindingCompletion {
+  section: {
+    name: string
+  }
+  label: string
+}
+
+export interface EnrichedBinding {
+  runtimeBinding: string
+  readableBinding: string
+  type?: null | string
+}
+
+export enum BindingMode {
+  Text = "Text",
+  JavaScript = "JavaScript",
+}
+
+export type CaretPositionFn = () => { start: number; end: number }
+
+export type InsertAtPositionFn = (_: {
+  start: number
+  end?: number
+  value: string
+  cursor?: { anchor: number }
+}) => void
+
+export interface UIBinding {
+  tableId?: string
+  fieldSchema?: {
+    name: string
+    tableId: string
+    type: string
+    subtype?: string
+    prefixKeys?: string
+  }
+  component?: string
+  providerId: string
+  readableBinding?: string
+  runtimeBinding?: string
+}
diff --git a/packages/types/src/ui/bindings/helper.ts b/packages/types/src/ui/bindings/helper.ts
new file mode 100644
index 0000000000..5ebd305958
--- /dev/null
+++ b/packages/types/src/ui/bindings/helper.ts
@@ -0,0 +1,4 @@
+export interface Helper {
+  example: string
+  description: string
+}
diff --git a/packages/types/src/ui/bindings/index.ts b/packages/types/src/ui/bindings/index.ts
new file mode 100644
index 0000000000..6c4e6037b4
--- /dev/null
+++ b/packages/types/src/ui/bindings/index.ts
@@ -0,0 +1,2 @@
+export * from "./binding"
+export * from "./helper"
diff --git a/packages/types/src/ui/components/codeEditor.ts b/packages/types/src/ui/components/codeEditor.ts
new file mode 100644
index 0000000000..ffbea1d643
--- /dev/null
+++ b/packages/types/src/ui/components/codeEditor.ts
@@ -0,0 +1,26 @@
+interface JSEditorMode {
+  name: "javascript"
+  json: boolean
+  match: RegExp
+}
+
+interface HBSEditorMode {
+  name: "handlebars"
+  base: "text/html"
+  match: RegExp
+}
+
+interface HTMLEditorMode {
+  name: "text/html"
+}
+
+export type EditorMode = JSEditorMode | HBSEditorMode | HTMLEditorMode
+
+type EditorModeMapBase =
+  | (JSEditorMode & { key: "JS" })
+  | (HBSEditorMode & { key: "Handlebars" })
+  | (HTMLEditorMode & { key: "Text" })
+
+export type EditorModesMap = {
+  [M in EditorModeMapBase as M["key"]]: Omit<M, "key">
+}
diff --git a/packages/types/src/ui/components/index.ts b/packages/types/src/ui/components/index.ts
new file mode 100644
index 0000000000..8dc1638f8c
--- /dev/null
+++ b/packages/types/src/ui/components/index.ts
@@ -0,0 +1,2 @@
+export * from "./sidepanel"
+export * from "./codeEditor"
diff --git a/packages/types/src/ui/components/sidepanel.ts b/packages/types/src/ui/components/sidepanel.ts
new file mode 100644
index 0000000000..f2d62458d6
--- /dev/null
+++ b/packages/types/src/ui/components/sidepanel.ts
@@ -0,0 +1,5 @@
+export enum SidePanel {
+  Bindings = "FlashOn",
+  Evaluation = "Play",
+  Snippets = "Code",
+}
diff --git a/packages/types/src/ui/dataFetch/datasources.ts b/packages/types/src/ui/dataFetch/datasources.ts
new file mode 100644
index 0000000000..385468efba
--- /dev/null
+++ b/packages/types/src/ui/dataFetch/datasources.ts
@@ -0,0 +1,93 @@
+import { InternalTable, Row, TableSchema } from "../../documents"
+
+export type DataFetchDatasource =
+  | TableDatasource
+  | ViewV1Datasource
+  | ViewDatasource
+  | QueryDatasource
+  | RelationshipDatasource
+  | UserDatasource
+  | GroupUserDatasource
+  | CustomDatasource
+  | NestedProviderDatasource
+  | FieldDatasource
+  | QueryArrayFieldDatasource
+  | JSONArrayFieldDatasource
+
+export interface TableDatasource {
+  type: "table"
+  tableId: string
+}
+
+export type ViewV1Datasource = {
+  type: "view"
+  name: string
+  tableId: string
+  calculation: string
+  field: string
+  groupBy: string
+}
+
+export interface ViewDatasource {
+  type: "viewV2"
+  id: string
+}
+
+export interface QueryDatasource {
+  type: "query"
+  _id: string
+  fields: Record<string, any> & {
+    pagination?: {
+      type: string
+      location: string
+      pageParam: string
+    }
+  }
+  queryParams?: Record<string, string>
+  parameters: { name: string; default: string }[]
+}
+
+export interface RelationshipDatasource {
+  type: "link"
+  tableId: string
+  rowId: string
+  rowTableId: string
+  fieldName: string
+}
+
+export interface UserDatasource {
+  type: "user"
+  tableId: InternalTable.USER_METADATA
+}
+
+export interface GroupUserDatasource {
+  type: "groupUser"
+  tableId: InternalTable.USER_METADATA
+}
+
+export interface CustomDatasource {
+  type: "custom"
+  data: any
+}
+
+export interface NestedProviderDatasource {
+  type: "provider"
+  value?: {
+    schema: TableSchema
+    primaryDisplay: string
+    rows: Row[]
+  }
+}
+
+interface BaseFieldDatasource<
+  TType extends "field" | "queryarray" | "jsonarray"
+> {
+  type: TType
+  tableId: string
+  fieldType: "attachment" | "array"
+  value: string[] | Row[]
+}
+
+export type FieldDatasource = BaseFieldDatasource<"field">
+export type QueryArrayFieldDatasource = BaseFieldDatasource<"queryarray">
+export type JSONArrayFieldDatasource = BaseFieldDatasource<"jsonarray">
diff --git a/packages/types/src/ui/dataFetch/index.ts b/packages/types/src/ui/dataFetch/index.ts
new file mode 100644
index 0000000000..0971849d9b
--- /dev/null
+++ b/packages/types/src/ui/dataFetch/index.ts
@@ -0,0 +1,16 @@
+import { LegacyFilter, SortOrder, UISearchFilter } from "../../api"
+import { SearchFilters } from "../../sdk"
+
+export * from "./datasources"
+
+export interface DataFetchOptions<TQuery = SearchFilters> {
+  // Search config
+  filter: UISearchFilter | LegacyFilter[] | null
+  query: TQuery
+  // Sorting config
+  sortColumn: string | null
+  sortOrder: SortOrder
+  // Pagination config
+  limit: number
+  paginate: boolean
+}
diff --git a/packages/types/src/ui/datasource.ts b/packages/types/src/ui/datasource.ts
new file mode 100644
index 0000000000..8cc9b4ff94
--- /dev/null
+++ b/packages/types/src/ui/datasource.ts
@@ -0,0 +1,9 @@
+export type UIDatasourceType =
+  | "table"
+  | "view"
+  | "viewV2"
+  | "query"
+  | "custom"
+  | "link"
+  | "field"
+  | "jsonarray"
diff --git a/packages/types/src/ui/index.ts b/packages/types/src/ui/index.ts
new file mode 100644
index 0000000000..6e5f37608c
--- /dev/null
+++ b/packages/types/src/ui/index.ts
@@ -0,0 +1,5 @@
+export * from "./stores"
+export * from "./bindings"
+export * from "./components"
+export * from "./dataFetch"
+export * from "./datasource"
diff --git a/packages/types/src/ui/stores/automations.ts b/packages/types/src/ui/stores/automations.ts
new file mode 100644
index 0000000000..7e85ceee38
--- /dev/null
+++ b/packages/types/src/ui/stores/automations.ts
@@ -0,0 +1,12 @@
+export interface BranchPath {
+  stepIdx: number
+  branchIdx: number
+  branchStepId: string
+  id: string
+}
+
+export interface BlockDefinitions {
+  TRIGGER: Record<string, any>
+  CREATABLE_TRIGGER: Record<string, any>
+  ACTION: Record<string, any>
+}
diff --git a/packages/types/src/ui/stores/grid/columns.ts b/packages/types/src/ui/stores/grid/columns.ts
new file mode 100644
index 0000000000..2517d2a3e0
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/columns.ts
@@ -0,0 +1,23 @@
+import { CalculationType, FieldSchema, FieldType } from "@budibase/types"
+
+export type UIColumn = FieldSchema & {
+  label: string
+  readonly: boolean
+  conditions: any
+  related?: {
+    field: string
+    subField: string
+  }
+  primaryDisplay?: boolean
+  schema: {
+    disabled: boolean
+    type: FieldType
+    readonly: boolean
+    autocolumn: boolean
+    cellRenderType?: FieldType | "role"
+  }
+  calculationType: CalculationType
+  __idx: number
+  __left: number
+  width: number
+}
diff --git a/packages/types/src/ui/stores/grid/condition.ts b/packages/types/src/ui/stores/grid/condition.ts
new file mode 100644
index 0000000000..dfd9ee867c
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/condition.ts
@@ -0,0 +1,11 @@
+import { FieldType, SearchFilter } from "@budibase/types"
+
+export interface UICondition {
+  column: string
+  type: FieldType
+  referenceValue: string
+  operator: SearchFilter["operator"]
+  metadataKey: string
+  metadataValue: string
+  target: string
+}
diff --git a/packages/types/src/ui/stores/grid/datasource.ts b/packages/types/src/ui/stores/grid/datasource.ts
new file mode 100644
index 0000000000..f4210f6725
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/datasource.ts
@@ -0,0 +1,10 @@
+import { UITable, UIView } from "@budibase/types"
+
+export type UIDatasource = UITable | (Omit<UIView, "type"> & { type: "viewV2" })
+
+export interface UIFieldMutation {
+  visible?: boolean
+  readonly?: boolean
+  width?: number
+  order?: number
+}
diff --git a/packages/types/src/ui/stores/grid/filters.ts b/packages/types/src/ui/stores/grid/filters.ts
new file mode 100644
index 0000000000..d75f32370c
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/filters.ts
@@ -0,0 +1,5 @@
+import { LegacyFilter } from "@budibase/types"
+
+export type UILegacyFilter = LegacyFilter & {
+  id: string
+}
diff --git a/packages/types/src/ui/stores/grid/index.ts b/packages/types/src/ui/stores/grid/index.ts
new file mode 100644
index 0000000000..7c3b6d4cb4
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/index.ts
@@ -0,0 +1,8 @@
+export * from "./columns"
+export * from "./condition"
+export * from "./datasource"
+export * from "./table"
+export * from "./view"
+export * from "./user"
+export * from "./filters"
+export * from "./rows"
diff --git a/packages/types/src/ui/stores/grid/rows.ts b/packages/types/src/ui/stores/grid/rows.ts
new file mode 100644
index 0000000000..accb104a1a
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/rows.ts
@@ -0,0 +1,5 @@
+import { Row } from "@budibase/types"
+
+export type UIRow = Row & {
+  _id: string
+}
diff --git a/packages/types/src/ui/stores/grid/table.ts b/packages/types/src/ui/stores/grid/table.ts
new file mode 100644
index 0000000000..7b6d659e4c
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/table.ts
@@ -0,0 +1,34 @@
+import {
+  BasicViewFieldMetadata,
+  FieldSchema,
+  FieldType,
+  RelationSchemaField,
+  SortOrder,
+  Table,
+  UISearchFilter,
+} from "@budibase/types"
+
+export interface UITable extends Table {
+  name: string
+  id: string
+  tableId: string
+  primaryDisplay?: string
+  sort?: {
+    field: string
+    order: SortOrder
+  }
+  queryUI: UISearchFilter
+  schema: Record<string, UIFieldSchema>
+}
+
+export type UIFieldSchema = FieldSchema &
+  BasicViewFieldMetadata & {
+    related?: { field: string; subField: string }
+    columns?: Record<string, UIRelationSchemaField>
+    cellRenderType?: string
+    disabled?: boolean
+  }
+
+interface UIRelationSchemaField extends RelationSchemaField {
+  type: FieldType
+}
diff --git a/packages/types/src/ui/stores/grid/user.ts b/packages/types/src/ui/stores/grid/user.ts
new file mode 100644
index 0000000000..9625b0bb80
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/user.ts
@@ -0,0 +1,7 @@
+import { User } from "@budibase/types"
+
+export interface UIUser extends User {
+  sessionId: string
+  gridMetadata?: { focusedCellId?: string }
+  builderMetadata?: { selectedResourceId?: string }
+}
diff --git a/packages/types/src/ui/stores/grid/view.ts b/packages/types/src/ui/stores/grid/view.ts
new file mode 100644
index 0000000000..f81cc34aaf
--- /dev/null
+++ b/packages/types/src/ui/stores/grid/view.ts
@@ -0,0 +1,6 @@
+import { ViewV2 } from "@budibase/types"
+import { UIFieldSchema } from "./table"
+
+export interface UIView extends ViewV2 {
+  schema: Record<string, UIFieldSchema>
+}
diff --git a/packages/types/src/ui/stores/index.ts b/packages/types/src/ui/stores/index.ts
new file mode 100644
index 0000000000..daf73bba75
--- /dev/null
+++ b/packages/types/src/ui/stores/index.ts
@@ -0,0 +1,5 @@
+export * from "./integration"
+export * from "./misc"
+export * from "./automations"
+export * from "./grid"
+export * from "./preview"
diff --git a/packages/types/src/ui/stores/integration.ts b/packages/types/src/ui/stores/integration.ts
new file mode 100644
index 0000000000..4580fd00b1
--- /dev/null
+++ b/packages/types/src/ui/stores/integration.ts
@@ -0,0 +1,5 @@
+import { Integration } from "@budibase/types"
+
+export interface UIIntegration extends Integration {
+  name: string
+}
diff --git a/packages/types/src/ui/stores/misc.ts b/packages/types/src/ui/stores/misc.ts
new file mode 100644
index 0000000000..275b388e9f
--- /dev/null
+++ b/packages/types/src/ui/stores/misc.ts
@@ -0,0 +1,2 @@
+// type purely to capture structures that the type is unknown, but maybe known later
+export type UIObject = Record<string, any>
diff --git a/packages/types/src/ui/stores/preview.ts b/packages/types/src/ui/stores/preview.ts
new file mode 100644
index 0000000000..4d09366ff5
--- /dev/null
+++ b/packages/types/src/ui/stores/preview.ts
@@ -0,0 +1 @@
+export type PreviewDevice = "desktop" | "tablet" | "mobile"
diff --git a/packages/types/tsconfig.build.json b/packages/types/tsconfig.build.json
index 1e289260e4..34c2b771c3 100644
--- a/packages/types/tsconfig.build.json
+++ b/packages/types/tsconfig.build.json
@@ -1,19 +1,9 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "sourceMap": true,
-    "declaration": true,
-    "skipLibCheck": true,
-    "outDir": "dist",
-    "tsBuildInfoFile": "dist/tsconfig.tsbuildinfo"
+    "rootDir": "src/",
+    "outDir": "dist"
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "**/*.spec.ts", "**/*.spec.js"]
+  "exclude": ["node_modules", "dist"]
 }
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
index ad5356c2dc..d8faaf5080 100644
--- a/packages/types/tsconfig.json
+++ b/packages/types/tsconfig.json
@@ -1,7 +1,3 @@
 {
-  "extends": "./tsconfig.build.json",
-  "compilerOptions": {
-    "composite": true
-  },
-  "exclude": ["node_modules", "dist"]
+  "extends": "./tsconfig.build.json"
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index a65b5ed90f..ff21d88ac0 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -15,7 +15,8 @@
     "prebuild": "rimraf dist/",
     "build": "node ../../scripts/build.js",
     "postbuild": "copyfiles -f ../../yarn.lock ./dist/",
-    "check:types": "tsc -p tsconfig.json --noEmit --paths null --target es2020",
+    "check:types": "tsc -p tsconfig.json --noEmit --paths null",
+    "check:dependencies": "node ../../scripts/depcheck.js",
     "build:dev": "yarn prebuild && tsc --build --watch --preserveWatchOutput",
     "run:docker": "node dist/index.js",
     "debug": "yarn build && node --expose-gc --inspect=9223 dist/index.js",
@@ -37,22 +38,26 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "0.0.0",
-    "@budibase/pro": "0.0.0",
-    "@budibase/string-templates": "0.0.0",
-    "@budibase/types": "0.0.0",
-    "@koa/router": "8.0.8",
+    "@budibase/backend-core": "*",
+    "@budibase/pro": "*",
+    "@budibase/shared-core": "*",
+    "@budibase/string-templates": "*",
+    "@budibase/types": "*",
+    "@koa/router": "13.1.0",
     "@techpass/passport-openidconnect": "0.3.3",
     "@types/global-agent": "2.1.1",
-    "aws-sdk": "2.1030.0",
+    "aws-sdk": "2.1692.0",
     "bcrypt": "5.1.0",
     "bcryptjs": "2.4.3",
     "bull": "4.10.1",
-    "dd-trace": "5.2.0",
+    "dd-trace": "5.26.0",
     "dotenv": "8.6.0",
+    "email-validator": "^2.0.4",
     "global-agent": "3.0.0",
     "ical-generator": "4.1.0",
     "joi": "17.6.0",
+    "jsonwebtoken": "9.0.2",
+    "knex": "2.4.2",
     "koa": "2.13.4",
     "koa-body": "4.2.0",
     "koa-compress": "4.0.1",
@@ -69,15 +74,16 @@
     "pouchdb": "7.3.0",
     "pouchdb-all-dbs": "1.1.1",
     "server-destroy": "1.0.1",
-    "knex": "2.4.2"
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@jest/types": "^29.6.3",
     "@swc/core": "1.3.71",
     "@swc/jest": "0.2.27",
     "@types/jest": "29.5.5",
     "@types/jsonwebtoken": "9.0.3",
     "@types/koa": "2.13.4",
-    "@types/koa__router": "8.0.8",
+    "@types/koa__router": "12.0.4",
     "@types/lodash": "4.14.200",
     "@types/node-fetch": "2.6.4",
     "@types/server-destroy": "1.0.1",
@@ -87,9 +93,10 @@
     "nock": "^13.5.4",
     "nodemon": "2.0.15",
     "rimraf": "3.0.2",
+    "superagent": "^10.1.1",
     "supertest": "6.3.3",
     "timekeeper": "2.2.0",
-    "typescript": "5.5.2",
+    "typescript": "5.7.2",
     "update-dotenv": "1.1.1"
   },
   "nx": {
@@ -101,7 +108,7 @@
             "projects": [
               "@budibase/backend-core"
             ],
-            "target": "build"
+            "target": "build:oss"
           }
         ]
       }
diff --git a/packages/worker/src/api/controllers/global/auth.ts b/packages/worker/src/api/controllers/global/auth.ts
index 530a1df102..0d49515700 100644
--- a/packages/worker/src/api/controllers/global/auth.ts
+++ b/packages/worker/src/api/controllers/global/auth.ts
@@ -16,8 +16,17 @@ import {
   PasswordResetUpdateRequest,
   GoogleInnerConfig,
   DatasourceAuthCookie,
+  LogoutResponse,
+  UserCtx,
+  SetInitInfoRequest,
+  GetInitInfoResponse,
+  PasswordResetResponse,
+  PasswordResetUpdateResponse,
+  SetInitInfoResponse,
+  LoginResponse,
 } from "@budibase/types"
 import env from "../../../environment"
+import { Next } from "koa"
 
 import * as authSdk from "../../../sdk/auth"
 import * as userSdk from "../../../sdk/users"
@@ -52,7 +61,10 @@ async function passportCallback(
   ctx.set(Header.TOKEN, token)
 }
 
-export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
+export const login = async (
+  ctx: Ctx<LoginRequest, LoginResponse>,
+  next: Next
+) => {
   const email = ctx.request.body.username
 
   const user = await userSdk.db.getUserByEmail(email)
@@ -67,12 +79,15 @@ export const login = async (ctx: Ctx<LoginRequest>, next: any) => {
       await context.identity.doInUserContext(user, ctx, async () => {
         await events.auth.login("local", user.email)
       })
-      ctx.status = 200
+      ctx.body = {
+        message: "Login successful",
+        userId: user.userId,
+      }
     }
   )(ctx, next)
 }
 
-export const logout = async (ctx: any) => {
+export const logout = async (ctx: UserCtx<void, LogoutResponse>) => {
   if (ctx.user && ctx.user._id) {
     await authSdk.logout({ ctx, userId: ctx.user._id })
   }
@@ -81,13 +96,17 @@ export const logout = async (ctx: any) => {
 
 // INIT
 
-export const setInitInfo = (ctx: any) => {
+export const setInitInfo = (
+  ctx: UserCtx<SetInitInfoRequest, SetInitInfoResponse>
+) => {
   const initInfo = ctx.request.body
   setCookie(ctx, initInfo, Cookie.Init)
-  ctx.status = 200
+  ctx.body = {
+    message: "Init info updated.",
+  }
 }
 
-export const getInitInfo = (ctx: any) => {
+export const getInitInfo = (ctx: UserCtx<void, GetInitInfoResponse>) => {
   try {
     ctx.body = getCookie(ctx, Cookie.Init) || {}
   } catch (err) {
@@ -101,7 +120,9 @@ export const getInitInfo = (ctx: any) => {
 /**
  * Reset the user password, used as part of a forgotten password flow.
  */
-export const reset = async (ctx: Ctx<PasswordResetRequest>) => {
+export const reset = async (
+  ctx: Ctx<PasswordResetRequest, PasswordResetResponse>
+) => {
   const { email } = ctx.request.body
 
   await authSdk.reset(email)
@@ -114,7 +135,9 @@ export const reset = async (ctx: Ctx<PasswordResetRequest>) => {
 /**
  * Perform the user password update if the provided reset code is valid.
  */
-export const resetUpdate = async (ctx: Ctx<PasswordResetUpdateRequest>) => {
+export const resetUpdate = async (
+  ctx: Ctx<PasswordResetUpdateRequest, PasswordResetUpdateResponse>
+) => {
   const { resetCode, password } = ctx.request.body
   try {
     await authSdk.resetUpdate(resetCode, password)
@@ -130,7 +153,10 @@ export const resetUpdate = async (ctx: Ctx<PasswordResetUpdateRequest>) => {
 
 // DATASOURCE
 
-export const datasourcePreAuth = async (ctx: any, next: any) => {
+export const datasourcePreAuth = async (
+  ctx: UserCtx<void, void>,
+  next: Next
+) => {
   const provider = ctx.params.provider
   const { middleware } = require(`@budibase/backend-core`)
   const handler = middleware.datasource[provider]
@@ -147,7 +173,7 @@ export const datasourcePreAuth = async (ctx: any, next: any) => {
   return handler.preAuth(passport, ctx, next)
 }
 
-export const datasourceAuth = async (ctx: any, next: any) => {
+export const datasourceAuth = async (ctx: UserCtx<void, void>, next: Next) => {
   const authStateCookie = getCookie<DatasourceAuthCookie>(
     ctx,
     Cookie.DatasourceAuth
@@ -171,7 +197,7 @@ export async function googleCallbackUrl(config?: GoogleInnerConfig) {
  * The initial call that google authentication makes to take you to the google login screen.
  * On a successful login, you will be redirected to the googleAuth callback route.
  */
-export const googlePreAuth = async (ctx: any, next: any) => {
+export const googlePreAuth = async (ctx: Ctx<void, void>, next: Next) => {
   const config = await configs.getGoogleConfig()
   if (!config) {
     return ctx.throw(400, "Google config not found")
@@ -190,7 +216,7 @@ export const googlePreAuth = async (ctx: any, next: any) => {
   })(ctx, next)
 }
 
-export const googleCallback = async (ctx: any, next: any) => {
+export const googleCallback = async (ctx: Ctx<void, void>, next: Next) => {
   const config = await configs.getGoogleConfig()
   if (!config) {
     return ctx.throw(400, "Google config not found")
@@ -241,7 +267,7 @@ export const oidcStrategyFactory = async (ctx: any) => {
  * The initial call that OIDC authentication makes to take you to the configured OIDC login screen.
  * On a successful login, you will be redirected to the oidcAuth callback route.
  */
-export const oidcPreAuth = async (ctx: Ctx, next: any) => {
+export const oidcPreAuth = async (ctx: Ctx<void, void>, next: Next) => {
   const { configId } = ctx.params
   if (!configId) {
     ctx.throw(400, "OIDC config id is required")
@@ -266,7 +292,7 @@ export const oidcPreAuth = async (ctx: Ctx, next: any) => {
   })(ctx, next)
 }
 
-export const oidcCallback = async (ctx: any, next: any) => {
+export const oidcCallback = async (ctx: Ctx<void, void>, next: Next) => {
   const strategy = await oidcStrategyFactory(ctx)
 
   return passport.authenticate(
diff --git a/packages/worker/src/api/controllers/global/configs.ts b/packages/worker/src/api/controllers/global/configs.ts
index b3f02a44c6..a10fce35f6 100644
--- a/packages/worker/src/api/controllers/global/configs.ts
+++ b/packages/worker/src/api/controllers/global/configs.ts
@@ -15,8 +15,11 @@ import {
   AIConfig,
   AIInnerConfig,
   Config,
+  ConfigChecklistResponse,
   ConfigType,
   Ctx,
+  DeleteConfigResponse,
+  FindConfigResponse,
   GetPublicOIDCConfigResponse,
   GetPublicSettingsResponse,
   GoogleInnerConfig,
@@ -29,11 +32,14 @@ import {
   OIDCLogosConfig,
   PASSWORD_REPLACEMENT,
   QuotaUsageType,
+  SaveConfigRequest,
+  SaveConfigResponse,
   SettingsBrandingConfig,
   SettingsInnerConfig,
   SSOConfig,
   SSOConfigType,
   StaticQuotaName,
+  UploadConfigFileResponse,
   UserCtx,
 } from "@budibase/types"
 import * as pro from "@budibase/pro"
@@ -225,7 +231,9 @@ export async function verifyAIConfig(
   }
 }
 
-export async function save(ctx: UserCtx<Config>) {
+export async function save(
+  ctx: UserCtx<SaveConfigRequest, SaveConfigResponse>
+) {
   const body = ctx.request.body
   const type = body.type
   const config = body.config
@@ -337,7 +345,7 @@ function enrichOIDCLogos(oidcLogos: OIDCLogosConfig) {
   )
 }
 
-export async function find(ctx: UserCtx) {
+export async function find(ctx: UserCtx<void, FindConfigResponse>) {
   try {
     // Find the config with the most granular scope based on context
     const type = ctx.params.type
@@ -473,7 +481,7 @@ export async function publicSettings(
   }
 }
 
-export async function upload(ctx: UserCtx) {
+export async function upload(ctx: UserCtx<void, UploadConfigFileResponse>) {
   if (ctx.request.files == null || Array.isArray(ctx.request.files.file)) {
     ctx.throw(400, "One file must be uploaded.")
   }
@@ -518,7 +526,7 @@ export async function upload(ctx: UserCtx) {
   }
 }
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, DeleteConfigResponse>) {
   const db = tenancy.getGlobalDB()
   const { id, rev } = ctx.params
   try {
@@ -537,14 +545,14 @@ export async function destroy(ctx: UserCtx) {
   }
 }
 
-export async function configChecklist(ctx: Ctx) {
+export async function configChecklist(ctx: Ctx<void, ConfigChecklistResponse>) {
   const tenantId = tenancy.getTenantId()
 
   try {
     ctx.body = await cache.withCache(
       cache.CacheKey.CHECKLIST,
       env.CHECKLIST_CACHE_TTL,
-      async () => {
+      async (): Promise<ConfigChecklistResponse> => {
         let apps = []
         if (!env.MULTI_TENANCY || tenantId) {
           // Apps exist
diff --git a/packages/worker/src/api/controllers/global/email.ts b/packages/worker/src/api/controllers/global/email.ts
index 74a811376a..ad0fc3fa32 100644
--- a/packages/worker/src/api/controllers/global/email.ts
+++ b/packages/worker/src/api/controllers/global/email.ts
@@ -1,8 +1,15 @@
 import { sendEmail as sendEmailFn } from "../../../utilities/email"
 import { tenancy } from "@budibase/backend-core"
-import { BBContext, User } from "@budibase/types"
+import {
+  UserCtx,
+  User,
+  SendEmailRequest,
+  SendEmailResponse,
+} from "@budibase/types"
 
-export async function sendEmail(ctx: BBContext) {
+export async function sendEmail(
+  ctx: UserCtx<SendEmailRequest, SendEmailResponse>
+) {
   let {
     workspaceId,
     email,
diff --git a/packages/worker/src/api/controllers/global/events.ts b/packages/worker/src/api/controllers/global/events.ts
index 758fb41b54..3d7ff4c29e 100644
--- a/packages/worker/src/api/controllers/global/events.ts
+++ b/packages/worker/src/api/controllers/global/events.ts
@@ -2,10 +2,13 @@ import {
   UserCtx,
   PostEventPublishRequest,
   EventPublishType,
+  PostEventPublishResponse,
 } from "@budibase/types"
 import { events } from "@budibase/backend-core"
 
-export async function publish(ctx: UserCtx<PostEventPublishRequest, void>) {
+export async function publish(
+  ctx: UserCtx<PostEventPublishRequest, PostEventPublishResponse>
+) {
   switch (ctx.request.body.type) {
     case EventPublishType.ENVIRONMENT_VARIABLE_UPGRADE_PANEL_OPENED:
       await events.environmentVariable.upgradePanelOpened(ctx.user._id!)
@@ -13,5 +16,5 @@ export async function publish(ctx: UserCtx<PostEventPublishRequest, void>) {
     default:
       ctx.throw(400, "Invalid publish event type.")
   }
-  ctx.status = 200
+  ctx.body = { message: "Event published." }
 }
diff --git a/packages/worker/src/api/controllers/global/license.ts b/packages/worker/src/api/controllers/global/license.ts
index 111cb5cea3..014b01d87c 100644
--- a/packages/worker/src/api/controllers/global/license.ts
+++ b/packages/worker/src/api/controllers/global/license.ts
@@ -1,28 +1,33 @@
 import { licensing, quotas } from "@budibase/pro"
 import {
   ActivateLicenseKeyRequest,
+  ActivateLicenseKeyResponse,
   ActivateOfflineLicenseTokenRequest,
+  ActivateOfflineLicenseTokenResponse,
   GetLicenseKeyResponse,
   GetOfflineIdentifierResponse,
   GetOfflineLicenseTokenResponse,
+  GetQuotaUsageResponse,
+  RefreshOfflineLicenseResponse,
   UserCtx,
 } from "@budibase/types"
 
 // LICENSE KEY
 
 export async function activateLicenseKey(
-  ctx: UserCtx<ActivateLicenseKeyRequest>
+  ctx: UserCtx<ActivateLicenseKeyRequest, ActivateLicenseKeyResponse>
 ) {
   const { licenseKey } = ctx.request.body
   await licensing.keys.activateLicenseKey(licenseKey)
-  ctx.status = 200
+  ctx.body = {
+    message: "License activated.",
+  }
 }
 
 export async function getLicenseKey(ctx: UserCtx<void, GetLicenseKeyResponse>) {
   const licenseKey = await licensing.keys.getLicenseKey()
   if (licenseKey) {
     ctx.body = { licenseKey: "*" }
-    ctx.status = 200
   } else {
     ctx.status = 404
   }
@@ -36,11 +41,16 @@ export async function deleteLicenseKey(ctx: UserCtx<void, void>) {
 // OFFLINE LICENSE
 
 export async function activateOfflineLicenseToken(
-  ctx: UserCtx<ActivateOfflineLicenseTokenRequest>
+  ctx: UserCtx<
+    ActivateOfflineLicenseTokenRequest,
+    ActivateOfflineLicenseTokenResponse
+  >
 ) {
   const { offlineLicenseToken } = ctx.request.body
   await licensing.offline.activateOfflineLicenseToken(offlineLicenseToken)
-  ctx.status = 200
+  ctx.body = {
+    message: "License token activated.",
+  }
 }
 
 export async function getOfflineLicenseToken(
@@ -49,7 +59,6 @@ export async function getOfflineLicenseToken(
   const offlineLicenseToken = await licensing.offline.getOfflineLicenseToken()
   if (offlineLicenseToken) {
     ctx.body = { offlineLicenseToken: "*" }
-    ctx.status = 200
   } else {
     ctx.status = 404
   }
@@ -65,19 +74,23 @@ export async function getOfflineLicenseIdentifier(
 ) {
   const identifierBase64 = await licensing.offline.getIdentifierBase64()
   ctx.body = { identifierBase64 }
-  ctx.status = 200
 }
 
 // LICENSES
 
-export const refresh = async (ctx: any) => {
+export const refresh = async (
+  ctx: UserCtx<void, RefreshOfflineLicenseResponse>
+) => {
   await licensing.cache.refresh()
-  ctx.status = 200
+  ctx.body = {
+    message: "License refreshed.",
+  }
 }
 
 // USAGE
 
-export const getQuotaUsage = async (ctx: any) => {
+export const getQuotaUsage = async (
+  ctx: UserCtx<void, GetQuotaUsageResponse>
+) => {
   ctx.body = await quotas.getQuotaUsage()
-  ctx.status = 200
 }
diff --git a/packages/worker/src/api/controllers/global/roles.ts b/packages/worker/src/api/controllers/global/roles.ts
index e1a3130924..fb93ab504c 100644
--- a/packages/worker/src/api/controllers/global/roles.ts
+++ b/packages/worker/src/api/controllers/global/roles.ts
@@ -6,9 +6,15 @@ import {
   tenancy,
 } from "@budibase/backend-core"
 import sdk from "../../../sdk"
-import { Ctx, App } from "@budibase/types"
+import {
+  Ctx,
+  App,
+  FetchGlobalRolesResponse,
+  FindGlobalRoleResponse,
+  RemoveAppRoleResponse,
+} from "@budibase/types"
 
-export async function fetch(ctx: Ctx) {
+export async function fetch(ctx: Ctx<void, FetchGlobalRolesResponse>) {
   const tenantId = ctx.user!.tenantId
   // always use the dev apps as they'll be most up to date (true)
   const apps = (await dbCore.getAllApps({ tenantId, all: true })) as App[]
@@ -31,7 +37,7 @@ export async function fetch(ctx: Ctx) {
   ctx.body = response
 }
 
-export async function find(ctx: Ctx) {
+export async function find(ctx: Ctx<void, FindGlobalRoleResponse>) {
   const appId = ctx.params.appId
   await context.doInAppContext(dbCore.getDevAppID(appId), async () => {
     const db = context.getAppDB()
@@ -45,7 +51,7 @@ export async function find(ctx: Ctx) {
   })
 }
 
-export async function removeAppRole(ctx: Ctx) {
+export async function removeAppRole(ctx: Ctx<void, RemoveAppRoleResponse>) {
   const { appId } = ctx.params
   const db = tenancy.getGlobalDB()
   const users = await sdk.users.db.allUsers()
diff --git a/packages/worker/src/api/controllers/global/self.ts b/packages/worker/src/api/controllers/global/self.ts
index 14a2ce8c73..3464bff88f 100644
--- a/packages/worker/src/api/controllers/global/self.ts
+++ b/packages/worker/src/api/controllers/global/self.ts
@@ -10,6 +10,11 @@ import {
 import env from "../../../environment"
 import { groups } from "@budibase/pro"
 import {
+  DevInfo,
+  FetchAPIKeyResponse,
+  GenerateAPIKeyRequest,
+  GenerateAPIKeyResponse,
+  GetGlobalSelfResponse,
   UpdateSelfRequest,
   UpdateSelfResponse,
   User,
@@ -35,22 +40,24 @@ function cleanupDevInfo(info: any) {
   return info
 }
 
-export async function generateAPIKey(ctx: any) {
+export async function generateAPIKey(
+  ctx: UserCtx<GenerateAPIKeyRequest, GenerateAPIKeyResponse>
+) {
   let userId
   let apiKey
   if (env.isTest() && ctx.request.body.userId) {
     userId = ctx.request.body.userId
     apiKey = newTestApiKey()
   } else {
-    userId = ctx.user._id
+    userId = ctx.user._id!
     apiKey = newApiKey()
   }
 
   const db = tenancy.getGlobalDB()
   const id = dbCore.generateDevInfoID(userId)
-  let devInfo
+  let devInfo: DevInfo
   try {
-    devInfo = await db.get<any>(id)
+    devInfo = await db.get<DevInfo>(id)
   } catch (err) {
     devInfo = { _id: id, userId }
   }
@@ -59,9 +66,9 @@ export async function generateAPIKey(ctx: any) {
   ctx.body = cleanupDevInfo(devInfo)
 }
 
-export async function fetchAPIKey(ctx: any) {
+export async function fetchAPIKey(ctx: UserCtx<void, FetchAPIKeyResponse>) {
   const db = tenancy.getGlobalDB()
-  const id = dbCore.generateDevInfoID(ctx.user._id)
+  const id = dbCore.generateDevInfoID(ctx.user._id!)
   let devInfo
   try {
     devInfo = await db.get(id)
@@ -77,21 +84,21 @@ export async function fetchAPIKey(ctx: any) {
 }
 
 /**
- * Add the attributes that are session based to the current user.
+ *
  */
-const addSessionAttributesToUser = (ctx: any) => {
-  ctx.body.account = ctx.user.account
-  ctx.body.license = ctx.user.license
-  ctx.body.budibaseAccess = !!ctx.user.budibaseAccess
-  ctx.body.accountPortalAccess = !!ctx.user.accountPortalAccess
-  ctx.body.csrfToken = ctx.user.csrfToken
-}
+const getUserSessionAttributes = (ctx: any) => ({
+  account: ctx.user.account,
+  license: ctx.user.license,
+  budibaseAccess: !!ctx.user.budibaseAccess,
+  accountPortalAccess: !!ctx.user.accountPortalAccess,
+  csrfToken: ctx.user.csrfToken,
+})
 
-export async function getSelf(ctx: any) {
+export async function getSelf(ctx: UserCtx<void, GetGlobalSelfResponse>) {
   if (!ctx.user) {
     ctx.throw(403, "User not logged in")
   }
-  const userId = ctx.user._id
+  const userId = ctx.user._id!
   ctx.params = {
     id: userId,
   }
@@ -101,13 +108,19 @@ export async function getSelf(ctx: any) {
 
   // get the main body of the user
   const user = await userSdk.db.getUser(userId)
-  ctx.body = await groups.enrichUserRolesFromGroups(user)
+  const enrichedUser = await groups.enrichUserRolesFromGroups(user)
+
+  // add the attributes that are session based to the current user
+  const sessionAttributes = getUserSessionAttributes(ctx)
 
   // add the feature flags for this tenant
   const flags = await features.flags.fetch()
-  ctx.body.flags = flags
 
-  addSessionAttributesToUser(ctx)
+  ctx.body = {
+    ...enrichedUser,
+    ...sessionAttributes,
+    flags,
+  }
 }
 
 export const syncAppFavourites = async (processedAppIds: string[]) => {
diff --git a/packages/worker/src/api/controllers/global/templates.ts b/packages/worker/src/api/controllers/global/templates.ts
index 0abce704c7..d717f47515 100644
--- a/packages/worker/src/api/controllers/global/templates.ts
+++ b/packages/worker/src/api/controllers/global/templates.ts
@@ -3,10 +3,25 @@ import {
   TemplateBindings,
   GLOBAL_OWNER,
 } from "../../../constants"
-import { getTemplates } from "../../../constants/templates"
+import { getTemplateByID, getTemplates } from "../../../constants/templates"
 import { tenancy, db as dbCore } from "@budibase/backend-core"
+import {
+  DeleteGlobalTemplateResponse,
+  FetchGlobalTemplateByOwnerIDResponse,
+  FetchGlobalTemplateByTypeResponse,
+  FetchGlobalTemplateDefinitionResponse,
+  FetchGlobalTemplateResponse,
+  FindGlobalTemplateResponse,
+  SaveGlobalTemplateRequest,
+  SaveGlobalTemplateResponse,
+  GlobalTemplateBinding,
+  GlobalTemplateDefinition,
+  UserCtx,
+} from "@budibase/types"
 
-export async function save(ctx: any) {
+export async function save(
+  ctx: UserCtx<SaveGlobalTemplateRequest, SaveGlobalTemplateResponse>
+) {
   const db = tenancy.getGlobalDB()
   let template = ctx.request.body
   if (!template.ownerId) {
@@ -23,9 +38,11 @@ export async function save(ctx: any) {
   }
 }
 
-export async function definitions(ctx: any) {
-  const bindings: any = {}
-  const info: any = {}
+export async function definitions(
+  ctx: UserCtx<void, FetchGlobalTemplateDefinitionResponse>
+) {
+  const bindings: Record<string, GlobalTemplateBinding[]> = {}
+  const info: Record<string, GlobalTemplateDefinition> = {}
   for (let template of TemplateMetadata.email) {
     bindings[template.purpose] = template.bindings
     info[template.purpose] = {
@@ -44,34 +61,35 @@ export async function definitions(ctx: any) {
   }
 }
 
-export async function fetch(ctx: any) {
+export async function fetch(ctx: UserCtx<void, FetchGlobalTemplateResponse>) {
   ctx.body = await getTemplates()
 }
 
-export async function fetchByType(ctx: any) {
-  // @ts-ignore
+export async function fetchByType(
+  ctx: UserCtx<void, FetchGlobalTemplateByTypeResponse>
+) {
   ctx.body = await getTemplates({
     type: ctx.params.type,
   })
 }
 
-export async function fetchByOwner(ctx: any) {
+export async function fetchByOwner(
+  ctx: UserCtx<void, FetchGlobalTemplateByOwnerIDResponse>
+) {
   // @ts-ignore
   ctx.body = await getTemplates({
     ownerId: ctx.params.ownerId,
   })
 }
 
-export async function find(ctx: any) {
-  // @ts-ignore
-  ctx.body = await getTemplates({
-    id: ctx.params.id,
-  })
+export async function find(ctx: UserCtx<void, FindGlobalTemplateResponse>) {
+  ctx.body = await getTemplateByID(ctx.params.id)
 }
 
-export async function destroy(ctx: any) {
+export async function destroy(
+  ctx: UserCtx<void, DeleteGlobalTemplateResponse>
+) {
   const db = tenancy.getGlobalDB()
   await db.remove(ctx.params.id, ctx.params.rev)
-  ctx.message = `Template ${ctx.params.id} deleted.`
-  ctx.status = 200
+  ctx.body = { message: `Template ${ctx.params.id} deleted.` }
 }
diff --git a/packages/worker/src/api/controllers/global/users.ts b/packages/worker/src/api/controllers/global/users.ts
index fa19948bf5..e36c45a3ba 100644
--- a/packages/worker/src/api/controllers/global/users.ts
+++ b/packages/worker/src/api/controllers/global/users.ts
@@ -4,42 +4,57 @@ import {
   AcceptUserInviteRequest,
   AcceptUserInviteResponse,
   AddSSoUserRequest,
+  AddSSoUserResponse,
   BulkUserRequest,
   BulkUserResponse,
-  CloudAccount,
+  CheckInviteResponse,
+  CountUserResponse,
   CreateAdminUserRequest,
   CreateAdminUserResponse,
   Ctx,
   DeleteInviteUserRequest,
   DeleteInviteUsersRequest,
+  DeleteInviteUsersResponse,
+  DeleteUserResponse,
+  FetchUsersResponse,
+  FindUserResponse,
+  GetUserInvitesResponse,
+  Hosting,
   InviteUserRequest,
+  InviteUserResponse,
   InviteUsersRequest,
   InviteUsersResponse,
   LockName,
   LockType,
-  MigrationType,
+  LookupAccountHolderResponse,
+  LookupTenantUserResponse,
   PlatformUserByEmail,
   SaveUserResponse,
   SearchUsersRequest,
+  SearchUsersResponse,
+  UnsavedUser,
+  UpdateInviteRequest,
+  UpdateInviteResponse,
   User,
   UserCtx,
   UserIdentifier,
 } from "@budibase/types"
 import {
-  accounts,
   users,
   cache,
   ErrorCode,
   events,
-  migrations,
   platform,
   tenancy,
   db,
   locks,
+  context,
 } from "@budibase/backend-core"
 import { checkAnyUserExists } from "../../../utilities/users"
 import { isEmailConfigured } from "../../../utilities/email"
 import { BpmStatusKey, BpmStatusValue, utils } from "@budibase/shared-core"
+import emailValidator from "email-validator"
+import crypto from "crypto"
 
 const MAX_USERS_UPLOAD_LIMIT = 1000
 
@@ -51,18 +66,21 @@ const generatePassword = (length: number) => {
     .slice(0, length)
 }
 
-export const save = async (ctx: UserCtx<User, SaveUserResponse>) => {
+export const save = async (ctx: UserCtx<UnsavedUser, SaveUserResponse>) => {
   try {
     const currentUserId = ctx.user?._id
-    const requestUser = ctx.request.body
+    const tenantId = context.getTenantId()
+    const requestUser: User = { ...ctx.request.body, tenantId }
 
     // Do not allow the account holder role to be changed
-    const accountMetadata = await users.getExistingAccounts([requestUser.email])
-    if (accountMetadata?.length > 0) {
-      if (
-        requestUser.admin?.global !== true ||
-        requestUser.builder?.global !== true
-      ) {
+    if (
+      requestUser.admin?.global !== true ||
+      requestUser.builder?.global !== true
+    ) {
+      const accountMetadata = await users.getExistingAccounts([
+        requestUser.email,
+      ])
+      if (accountMetadata?.length > 0) {
         throw Error("Cannot set role of account holder")
       }
     }
@@ -79,7 +97,9 @@ export const save = async (ctx: UserCtx<User, SaveUserResponse>) => {
   }
 }
 
-export const addSsoSupport = async (ctx: Ctx<AddSSoUserRequest>) => {
+export const addSsoSupport = async (
+  ctx: Ctx<AddSSoUserRequest, AddSSoUserResponse>
+) => {
   const { email, ssoId } = ctx.request.body
   try {
     // Status is changed to 404 from getUserDoc if user is not found
@@ -99,7 +119,7 @@ export const addSsoSupport = async (ctx: Ctx<AddSSoUserRequest>) => {
       email,
       ssoId,
     })
-    ctx.status = 200
+    ctx.body = { message: "SSO support added." }
   } catch (err: any) {
     ctx.throw(err.status || 400, err)
   }
@@ -132,7 +152,12 @@ export const bulkUpdate = async (
   let created, deleted
   try {
     if (input.create) {
-      created = await bulkCreate(input.create.users, input.create.groups)
+      const tenantId = context.getTenantId()
+      const users: User[] = input.create.users.map(user => ({
+        ...user,
+        tenantId,
+      }))
+      created = await bulkCreate(users, input.create.groups)
     }
     if (input.delete) {
       deleted = await bulkDelete(input.delete.users, currentUserId)
@@ -160,10 +185,6 @@ export const adminUser = async (
   if (env.MULTI_TENANCY) {
     // store the new tenant record in the platform db
     await platform.tenants.addTenant(tenantId)
-    await migrations.backPopulateMigrations({
-      type: MigrationType.GLOBAL,
-      tenantId,
-    })
   }
 
   await tenancy.doInTenant(tenantId, async () => {
@@ -190,12 +211,10 @@ export const adminUser = async (
         lastName: familyName,
       })
 
-      // events
-      let account: CloudAccount | undefined
-      if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
-        account = await accounts.getAccountByTenantId(tenantId)
-      }
-      await events.identification.identifyTenantGroup(tenantId, account)
+      await events.identification.identifyTenantGroup(
+        tenantId,
+        env.SELF_HOSTED ? Hosting.SELF : Hosting.CLOUD
+      )
 
       ctx.body = {
         _id: finalUser._id!,
@@ -208,7 +227,7 @@ export const adminUser = async (
   })
 }
 
-export const countByApp = async (ctx: any) => {
+export const countByApp = async (ctx: UserCtx<void, CountUserResponse>) => {
   const appId = ctx.params.appId
   try {
     ctx.body = await userSdk.db.countUsersByApp(appId)
@@ -217,7 +236,7 @@ export const countByApp = async (ctx: any) => {
   }
 }
 
-export const destroy = async (ctx: any) => {
+export const destroy = async (ctx: UserCtx<void, DeleteUserResponse>) => {
   const id = ctx.params.id
   if (id === ctx.user._id) {
     ctx.throw(400, "Unable to delete self.")
@@ -240,7 +259,9 @@ export const getAppUsers = async (ctx: Ctx<SearchUsersRequest>) => {
   ctx.body = { data: users }
 }
 
-export const search = async (ctx: Ctx<SearchUsersRequest>) => {
+export const search = async (
+  ctx: Ctx<SearchUsersRequest, SearchUsersResponse>
+) => {
   const body = ctx.request.body
 
   // TODO: for now only two supported search keys; string.email and equal._id
@@ -281,7 +302,7 @@ export const search = async (ctx: Ctx<SearchUsersRequest>) => {
 }
 
 // called internally by app server user fetch
-export const fetch = async (ctx: any) => {
+export const fetch = async (ctx: UserCtx<void, FetchUsersResponse>) => {
   const all = await userSdk.db.allUsers()
   // user hashed password shouldn't ever be returned
   for (let user of all) {
@@ -293,12 +314,18 @@ export const fetch = async (ctx: any) => {
 }
 
 // called internally by app server user find
-export const find = async (ctx: any) => {
+export const find = async (ctx: UserCtx<void, FindUserResponse>) => {
   ctx.body = await userSdk.db.getUser(ctx.params.id)
 }
 
-export const tenantUserLookup = async (ctx: any) => {
+export const tenantUserLookup = async (
+  ctx: UserCtx<void, LookupTenantUserResponse>
+) => {
   const id = ctx.params.id
+  // is email, check its valid
+  if (id.includes("@") && !emailValidator.validate(id)) {
+    ctx.throw(400, `${id} is not a valid email address to lookup.`)
+  }
   const user = await userSdk.core.getFirstPlatformUser(id)
   if (user) {
     ctx.body = user
@@ -311,7 +338,9 @@ export const tenantUserLookup = async (ctx: any) => {
  * This will be paginated to a default of the first 50 users,
  * So the account holder may not be found until further pagination has occurred
  */
-export const accountHolderLookup = async (ctx: Ctx) => {
+export const accountHolderLookup = async (
+  ctx: Ctx<void, LookupAccountHolderResponse>
+) => {
   try {
     const users = await userSdk.core.getAllUsers()
     const response = await userSdk.core.getExistingAccounts(
@@ -363,7 +392,9 @@ export const onboardUsers = async (
   ctx.body = { ...resp, created: true }
 }
 
-export const invite = async (ctx: Ctx<InviteUserRequest>) => {
+export const invite = async (
+  ctx: Ctx<InviteUserRequest, InviteUserResponse>
+) => {
   const request = ctx.request.body
 
   let multiRequest = [request]
@@ -386,12 +417,14 @@ export const invite = async (ctx: Ctx<InviteUserRequest>) => {
   }
 }
 
-export const inviteMultiple = async (ctx: Ctx<InviteUsersRequest>) => {
+export const inviteMultiple = async (
+  ctx: Ctx<InviteUsersRequest, InviteUsersResponse>
+) => {
   ctx.body = await userSdk.invite(ctx.request.body)
 }
 
 export const removeMultipleInvites = async (
-  ctx: Ctx<DeleteInviteUsersRequest>
+  ctx: Ctx<DeleteInviteUsersRequest, DeleteInviteUsersResponse>
 ) => {
   const inviteCodesToRemove = ctx.request.body.map(
     (invite: DeleteInviteUserRequest) => invite.code
@@ -404,7 +437,7 @@ export const removeMultipleInvites = async (
   }
 }
 
-export const checkInvite = async (ctx: any) => {
+export const checkInvite = async (ctx: UserCtx<void, CheckInviteResponse>) => {
   const { code } = ctx.params
   let invite
   try {
@@ -412,14 +445,15 @@ export const checkInvite = async (ctx: any) => {
   } catch (e) {
     console.warn("Error getting invite from code", e)
     ctx.throw(400, "There was a problem with the invite")
-    return
   }
   ctx.body = {
     email: invite.email,
   }
 }
 
-export const getUserInvites = async (ctx: any) => {
+export const getUserInvites = async (
+  ctx: UserCtx<void, GetUserInvitesResponse>
+) => {
   try {
     // Restricted to the currently authenticated tenant
     ctx.body = await cache.invite.getInviteCodes()
@@ -428,7 +462,9 @@ export const getUserInvites = async (ctx: any) => {
   }
 }
 
-export const updateInvite = async (ctx: any) => {
+export const updateInvite = async (
+  ctx: UserCtx<UpdateInviteRequest, UpdateInviteResponse>
+) => {
   const { code } = ctx.params
   let updateBody = { ...ctx.request.body }
 
@@ -439,7 +475,6 @@ export const updateInvite = async (ctx: any) => {
     invite = await cache.invite.getCode(code)
   } catch (e) {
     ctx.throw(400, "There was a problem with the invite")
-    return
   }
 
   let updated = {
diff --git a/packages/worker/src/api/controllers/global/workspaces.ts b/packages/worker/src/api/controllers/global/workspaces.ts
deleted file mode 100644
index cf6486fec9..0000000000
--- a/packages/worker/src/api/controllers/global/workspaces.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { tenancy, db as dbCore } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
-
-export async function save(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const workspaceDoc = ctx.request.body
-
-  // workspace does not exist yet
-  if (!workspaceDoc._id) {
-    workspaceDoc._id = dbCore.generateWorkspaceID()
-  }
-
-  try {
-    const response = await db.put(workspaceDoc)
-    ctx.body = {
-      _id: response.id,
-      _rev: response.rev,
-    }
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}
-
-export async function fetch(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const response = await db.allDocs(
-    dbCore.getWorkspaceParams(undefined, {
-      include_docs: true,
-    })
-  )
-  ctx.body = response.rows.map(row => row.doc)
-}
-
-export async function find(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  try {
-    ctx.body = await db.get(ctx.params.id)
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}
-
-export async function destroy(ctx: BBContext) {
-  const db = tenancy.getGlobalDB()
-  const { id, rev } = ctx.params
-
-  try {
-    await db.remove(id, rev)
-    ctx.body = { message: "Workspace deleted successfully" }
-  } catch (err: any) {
-    ctx.throw(err.status, err)
-  }
-}
diff --git a/packages/worker/src/api/controllers/system/accounts.ts b/packages/worker/src/api/controllers/system/accounts.ts
index 7e6d1b51b8..e3fd9f2627 100644
--- a/packages/worker/src/api/controllers/system/accounts.ts
+++ b/packages/worker/src/api/controllers/system/accounts.ts
@@ -1,7 +1,15 @@
-import { Account, AccountMetadata, Ctx } from "@budibase/types"
+import {
+  Account,
+  AccountMetadata,
+  Ctx,
+  SaveAccountRequest,
+  SaveAccountResponse,
+} from "@budibase/types"
 import * as accounts from "../../../sdk/accounts"
 
-export const save = async (ctx: Ctx<Account, AccountMetadata>) => {
+export const save = async (
+  ctx: Ctx<SaveAccountRequest, SaveAccountResponse>
+) => {
   const account = ctx.request.body as Account
   let metadata: AccountMetadata = {
     _id: accounts.metadata.formatAccountMetadataId(account.accountId),
@@ -11,10 +19,9 @@ export const save = async (ctx: Ctx<Account, AccountMetadata>) => {
   metadata = await accounts.metadata.saveMetadata(metadata)
 
   ctx.body = metadata
-  ctx.status = 200
 }
 
-export const destroy = async (ctx: any) => {
+export const destroy = async (ctx: Ctx<void, void>) => {
   const accountId = accounts.metadata.formatAccountMetadataId(
     ctx.params.accountId
   )
diff --git a/packages/worker/src/api/controllers/system/environment.ts b/packages/worker/src/api/controllers/system/environment.ts
index 18ecc380db..4b75f49554 100644
--- a/packages/worker/src/api/controllers/system/environment.ts
+++ b/packages/worker/src/api/controllers/system/environment.ts
@@ -1,4 +1,4 @@
-import { Ctx, MaintenanceType } from "@budibase/types"
+import { Ctx, GetEnvironmentResponse, MaintenanceType } from "@budibase/types"
 import env from "../../../environment"
 import { env as coreEnv, db as dbCore } from "@budibase/backend-core"
 import nodeFetch from "node-fetch"
@@ -38,13 +38,13 @@ async function isSqsMissing() {
   return !(await isSqsAvailable())
 }
 
-export const fetch = async (ctx: Ctx) => {
+export const fetch = async (ctx: Ctx<void, GetEnvironmentResponse>) => {
   ctx.body = {
     multiTenancy: !!env.MULTI_TENANCY,
     offlineMode: !!coreEnv.OFFLINE_MODE,
     cloud: !env.SELF_HOSTED,
     accountPortalUrl: env.ACCOUNT_PORTAL_URL,
-    disableAccountPortal: env.DISABLE_ACCOUNT_PORTAL,
+    disableAccountPortal: !!env.DISABLE_ACCOUNT_PORTAL,
     baseUrl: env.PLATFORM_URL,
     isDev: env.isDev() && !env.isTest(),
     maintenance: [],
diff --git a/packages/worker/src/api/controllers/system/logs.ts b/packages/worker/src/api/controllers/system/logs.ts
index a5607d545a..06ae75407d 100644
--- a/packages/worker/src/api/controllers/system/logs.ts
+++ b/packages/worker/src/api/controllers/system/logs.ts
@@ -1,7 +1,7 @@
-import { UserCtx } from "@budibase/types"
+import { GetLogResponse, UserCtx } from "@budibase/types"
 import { installation, logging } from "@budibase/backend-core"
 
-export async function getLogs(ctx: UserCtx) {
+export async function getLogs(ctx: UserCtx<void, GetLogResponse>) {
   const logReadStream = logging.system.getLogReadStream()
 
   const { installId } = await installation.getInstall()
diff --git a/packages/worker/src/api/controllers/system/migrations.ts b/packages/worker/src/api/controllers/system/migrations.ts
deleted file mode 100644
index 57a5f6261c..0000000000
--- a/packages/worker/src/api/controllers/system/migrations.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-const { migrate, MIGRATIONS } = require("../../../migrations")
-
-export const runMigrations = async (ctx: any) => {
-  const options = ctx.request.body
-  // don't await as can take a while, just return
-  migrate(options)
-  ctx.status = 200
-}
-
-export const fetchDefinitions = async (ctx: any) => {
-  ctx.body = MIGRATIONS
-  ctx.status = 200
-}
diff --git a/packages/worker/src/api/controllers/system/restore.ts b/packages/worker/src/api/controllers/system/restore.ts
index def6d58a5d..de3b4b8ff0 100644
--- a/packages/worker/src/api/controllers/system/restore.ts
+++ b/packages/worker/src/api/controllers/system/restore.ts
@@ -1,8 +1,10 @@
 import env from "../../../environment"
-import { BBContext } from "@budibase/types"
+import { SystemRestoreResponse, UserCtx } from "@budibase/types"
 import { cache } from "@budibase/backend-core"
 
-export async function systemRestored(ctx: BBContext) {
+export async function systemRestored(
+  ctx: UserCtx<void, SystemRestoreResponse>
+) {
   if (!env.SELF_HOSTED) {
     ctx.throw(405, "This operation is not allowed in cloud.")
   }
diff --git a/packages/worker/src/api/controllers/system/tenants.ts b/packages/worker/src/api/controllers/system/tenants.ts
index 476343a05e..54388bf1fc 100644
--- a/packages/worker/src/api/controllers/system/tenants.ts
+++ b/packages/worker/src/api/controllers/system/tenants.ts
@@ -1,7 +1,7 @@
-import { UserCtx } from "@budibase/types"
+import { GetTenantInfoResponse, UserCtx } from "@budibase/types"
 import * as tenantSdk from "../../../sdk/tenants"
 
-export async function destroy(ctx: UserCtx) {
+export async function destroy(ctx: UserCtx<void, void>) {
   const user = ctx.user!
   const tenantId = ctx.params.tenantId
 
@@ -18,6 +18,6 @@ export async function destroy(ctx: UserCtx) {
   }
 }
 
-export async function info(ctx: UserCtx) {
+export async function info(ctx: UserCtx<void, GetTenantInfoResponse>) {
   ctx.body = await tenantSdk.tenantInfo(ctx.params.tenantId)
 }
diff --git a/packages/worker/src/api/routes/global/email.ts b/packages/worker/src/api/routes/global/email.ts
index 94e6b9bce5..6b60da47b5 100644
--- a/packages/worker/src/api/routes/global/email.ts
+++ b/packages/worker/src/api/routes/global/email.ts
@@ -1,7 +1,7 @@
 import Router from "@koa/router"
 import * as controller from "../../controllers/global/email"
-import { EmailTemplatePurpose } from "../../../constants"
 import { auth } from "@budibase/backend-core"
+import { EmailTemplatePurpose } from "@budibase/types"
 import Joi from "joi"
 
 const router: Router = new Router()
diff --git a/packages/worker/src/api/routes/global/tests/auth.spec.ts b/packages/worker/src/api/routes/global/tests/auth.spec.ts
index f6bdd7f663..bff959469e 100644
--- a/packages/worker/src/api/routes/global/tests/auth.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/auth.spec.ts
@@ -54,7 +54,7 @@ describe("/api/global/auth", () => {
     describe("POST /api/global/auth/:tenantId/login", () => {
       it("logs in with correct credentials", async () => {
         const tenantId = config.tenantId!
-        const email = config.user?.email!
+        const email = config.user!.email!
         const password = config.userPassword
 
         const response = await config.api.auth.login(tenantId, email, password)
@@ -65,7 +65,7 @@ describe("/api/global/auth", () => {
 
       it("should return 403 with incorrect credentials", async () => {
         const tenantId = config.tenantId!
-        const email = config.user?.email!
+        const email = config.user!.email!
         const password = "incorrect123"
 
         const response = await config.api.auth.login(
diff --git a/packages/worker/src/api/routes/global/tests/email.spec.ts b/packages/worker/src/api/routes/global/tests/email.spec.ts
index 49d7c3bbeb..eb46c501d9 100644
--- a/packages/worker/src/api/routes/global/tests/email.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/email.spec.ts
@@ -1,8 +1,8 @@
 jest.mock("nodemailer")
+import { EmailTemplatePurpose } from "@budibase/types"
 import { TestConfiguration, mocks } from "../../../../tests"
 
 const sendMailMock = mocks.email.mock()
-import { EmailTemplatePurpose } from "../../../../constants"
 
 describe("/api/global/email", () => {
   const config = new TestConfiguration()
diff --git a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
index 99dfb7f824..bf5ed7b4ee 100644
--- a/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/realEmail.spec.ts
@@ -1,11 +1,10 @@
 jest.unmock("node-fetch")
 import { TestConfiguration } from "../../../../tests"
-import { EmailTemplatePurpose } from "../../../../constants"
 import { objectStore } from "@budibase/backend-core"
 import { helpers } from "@budibase/shared-core"
 
 import tk from "timekeeper"
-import { EmailAttachment } from "@budibase/types"
+import { EmailAttachment, EmailTemplatePurpose } from "@budibase/types"
 
 const fetch = require("node-fetch")
 
diff --git a/packages/worker/src/api/routes/global/tests/self.spec.ts b/packages/worker/src/api/routes/global/tests/self.spec.ts
index 277c11b081..bf34f14aa0 100644
--- a/packages/worker/src/api/routes/global/tests/self.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/self.spec.ts
@@ -1,5 +1,5 @@
 jest.mock("nodemailer")
-import { TestConfiguration, mocks } from "../../../../tests"
+import { TestConfiguration } from "../../../../tests"
 import { events } from "@budibase/backend-core"
 
 describe("/api/global/self", () => {
@@ -39,7 +39,6 @@ describe("/api/global/self", () => {
       const dbUser = (await config.getUser(user.email))!
 
       user._rev = dbUser._rev
-      user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
       expect(res.body._id).toBe(user._id)
       expect(events.user.updated).toHaveBeenCalledTimes(1)
       expect(events.user.updated).toHaveBeenCalledWith(dbUser)
@@ -62,7 +61,6 @@ describe("/api/global/self", () => {
     const dbUser = (await config.getUser(user.email))!
 
     user._rev = dbUser._rev
-    user.dayPassRecordedAt = mocks.date.MOCK_DATE.toISOString()
     expect(dbUser.onboardedAt).toBe("2023-03-07T14:10:54.869Z")
     expect(dbUser.freeTrialConfirmedAt).toBe("2024-03-17T14:10:54.869Z")
     expect(res.body._id).toBe(user._id)
diff --git a/packages/worker/src/api/routes/global/tests/templates.spec.ts b/packages/worker/src/api/routes/global/tests/templates.spec.ts
index 982cae28b5..786023101e 100644
--- a/packages/worker/src/api/routes/global/tests/templates.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/templates.spec.ts
@@ -1,9 +1,6 @@
-import {
-  EmailTemplatePurpose,
-  TemplateMetadata,
-  TemplateType,
-} from "../../../../constants"
+import { TemplateMetadata, TemplateType } from "../../../../constants"
 import { TestConfiguration } from "../../../../tests"
+import { EmailTemplatePurpose } from "@budibase/types"
 
 // TODO
 
diff --git a/packages/worker/src/api/routes/global/tests/users.spec.ts b/packages/worker/src/api/routes/global/tests/users.spec.ts
index b6237c7b4b..239877b71a 100644
--- a/packages/worker/src/api/routes/global/tests/users.spec.ts
+++ b/packages/worker/src/api/routes/global/tests/users.spec.ts
@@ -343,7 +343,7 @@ describe("/api/global/users", () => {
     })
 
     it("should not allow a user to update their own admin/builder status", async () => {
-      const user = (await config.api.users.getUser(config.user?._id!))
+      const user = (await config.api.users.getUser(config.user!._id!))
         .body as User
       await config.api.users.saveUser({
         ...user,
diff --git a/packages/worker/src/api/routes/global/workspaces.ts b/packages/worker/src/api/routes/global/workspaces.ts
deleted file mode 100644
index 79afb53b96..0000000000
--- a/packages/worker/src/api/routes/global/workspaces.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import Router from "@koa/router"
-import * as controller from "../../controllers/global/workspaces"
-import { auth } from "@budibase/backend-core"
-import Joi from "joi"
-
-const router: Router = new Router()
-
-function buildWorkspaceSaveValidation() {
-  // prettier-ignore
-  return auth.joiValidator.body(Joi.object({
-    _id: Joi.string().optional(),
-    _rev: Joi.string().optional(),
-    name: Joi.string().required(),
-    users: Joi.array().required(),
-    managers: Joi.array().required(),
-    roles: Joi.object({
-      default: Joi.string().optional(),
-      app: Joi.object()
-        .pattern(/.*/, Joi.string())
-        .required()
-        .unknown(true),
-    }).unknown(true).optional(),
-  }).required().unknown(true))
-}
-
-router
-  .post(
-    "/api/global/workspaces",
-    auth.adminOnly,
-    buildWorkspaceSaveValidation(),
-    controller.save
-  )
-  .delete("/api/global/workspaces/:id", auth.adminOnly, controller.destroy)
-  .get("/api/global/workspaces", controller.fetch)
-  .get("/api/global/workspaces/:id", controller.find)
-
-export default router
diff --git a/packages/worker/src/api/routes/index.ts b/packages/worker/src/api/routes/index.ts
index e6cacf110f..d4ddb41522 100644
--- a/packages/worker/src/api/routes/index.ts
+++ b/packages/worker/src/api/routes/index.ts
@@ -2,7 +2,6 @@ import Router from "@koa/router"
 import { api as pro } 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"
@@ -13,7 +12,6 @@ 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"
 import restoreRoutes from "./system/restore"
 import systemLogRoutes from "./system/logs"
@@ -24,7 +22,6 @@ export const routes: Router[] = [
   configRoutes,
   userRoutes,
   pro.users,
-  workspaceRoutes,
   authRoutes,
   templateRoutes,
   tenantsRoutes,
@@ -36,7 +33,6 @@ export const routes: Router[] = [
   licenseRoutes,
   pro.groups,
   pro.auditLogs,
-  migrationRoutes,
   accountRoutes,
   restoreRoutes,
   eventRoutes,
diff --git a/packages/worker/src/api/routes/system/migrations.ts b/packages/worker/src/api/routes/system/migrations.ts
deleted file mode 100644
index a8189b5a91..0000000000
--- a/packages/worker/src/api/routes/system/migrations.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import Router from "@koa/router"
-import * as migrationsController from "../../controllers/system/migrations"
-import { auth } from "@budibase/backend-core"
-
-const router: Router = new Router()
-
-router
-  .post(
-    "/api/system/migrations/run",
-    auth.internalApi,
-    migrationsController.runMigrations
-  )
-  .get(
-    "/api/system/migrations/definitions",
-    auth.internalApi,
-    migrationsController.fetchDefinitions
-  )
-
-export default router
diff --git a/packages/worker/src/api/routes/system/tests/environment.spec.ts b/packages/worker/src/api/routes/system/tests/environment.spec.ts
index dbe9be7374..58f523648d 100644
--- a/packages/worker/src/api/routes/system/tests/environment.spec.ts
+++ b/packages/worker/src/api/routes/system/tests/environment.spec.ts
@@ -22,7 +22,7 @@ describe("/api/system/environment", () => {
       const env = await config.api.environment.getEnvironment()
       expect(env.body).toEqual({
         cloud: true,
-        disableAccountPortal: 0,
+        disableAccountPortal: false,
         isDev: false,
         multiTenancy: true,
         baseUrl: "http://localhost:10000",
@@ -36,7 +36,7 @@ describe("/api/system/environment", () => {
         const env = await config.api.environment.getEnvironment()
         expect(env.body).toEqual({
           cloud: false,
-          disableAccountPortal: 0,
+          disableAccountPortal: false,
           isDev: false,
           multiTenancy: true,
           baseUrl: "http://localhost:10000",
diff --git a/packages/worker/src/api/routes/system/tests/migrations.spec.ts b/packages/worker/src/api/routes/system/tests/migrations.spec.ts
deleted file mode 100644
index 4198d65ee9..0000000000
--- a/packages/worker/src/api/routes/system/tests/migrations.spec.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-const migrateFn = jest.fn()
-
-import { TestConfiguration } from "../../../../tests"
-
-jest.mock("../../../../migrations", () => {
-  return {
-    ...jest.requireActual("../../../../migrations"),
-    migrate: migrateFn,
-  }
-})
-
-describe("/api/system/migrations", () => {
-  const config = new TestConfiguration()
-
-  beforeAll(async () => {
-    await config.beforeAll()
-  })
-
-  afterAll(async () => {
-    await config.afterAll()
-  })
-
-  afterEach(() => {
-    jest.clearAllMocks()
-  })
-
-  describe("POST /api/system/migrations/run", () => {
-    it("fails with no internal api key", async () => {
-      const res = await config.api.migrations.runMigrations({
-        headers: {},
-        status: 403,
-      })
-      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
-      expect(migrateFn).toHaveBeenCalledTimes(0)
-    })
-
-    it("runs migrations", async () => {
-      const res = await config.api.migrations.runMigrations()
-      expect(res.text).toBe("OK")
-      expect(migrateFn).toHaveBeenCalledTimes(1)
-    })
-  })
-
-  describe("DELETE /api/system/migrations/definitions", () => {
-    it("fails with no internal api key", async () => {
-      const res = await config.api.migrations.getMigrationDefinitions({
-        headers: {},
-        status: 403,
-      })
-      expect(res.body).toEqual({ message: "Unauthorized", status: 403 })
-    })
-
-    it("returns definitions", async () => {
-      const res = await config.api.migrations.getMigrationDefinitions()
-      expect(res.body).toEqual([
-        {
-          name: "global_info_sync_users",
-          type: "global",
-        },
-      ])
-    })
-  })
-})
diff --git a/packages/worker/src/constants/index.ts b/packages/worker/src/constants/index.ts
index 17fce666db..309fdeebc1 100644
--- a/packages/worker/src/constants/index.ts
+++ b/packages/worker/src/constants/index.ts
@@ -1,4 +1,5 @@
 import { constants } from "@budibase/backend-core"
+import { EmailTemplatePurpose } from "@budibase/types"
 
 export const LOGO_URL =
   "https://d33wubrfki0l68.cloudfront.net/aac32159d7207b5085e74a7ef67afbb7027786c5/2b1fd/img/logo/bb-emblem.svg"
@@ -19,15 +20,6 @@ export enum TemplateType {
   EMAIL = "email",
 }
 
-export enum EmailTemplatePurpose {
-  CORE = "core",
-  BASE = "base",
-  PASSWORD_RECOVERY = "password_recovery",
-  INVITATION = "invitation",
-  WELCOME = "welcome",
-  CUSTOM = "custom",
-}
-
 export enum TemplateMetadataNames {
   BASE = "Base format",
   PASSWORD_RECOVERY = "Password recovery",
diff --git a/packages/worker/src/constants/templates/index.ts b/packages/worker/src/constants/templates/index.ts
index 6dd3f556a6..b2e98afe58 100644
--- a/packages/worker/src/constants/templates/index.ts
+++ b/packages/worker/src/constants/templates/index.ts
@@ -1,13 +1,8 @@
 import { readStaticFile } from "../../utilities/fileSystem"
-import {
-  EmailTemplatePurpose,
-  TemplateType,
-  TemplatePurpose,
-  GLOBAL_OWNER,
-} from "../index"
+import { TemplateType, TemplatePurpose, GLOBAL_OWNER } from "../index"
 import { join } from "path"
 import { db as dbCore, tenancy } from "@budibase/backend-core"
-import { Template } from "@budibase/types"
+import { Template, EmailTemplatePurpose } from "@budibase/types"
 
 export const EmailTemplates = {
   [EmailTemplatePurpose.PASSWORD_RECOVERY]: readStaticFile(
@@ -53,8 +48,21 @@ export function addBaseTemplates(templates: Template[], type?: string) {
 export async function getTemplates({
   ownerId,
   type,
-  id,
-}: { ownerId?: string; type?: string; id?: string } = {}) {
+}: { ownerId?: string; type?: string } = {}) {
+  const db = tenancy.getGlobalDB()
+  const response = await db.allDocs<Template>(
+    dbCore.getTemplateParams(ownerId || GLOBAL_OWNER, undefined, {
+      include_docs: true,
+    })
+  )
+  let templates = response.rows.map(row => row.doc!)
+  if (type) {
+    templates = templates.filter(template => template.type === type)
+  }
+  return addBaseTemplates(templates, type)
+}
+
+export async function getTemplateByID(id: string, ownerId?: string) {
   const db = tenancy.getGlobalDB()
   const response = await db.allDocs<Template>(
     dbCore.getTemplateParams(ownerId || GLOBAL_OWNER, id, {
@@ -63,16 +71,10 @@ export async function getTemplates({
   )
   let templates = response.rows.map(row => row.doc!)
   // should only be one template with ID
-  if (id) {
-    return templates[0]
-  }
-  if (type) {
-    templates = templates.filter(template => template.type === type)
-  }
-  return addBaseTemplates(templates, type)
+  return templates[0]
 }
 
 export async function getTemplateByPurpose(type: string, purpose: string) {
-  const templates = (await getTemplates({ type })) as Template[]
+  const templates = await getTemplates({ type })
   return templates.find((template: Template) => template.purpose === purpose)
 }
diff --git a/packages/worker/src/middleware/cloudRestricted.ts b/packages/worker/src/middleware/cloudRestricted.ts
index f9ab86e2e9..747510479e 100644
--- a/packages/worker/src/middleware/cloudRestricted.ts
+++ b/packages/worker/src/middleware/cloudRestricted.ts
@@ -1,12 +1,12 @@
 import env from "../environment"
 import { constants, utils } from "@budibase/backend-core"
-import { BBContext } from "@budibase/types"
+import { UserCtx } from "@budibase/types"
 
 /**
  * This is a restricted endpoint in the cloud.
  * Ensure that the correct API key has been supplied.
  */
-export default async (ctx: BBContext, next: any) => {
+export default async (ctx: UserCtx, next: any) => {
   if (!env.SELF_HOSTED && !env.DISABLE_ACCOUNT_PORTAL) {
     const apiKey = ctx.request.headers[constants.Header.API_KEY]
     if (!apiKey) {
diff --git a/packages/worker/src/middleware/handleScimBody.ts b/packages/worker/src/middleware/handleScimBody.ts
index bfcd6dfcf2..07e6286b6b 100644
--- a/packages/worker/src/middleware/handleScimBody.ts
+++ b/packages/worker/src/middleware/handleScimBody.ts
@@ -1,7 +1,7 @@
 import { Ctx } from "@budibase/types"
 
 export const handleScimBody = (ctx: Ctx, next: any) => {
-  var type = ctx.req.headers["content-type"] || ""
+  let type = ctx.req.headers["content-type"] || ""
   type = type.split(";")[0]
 
   if (type === "application/scim+json") {
diff --git a/packages/worker/src/migrations/index.ts b/packages/worker/src/migrations/index.ts
deleted file mode 100644
index 642fbeb54e..0000000000
--- a/packages/worker/src/migrations/index.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-import { migrations, locks } from "@budibase/backend-core"
-import {
-  Migration,
-  MigrationOptions,
-  MigrationName,
-  LockType,
-  LockName,
-} from "@budibase/types"
-import env from "../environment"
-
-// migration functions
-import * as syncUserInfo from "./functions/globalInfoSyncUsers"
-
-/**
- * Populate the migration function and additional configuration from
- * the static migration definitions.
- */
-export const buildMigrations = () => {
-  const definitions = migrations.DEFINITIONS
-  const workerMigrations: Migration[] = []
-
-  for (const definition of definitions) {
-    switch (definition.name) {
-      case MigrationName.GLOBAL_INFO_SYNC_USERS: {
-        // only needed in cloud
-        if (!env.SELF_HOSTED) {
-          workerMigrations.push({
-            ...definition,
-            fn: syncUserInfo.run,
-          })
-        }
-        break
-      }
-    }
-  }
-
-  return workerMigrations
-}
-
-export const MIGRATIONS = buildMigrations()
-
-export const migrate = async (options?: MigrationOptions) => {
-  if (env.SELF_HOSTED) {
-    await migrateWithLock(options)
-  } else {
-    await migrations.runMigrations(MIGRATIONS, options)
-  }
-}
-
-const migrateWithLock = async (options?: MigrationOptions) => {
-  await locks.doWithLock(
-    {
-      type: LockType.TRY_ONCE,
-      name: LockName.MIGRATIONS,
-      ttl: 1000 * 60 * 15, // auto expire the migration lock after 15 minutes
-      systemLock: true,
-    },
-    async () => {
-      await migrations.runMigrations(MIGRATIONS, options)
-    }
-  )
-}
diff --git a/packages/worker/src/sdk/accounts/metadata.ts b/packages/worker/src/sdk/accounts/metadata.ts
index 11ab069839..1cace19981 100644
--- a/packages/worker/src/sdk/accounts/metadata.ts
+++ b/packages/worker/src/sdk/accounts/metadata.ts
@@ -40,10 +40,7 @@ export const getMetadata = async (
     try {
       return await db.get(accountId)
     } catch (e: any) {
-      if (e.status === 404) {
-        // do nothing
-        return
-      } else {
+      if (e.status !== 404) {
         throw e
       }
     }
diff --git a/packages/worker/src/sdk/auth/auth.ts b/packages/worker/src/sdk/auth/auth.ts
index 078ac441e9..82602f58aa 100644
--- a/packages/worker/src/sdk/auth/auth.ts
+++ b/packages/worker/src/sdk/auth/auth.ts
@@ -8,11 +8,10 @@ import {
   utils as coreUtils,
   cache,
 } from "@budibase/backend-core"
-import { PlatformLogoutOpts, User } from "@budibase/types"
+import { PlatformLogoutOpts, User, EmailTemplatePurpose } from "@budibase/types"
 import jwt from "jsonwebtoken"
 import * as userSdk from "../users"
 import * as emails from "../../utilities/email"
-import { EmailTemplatePurpose } from "../../constants"
 
 // LOGIN / LOGOUT
 
diff --git a/packages/worker/src/sdk/users/users.ts b/packages/worker/src/sdk/users/users.ts
index 9dc1bac0e9..343108cbeb 100644
--- a/packages/worker/src/sdk/users/users.ts
+++ b/packages/worker/src/sdk/users/users.ts
@@ -3,9 +3,9 @@ import {
   InviteUserRequest,
   InviteUsersRequest,
   InviteUsersResponse,
+  EmailTemplatePurpose,
 } from "@budibase/types"
 import { sendEmail } from "../../utilities/email"
-import { EmailTemplatePurpose } from "../../constants"
 
 export async function invite(
   users: InviteUsersRequest
diff --git a/packages/worker/src/tests/api/accounts.ts b/packages/worker/src/tests/api/accounts.ts
index bc6d055b77..25861226f9 100644
--- a/packages/worker/src/tests/api/accounts.ts
+++ b/packages/worker/src/tests/api/accounts.ts
@@ -1,12 +1,7 @@
 import { Account, AccountMetadata } from "@budibase/types"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class AccountAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   saveMetadata = async (account: Account) => {
     const res = await this.request
       .put(`/api/system/accounts/${account.accountId}/metadata`)
diff --git a/packages/worker/src/tests/api/auditLogs.ts b/packages/worker/src/tests/api/auditLogs.ts
index d7bc4d99fb..c79b4ea934 100644
--- a/packages/worker/src/tests/api/auditLogs.ts
+++ b/packages/worker/src/tests/api/auditLogs.ts
@@ -1,12 +1,7 @@
 import { AuditLogSearchParams, SearchAuditLogsResponse } from "@budibase/types"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class AuditLogAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   search = async (search: AuditLogSearchParams) => {
     const res = await this.request
       .post("/api/global/auditlogs/search")
diff --git a/packages/worker/src/tests/api/auth.ts b/packages/worker/src/tests/api/auth.ts
index 552d4da505..2587fe4c8f 100644
--- a/packages/worker/src/tests/api/auth.ts
+++ b/packages/worker/src/tests/api/auth.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class AuthAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   updatePassword = (
     resetCode: string,
     password: string,
diff --git a/packages/worker/src/tests/api/base.ts b/packages/worker/src/tests/api/base.ts
index 460d61e70a..78ca0bf961 100644
--- a/packages/worker/src/tests/api/base.ts
+++ b/packages/worker/src/tests/api/base.ts
@@ -10,7 +10,7 @@ export abstract class TestAPI {
   config: TestConfiguration
   request: SuperTest<Test>
 
-  protected constructor(config: TestConfiguration) {
+  constructor(config: TestConfiguration) {
     this.config = config
     this.request = config.request
   }
diff --git a/packages/worker/src/tests/api/configs.ts b/packages/worker/src/tests/api/configs.ts
index e0c1c806af..36d145412a 100644
--- a/packages/worker/src/tests/api/configs.ts
+++ b/packages/worker/src/tests/api/configs.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class ConfigAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   getConfigChecklist = () => {
     return this.request
       .get(`/api/global/configs/checklist`)
diff --git a/packages/worker/src/tests/api/email.ts b/packages/worker/src/tests/api/email.ts
index dc464ba16d..a8f5967d58 100644
--- a/packages/worker/src/tests/api/email.ts
+++ b/packages/worker/src/tests/api/email.ts
@@ -1,12 +1,7 @@
 import { EmailAttachment } from "@budibase/types"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class EmailAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   sendEmail = (purpose: string, attachments?: EmailAttachment[]) => {
     return this.request
       .post(`/api/global/email/send`)
@@ -15,7 +10,7 @@ export class EmailAPI extends TestAPI {
         attachments,
         purpose,
         tenantId: this.config.getTenantId(),
-        userId: this.config.user?._id!,
+        userId: this.config.user!._id!,
       })
       .set(this.config.defaultHeaders())
       .expect("Content-Type", /json/)
diff --git a/packages/worker/src/tests/api/environment.ts b/packages/worker/src/tests/api/environment.ts
index d6a76f3b06..b394f692ec 100644
--- a/packages/worker/src/tests/api/environment.ts
+++ b/packages/worker/src/tests/api/environment.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class EnvironmentAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   getEnvironment = () => {
     return this.request
       .get(`/api/system/environment`)
diff --git a/packages/worker/src/tests/api/groups.ts b/packages/worker/src/tests/api/groups.ts
index 5153c19db0..5d983a53d4 100644
--- a/packages/worker/src/tests/api/groups.ts
+++ b/packages/worker/src/tests/api/groups.ts
@@ -1,12 +1,7 @@
 import { UserGroup } from "@budibase/types"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class GroupsAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   saveGroup = (
     group: UserGroup,
     { expect }: { expect: number | object } = { expect: 200 }
diff --git a/packages/worker/src/tests/api/index.ts b/packages/worker/src/tests/api/index.ts
index fa4e54184c..0f0334c8da 100644
--- a/packages/worker/src/tests/api/index.ts
+++ b/packages/worker/src/tests/api/index.ts
@@ -6,7 +6,6 @@ import { EmailAPI } from "./email"
 import { SelfAPI } from "./self"
 import { UserAPI } from "./users"
 import { EnvironmentAPI } from "./environment"
-import { MigrationAPI } from "./migrations"
 import { StatusAPI } from "./status"
 import { RestoreAPI } from "./restore"
 import { TenantAPI } from "./tenants"
@@ -26,7 +25,6 @@ export default class API {
   self: SelfAPI
   users: UserAPI
   environment: EnvironmentAPI
-  migrations: MigrationAPI
   status: StatusAPI
   restore: RestoreAPI
   tenants: TenantAPI
@@ -46,7 +44,6 @@ export default class API {
     this.self = new SelfAPI(config)
     this.users = new UserAPI(config)
     this.environment = new EnvironmentAPI(config)
-    this.migrations = new MigrationAPI(config)
     this.status = new StatusAPI(config)
     this.restore = new RestoreAPI(config)
     this.tenants = new TenantAPI(config)
diff --git a/packages/worker/src/tests/api/license.ts b/packages/worker/src/tests/api/license.ts
index a6645226af..bf7c952ab0 100644
--- a/packages/worker/src/tests/api/license.ts
+++ b/packages/worker/src/tests/api/license.ts
@@ -1,4 +1,3 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 import {
   ActivateLicenseKeyRequest,
@@ -6,10 +5,6 @@ import {
 } from "@budibase/types"
 
 export class LicenseAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   refresh = async () => {
     return this.request
       .post("/api/global/license/refresh")
diff --git a/packages/worker/src/tests/api/migrations.ts b/packages/worker/src/tests/api/migrations.ts
deleted file mode 100644
index 6038cbd5d8..0000000000
--- a/packages/worker/src/tests/api/migrations.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import TestConfiguration from "../TestConfiguration"
-import { TestAPI, TestAPIOpts } from "./base"
-
-export class MigrationAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
-  runMigrations = (opts?: TestAPIOpts) => {
-    return this.request
-      .post(`/api/system/migrations/run`)
-      .set(opts?.headers ? opts.headers : this.config.internalAPIHeaders())
-      .expect(opts?.status ? opts.status : 200)
-  }
-
-  getMigrationDefinitions = (opts?: TestAPIOpts) => {
-    return this.request
-      .get(`/api/system/migrations/definitions`)
-      .set(opts?.headers ? opts.headers : this.config.internalAPIHeaders())
-      .expect(opts?.status ? opts.status : 200)
-  }
-}
diff --git a/packages/worker/src/tests/api/restore.ts b/packages/worker/src/tests/api/restore.ts
index c6a646317d..a39428da07 100644
--- a/packages/worker/src/tests/api/restore.ts
+++ b/packages/worker/src/tests/api/restore.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class RestoreAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   restored = (opts?: TestAPIOpts) => {
     return this.request
       .post(`/api/system/restored`)
diff --git a/packages/worker/src/tests/api/roles.ts b/packages/worker/src/tests/api/roles.ts
index 8e7647583a..6c7be76054 100644
--- a/packages/worker/src/tests/api/roles.ts
+++ b/packages/worker/src/tests/api/roles.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class RolesAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   get = (opts?: TestAPIOpts) => {
     return this.request
       .get(`/api/global/roles`)
diff --git a/packages/worker/src/tests/api/scim/groups.ts b/packages/worker/src/tests/api/scim/groups.ts
index d2df007614..0ec705fc52 100644
--- a/packages/worker/src/tests/api/scim/groups.ts
+++ b/packages/worker/src/tests/api/scim/groups.ts
@@ -4,14 +4,9 @@ import {
   ScimGroupResponse,
   ScimUpdateRequest,
 } from "@budibase/types"
-import TestConfiguration from "../../TestConfiguration"
 import { RequestSettings, ScimTestAPI } from "./shared"
 
 export class ScimGroupsAPI extends ScimTestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   get = async (
     requestSettings?: Partial<RequestSettings> & {
       params?: {
diff --git a/packages/worker/src/tests/api/scim/shared.ts b/packages/worker/src/tests/api/scim/shared.ts
index 546a940093..fca6f77abd 100644
--- a/packages/worker/src/tests/api/scim/shared.ts
+++ b/packages/worker/src/tests/api/scim/shared.ts
@@ -1,4 +1,3 @@
-import TestConfiguration from "../../TestConfiguration"
 import { TestAPI } from "../base"
 
 const defaultConfig: RequestSettings = {
@@ -14,10 +13,6 @@ export type RequestSettings = {
 }
 
 export abstract class ScimTestAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   call = (
     url: string,
     method: "get" | "post" | "patch" | "delete",
diff --git a/packages/worker/src/tests/api/scim/users.ts b/packages/worker/src/tests/api/scim/users.ts
index 318492d378..f518d49ce6 100644
--- a/packages/worker/src/tests/api/scim/users.ts
+++ b/packages/worker/src/tests/api/scim/users.ts
@@ -4,14 +4,9 @@ import {
   ScimUserResponse,
   ScimUpdateRequest,
 } from "@budibase/types"
-import TestConfiguration from "../../TestConfiguration"
 import { RequestSettings, ScimTestAPI } from "./shared"
 
 export class ScimUsersAPI extends ScimTestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   get = async (
     requestSettings?: Partial<RequestSettings> & {
       params?: {
diff --git a/packages/worker/src/tests/api/self.ts b/packages/worker/src/tests/api/self.ts
index 1c1492f37f..6f8cd8decf 100644
--- a/packages/worker/src/tests/api/self.ts
+++ b/packages/worker/src/tests/api/self.ts
@@ -1,12 +1,7 @@
-import TestConfiguration from "../TestConfiguration"
 import { User } from "@budibase/types"
 import { TestAPI } from "./base"
 
 export class SelfAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   updateSelf = (user: User, update: any) => {
     return this.request
       .post(`/api/global/self`)
diff --git a/packages/worker/src/tests/api/status.ts b/packages/worker/src/tests/api/status.ts
index 5b0f77efc6..c658411abc 100644
--- a/packages/worker/src/tests/api/status.ts
+++ b/packages/worker/src/tests/api/status.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI } from "./base"
 
 export class StatusAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   getStatus = () => {
     return this.request.get(`/api/system/status`).expect(200)
   }
diff --git a/packages/worker/src/tests/api/templates.ts b/packages/worker/src/tests/api/templates.ts
index 0c8110394f..23e327b392 100644
--- a/packages/worker/src/tests/api/templates.ts
+++ b/packages/worker/src/tests/api/templates.ts
@@ -1,11 +1,6 @@
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class TemplatesAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   definitions = (opts?: TestAPIOpts) => {
     return this.request
       .get(`/api/global/template/definitions`)
diff --git a/packages/worker/src/tests/api/users.ts b/packages/worker/src/tests/api/users.ts
index b54fb45d2c..b964ba5112 100644
--- a/packages/worker/src/tests/api/users.ts
+++ b/packages/worker/src/tests/api/users.ts
@@ -9,14 +9,9 @@ import {
 } from "@budibase/types"
 import structures from "../structures"
 import { generator } from "@budibase/backend-core/tests"
-import TestConfiguration from "../TestConfiguration"
 import { TestAPI, TestAPIOpts } from "./base"
 
 export class UserAPI extends TestAPI {
-  constructor(config: TestConfiguration) {
-    super(config)
-  }
-
   // INVITE
 
   sendUserInvite = async (sendMailMock: any, email: string, status = 200) => {
@@ -178,11 +173,7 @@ export class UserAPI extends TestAPI {
       .expect(opts?.status ? opts.status : 200)
   }
 
-  grantBuilderToApp = (
-    userId: string,
-    appId: string,
-    statusCode: number = 200
-  ) => {
+  grantBuilderToApp = (userId: string, appId: string, statusCode = 200) => {
     return this.request
       .post(`/api/global/users/${userId}/app/${appId}/builder`)
       .set(this.config.defaultHeaders())
diff --git a/packages/worker/src/tests/controllers.ts b/packages/worker/src/tests/controllers.ts
index bdcf11434b..615e9725f3 100644
--- a/packages/worker/src/tests/controllers.ts
+++ b/packages/worker/src/tests/controllers.ts
@@ -1,5 +1,4 @@
 export * as email from "../api/controllers/global/email"
-export * as workspaces from "../api/controllers/global/workspaces"
 export * as config from "../api/controllers/global/configs"
 export * as templates from "../api/controllers/global/templates"
 export * as users from "../api/controllers/global/users"
diff --git a/packages/worker/src/utilities/email.ts b/packages/worker/src/utilities/email.ts
index bf686f647c..fa9dd7a6fa 100644
--- a/packages/worker/src/utilities/email.ts
+++ b/packages/worker/src/utilities/email.ts
@@ -1,9 +1,14 @@
 import env from "../environment"
-import { EmailTemplatePurpose, TemplateType } from "../constants"
+import { TemplateType } from "../constants"
 import { getTemplateByPurpose, EmailTemplates } from "../constants/templates"
 import { getSettingsTemplateContext } from "./templates"
 import { processString } from "@budibase/string-templates"
-import { User, SendEmailOpts, SMTPInnerConfig } from "@budibase/types"
+import {
+  User,
+  SendEmailOpts,
+  SMTPInnerConfig,
+  EmailTemplatePurpose,
+} from "@budibase/types"
 import { configs, cache, objectStore } from "@budibase/backend-core"
 import ical from "ical-generator"
 import _ from "lodash"
diff --git a/packages/worker/src/utilities/templates.ts b/packages/worker/src/utilities/templates.ts
index c9e86ae4f9..cdfbb9b0ff 100644
--- a/packages/worker/src/utilities/templates.ts
+++ b/packages/worker/src/utilities/templates.ts
@@ -1,9 +1,6 @@
 import { tenancy, configs } from "@budibase/backend-core"
-import {
-  InternalTemplateBinding,
-  LOGO_URL,
-  EmailTemplatePurpose,
-} from "../constants"
+import { EmailTemplatePurpose } from "@budibase/types"
+import { InternalTemplateBinding, LOGO_URL } from "../constants"
 import { checkSlashesInUrl } from "./index"
 
 const BASE_COMPANY = "Budibase"
diff --git a/packages/worker/tsconfig.build.json b/packages/worker/tsconfig.build.json
index f38f31fe67..0a65525cfd 100644
--- a/packages/worker/tsconfig.build.json
+++ b/packages/worker/tsconfig.build.json
@@ -1,24 +1,7 @@
 {
+  "extends": "../../tsconfig.build.json",
   "compilerOptions": {
-    "target": "es6",
-    "module": "commonjs",
-    "lib": ["es2020"],
-    "strict": true,
-    "noImplicitAny": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true,
-    "incremental": true,
-    "types": ["node", "jest"],
-    "outDir": "dist",
-    "skipLibCheck": true,
-    "paths": {
-      "@budibase/types": ["../types/src"],
-      "@budibase/backend-core": ["../backend-core/src"],
-      "@budibase/backend-core/*": ["../backend-core/*"],
-      "@budibase/shared-core": ["../shared-core/src"],
-      "@budibase/pro": ["../pro/src"],
-      "@budibase/string-templates": ["../string-templates/src"]
-    }
+    "target": "es2020"
   },
   "include": ["src/**/*"],
   "exclude": [
diff --git a/packages/worker/tsconfig.json b/packages/worker/tsconfig.json
index a02147aa81..475cf6edda 100644
--- a/packages/worker/tsconfig.json
+++ b/packages/worker/tsconfig.json
@@ -1,9 +1,5 @@
 {
   "extends": "./tsconfig.build.json",
-  "compilerOptions": {
-    "composite": true,
-    "baseUrl": "."
-  },
   "ts-node": {
     "require": ["tsconfig-paths/register"]
   },
diff --git a/scripts/build.js b/scripts/build.js
index 93a2a1e589..0106421fe7 100755
--- a/scripts/build.js
+++ b/scripts/build.js
@@ -8,6 +8,7 @@ const path = require("path")
 
 const { build } = require("esbuild")
 const { compile } = require("svelte/compiler")
+const { loadTsConfig } = require("load-tsconfig")
 
 const {
   default: TsconfigPathsPlugin,
@@ -42,20 +43,25 @@ const svelteCompilePlugin = {
   },
 }
 
-var { argv } = require("yargs")
+let { argv } = require("yargs")
 
 async function runBuild(entry, outfile) {
-  const isDev = process.env.NODE_ENV !== "production"
+  const isDev = !process.env.CI
+
+  console.log(`Building in mode dev mode: ${isDev}`)
+
   const tsconfig = argv["p"] || `tsconfig.build.json`
-  const tsconfigPathPluginContent = JSON.parse(
-    fs.readFileSync(tsconfig, "utf-8")
+
+  const { data: tsconfigPathPluginContent } = loadTsConfig(
+    process.cwd(),
+    tsconfig
   )
 
   const sharedConfig = {
     entryPoints: [entry],
     bundle: true,
     minify: !isDev,
-    sourcemap: isDev,
+    sourcemap: tsconfigPathPluginContent.compilerOptions.sourceMap,
     tsconfig,
     plugins: [
       svelteCompilePlugin,
@@ -122,10 +128,12 @@ async function runBuild(entry, outfile) {
 
   await Promise.all([hbsFiles, mainBuild, oldClientVersions])
 
-  fs.writeFileSync(
-    `dist/${path.basename(outfile)}.meta.json`,
-    JSON.stringify((await mainBuild).metafile)
-  )
+  if (isDev) {
+    fs.writeFileSync(
+      `dist/${path.basename(outfile)}.meta.json`,
+      JSON.stringify((await mainBuild).metafile)
+    )
+  }
 
   console.log(
     "\x1b[32m%s\x1b[0m",
diff --git a/scripts/buildx-multiarch.sh b/scripts/buildx-multiarch.sh
deleted file mode 100755
index 07a8fdb5c1..0000000000
--- a/scripts/buildx-multiarch.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-sudo apt-get install -y qemu qemu-user-static
-docker buildx create --name budibase
-docker buildx use budibase
diff --git a/scripts/depcheck.js b/scripts/depcheck.js
new file mode 100755
index 0000000000..a60bd9e580
--- /dev/null
+++ b/scripts/depcheck.js
@@ -0,0 +1,29 @@
+#!/usr/bin/node
+
+const depcheck = require("depcheck")
+
+function filterResults(missing) {
+  if (missing.src) {
+    delete missing.src
+  }
+  return missing
+}
+
+function printMissing(missing) {
+  for (let [key, value] of Object.entries(filterResults(missing))) {
+    console.log(`Package ${key} missing in: ${value.join(", ")}`)
+  }
+}
+
+depcheck(process.cwd(), {
+  ignorePatterns: ["dist"],
+  skipMissing: false,
+}).then(results => {
+  if (Object.values(filterResults(results.missing)).length > 0) {
+    printMissing(results.missing)
+    console.error("Missing packages found - stopping.")
+    process.exit(-1)
+  } else {
+    console.log("No missing dependencies.")
+  }
+})
diff --git a/scripts/deploy-camunda.sh b/scripts/deploy-camunda.sh
deleted file mode 100755
index 66c505a6f0..0000000000
--- a/scripts/deploy-camunda.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-yarn global add zbctl
-export ZEEBE_ADDRESS='localhost:26500'
-
-cd ../budibase-bpm
-
-is_camunda_ready() {
-    if (zbctl --insecure status 2>/dev/null) | grep -q 'Healthy'; then
-        return 1
-    else
-        return 0
-    fi
-}
-
-docker-compose up -d
-echo "waiting for Camunda to be ready..."
-
-while is_camunda_ready -eq 0; do sleep 1; done
-
-echo "deploy processes..."
-for file in src/main/resources/models/*; do
-    zbctl deploy resource $file --insecure
-done
-
-cd ../budibase/packages/pro
-yarn && yarn build
-
-cd ../account-portal/packages/server 
-yarn worker:run & cd ../../../.. && yarn dev:accountportal
-
-
-
diff --git a/scripts/localdomain.sh b/scripts/localdomain.sh
index f13511723d..d32dbcc116 100755
--- a/scripts/localdomain.sh
+++ b/scripts/localdomain.sh
@@ -5,12 +5,12 @@ domain=$2
 
 if [ "$enable" = "enable" ]; then
   lerna run env:localdomain:enable -- "$domain"
-  cd packages/account-portal
+  cd ../account-portal
   yarn env:localdomain:enable "$domain"
   cd -
 else
   lerna run env:localdomain:disable
-  cd packages/account-portal
+  cd ../account-portal
   yarn env:localdomain:disable
   cd -
 fi
\ No newline at end of file
diff --git a/scripts/pinVersions.js b/scripts/pinVersions.js
deleted file mode 100644
index 44cbba1090..0000000000
--- a/scripts/pinVersions.js
+++ /dev/null
@@ -1,46 +0,0 @@
-const fs = require("fs")
-const path = require("path")
-
-const MONOREPO_ROOT = "packages"
-
-const packages = getPackages()
-
-function getPackages() {
-  if (fs.existsSync(MONOREPO_ROOT)) {
-    return fs.readdirSync(MONOREPO_ROOT).map(pkg => path.join(MONOREPO_ROOT, pkg))
-  } else {
-    return ["./"]
-  }
-}
-
-function pinDeps(dependencies) {
-  for (let dependency in dependencies) {
-    if (dependency.startsWith("@budibase")) {
-      dependencies[dependency] = dependencies[dependency].replace("^", "")
-    }
-  }
-  return dependencies
-}
-
-// iterate over the monorepo packages
-for (let pkgPath of packages) {
-  // only directories
-  if (fs.statSync(pkgPath).isDirectory()) {
-    // get the package JSON file
-    const pkgJsonPath = path.join(pkgPath, "package.json")
-    if (!fs.existsSync(pkgJsonPath)) {
-      continue
-    }
-    const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath))
-    
-
-    // find any budibase dependencies, and pin them
-    pkgJson.dependencies = pinDeps(pkgJson.dependencies)
-    pkgJson.devDependencies = pinDeps(pkgJson.devDependencies)
-
-    // update the package JSON files
-    fs.writeFileSync(pkgJsonPath, JSON.stringify(pkgJson, null, 2))
-  }
-}
-
-console.log("Pinned dev versions for budibase packages successfully.")
diff --git a/scripts/releaseHelmChart.js b/scripts/releaseHelmChart.js
deleted file mode 100755
index 45ae01df0e..0000000000
--- a/scripts/releaseHelmChart.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const yaml = require("js-yaml") 
-const fs = require("fs")
-const path = require("path")
-
-const CHART_PATH = path.join(__dirname, "../", "charts", "budibase", "Chart.yaml")
-const UPGRADE_VERSION = process.env.BUDIBASE_RELEASE_VERSION
-
-if (!UPGRADE_VERSION) {
-	throw new Error("BUDIBASE_RELEASE_VERSION env var must be set.")
-}
-
-try {
-	const chartFile = fs.readFileSync(CHART_PATH, "utf-8")
-	const chart = yaml.load(chartFile)
-
-	// Upgrade app version in chart to match budibase release version
-	chart.appVersion = UPGRADE_VERSION
-
-	// semantically version the chart
-	const [major, minor, patch] = chart.version.split(".")
-	const newPatch = parseInt(patch) + 1
-	chart.version = [major, minor, newPatch].join(".")
-	const updatedChartYaml = yaml.dump(chart)
-	fs.writeFileSync(CHART_PATH, updatedChartYaml)
-} catch (err) {
-	console.error("Error releasing helm chart")
-	throw err
-}
diff --git a/scripts/resetVersions.sh b/scripts/resetVersions.sh
deleted file mode 100755
index 83411f5153..0000000000
--- a/scripts/resetVersions.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-echo "Resetting package versions"
-yarn lerna exec "yarn version --no-git-tag-version --new-version=0.0.0"
-echo "Updating dependencies"
-node scripts/syncLocalDependencies.js "0.0.0"
-git checkout package.json
-echo "Package versions reset!"
diff --git a/scripts/run-affected.js b/scripts/run-affected.js
deleted file mode 100755
index 97f79bb463..0000000000
--- a/scripts/run-affected.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/***
- * Running lerna with since and scope is not working as expected.
- * For example, running the command `yarn test --scope=@budibase/worker --since=master`, with changes only on `@budibase/backend-core` will not work as expected, as it does not analyse the dependencies properly. The actual `@budibase/worker` task will not be triggered.
- *
- * This script is using `lerna ls` to detect all the affected projects from a given commit, and if the scoped package is affected, the actual command will be executed.
- *
- * The current version of the script only supports a single project in the scope.
- */
-
-const { execSync } = require("child_process")
-
-const argv = require("yargs").demandOption(["task", "since", "scope"]).argv
-
-const { task, since, scope } = argv
-
-const affectedPackages = execSync(
-  `yarn --silent nx show projects --affected -t ${task} --base=${since} --json`,
-  {
-    encoding: "utf-8",
-  }
-)
-
-const packages = JSON.parse(affectedPackages)
-
-const isAffected = packages.includes(scope)
-
-if (isAffected) {
-  console.log(`${scope} is affected. Running task "${task}"`)
-  execSync(`yarn ${task} --scope=${scope}`, {
-    stdio: "inherit",
-  })
-} else {
-  console.log(`${scope} is not affected. Skipping task "${task}"`)
-}
diff --git a/scripts/updateVersions.sh b/scripts/updateVersions.sh
deleted file mode 100755
index 1d019fd886..0000000000
--- a/scripts/updateVersions.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-version=$(./scripts/getCurrentVersion.sh)
-echo "Setting version $version"
-yarn lerna exec "yarn version --no-git-tag-version --new-version=$version"
-echo "Updating dependencies"
-node scripts/syncLocalDependencies.js $version
-echo "Syncing yarn workspace"
-yarn
diff --git a/tsconfig.build.json b/tsconfig.build.json
new file mode 100644
index 0000000000..0e22ddf964
--- /dev/null
+++ b/tsconfig.build.json
@@ -0,0 +1,28 @@
+{
+  "compilerOptions": {
+    "target": "es6",
+    "module": "commonjs",
+    "lib": ["es2020"],
+    "strict": true,
+    "noImplicitAny": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+    "skipLibCheck": true,
+    "declaration": true,
+    "isolatedModules": true,
+    "baseUrl": ".",
+    "sourceMap": true,
+    "paths": {
+      "@budibase/types": ["./packages/types/src"],
+      "@budibase/backend-core": ["./packages/backend-core/src"],
+      "@budibase/backend-core/*": ["./packages/backend-core/*"],
+      "@budibase/shared-core": ["./packages/shared-core/src"],
+      "@budibase/pro": ["./packages/pro/src"],
+      "@budibase/string-templates": ["./packages/string-templates/src"],
+      "@budibase/string-templates/*": ["./packages/string-templates/*"],
+      "@budibase/frontend-core": ["./packages/frontend-core/src"],
+      "@budibase/bbui": ["./packages/bbui/src"]
+    }
+  },
+  "exclude": []
+}
diff --git a/yarn.lock b/yarn.lock
index 73a4e8fa4d..60294cc5ab 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -17,7 +17,7 @@
   resolved "https://registry.yarnpkg.com/@adobe/spectrum-css-workflow-icons/-/spectrum-css-workflow-icons-1.2.1.tgz#7e2cb3fcfb5c8b12d7275afafbb6ec44913551b4"
   integrity sha512-uVgekyBXnOVkxp+CUssjN/gefARtudZC8duEn1vm0lBQFwGRZFlDEzU1QC+aIRWCrD1Z8OgRpmBYlSZ7QS003w==
 
-"@ampproject/remapping@^2.2.0", "@ampproject/remapping@^2.2.1", "@ampproject/remapping@^2.3.0":
+"@ampproject/remapping@^2.2.0", "@ampproject/remapping@^2.2.1":
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
   integrity sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==
@@ -82,568 +82,615 @@
     call-me-maybe "^1.0.1"
     z-schema "^5.0.1"
 
-"@aws-crypto/crc32@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-3.0.0.tgz#07300eca214409c33e3ff769cd5697b57fdd38fa"
-  integrity "sha1-BzAOyiFECcM+P/dpzVaXtX/dOPo= sha512-IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA=="
+"@aws-crypto/crc32@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/crc32/-/crc32-5.2.0.tgz#cfcc22570949c98c6689cfcbd2d693d36cdae2e1"
+  integrity sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==
   dependencies:
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/crc32c@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz#016c92da559ef638a84a245eecb75c3e97cb664f"
-  integrity "sha1-AWyS2lWe9jioSiRe7LdcPpfLZk8= sha512-ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w=="
+"@aws-crypto/crc32c@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz#4e34aab7f419307821509a98b9b08e84e0c1917e"
+  integrity sha512-+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==
   dependencies:
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/ie11-detection@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz#640ae66b4ec3395cee6a8e94ebcd9f80c24cd688"
-  integrity "sha1-ZArma07DOVzuao6U682fgMJM1og= sha512-341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q=="
+"@aws-crypto/sha1-browser@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz#b0ee2d2821d3861f017e965ef3b4cb38e3b6a0f4"
+  integrity sha512-OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==
   dependencies:
-    tslib "^1.11.1"
-
-"@aws-crypto/sha1-browser@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz#f9083c00782b24714f528b1a1fef2174002266a3"
-  integrity "sha1-+Qg8AHgrJHFPUosaH+8hdAAiZqM= sha512-NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw=="
-  dependencies:
-    "@aws-crypto/ie11-detection" "^3.0.0"
-    "@aws-crypto/supports-web-crypto" "^3.0.0"
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/supports-web-crypto" "^5.2.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
     "@aws-sdk/util-locate-window" "^3.0.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
 
-"@aws-crypto/sha256-browser@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz#05f160138ab893f1c6ba5be57cfd108f05827766"
-  integrity "sha1-BfFgE4q4k/HGulvlfP0QjwWCd2Y= sha512-8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ=="
+"@aws-crypto/sha256-browser@5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz#153895ef1dba6f9fce38af550e0ef58988eb649e"
+  integrity sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==
   dependencies:
-    "@aws-crypto/ie11-detection" "^3.0.0"
-    "@aws-crypto/sha256-js" "^3.0.0"
-    "@aws-crypto/supports-web-crypto" "^3.0.0"
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/sha256-js" "^5.2.0"
+    "@aws-crypto/supports-web-crypto" "^5.2.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
     "@aws-sdk/util-locate-window" "^3.0.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
 
-"@aws-crypto/sha256-js@3.0.0", "@aws-crypto/sha256-js@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz#f06b84d550d25521e60d2a0e2a90139341e007c2"
-  integrity "sha1-8GuE1VDSVSHmDSoOKpATk0HgB8I= sha512-PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ=="
+"@aws-crypto/sha256-js@5.2.0", "@aws-crypto/sha256-js@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz#c4fdb773fdbed9a664fc1a95724e206cf3860042"
+  integrity sha512-FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==
   dependencies:
-    "@aws-crypto/util" "^3.0.0"
+    "@aws-crypto/util" "^5.2.0"
     "@aws-sdk/types" "^3.222.0"
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/supports-web-crypto@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz#5d1bf825afa8072af2717c3e455f35cda0103ec2"
-  integrity "sha1-XRv4Ja+oByrycXw+RV81zaAQPsI= sha512-06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg=="
+"@aws-crypto/supports-web-crypto@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz#a1e399af29269be08e695109aa15da0a07b5b5fb"
+  integrity sha512-iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==
   dependencies:
-    tslib "^1.11.1"
+    tslib "^2.6.2"
 
-"@aws-crypto/util@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-3.0.0.tgz#1c7ca90c29293f0883468ad48117937f0fe5bfb0"
-  integrity "sha1-HHypDCkpPwiDRorUgReTfw/lv7A= sha512-2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w=="
+"@aws-crypto/util@5.2.0", "@aws-crypto/util@^5.2.0":
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/@aws-crypto/util/-/util-5.2.0.tgz#71284c9cffe7927ddadac793c14f14886d3876da"
+  integrity sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==
   dependencies:
     "@aws-sdk/types" "^3.222.0"
-    "@aws-sdk/util-utf8-browser" "^3.0.0"
-    tslib "^1.11.1"
+    "@smithy/util-utf8" "^2.0.0"
+    tslib "^2.6.2"
 
 "@aws-sdk/client-s3@^3.388.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.423.0.tgz#b15fc64db09f1698bf4ad19f6f8e3b57c15e5305"
-  integrity "sha1-sV/GTbCfFpi/StGfb447V8FeUwU= sha512-Sn/6fotTDGp+uUfPU0JrKszHT/cYwZonly6Ahi4R/uxASLQnOEAF7MwVSjms+/LGu72Qs0Tt7B7RKW76GI4OIA=="
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-s3/-/client-s3-3.693.0.tgz#188b621498ffaeb7b1ea5794f61e3e8d9a4bcac2"
+  integrity sha512-vgGI2e0Q6pzyhqfrSysi+sk/i+Nl+lMon67oqj/57RcCw9daL1/inpS+ADuwHpiPWkrg+U0bOXnmHjkLeTslJg==
   dependencies:
-    "@aws-crypto/sha1-browser" "3.0.0"
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/client-sts" "3.423.0"
-    "@aws-sdk/credential-provider-node" "3.423.0"
-    "@aws-sdk/middleware-bucket-endpoint" "3.418.0"
-    "@aws-sdk/middleware-expect-continue" "3.418.0"
-    "@aws-sdk/middleware-flexible-checksums" "3.418.0"
-    "@aws-sdk/middleware-host-header" "3.418.0"
-    "@aws-sdk/middleware-location-constraint" "3.418.0"
-    "@aws-sdk/middleware-logger" "3.418.0"
-    "@aws-sdk/middleware-recursion-detection" "3.418.0"
-    "@aws-sdk/middleware-sdk-s3" "3.418.0"
-    "@aws-sdk/middleware-signing" "3.418.0"
-    "@aws-sdk/middleware-ssec" "3.418.0"
-    "@aws-sdk/middleware-user-agent" "3.418.0"
-    "@aws-sdk/region-config-resolver" "3.418.0"
-    "@aws-sdk/signature-v4-multi-region" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-endpoints" "3.418.0"
-    "@aws-sdk/util-user-agent-browser" "3.418.0"
-    "@aws-sdk/util-user-agent-node" "3.418.0"
-    "@aws-sdk/xml-builder" "3.310.0"
-    "@smithy/config-resolver" "^2.0.10"
-    "@smithy/eventstream-serde-browser" "^2.0.9"
-    "@smithy/eventstream-serde-config-resolver" "^2.0.9"
-    "@smithy/eventstream-serde-node" "^2.0.9"
-    "@smithy/fetch-http-handler" "^2.1.5"
-    "@smithy/hash-blob-browser" "^2.0.9"
-    "@smithy/hash-node" "^2.0.9"
-    "@smithy/hash-stream-node" "^2.0.9"
-    "@smithy/invalid-dependency" "^2.0.9"
-    "@smithy/md5-js" "^2.0.9"
-    "@smithy/middleware-content-length" "^2.0.11"
-    "@smithy/middleware-endpoint" "^2.0.9"
-    "@smithy/middleware-retry" "^2.0.12"
-    "@smithy/middleware-serde" "^2.0.9"
-    "@smithy/middleware-stack" "^2.0.2"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/node-http-handler" "^2.1.5"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/smithy-client" "^2.1.6"
-    "@smithy/types" "^2.3.3"
-    "@smithy/url-parser" "^2.0.9"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.10"
-    "@smithy/util-defaults-mode-node" "^2.0.12"
-    "@smithy/util-retry" "^2.0.2"
-    "@smithy/util-stream" "^2.0.12"
-    "@smithy/util-utf8" "^2.0.0"
-    "@smithy/util-waiter" "^2.0.9"
-    fast-xml-parser "4.2.5"
+    "@aws-crypto/sha1-browser" "5.2.0"
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/client-sso-oidc" "3.693.0"
+    "@aws-sdk/client-sts" "3.693.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/credential-provider-node" "3.693.0"
+    "@aws-sdk/middleware-bucket-endpoint" "3.693.0"
+    "@aws-sdk/middleware-expect-continue" "3.693.0"
+    "@aws-sdk/middleware-flexible-checksums" "3.693.0"
+    "@aws-sdk/middleware-host-header" "3.693.0"
+    "@aws-sdk/middleware-location-constraint" "3.693.0"
+    "@aws-sdk/middleware-logger" "3.693.0"
+    "@aws-sdk/middleware-recursion-detection" "3.693.0"
+    "@aws-sdk/middleware-sdk-s3" "3.693.0"
+    "@aws-sdk/middleware-ssec" "3.693.0"
+    "@aws-sdk/middleware-user-agent" "3.693.0"
+    "@aws-sdk/region-config-resolver" "3.693.0"
+    "@aws-sdk/signature-v4-multi-region" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-endpoints" "3.693.0"
+    "@aws-sdk/util-user-agent-browser" "3.693.0"
+    "@aws-sdk/util-user-agent-node" "3.693.0"
+    "@aws-sdk/xml-builder" "3.693.0"
+    "@smithy/config-resolver" "^3.0.11"
+    "@smithy/core" "^2.5.2"
+    "@smithy/eventstream-serde-browser" "^3.0.12"
+    "@smithy/eventstream-serde-config-resolver" "^3.0.9"
+    "@smithy/eventstream-serde-node" "^3.0.11"
+    "@smithy/fetch-http-handler" "^4.1.0"
+    "@smithy/hash-blob-browser" "^3.1.8"
+    "@smithy/hash-node" "^3.0.9"
+    "@smithy/hash-stream-node" "^3.1.8"
+    "@smithy/invalid-dependency" "^3.0.9"
+    "@smithy/md5-js" "^3.0.9"
+    "@smithy/middleware-content-length" "^3.0.11"
+    "@smithy/middleware-endpoint" "^3.2.2"
+    "@smithy/middleware-retry" "^3.0.26"
+    "@smithy/middleware-serde" "^3.0.9"
+    "@smithy/middleware-stack" "^3.0.9"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/node-http-handler" "^3.3.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/url-parser" "^3.0.9"
+    "@smithy/util-base64" "^3.0.0"
+    "@smithy/util-body-length-browser" "^3.0.0"
+    "@smithy/util-body-length-node" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.26"
+    "@smithy/util-defaults-mode-node" "^3.0.26"
+    "@smithy/util-endpoints" "^2.1.5"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-retry" "^3.0.9"
+    "@smithy/util-stream" "^3.3.0"
+    "@smithy/util-utf8" "^3.0.0"
+    "@smithy/util-waiter" "^3.1.8"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-sso-oidc@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.693.0.tgz#2fd7f93bd81839f5cd08c5e6e9a578b80572d3c4"
+  integrity sha512-UEDbYlYtK/e86OOMyFR4zEPyenIxDzO2DRdz3fwVW7RzZ94wfmSwBh/8skzPTuY1G7sI064cjHW0b0QG01Sdtg==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/credential-provider-node" "3.693.0"
+    "@aws-sdk/middleware-host-header" "3.693.0"
+    "@aws-sdk/middleware-logger" "3.693.0"
+    "@aws-sdk/middleware-recursion-detection" "3.693.0"
+    "@aws-sdk/middleware-user-agent" "3.693.0"
+    "@aws-sdk/region-config-resolver" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-endpoints" "3.693.0"
+    "@aws-sdk/util-user-agent-browser" "3.693.0"
+    "@aws-sdk/util-user-agent-node" "3.693.0"
+    "@smithy/config-resolver" "^3.0.11"
+    "@smithy/core" "^2.5.2"
+    "@smithy/fetch-http-handler" "^4.1.0"
+    "@smithy/hash-node" "^3.0.9"
+    "@smithy/invalid-dependency" "^3.0.9"
+    "@smithy/middleware-content-length" "^3.0.11"
+    "@smithy/middleware-endpoint" "^3.2.2"
+    "@smithy/middleware-retry" "^3.0.26"
+    "@smithy/middleware-serde" "^3.0.9"
+    "@smithy/middleware-stack" "^3.0.9"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/node-http-handler" "^3.3.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/url-parser" "^3.0.9"
+    "@smithy/util-base64" "^3.0.0"
+    "@smithy/util-body-length-browser" "^3.0.0"
+    "@smithy/util-body-length-node" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.26"
+    "@smithy/util-defaults-mode-node" "^3.0.26"
+    "@smithy/util-endpoints" "^2.1.5"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-retry" "^3.0.9"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-sso@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.693.0.tgz#9cd5e07e57013b8c7980512810d775d7b6f67e36"
+  integrity sha512-QEynrBC26x6TG9ZMzApR/kZ3lmt4lEIs2D+cHuDxt6fDGzahBUsQFBwJqhizzsM97JJI5YvmJhmihoYjdSSaXA==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/middleware-host-header" "3.693.0"
+    "@aws-sdk/middleware-logger" "3.693.0"
+    "@aws-sdk/middleware-recursion-detection" "3.693.0"
+    "@aws-sdk/middleware-user-agent" "3.693.0"
+    "@aws-sdk/region-config-resolver" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-endpoints" "3.693.0"
+    "@aws-sdk/util-user-agent-browser" "3.693.0"
+    "@aws-sdk/util-user-agent-node" "3.693.0"
+    "@smithy/config-resolver" "^3.0.11"
+    "@smithy/core" "^2.5.2"
+    "@smithy/fetch-http-handler" "^4.1.0"
+    "@smithy/hash-node" "^3.0.9"
+    "@smithy/invalid-dependency" "^3.0.9"
+    "@smithy/middleware-content-length" "^3.0.11"
+    "@smithy/middleware-endpoint" "^3.2.2"
+    "@smithy/middleware-retry" "^3.0.26"
+    "@smithy/middleware-serde" "^3.0.9"
+    "@smithy/middleware-stack" "^3.0.9"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/node-http-handler" "^3.3.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/url-parser" "^3.0.9"
+    "@smithy/util-base64" "^3.0.0"
+    "@smithy/util-body-length-browser" "^3.0.0"
+    "@smithy/util-body-length-node" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.26"
+    "@smithy/util-defaults-mode-node" "^3.0.26"
+    "@smithy/util-endpoints" "^2.1.5"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-retry" "^3.0.9"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/client-sts@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.693.0.tgz#9e2c418f4850269635632bee4d1a31057c04bcc5"
+  integrity sha512-4S2y7VEtvdnjJX4JPl4kDQlslxXEZFnC50/UXVUYSt/AMc5A/GgspFNA5FVz4E3Gwpfobbf23hR2NBF8AGvYoQ==
+  dependencies:
+    "@aws-crypto/sha256-browser" "5.2.0"
+    "@aws-crypto/sha256-js" "5.2.0"
+    "@aws-sdk/client-sso-oidc" "3.693.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/credential-provider-node" "3.693.0"
+    "@aws-sdk/middleware-host-header" "3.693.0"
+    "@aws-sdk/middleware-logger" "3.693.0"
+    "@aws-sdk/middleware-recursion-detection" "3.693.0"
+    "@aws-sdk/middleware-user-agent" "3.693.0"
+    "@aws-sdk/region-config-resolver" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-endpoints" "3.693.0"
+    "@aws-sdk/util-user-agent-browser" "3.693.0"
+    "@aws-sdk/util-user-agent-node" "3.693.0"
+    "@smithy/config-resolver" "^3.0.11"
+    "@smithy/core" "^2.5.2"
+    "@smithy/fetch-http-handler" "^4.1.0"
+    "@smithy/hash-node" "^3.0.9"
+    "@smithy/invalid-dependency" "^3.0.9"
+    "@smithy/middleware-content-length" "^3.0.11"
+    "@smithy/middleware-endpoint" "^3.2.2"
+    "@smithy/middleware-retry" "^3.0.26"
+    "@smithy/middleware-serde" "^3.0.9"
+    "@smithy/middleware-stack" "^3.0.9"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/node-http-handler" "^3.3.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/url-parser" "^3.0.9"
+    "@smithy/util-base64" "^3.0.0"
+    "@smithy/util-body-length-browser" "^3.0.0"
+    "@smithy/util-body-length-node" "^3.0.0"
+    "@smithy/util-defaults-mode-browser" "^3.0.26"
+    "@smithy/util-defaults-mode-node" "^3.0.26"
+    "@smithy/util-endpoints" "^2.1.5"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-retry" "^3.0.9"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/core@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.693.0.tgz#437969dd740895a59863d737bad14646bc2e1725"
+  integrity sha512-v6Z/kWmLFqRLDPEwl9hJGhtTgIFHjZugSfF1Yqffdxf4n1AWgtHS7qSegakuMyN5pP4K2tvUD8qHJ+gGe2Bw2A==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/core" "^2.5.2"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/signature-v4" "^4.2.2"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-middleware" "^3.0.9"
+    fast-xml-parser "4.4.1"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-env@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.693.0.tgz#f97feed9809fe2800216943470015fdaaba47c4f"
+  integrity sha512-hMUZaRSF7+iBKZfBHNLihFs9zvpM1CB8MBOTnTp5NGCVkRYF3SB2LH+Kcippe0ats4qCyB1eEoyQX99rERp2iQ==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-http@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.693.0.tgz#5caad0ac47eded1edeb63f907280580ccfaadba3"
+  integrity sha512-sL8MvwNJU7ZpD7/d2VVb3by1GknIJUxzTIgYtVkDVA/ojo+KRQSSHxcj0EWWXF5DTSh2Tm+LrEug3y1ZyKHsDA==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/fetch-http-handler" "^4.1.0"
+    "@smithy/node-http-handler" "^3.3.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-stream" "^3.3.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-ini@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.693.0.tgz#b4557ac1092657660a15c9bd55e17c27f79ec621"
+  integrity sha512-kvaa4mXhCCOuW7UQnBhYqYfgWmwy7WSBSDClutwSLPZvgrhYj2l16SD2lN4IfYdxARYMJJ1lFYp3/jJG/9Yk4Q==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/credential-provider-env" "3.693.0"
+    "@aws-sdk/credential-provider-http" "3.693.0"
+    "@aws-sdk/credential-provider-process" "3.693.0"
+    "@aws-sdk/credential-provider-sso" "3.693.0"
+    "@aws-sdk/credential-provider-web-identity" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/credential-provider-imds" "^3.2.6"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/shared-ini-file-loader" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-node@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.693.0.tgz#c5ceac64a69304d5b4db3fd68473480cafddb4a9"
+  integrity sha512-42WMsBjTNnjYxYuM3qD/Nq+8b7UdMopUq5OduMDxoM3mFTV6PXMMnfI4Z1TNnR4tYRvPXAnuNltF6xmjKbSJRA==
+  dependencies:
+    "@aws-sdk/credential-provider-env" "3.693.0"
+    "@aws-sdk/credential-provider-http" "3.693.0"
+    "@aws-sdk/credential-provider-ini" "3.693.0"
+    "@aws-sdk/credential-provider-process" "3.693.0"
+    "@aws-sdk/credential-provider-sso" "3.693.0"
+    "@aws-sdk/credential-provider-web-identity" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/credential-provider-imds" "^3.2.6"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/shared-ini-file-loader" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-process@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.693.0.tgz#e84e945f1a148f06ff697608d5309e73347e5aa9"
+  integrity sha512-cvxQkrTWHHjeHrPlj7EWXPnFSq8x7vMx+Zn1oTsMpCY445N9KuzjfJTkmNGwU2GT6rSZI9/0MM02aQvl5bBBTQ==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/shared-ini-file-loader" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-sso@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.693.0.tgz#72767389f533d9d17a14af63daaafcc8368ab43a"
+  integrity sha512-479UlJxY+BFjj3pJFYUNC0DCMrykuG7wBAXfsvZqQxKUa83DnH5Q1ID/N2hZLkxjGd4ZW0AC3lTOMxFelGzzpQ==
+  dependencies:
+    "@aws-sdk/client-sso" "3.693.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/token-providers" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/shared-ini-file-loader" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/credential-provider-web-identity@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.693.0.tgz#b6133b5ef9d3582e36e02e9c66766714ff672a11"
+  integrity sha512-8LB210Pr6VeCiSb2hIra+sAH4KUBLyGaN50axHtIgufVK8jbKIctTZcVY5TO9Se+1107TsruzeXS7VeqVdJfFA==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-bucket-endpoint@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.693.0.tgz#e4823a40935d34f5e58a4fbc830d8ff92e44fc99"
+  integrity sha512-cPIa+lxMYiFRHtxKfNIVSFGO6LSgZCk42pu3d7KGwD6hu6vXRD5B2/DD3rPcEH1zgl2j0Kx1oGAV7SRXKHSFag==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-arn-parser" "3.693.0"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-config-provider" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-expect-continue@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.693.0.tgz#d8696cee9ebea1d973d8daf872fd913b41d62cf0"
+  integrity sha512-MuK/gsJWpHz6Tv0CqTCS+QNOxLa2RfPh1biVCu/uO3l7kA0TjQ/C+tfgKvLXeH103tuDrOVINK+bt2ENmI3SWg==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-flexible-checksums@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.693.0.tgz#80f07802d98ff33a6899a09c59cf51aab426aaac"
+  integrity sha512-xkS6zjuE11ob93H9t65kHzphXcUMnN2SmIm2wycUPg+hi8Q6DJA6U2p//6oXkrr9oHy1QvwtllRd7SAd63sFKQ==
+  dependencies:
+    "@aws-crypto/crc32" "5.2.0"
+    "@aws-crypto/crc32c" "5.2.0"
+    "@aws-crypto/util" "5.2.0"
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/is-array-buffer" "^3.0.0"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-stream" "^3.3.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-host-header@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.693.0.tgz#69322909c0792df1e6be7c7fb5e2b6f76090a55c"
+  integrity sha512-BCki6sAZ5jYwIN/t3ElCiwerHad69ipHwPsDCxJQyeiOnJ8HG+lEpnVIfrnI8A0fLQNSF3Gtx6ahfBpKiv1Oug==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-location-constraint@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.693.0.tgz#1856eaaad64d41d1f8fa53ced58a6c7cf5eccc6e"
+  integrity sha512-eDAExTZ9uNIP7vs2JCVCOuWJauGueisBSn+Ovt7UvvuEUp6KOIJqn8oFxWmyUQu2GvbG4OcaTLgbqD95YHTB0Q==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-logger@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.693.0.tgz#fc10294e6963f8e5d58ba1ededd891e999f544a9"
+  integrity sha512-dXnXDPr+wIiJ1TLADACI1g9pkSB21KkMIko2u4CJ2JCBoxi5IqeTnVoa6YcC8GdFNVRl+PorZ3Zqfmf1EOTC6w==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-recursion-detection@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.693.0.tgz#88a8157293775e7116707da26501da4b5e042f51"
+  integrity sha512-0LDmM+VxXp0u3rG0xQRWD/q6Ubi7G8I44tBPahevD5CaiDZTkmNTrVUf0VEJgVe0iCKBppACMBDkLB0/ETqkFw==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-sdk-s3@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.693.0.tgz#e0850854d5079f372786b2ccfe85729caa7a49d8"
+  integrity sha512-5A++RBjJ3guyq5pbYs+Oq5hMlA8CK2OWaHx09cxVfhHWl/RoaY8DXrft4gnhoUEBrrubyMw7r9j7RIMLvS58kg==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-arn-parser" "3.693.0"
+    "@smithy/core" "^2.5.2"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/signature-v4" "^4.2.2"
+    "@smithy/smithy-client" "^3.4.3"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-config-provider" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.9"
+    "@smithy/util-stream" "^3.3.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-ssec@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.693.0.tgz#2ff779147d188090b3a6cda3ed12ca4085220a73"
+  integrity sha512-Ro5vzI7SRgEeuoMk3fKqFjGv6mG4c7VsSCDwnkiasmafQFBTPvUIpgmu2FXMHqW/OthvoiOzpSrlJ9Bwlx2f8A==
+  dependencies:
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/middleware-user-agent@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.693.0.tgz#4b55cfab3fc7e671b08e1ea63a98e45a1e13e6a5"
+  integrity sha512-/KUq/KEpFFbQmNmpp7SpAtFAdViquDfD2W0QcG07zYBfz9MwE2ig48ALynXm5sMpRmnG7sJXjdvPtTsSVPfkiw==
+  dependencies:
+    "@aws-sdk/core" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@aws-sdk/util-endpoints" "3.693.0"
+    "@smithy/core" "^2.5.2"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
+
+"@aws-sdk/node-http-handler@^3.374.0":
+  version "3.374.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/node-http-handler/-/node-http-handler-3.374.0.tgz#8cd58b4d9814713e26034c12eabc119c113a5bc4"
+  integrity sha512-v1Z6m0wwkf65/tKuhwrtPRqVoOtNkDTRn2MBMtxCwEw+8V8Q+YRFqVgGN+J1n53ktE0G5OYVBux/NHiAjJHReQ==
+  dependencies:
+    "@smithy/node-http-handler" "^1.0.2"
     tslib "^2.5.0"
 
-"@aws-sdk/client-sso@3.423.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.423.0.tgz#99db1f73419443cef544892337a1344aba10abc2"
-  integrity "sha1-mdsfc0GUQ871RIkjN6E0SroQq8I= sha512-znIufHkwhCIePgaYciIs3x/+BpzR57CZzbCKHR9+oOvGyufEPPpUT5bFLvbwTgfiVkTjuk6sG/ES3U5Bc+xtrA=="
+"@aws-sdk/region-config-resolver@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.693.0.tgz#9cde5e99f654c788540acfb2a4218d444e8621c2"
+  integrity sha512-YLUkMsUY0GLW/nfwlZ69cy1u07EZRmsv8Z9m0qW317/EZaVx59hcvmcvb+W4bFqj5E8YImTjoGfE4cZ0F9mkyw==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.418.0"
-    "@aws-sdk/middleware-logger" "3.418.0"
-    "@aws-sdk/middleware-recursion-detection" "3.418.0"
-    "@aws-sdk/middleware-user-agent" "3.418.0"
-    "@aws-sdk/region-config-resolver" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-endpoints" "3.418.0"
-    "@aws-sdk/util-user-agent-browser" "3.418.0"
-    "@aws-sdk/util-user-agent-node" "3.418.0"
-    "@smithy/config-resolver" "^2.0.10"
-    "@smithy/fetch-http-handler" "^2.1.5"
-    "@smithy/hash-node" "^2.0.9"
-    "@smithy/invalid-dependency" "^2.0.9"
-    "@smithy/middleware-content-length" "^2.0.11"
-    "@smithy/middleware-endpoint" "^2.0.9"
-    "@smithy/middleware-retry" "^2.0.12"
-    "@smithy/middleware-serde" "^2.0.9"
-    "@smithy/middleware-stack" "^2.0.2"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/node-http-handler" "^2.1.5"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/smithy-client" "^2.1.6"
-    "@smithy/types" "^2.3.3"
-    "@smithy/url-parser" "^2.0.9"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.10"
-    "@smithy/util-defaults-mode-node" "^2.0.12"
-    "@smithy/util-retry" "^2.0.2"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-config-provider" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.9"
+    tslib "^2.6.2"
 
-"@aws-sdk/client-sts@3.423.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sts/-/client-sts-3.423.0.tgz#530a9cd58baef40cc6bbc6321c6ed93175e0e5b2"
-  integrity "sha1-Uwqc1Yuu9AzGu8YyHG7ZMXXg5bI= sha512-EcpkKu02QZbRX6dQE0u7a8RgWrn/5riz1qAlKd7rM8FZJpr/D6GGX8ZzWxjgp7pRUgfNvinTmIudDnyQY3v9Mg=="
+"@aws-sdk/signature-v4-multi-region@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.693.0.tgz#85bd90bb78be1a98d5a5ca41033cb0703146c2c4"
+  integrity sha512-s7zbbsoVIriTR4ZGaateKuTqz6ddpazAyHvjk7I9kd+NvGNPiuAI18UdbuiiRI6K5HuYKf1ah6mKWFGPG15/kQ==
   dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/credential-provider-node" "3.423.0"
-    "@aws-sdk/middleware-host-header" "3.418.0"
-    "@aws-sdk/middleware-logger" "3.418.0"
-    "@aws-sdk/middleware-recursion-detection" "3.418.0"
-    "@aws-sdk/middleware-sdk-sts" "3.418.0"
-    "@aws-sdk/middleware-signing" "3.418.0"
-    "@aws-sdk/middleware-user-agent" "3.418.0"
-    "@aws-sdk/region-config-resolver" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-endpoints" "3.418.0"
-    "@aws-sdk/util-user-agent-browser" "3.418.0"
-    "@aws-sdk/util-user-agent-node" "3.418.0"
-    "@smithy/config-resolver" "^2.0.10"
-    "@smithy/fetch-http-handler" "^2.1.5"
-    "@smithy/hash-node" "^2.0.9"
-    "@smithy/invalid-dependency" "^2.0.9"
-    "@smithy/middleware-content-length" "^2.0.11"
-    "@smithy/middleware-endpoint" "^2.0.9"
-    "@smithy/middleware-retry" "^2.0.12"
-    "@smithy/middleware-serde" "^2.0.9"
-    "@smithy/middleware-stack" "^2.0.2"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/node-http-handler" "^2.1.5"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/smithy-client" "^2.1.6"
-    "@smithy/types" "^2.3.3"
-    "@smithy/url-parser" "^2.0.9"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.10"
-    "@smithy/util-defaults-mode-node" "^2.0.12"
-    "@smithy/util-retry" "^2.0.2"
-    "@smithy/util-utf8" "^2.0.0"
-    fast-xml-parser "4.2.5"
-    tslib "^2.5.0"
+    "@aws-sdk/middleware-sdk-s3" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/protocol-http" "^4.1.6"
+    "@smithy/signature-v4" "^4.2.2"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.418.0.tgz#7b14169350d9c14c9f656da06edf46f40a224ed2"
-  integrity "sha1-exQWk1DZwUyfZW2gbt9G9AoiTtI= sha512-e74sS+x63EZUBO+HaI8zor886YdtmULzwKdctsZp5/37Xho1CVUNtEC+fYa69nigBD9afoiH33I4JggaHgrekQ=="
+"@aws-sdk/token-providers@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.693.0.tgz#5ce7d6aa7a3437d4abdc0dca1be47f5158d15c85"
+  integrity sha512-nDBTJMk1l/YmFULGfRbToOA2wjf+FkQT4dMgYCv+V9uSYsMzQj8A7Tha2dz9yv4vnQgYaEiErQ8d7HVyXcVEoA==
   dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/property-provider" "^3.1.9"
+    "@smithy/shared-ini-file-loader" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.423.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.423.0.tgz#62690a3c49b0223c3d239c8a3d2f2708e967a767"
-  integrity "sha1-YmkKPEmwIjw9I5yKPS8nCOlnp2c= sha512-7CsFWz8g7dQmblp57XzzxMirO4ClowGZIOwAheBkmk6q1XHbllcHFnbh2kdPyQQ0+JmjDg6waztIc7dY7Ycfvw=="
+"@aws-sdk/types@3.692.0", "@aws-sdk/types@^3.222.0":
+  version "3.692.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.692.0.tgz#c8f6c75b6ad659865b72759796d4d92c1b72069b"
+  integrity sha512-RpNvzD7zMEhiKgmlxGzyXaEcg2khvM7wd5sSHVapOcrde1awQSOMGI4zKBQ+wy5TnDfrm170ROz/ERLYtrjPZA==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.418.0"
-    "@aws-sdk/credential-provider-process" "3.418.0"
-    "@aws-sdk/credential-provider-sso" "3.423.0"
-    "@aws-sdk/credential-provider-web-identity" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/credential-provider-imds" "^2.0.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.423.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.423.0.tgz#80d05ea89b1a4f245786171ae516c331aa315908"
-  integrity "sha1-gNBeqJsaTyRXhhca5RbDMaoxWQg= sha512-lygbGJJUnDpgo8OEqdoYd51BKkyBVQ1Catiua/m0aHvL+SCmVrHiYPQPawWYGxpH8X3DXdXa0nd0LkEaevrHRg=="
+"@aws-sdk/util-arn-parser@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.693.0.tgz#8dae27eb822ab4f88be28bb3c0fc11f1f13d3948"
+  integrity sha512-WC8x6ca+NRrtpAH64rWu+ryDZI3HuLwlEr8EU6/dbC/pt+r/zC0PBoC15VEygUaBA+isppCikQpGyEDu0Yj7gQ==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.418.0"
-    "@aws-sdk/credential-provider-ini" "3.423.0"
-    "@aws-sdk/credential-provider-process" "3.418.0"
-    "@aws-sdk/credential-provider-sso" "3.423.0"
-    "@aws-sdk/credential-provider-web-identity" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/credential-provider-imds" "^2.0.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.418.0.tgz#1cb6d816bd471db3f9724715b007035ef18b5b2b"
-  integrity "sha1-HLbYFr1HHbP5ckcVsAcDXvGLWys= sha512-xPbdm2WKz1oH6pTkrJoUmr3OLuqvvcPYTQX0IIlc31tmDwDWPQjXGGFD/vwZGIZIkKaFpFxVMgAzfFScxox7dw=="
+"@aws-sdk/util-endpoints@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.693.0.tgz#99f56f83fc25bdc3321f5871d6354abd56768891"
+  integrity sha512-eo4F6DRQ/kxS3gxJpLRv+aDNy76DxQJL5B3DPzpr9Vkq0ygVoi4GT5oIZLVaAVIJmi6k5qq9dLsYZfWLUxJJSg==
   dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/credential-provider-sso@3.423.0":
-  version "3.423.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.423.0.tgz#a04f1715e5d9c75370d17ceac645379ca57cbb0b"
-  integrity "sha1-oE8XFeXZx1Nw0XzqxkU3nKV8uws= sha512-zAH68IjRMmW22USbsCVQ5Q6AHqhmWABwLbZAMocSGMasddTGv/nkA/nUiVCJ/B4LI3P81FoPQVrG5JxNmkNH0w=="
-  dependencies:
-    "@aws-sdk/client-sso" "3.423.0"
-    "@aws-sdk/token-providers" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/credential-provider-web-identity@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.418.0.tgz#c2aed2a79bf193c1fef2b98391aaa9de7336aaaf"
-  integrity "sha1-wq7Sp5vxk8H+8rmDkaqp3nM2qq8= sha512-do7ang565n9p3dS1JdsQY01rUfRx8vkxQqz5M8OlcEHBNiCdi2PvSjNwcBdrv/FKkyIxZb0TImOfBSt40hVdxQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-bucket-endpoint@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.418.0.tgz#1c330fb4dd583454872db7eba3b6e06c0699d59d"
-  integrity "sha1-HDMPtN1YNFSHLbfro7bgbAaZ1Z0= sha512-gj/mj1UfbKkGbQ1N4YUvjTTp8BVs5fO1QAL2AjFJ+jfJOToLReX72aNEkm7sPGbHML0TqOY4cQbJuWYy+zdD5g=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-arn-parser" "3.310.0"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    "@smithy/util-config-provider" "^2.0.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-expect-continue@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.418.0.tgz#b621c6a8bc281f23bfd3791eaab25f687946d4a7"
-  integrity "sha1-tiHGqLwoHyO/03keqrJfaHlG1Kc= sha512-6x4rcIj685EmqDLQkbWoCur3Dg5DRClHMen6nHXmD3CR5Xyt3z1Gk/+jmZICxyJo9c6M4AeZht8o95BopkmYAQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-flexible-checksums@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.418.0.tgz#a79f44739ec918d8947294d0acc52eb7eb358773"
-  integrity "sha1-p59Ec57JGNiUcpTQrMUut+s1h3M= sha512-3O203dqS2JU5P1TAAbo7p1qplXQh59pevw9nqzPVb3EG8B+mSucVf2kKmF7kGHqKSk+nK/mB/4XGSsZBzGt6Wg=="
-  dependencies:
-    "@aws-crypto/crc32" "3.0.0"
-    "@aws-crypto/crc32c" "3.0.0"
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/is-array-buffer" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-host-header@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.418.0.tgz#35d682e14f36c9d9d7464c7c1dd582bf6611436d"
-  integrity "sha1-NdaC4U82ydnXRkx8HdWCv2YRQ20= sha512-LrMTdzalkPw/1ujLCKPLwCGvPMCmT4P+vOZQRbSEVZPnlZk+Aj++aL/RaHou0jL4kJH3zl8iQepriBt4a7UvXQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-location-constraint@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.418.0.tgz#e62e213a72ce583ba6135db51dcc60d07825b8ee"
-  integrity "sha1-5i4hOnLOWDumE121Hcxg0HgluO4= sha512-cc8M3VEaESHJhDsDV8tTpt2QYUprDWhvAVVSlcL43cTdZ54Quc0W+toDiaVOUlwrAZz2Y7g5NDj22ibJGFbOvw=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-logger@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.418.0.tgz#08d7419f4220c36032a070a7dbb8bbf7e744a9ce"
-  integrity "sha1-CNdBn0Igw2AyoHCn27i79+dEqc4= sha512-StKGmyPVfoO/wdNTtKemYwoJsqIl4l7oqarQY7VSf2Mp3mqaa+njLViHsQbirYpyqpgUEusOnuTlH5utxJ1NsQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-recursion-detection@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.418.0.tgz#2bb80d084f946846ad4907f3d6e0b451787d62b1"
-  integrity "sha1-K7gNCE+UaEatSQfz1uC0UXh9YrE= sha512-kKFrIQglBLUFPbHSDy1+bbe3Na2Kd70JSUC3QLMbUHmqipXN8KeXRfAj7vTv97zXl0WzG0buV++WcNwOm1rFjg=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-sdk-s3@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.418.0.tgz#b1de52d54e0cbc8d46ce0bc4c6c54b527f409aaf"
-  integrity "sha1-sd5S1U4MvI1GzgvExsVLUn9Amq8= sha512-rei32LF45SyqL3NlWDjEOfMwAca9A5F4QgUyXJqvASc43oWC1tJnLIhiCxNh8qkWAiRyRzFpcanTeqyaRSsZpA=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-arn-parser" "3.310.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/smithy-client" "^2.1.6"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-sdk-sts@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.418.0.tgz#f167f16050e055282ddd60226a2216c84873d464"
-  integrity "sha1-8WfxYFDgVSgt3WAiaiIWyEhz1GQ= sha512-cW8ijrCTP+mgihvcq4+TbhAcE/we5lFl4ydRqvTdtcSnYQAVQADg47rnTScQiFsPFEB3NKq7BGeyTJF9MKolPA=="
-  dependencies:
-    "@aws-sdk/middleware-signing" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-signing@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-signing/-/middleware-signing-3.418.0.tgz#c7242b84069067bb671cb4191d412b59713a375e"
-  integrity "sha1-xyQrhAaQZ7tnHLQZHUErWXE6N14= sha512-onvs5KoYQE8OlOE740RxWBGtsUyVIgAo0CzRKOQO63ZEYqpL1Os+MS1CGzdNhvQnJgJruE1WW+Ix8fjN30zKPA=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/signature-v4" "^2.0.0"
-    "@smithy/types" "^2.3.3"
-    "@smithy/util-middleware" "^2.0.2"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-ssec@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-ssec/-/middleware-ssec-3.418.0.tgz#67b554c4acad81c7aa93421c8fcba8a18e138294"
-  integrity "sha1-Z7VUxKytgceqk0Icj8uooY4TgpQ= sha512-J7K+5h6aP7IYMlu/NwHEIjb0+WDu1eFvO8TCPo6j1H9xYRi8B/6h+6pa9Rk9IgRUzFnrdlDu9FazG8Tp0KKLyg=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/middleware-user-agent@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.418.0.tgz#37426cf801332165fb170b1fd62dea8bb967a1ef"
-  integrity "sha1-N0Js+AEzIWX7Fwsf1i3qi7lnoe8= sha512-Jdcztg9Tal9SEAL0dKRrnpKrm6LFlWmAhvuwv0dQ7bNTJxIxyEFbpqdgy7mpQHsLVZgq1Aad/7gT/72c9igyZw=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-endpoints" "3.418.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/region-config-resolver@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.418.0.tgz#53b99e4bd92f3369f51e9a76534b7d884db67526"
-  integrity "sha1-U7meS9kvM2n1Hpp2U0t9iE22dSY= sha512-lJRZ/9TjZU6yLz+mAwxJkcJZ6BmyYoIJVo1p5+BN//EFdEmC8/c0c9gXMRzfISV/mqWSttdtccpAyN4/goHTYA=="
-  dependencies:
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/types" "^2.3.3"
-    "@smithy/util-config-provider" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.2"
-    tslib "^2.5.0"
-
-"@aws-sdk/signature-v4-multi-region@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.418.0.tgz#984c8fc948c61a7ad02f1ccc6c2ddecf43a265b1"
-  integrity "sha1-mEyPyUjGGnrQLxzMbC3ez0OiZbE= sha512-LeVYMZeUQUURFqDf4yZxTEv016g64hi0LqYBjU0mjwd8aPc0k6hckwvshezc80jCNbuLyjNfQclvlg3iFliItQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/signature-v4" "^2.0.0"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/token-providers@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.418.0.tgz#cbfac922df397e72daf6dbdd8c1e9a140df0aa0e"
-  integrity "sha1-y/rJIt85fnLa9tvdjB6aFA3wqg4= sha512-9P7Q0VN0hEzTngy3Sz5eya2qEOEf0Q8qf1vB3um0gE6ID6EVAdz/nc/DztfN32MFxk8FeVBrCP5vWdoOzmd72g=="
-  dependencies:
-    "@aws-crypto/sha256-browser" "3.0.0"
-    "@aws-crypto/sha256-js" "3.0.0"
-    "@aws-sdk/middleware-host-header" "3.418.0"
-    "@aws-sdk/middleware-logger" "3.418.0"
-    "@aws-sdk/middleware-recursion-detection" "3.418.0"
-    "@aws-sdk/middleware-user-agent" "3.418.0"
-    "@aws-sdk/types" "3.418.0"
-    "@aws-sdk/util-endpoints" "3.418.0"
-    "@aws-sdk/util-user-agent-browser" "3.418.0"
-    "@aws-sdk/util-user-agent-node" "3.418.0"
-    "@smithy/config-resolver" "^2.0.10"
-    "@smithy/fetch-http-handler" "^2.1.5"
-    "@smithy/hash-node" "^2.0.9"
-    "@smithy/invalid-dependency" "^2.0.9"
-    "@smithy/middleware-content-length" "^2.0.11"
-    "@smithy/middleware-endpoint" "^2.0.9"
-    "@smithy/middleware-retry" "^2.0.12"
-    "@smithy/middleware-serde" "^2.0.9"
-    "@smithy/middleware-stack" "^2.0.2"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/node-http-handler" "^2.1.5"
-    "@smithy/property-provider" "^2.0.0"
-    "@smithy/protocol-http" "^3.0.5"
-    "@smithy/shared-ini-file-loader" "^2.0.6"
-    "@smithy/smithy-client" "^2.1.6"
-    "@smithy/types" "^2.3.3"
-    "@smithy/url-parser" "^2.0.9"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-body-length-browser" "^2.0.0"
-    "@smithy/util-body-length-node" "^2.1.0"
-    "@smithy/util-defaults-mode-browser" "^2.0.10"
-    "@smithy/util-defaults-mode-node" "^2.0.12"
-    "@smithy/util-retry" "^2.0.2"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@aws-sdk/types@3.418.0", "@aws-sdk/types@^3.222.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.418.0.tgz#c23213110b0c313d5546c810da032a441682f49a"
-  integrity "sha1-wjITEQsMMT1VRsgQ2gMqRBaC9Jo= sha512-y4PQSH+ulfFLY0+FYkaK4qbIaQI9IJNMO2xsxukW6/aNoApNymN1D2FSi2la8Qbp/iPjNDKsG8suNPm9NtsWXQ=="
-  dependencies:
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
-
-"@aws-sdk/util-arn-parser@3.310.0":
-  version "3.310.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-arn-parser/-/util-arn-parser-3.310.0.tgz#861ff8810851be52a320ec9e4786f15b5fc74fba"
-  integrity "sha1-hh/4gQhRvlKjIOyeR4bxW1/HT7o= sha512-jL8509owp/xB9+Or0pvn3Fe+b94qfklc2yPowZZIFAkFcCSIdkIglz18cPDWnYAcy9JGewpMS1COXKIUhZkJsA=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@aws-sdk/util-endpoints@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.418.0.tgz#462c976f054fe260562d4d2844152a04dd883fd7"
-  integrity "sha1-RiyXbwVP4mBWLU0oRBUqBN2IP9c= sha512-sYSDwRTl7yE7LhHkPzemGzmIXFVHSsi3AQ1KeNEk84eBqxMHHcCc2kqklaBk2roXWe50QDgRMy1ikZUxvtzNHQ=="
-  dependencies:
-    "@aws-sdk/types" "3.418.0"
-    tslib "^2.5.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/types" "^3.7.0"
+    "@smithy/util-endpoints" "^2.1.5"
+    tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
-  version "3.310.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.310.0.tgz#b071baf050301adee89051032bd4139bba32cc40"
-  integrity "sha1-sHG68FAwGt7okFEDK9QTm7oyzEA= sha512-qo2t/vBTnoXpjKxlsC2e1gBrRm80M3bId27r0BRB2VniSSe7bL1mmzM+/HFtujm0iAxtPM+aLEflLJlJeDPg0w=="
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-locate-window/-/util-locate-window-3.693.0.tgz#1160f6d055cf074ca198eb8ecf89b6311537ad6c"
+  integrity sha512-ttrag6haJLWABhLqtg1Uf+4LgHWIMOVSYL+VYZmAp2v4PUGOwWmWQH0Zk8RM7YuQcLfH/EoR72/Yxz6A4FKcuw==
   dependencies:
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.418.0.tgz#dc76b8e7e5cae3f827d68cd4a3ee30c0d475a39c"
-  integrity "sha1-3Ha45+XK4/gn1ozUo+4wwNR1o5w= sha512-c4p4mc0VV/jIeNH0lsXzhJ1MpWRLuboGtNEpqE4s1Vl9ck2amv9VdUUZUmHbg+bVxlMgRQ4nmiovA4qIrqGuyg=="
+"@aws-sdk/util-user-agent-browser@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.693.0.tgz#c6969be97e7cd0190b3b72a82a642b29ff4659c4"
+  integrity sha512-6EUfuKOujtddy18OLJUaXfKBgs+UcbZ6N/3QV4iOkubCUdeM1maIqs++B9bhCbWeaeF5ORizJw5FTwnyNjE/mw==
   dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/types" "^2.3.3"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/types" "^3.7.0"
     bowser "^2.11.0"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.418.0":
-  version "3.418.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.418.0.tgz#7d5a1c82ce3265ff0f70b13d58d08593113ab99a"
-  integrity "sha1-fVocgs4yZf8PcLE9WNCFkxE6uZo= sha512-BXMskXFtg+dmzSCgmnWOffokxIbPr1lFqa1D9kvM3l3IFRiFGx2IyDg+8MAhq11aPDLvoa/BDuQ0Yqma5izOhg=="
+"@aws-sdk/util-user-agent-node@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.693.0.tgz#b26c806faa2001d4fa1d515b146eeff411513dd9"
+  integrity sha512-td0OVX8m5ZKiXtecIDuzY3Y3UZIzvxEr57Hp21NOwieqKCG2UeyQWWeGPv0FQaU7dpTkvFmVNI+tx9iB8V/Nhg==
   dependencies:
-    "@aws-sdk/types" "3.418.0"
-    "@smithy/node-config-provider" "^2.0.12"
-    "@smithy/types" "^2.3.3"
-    tslib "^2.5.0"
+    "@aws-sdk/middleware-user-agent" "3.693.0"
+    "@aws-sdk/types" "3.692.0"
+    "@smithy/node-config-provider" "^3.1.10"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
 
-"@aws-sdk/util-utf8-browser@^3.0.0":
-  version "3.259.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz#3275a6f5eb334f96ca76635b961d3c50259fd9ff"
-  integrity "sha1-MnWm9eszT5bKdmNblh08UCWf2f8= sha512-UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw=="
+"@aws-sdk/xml-builder@3.693.0":
+  version "3.693.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.693.0.tgz#709a46a3335b71144d9f7917a7cb3033b5a04e82"
+  integrity sha512-C/rPwJcqnV8VDr2/VtcQnymSpcfEEgH1Jm6V0VmfXNZFv4Qzf1eCS8nsec0gipYgZB+cBBjfXw5dAk6pJ8ubpw==
   dependencies:
-    tslib "^2.3.1"
-
-"@aws-sdk/xml-builder@3.310.0":
-  version "3.310.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.310.0.tgz#f0236f2103b438d16117e0939a6305ad69b7ff76"
-  integrity "sha1-8CNvIQO0ONFhF+CTmmMFrWm3/3Y= sha512-TqELu4mOuSIKQCqj63fGVs86Yh+vBx5nHRpWKNUNhB2nPTpfbziTs5c1X358be3peVWA4wPxW7Nt53KIg1tnNw=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@aws/dynamodb-auto-marshaller@^0.7.1":
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/@aws/dynamodb-auto-marshaller/-/dynamodb-auto-marshaller-0.7.1.tgz#70676c056e4ecb798c08ec2e398a3d93e703858d"
-  integrity sha512-LeURlf6/avrfFo9+4Yht9J3CUTJ72yoBpm1FOUmlexuHNW4Ka61tG30w3ZDCXXXmCO2rG0k3ywAgNJEo3WPbyw==
-  dependencies:
-    tslib "^1.8.1"
+    "@smithy/types" "^3.7.0"
+    tslib "^2.6.2"
 
 "@azure/abort-controller@^1.0.0", "@azure/abort-controller@^1.0.4":
   version "1.1.0"
@@ -659,14 +706,14 @@
   dependencies:
     tslib "^2.6.2"
 
-"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0", "@azure/core-auth@^1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.5.0.tgz#a41848c5c31cb3b7c84c409885267d55a2c92e44"
-  integrity sha512-udzoBuYG1VBoHVohDTrvKjyzel34zt77Bhp7dQntVGGD0ehVq48owENbBG8fIgkHRNUBQH5k1r0hpoMu5L8+kw==
+"@azure/core-auth@^1.3.0", "@azure/core-auth@^1.4.0", "@azure/core-auth@^1.5.0", "@azure/core-auth@^1.7.2", "@azure/core-auth@^1.8.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-auth/-/core-auth-1.9.0.tgz#ac725b03fabe3c892371065ee9e2041bee0fd1ac"
+  integrity sha512-FPwHpZywuyasDSLMqJ6fhbOK3TqUdviZNF8OqRGA4W5Ewib2lEEZ+pBsYcBa88B2NGO/SEnYPGhyBqNlE8ilSw==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-util" "^1.1.0"
-    tslib "^2.2.0"
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-util" "^1.11.0"
+    tslib "^2.6.2"
 
 "@azure/core-client@^1.3.0", "@azure/core-client@^1.4.0", "@azure/core-client@^1.5.0":
   version "1.9.2"
@@ -691,9 +738,9 @@
     "@azure/core-rest-pipeline" "^1.3.0"
 
 "@azure/core-http@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.0.tgz#345845f9ba479a5ee41efc3fd7a13e82d2a0ec47"
-  integrity sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/@azure/core-http/-/core-http-3.0.4.tgz#024b2909bbc0f2fce08c74f97a21312c4f42e922"
+  integrity sha512-Fok9VVhMdxAFOtqiiAtg74fL0UJkt0z3D+ouUUxcRLzZNBioPRAMJFVxiWoJljYpXsRi4GDQHzQHDc9AiYaIUQ==
   dependencies:
     "@azure/abort-controller" "^1.0.0"
     "@azure/core-auth" "^1.3.0"
@@ -708,7 +755,7 @@
     tslib "^2.2.0"
     tunnel "^0.0.6"
     uuid "^8.3.0"
-    xml2js "^0.4.19"
+    xml2js "^0.5.0"
 
 "@azure/core-lro@^2.2.0":
   version "2.5.1"
@@ -727,19 +774,18 @@
     tslib "^2.2.0"
 
 "@azure/core-rest-pipeline@^1.1.0", "@azure/core-rest-pipeline@^1.3.0", "@azure/core-rest-pipeline@^1.8.0", "@azure/core-rest-pipeline@^1.9.1":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.11.0.tgz#fc0e8f56caac08a9d4ac91c07a6c5a360ea31c82"
-  integrity sha512-nB4KXl6qAyJmBVLWA7SakT4tzpYZTCk4pvRBeI+Ye0WYSOrlTqlMhc4MSS/8atD3ufeYWdkN380LLoXlUUzThw==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-rest-pipeline/-/core-rest-pipeline-1.18.0.tgz#165f1cd9bb1060be3b6895742db3d1f1106271d3"
+  integrity sha512-QSoGUp4Eq/gohEFNJaUOwTN7BCc2nHTjjbm75JT0aD7W65PWM1H/tItz0GsABn22uaKyGxiMhWQLt2r+FGU89Q==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    "@azure/core-auth" "^1.4.0"
+    "@azure/abort-controller" "^2.0.0"
+    "@azure/core-auth" "^1.8.0"
     "@azure/core-tracing" "^1.0.1"
-    "@azure/core-util" "^1.3.0"
+    "@azure/core-util" "^1.11.0"
     "@azure/logger" "^1.0.0"
-    form-data "^4.0.0"
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    tslib "^2.2.0"
+    http-proxy-agent "^7.0.0"
+    https-proxy-agent "^7.0.0"
+    tslib "^2.6.2"
 
 "@azure/core-tracing@1.0.0-preview.13":
   version "1.0.0-preview.13"
@@ -756,15 +802,15 @@
   dependencies:
     tslib "^2.2.0"
 
-"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.3.0", "@azure/core-util@^1.6.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.6.1.tgz#fea221c4fa43c26543bccf799beb30c1c7878f5a"
-  integrity sha512-h5taHeySlsV9qxuK64KZxy4iln1BtMYlNt5jbuEFN3UFSAd1EwKg/Gjl5a6tZ/W8t6li3xPnutOx7zbDyXnPmQ==
+"@azure/core-util@^1.0.0", "@azure/core-util@^1.1.1", "@azure/core-util@^1.11.0", "@azure/core-util@^1.3.0", "@azure/core-util@^1.6.1":
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/@azure/core-util/-/core-util-1.11.0.tgz#f530fc67e738aea872fbdd1cc8416e70219fada7"
+  integrity sha512-DxOSLua+NdpWoSqULhjDyAZTXFdP/LKkqtYuxxz1SCN289zk3OG8UOpnCQAz/tygyACBtWp/BoO72ptK7msY8g==
   dependencies:
-    "@azure/abort-controller" "^1.0.0"
-    tslib "^2.2.0"
+    "@azure/abort-controller" "^2.0.0"
+    tslib "^2.6.2"
 
-"@azure/identity@4.2.1", "@azure/identity@^3.4.1":
+"@azure/identity@4.2.1", "@azure/identity@^4.2.1":
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/@azure/identity/-/identity-4.2.1.tgz#22b366201e989b7b41c0e1690e103bd579c31e4c"
   integrity sha512-U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==
@@ -809,30 +855,30 @@
     tslib "^2.2.0"
 
 "@azure/msal-browser@^3.11.1":
-  version "3.24.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.24.0.tgz#3208047672d0b0c943b0bef5f995d510d6582ae4"
-  integrity sha512-JGNV9hTYAa7lsum9IMIibn2kKczAojNihGo1hi7pG0kNrcKej530Fl6jxwM05A44/6I079CSn6WxYxbVhKUmWg==
+  version "3.27.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-browser/-/msal-browser-3.27.0.tgz#b6f02f73c8e102d3f115009b4677539fb173fe2b"
+  integrity sha512-+b4ZKSD8+vslCtVRVetkegEhOFMLP3rxDWJY212ct+2r6jVg6OSQKc1Qz3kCoXo0FgwaXkb+76TMZfpHp8QtgA==
   dependencies:
-    "@azure/msal-common" "14.15.0"
+    "@azure/msal-common" "14.16.0"
 
-"@azure/msal-common@14.15.0":
-  version "14.15.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.15.0.tgz#0e27ac0bb88fe100f4f8d1605b64d5c268636a55"
-  integrity sha512-ImAQHxmpMneJ/4S8BRFhjt1MZ3bppmpRPYYNyzeQPeFN288YKbb8TmmISQEbtfkQ1BPASvYZU5doIZOPBAqENQ==
+"@azure/msal-common@14.16.0":
+  version "14.16.0"
+  resolved "https://registry.yarnpkg.com/@azure/msal-common/-/msal-common-14.16.0.tgz#f3470fcaec788dbe50859952cd499340bda23d7a"
+  integrity sha512-1KOZj9IpcDSwpNiQNjt0jDYZpQvNZay7QAEi/5DLubay40iGYtLzya/jbjRPLyOTZhEKyL1MzPuw2HqBCjceYA==
 
-"@azure/msal-node@^2.9.2":
-  version "2.14.0"
-  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.14.0.tgz#7881895d41b03d8b9b38a29550ba3bbb15f73b3c"
-  integrity sha512-rrfzIpG3Q1rHjVYZmHAEDidWAZZ2cgkxlIcMQ8dHebRISaZ2KCV33Q8Vs+uaV6lxweROabNxKFlR2lIKagZqYg==
+"@azure/msal-node@^2.5.1", "@azure/msal-node@^2.9.2":
+  version "2.16.2"
+  resolved "https://registry.yarnpkg.com/@azure/msal-node/-/msal-node-2.16.2.tgz#3eb768d36883ea6f9a939c0b5b467b518e78fffc"
+  integrity sha512-An7l1hEr0w1HMMh1LU+rtDtqL7/jw74ORlc9Wnh06v7TU/xpG39/Zdr1ZJu3QpjUfKJ+E0/OXMW8DRSWTlh7qQ==
   dependencies:
-    "@azure/msal-common" "14.15.0"
+    "@azure/msal-common" "14.16.0"
     jsonwebtoken "^9.0.0"
     uuid "^8.3.0"
 
-"@azure/storage-blob@^12.11.0":
-  version "12.13.0"
-  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.13.0.tgz#9209cbb5c2cd463fb967a0f2ae144ace20879160"
-  integrity sha512-t3Q2lvBMJucgTjQcP5+hvEJMAsJSk0qmAnjDLie2td017IiduZbbC9BOcFfmwzR6y6cJdZOuewLCNFmEx9IrXA==
+"@azure/storage-blob@12.18.x":
+  version "12.18.0"
+  resolved "https://registry.yarnpkg.com/@azure/storage-blob/-/storage-blob-12.18.0.tgz#9dd001c9aa5e972216f5af15131009086cfeb59e"
+  integrity sha512-BzBZJobMoDyjJsPRMLNHvqHycTGrT8R/dtcTx9qUFcqwSRfGVK9A/cZ7Nx38UQydT9usZGbaDCN75QRNjezSAA==
   dependencies:
     "@azure/abort-controller" "^1.0.0"
     "@azure/core-http" "^3.0.0"
@@ -843,13 +889,14 @@
     events "^3.0.0"
     tslib "^2.2.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
-  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.5", "@babel/code-frame@^7.25.9":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.26.2.tgz#4b5fab97d33338eff916235055f0ebc21e573a85"
+  integrity sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==
   dependencies:
-    "@babel/highlight" "^7.23.4"
-    chalk "^2.4.2"
+    "@babel/helper-validator-identifier" "^7.25.9"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
 
 "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.22.5":
   version "7.22.5"
@@ -877,24 +924,25 @@
     json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/eslint-parser@^7.22.5":
-  version "7.23.3"
-  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.23.3.tgz#7bf0db1c53b54da0c8a12627373554a0828479ca"
-  integrity sha512-9bTuNlyx7oSstodm1cR1bECj4fkiknsDa1YniISkJemMY3DGhJNYBECbe6QD/q54mp2J8VO66jW3/7uP//iFCw==
+"@babel/eslint-parser@7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.25.9.tgz#603c68a63078796527bc9d0833f5e52dd5f9224c"
+  integrity sha512-5UXfgpK0j0Xr/xIdgdLEhOFxaDZ0bRPWJJchRpqOSur/3rZoPbqqki5mm0p4NE2cs28krBEiSM2MB7//afRSQQ==
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
     eslint-visitor-keys "^2.1.0"
     semver "^6.3.1"
 
-"@babel/generator@^7.22.5", "@babel/generator@^7.23.6", "@babel/generator@^7.7.2":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.23.6.tgz#9e1fca4811c77a10580d17d26b57b036133f3c2e"
-  integrity sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==
+"@babel/generator@^7.22.5", "@babel/generator@^7.25.9", "@babel/generator@^7.7.2":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.26.2.tgz#87b75813bec87916210e5e01939a4c823d6bb74f"
+  integrity sha512-zevQbhbau95nkoxSq3f/DC/SC+EEOUZd3DYqfSkMhY2/wfSeaHV1Ew4vk8e+x8lja31IbyuUa2uQ3JONqKbysw==
   dependencies:
-    "@babel/types" "^7.23.6"
-    "@jridgewell/gen-mapping" "^0.3.2"
-    "@jridgewell/trace-mapping" "^0.3.17"
-    jsesc "^2.5.1"
+    "@babel/parser" "^7.26.2"
+    "@babel/types" "^7.26.0"
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    jsesc "^3.0.2"
 
 "@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
@@ -969,12 +1017,12 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.20", "@babel/helper-environment-visitor@^7.22.5":
+"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.22.5":
   version "7.22.20"
   resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
   integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
 
-"@babel/helper-function-name@^7.22.5", "@babel/helper-function-name@^7.23.0":
+"@babel/helper-function-name@^7.22.5":
   version "7.23.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
   integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
@@ -1065,22 +1113,22 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-split-export-declaration@^7.22.5", "@babel/helper-split-export-declaration@^7.22.6":
+"@babel/helper-split-export-declaration@^7.22.5":
   version "7.22.6"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
   integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz#9478c707febcbbe1ddb38a3d91a2e054ae622d83"
-  integrity sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==
+"@babel/helper-string-parser@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz#1aabb72ee72ed35789b4bbcad3ca2862ce614e8c"
+  integrity sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==
 
-"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5":
-  version "7.22.20"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.22.5", "@babel/helper-validator-identifier@^7.25.9":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz#24b64e2c3ec7cd3b3c547729b8d16871f22cbdc7"
+  integrity sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==
 
 "@babel/helper-validator-option@^7.16.7", "@babel/helper-validator-option@^7.22.5":
   version "7.22.5"
@@ -1106,19 +1154,12 @@
     "@babel/traverse" "^7.22.5"
     "@babel/types" "^7.22.5"
 
-"@babel/highlight@^7.23.4":
-  version "7.23.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
-  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.5", "@babel/parser@^7.23.0", "@babel/parser@^7.25.3", "@babel/parser@^7.25.9", "@babel/parser@^7.26.2":
+  version "7.26.2"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.2.tgz#fd7b6f487cfea09889557ef5d4eeb9ff9a5abd11"
+  integrity sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
-    chalk "^2.4.2"
-    js-tokens "^4.0.0"
-
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.20.7", "@babel/parser@^7.22.15", "@babel/parser@^7.22.5", "@babel/parser@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.23.6.tgz#ba1c9e512bda72a47e285ae42aff9d2a635a9e3b"
-  integrity sha512-Z2uID7YJ7oNvAI20O9X0bblw7Qqs8Q2hFy0R9tAfnfLkp5MW0UH9eUvnDSnFwKZ0AvgS1ucqR4KzvVHgnke1VQ==
+    "@babel/types" "^7.26.0"
 
 "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7", "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
   version "7.22.5"
@@ -2000,46 +2041,42 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.8.4", "@babel/runtime@^7.9.2":
   version "7.25.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.25.6.tgz#9afc3289f7184d8d7f98b099884c26317b9264d2"
   integrity sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.3.3":
-  version "7.22.15"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.15.tgz#09576efc3830f0430f4548ef971dde1350ef2f38"
-  integrity sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==
+"@babel/template@^7.22.15", "@babel/template@^7.22.5", "@babel/template@^7.25.9", "@babel/template@^7.3.3":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.25.9.tgz#ecb62d81a8a6f5dc5fe8abfc3901fc52ddf15016"
+  integrity sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==
   dependencies:
-    "@babel/code-frame" "^7.22.13"
-    "@babel/parser" "^7.22.15"
-    "@babel/types" "^7.22.15"
+    "@babel/code-frame" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/types" "^7.25.9"
 
-"@babel/traverse@^7.22.5":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.6.tgz#b53526a2367a0dd6edc423637f3d2d0f2521abc5"
-  integrity sha512-czastdK1e8YByZqezMPFiZ8ahwVMh/ESl9vPgvgdB9AmFMGP5jfpFax74AQgl5zj4XHzqeYAg2l8PuUeRS1MgQ==
+"@babel/traverse@^7.22.5", "@babel/traverse@^7.23.2":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.25.9.tgz#a50f8fe49e7f69f53de5bea7e413cd35c5e13c84"
+  integrity sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/generator" "^7.23.6"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.23.6"
-    "@babel/types" "^7.23.6"
+    "@babel/code-frame" "^7.25.9"
+    "@babel/generator" "^7.25.9"
+    "@babel/parser" "^7.25.9"
+    "@babel/template" "^7.25.9"
+    "@babel/types" "^7.25.9"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.20.7", "@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
-  version "7.23.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.23.6.tgz#be33fdb151e1f5a56877d704492c240fc71c7ccd"
-  integrity sha512-+uarb83brBzPKN38NX1MkB6vb6+mwvR6amUulqAE7ccQw1pEl+bCia9TbdG1lsnFP7lZySvUn37CHyXQdfTwzg==
+"@babel/types@^7.0.0", "@babel/types@^7.16.8", "@babel/types@^7.20.7", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+  version "7.26.0"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.0.tgz#deabd08d6b753bc8e0f198f8709fb575e31774ff"
+  integrity sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
-    to-fast-properties "^2.0.0"
+    "@babel/helper-string-parser" "^7.25.9"
+    "@babel/helper-validator-identifier" "^7.25.9"
 
 "@balena/dockerignore@^1.0.2":
   version "1.0.2"
@@ -2051,44 +2088,6 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
 
-"@budibase/backend-core@2.33.2":
-  version "0.0.0"
-  dependencies:
-    "@budibase/nano" "10.1.5"
-    "@budibase/pouchdb-replication-stream" "1.2.11"
-    "@budibase/shared-core" "0.0.0"
-    "@budibase/types" "0.0.0"
-    aws-cloudfront-sign "3.0.2"
-    aws-sdk "2.1030.0"
-    bcrypt "5.1.0"
-    bcryptjs "2.4.3"
-    bull "4.10.1"
-    correlation-id "4.0.0"
-    dd-trace "5.2.0"
-    dotenv "16.0.1"
-    ioredis "5.3.2"
-    joi "17.6.0"
-    jsonwebtoken "9.0.2"
-    knex "2.4.2"
-    koa-passport "^6.0.0"
-    koa-pino-logger "4.0.0"
-    lodash "4.17.21"
-    node-fetch "2.6.7"
-    passport-google-oauth "2.0.0"
-    passport-local "1.0.0"
-    passport-oauth2-refresh "^2.1.0"
-    pino "8.11.0"
-    pino-http "8.3.3"
-    posthog-node "4.0.1"
-    pouchdb "7.3.0"
-    pouchdb-find "7.2.2"
-    redlock "4.2.0"
-    rotating-file-stream "3.1.0"
-    sanitize-s3-objectkey "0.0.1"
-    semver "^7.5.4"
-    tar-fs "2.1.1"
-    uuid "^8.3.2"
-
 "@budibase/handlebars-helpers@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@budibase/handlebars-helpers/-/handlebars-helpers-0.13.2.tgz#73ab51c464e91fd955b429017648e0257060db77"
@@ -2132,18 +2131,18 @@
     through2 "^2.0.0"
 
 "@budibase/pro@npm:@budibase/pro@latest":
-  version "2.33.2"
-  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.33.2.tgz#5c2012f7b2bf0fd871cda1ad37ad7a0442c84658"
-  integrity sha512-lBB6Wfp6OIOHRlGq82WS9KxvEXRs/P2QlwJT0Aj9PhmkQFsnXm2r8d18f0xTGvcflD+iR7XGP/k56JlCanmhQg==
+  version "3.2.47"
+  resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-3.2.47.tgz#150d7b16b14932d03c84bdb0e6d570d490c28a5c"
+  integrity sha512-UeTIq7yzMUK6w/akUsRafoD/Kif6PXv4d7K1arn8GTMjwFm9QYu2hg1YkQ+duNdwyZ/GEPlEAV5SYK+NDgtpdA==
   dependencies:
     "@anthropic-ai/sdk" "^0.27.3"
-    "@budibase/backend-core" "2.33.2"
-    "@budibase/shared-core" "2.33.2"
-    "@budibase/string-templates" "2.33.2"
-    "@budibase/types" "2.33.2"
-    "@koa/router" "8.0.8"
+    "@budibase/backend-core" "*"
+    "@budibase/shared-core" "*"
+    "@budibase/string-templates" "*"
+    "@budibase/types" "*"
+    "@koa/router" "13.1.0"
     bull "4.10.1"
-    dd-trace "5.2.0"
+    dd-trace "5.26.0"
     joi "17.6.0"
     jsonwebtoken "9.0.2"
     lru-cache "^7.14.1"
@@ -2153,24 +2152,12 @@
     scim-patch "^0.8.1"
     scim2-parse-filter "^0.2.8"
 
-"@budibase/shared-core@2.33.2":
-  version "0.0.0"
+"@budibase/vm-browserify@^1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@budibase/vm-browserify/-/vm-browserify-1.1.4.tgz#eecb001bd9521cb7647e26fb4d2d29d0a4dce262"
+  integrity sha512-/dyOLj+jQNKe6sVfLP6NdwA79OZxEWHCa41VGsjKJC9DYo6l2fEcL5BNXq2pATqrbgWmOlEbcRulfZ+7W0QRUg==
   dependencies:
-    "@budibase/types" "0.0.0"
-    cron-validate "1.4.5"
-
-"@budibase/string-templates@2.33.2":
-  version "0.0.0"
-  dependencies:
-    "@budibase/handlebars-helpers" "^0.13.2"
-    dayjs "^1.10.8"
-    handlebars "^4.7.8"
-    lodash.clonedeep "^4.5.0"
-
-"@budibase/types@2.33.2":
-  version "0.0.0"
-  dependencies:
-    scim-patch "^0.8.1"
+    indexof "^0.0.1"
 
 "@bull-board/api@5.10.2":
   version "5.10.2"
@@ -2200,32 +2187,6 @@
   dependencies:
     "@bull-board/api" "5.10.2"
 
-"@camunda8/sdk@^8.5.3":
-  version "8.6.12"
-  resolved "https://registry.yarnpkg.com/@camunda8/sdk/-/sdk-8.6.12.tgz#8a210359cd9873b9e1750dcde45e62045409cc17"
-  integrity sha512-dQNw9rMCrL0hJezjAeCAJWMyhuV/ouizP21UzgG9Edqnj/od9ko9XQjEd/AuSj9VMEEQ+bt40mBMnZszbISONg==
-  dependencies:
-    "@grpc/grpc-js" "1.10.9"
-    "@grpc/proto-loader" "0.7.13"
-    chalk "^2.4.2"
-    console-stamp "^3.0.2"
-    dayjs "^1.8.15"
-    debug "^4.3.4"
-    fast-xml-parser "^4.1.3"
-    got "^11.8.6"
-    jwt-decode "^4.0.0"
-    lodash.mergewith "^4.6.2"
-    long "^4.0.0"
-    lossless-json "^4.0.1"
-    neon-env "^0.1.3"
-    promise-retry "^1.1.1"
-    reflect-metadata "^0.2.1"
-    stack-trace "0.0.10"
-    typed-duration "^1.0.12"
-    uuid "^7.0.3"
-  optionalDependencies:
-    win-ca "3.5.1"
-
 "@codemirror/autocomplete@^6.0.0", "@codemirror/autocomplete@^6.7.1":
   version "6.7.1"
   resolved "https://registry.yarnpkg.com/@codemirror/autocomplete/-/autocomplete-6.7.1.tgz#3364799b78dff70fb8f81615536c52ea53ce40b2"
@@ -2304,10 +2265,10 @@
     style-mod "^4.0.0"
     w3c-keyname "^2.2.4"
 
-"@colors/colors@1.5.0":
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
-  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+"@colors/colors@1.6.0", "@colors/colors@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.6.0.tgz#ec6cd237440700bc23ca23087f513c75508958b0"
+  integrity sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==
 
 "@cspotcode/source-map-support@^0.8.0":
   version "0.8.1"
@@ -2355,45 +2316,50 @@
   resolved "https://registry.yarnpkg.com/@dagrejs/graphlib/-/graphlib-2.2.4.tgz#d77bfa9ff49e2307c0c6e6b8b26b5dd3c05816c4"
   integrity sha512-mepCf/e9+SKYy1d02/UkvSy6+6MoyXhVxP8lLDfA7BPE1X1d4dR0sZznmbM8/XVJ1GPM+Svnx7Xj6ZweByWUkw==
 
-"@datadog/native-appsec@7.0.0":
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-7.0.0.tgz#a380174dd49aef2d9bb613a0ec8ead6dc7822095"
-  integrity sha512-bywstWFW2hWxzPuS0+mFMVHHL0geulx5yQFtsjfszaH2LTAgk2D+Rt40MKbAoZ8q3tRw2dy6aYQ7svO3ca8jpA==
+"@datadog/libdatadog@^0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@datadog/libdatadog/-/libdatadog-0.2.2.tgz#ac02c76ac9a38250dca740727c7cdf00244ce3d3"
+  integrity sha512-rTWo96mEPTY5UbtGoFj8/wY0uKSViJhsPg/Z6aoFWBFXQ8b45Ix2e/yvf92AAwrhG+gPLTxEqTXh3kef2dP8Ow==
+
+"@datadog/native-appsec@8.3.0":
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-appsec/-/native-appsec-8.3.0.tgz#91afd89d18d386be4da8a1b0e04500f2f8b5eb66"
+  integrity sha512-RYHbSJ/MwJcJaLzaCaZvUyNLUKFbMshayIiv4ckpFpQJDiq1T8t9iM2k7008s75g1vRuXfsRNX7MaLn4aoFuWA==
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-iast-rewriter@2.2.2":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.2.2.tgz#3f7feaf6be1af4c83ad063065b8ed509bbaf11cb"
-  integrity sha512-13ZBhJpjZ/tiV6rYfyAf/ITye9cyd3x12M/2NKhD4Ivev4N4uKBREAjpArOtzKtPXZ5b6oXwVV4ofT1SHoYyzA==
+"@datadog/native-iast-rewriter@2.5.0":
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-iast-rewriter/-/native-iast-rewriter-2.5.0.tgz#b613defe86e78168f750d1f1662d4ffb3cf002e6"
+  integrity sha512-WRu34A3Wwp6oafX8KWNAbedtDaaJO+nzfYQht7pcJKjyC2ggfPeF7SoP+eDo9wTn4/nQwEOscSR4hkJqTRlpXQ==
   dependencies:
     lru-cache "^7.14.0"
     node-gyp-build "^4.5.0"
 
-"@datadog/native-iast-taint-tracking@1.6.4":
-  version "1.6.4"
-  resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-1.6.4.tgz#16c21ad7c36a53420c0d3c5a3720731809cc7e98"
-  integrity sha512-Owxk7hQ4Dxwv4zJAoMjRga0IvE6lhvxnNc8pJCHsemCWBXchjr/9bqg05Zy5JnMbKUWn4XuZeJD6RFZpRa8bfw==
+"@datadog/native-iast-taint-tracking@3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@datadog/native-iast-taint-tracking/-/native-iast-taint-tracking-3.2.0.tgz#9fb6823d82f934e12c06ea1baa7399ca80deb2ec"
+  integrity sha512-Mc6FzCoyvU5yXLMsMS9yKnEqJMWoImAukJXolNWCTm+JQYCMf2yMsJ8pBAm7KyZKliamM9rCn7h7Tr2H3lXwjA==
   dependencies:
     node-gyp-build "^3.9.0"
 
-"@datadog/native-metrics@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-2.0.0.tgz#65bf03313ee419956361e097551db36173e85712"
-  integrity sha512-YklGVwUtmKGYqFf1MNZuOHvTYdKuR4+Af1XkWcMD8BwOAjxmd9Z+97328rCOY8TFUJzlGUPaXzB8j2qgG/BMwA==
+"@datadog/native-metrics@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@datadog/native-metrics/-/native-metrics-3.0.1.tgz#dc276c93785c0377a048e316f23b7c8ff3acfa84"
+  integrity sha512-0GuMyYyXf+Qpb/F+Fcekz58f2mO37lit9U3jMbWY/m8kac44gCPABzL5q3gWbdH+hWgqYfQoEYsdNDGSrKfwoQ==
   dependencies:
     node-addon-api "^6.1.0"
     node-gyp-build "^3.9.0"
 
-"@datadog/pprof@5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.0.0.tgz#0c0aaf06def6d2bc4b2d353ec7b264dadbfbefab"
-  integrity sha512-vhNan4SBuNWLpexunDJQ+hNbRAgWdk2qy5Iyh7Nn94uSSHXigAJMAvu4jwMKKQKFfchtobOkWT8GQUWW3tgpFg==
+"@datadog/pprof@5.4.1":
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/@datadog/pprof/-/pprof-5.4.1.tgz#08c9bcf5d8efb2eeafdfc9f5bb5402f79fb41266"
+  integrity sha512-IvpL96e/cuh8ugP5O8Czdup7XQOLHeIDgM5pac5W7Lc1YzGe5zTtebKFpitvb1CPw1YY+1qFx0pWGgKP2kOfHg==
   dependencies:
     delay "^5.0.0"
     node-gyp-build "<4.0"
     p-limit "^3.1.0"
-    pprof-format "^2.0.7"
+    pprof-format "^2.1.0"
     source-map "^0.7.4"
 
 "@datadog/sketches-js@^2.1.0":
@@ -2421,231 +2387,116 @@
     find-up "^5.0.0"
     strip-json-comments "^3.1.1"
 
-"@esbuild/aix-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz#c7184a326533fcdf1b8ee0733e21c713b975575f"
-  integrity sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==
-
 "@esbuild/android-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"
   integrity sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==
 
-"@esbuild/android-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz#09d9b4357780da9ea3a7dfb833a1f1ff439b4052"
-  integrity sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==
-
 "@esbuild/android-arm@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.18.20.tgz#fedb265bc3a589c84cc11f810804f234947c3682"
   integrity sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==
 
-"@esbuild/android-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.21.5.tgz#9b04384fb771926dfa6d7ad04324ecb2ab9b2e28"
-  integrity sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==
-
 "@esbuild/android-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.18.20.tgz#35cf419c4cfc8babe8893d296cd990e9e9f756f2"
   integrity sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==
 
-"@esbuild/android-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.21.5.tgz#29918ec2db754cedcb6c1b04de8cd6547af6461e"
-  integrity sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==
-
 "@esbuild/darwin-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz#08172cbeccf95fbc383399a7f39cfbddaeb0d7c1"
   integrity sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==
 
-"@esbuild/darwin-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz#e495b539660e51690f3928af50a76fb0a6ccff2a"
-  integrity sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==
-
 "@esbuild/darwin-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz#d70d5790d8bf475556b67d0f8b7c5bdff053d85d"
   integrity sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==
 
-"@esbuild/darwin-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz#c13838fa57372839abdddc91d71542ceea2e1e22"
-  integrity sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==
-
 "@esbuild/freebsd-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz#98755cd12707f93f210e2494d6a4b51b96977f54"
   integrity sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==
 
-"@esbuild/freebsd-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz#646b989aa20bf89fd071dd5dbfad69a3542e550e"
-  integrity sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==
-
 "@esbuild/freebsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz#c1eb2bff03915f87c29cece4c1a7fa1f423b066e"
   integrity sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==
 
-"@esbuild/freebsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz#aa615cfc80af954d3458906e38ca22c18cf5c261"
-  integrity sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==
-
 "@esbuild/linux-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz#bad4238bd8f4fc25b5a021280c770ab5fc3a02a0"
   integrity sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==
 
-"@esbuild/linux-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz#70ac6fa14f5cb7e1f7f887bcffb680ad09922b5b"
-  integrity sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==
-
 "@esbuild/linux-arm@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz#3e617c61f33508a27150ee417543c8ab5acc73b0"
   integrity sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==
 
-"@esbuild/linux-arm@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz#fc6fd11a8aca56c1f6f3894f2bea0479f8f626b9"
-  integrity sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==
-
 "@esbuild/linux-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz#699391cccba9aee6019b7f9892eb99219f1570a7"
   integrity sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==
 
-"@esbuild/linux-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz#3271f53b3f93e3d093d518d1649d6d68d346ede2"
-  integrity sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==
-
 "@esbuild/linux-loong64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz#e6fccb7aac178dd2ffb9860465ac89d7f23b977d"
   integrity sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==
 
-"@esbuild/linux-loong64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz#ed62e04238c57026aea831c5a130b73c0f9f26df"
-  integrity sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==
-
 "@esbuild/linux-mips64el@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz#eeff3a937de9c2310de30622a957ad1bd9183231"
   integrity sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==
 
-"@esbuild/linux-mips64el@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz#e79b8eb48bf3b106fadec1ac8240fb97b4e64cbe"
-  integrity sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==
-
 "@esbuild/linux-ppc64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz#2f7156bde20b01527993e6881435ad79ba9599fb"
   integrity sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==
 
-"@esbuild/linux-ppc64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz#5f2203860a143b9919d383ef7573521fb154c3e4"
-  integrity sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==
-
 "@esbuild/linux-riscv64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz#6628389f210123d8b4743045af8caa7d4ddfc7a6"
   integrity sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==
 
-"@esbuild/linux-riscv64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz#07bcafd99322d5af62f618cb9e6a9b7f4bb825dc"
-  integrity sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==
-
 "@esbuild/linux-s390x@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz#255e81fb289b101026131858ab99fba63dcf0071"
   integrity sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==
 
-"@esbuild/linux-s390x@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz#b7ccf686751d6a3e44b8627ababc8be3ef62d8de"
-  integrity sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==
-
 "@esbuild/linux-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz#c7690b3417af318a9b6f96df3031a8865176d338"
   integrity sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==
 
-"@esbuild/linux-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz#6d8f0c768e070e64309af8004bb94e68ab2bb3b0"
-  integrity sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==
-
 "@esbuild/netbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz#30e8cd8a3dded63975e2df2438ca109601ebe0d1"
   integrity sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==
 
-"@esbuild/netbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz#bbe430f60d378ecb88decb219c602667387a6047"
-  integrity sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==
-
 "@esbuild/openbsd-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz#7812af31b205055874c8082ea9cf9ab0da6217ae"
   integrity sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==
 
-"@esbuild/openbsd-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz#99d1cf2937279560d2104821f5ccce220cb2af70"
-  integrity sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==
-
 "@esbuild/sunos-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz#d5c275c3b4e73c9b0ecd38d1ca62c020f887ab9d"
   integrity sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==
 
-"@esbuild/sunos-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz#08741512c10d529566baba837b4fe052c8f3487b"
-  integrity sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==
-
 "@esbuild/win32-arm64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz#73bc7f5a9f8a77805f357fab97f290d0e4820ac9"
   integrity sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==
 
-"@esbuild/win32-arm64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz#675b7385398411240735016144ab2e99a60fc75d"
-  integrity sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==
-
 "@esbuild/win32-ia32@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz#ec93cbf0ef1085cc12e71e0d661d20569ff42102"
   integrity sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==
 
-"@esbuild/win32-ia32@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz#1bfc3ce98aa6ca9a0969e4d2af72144c59c1193b"
-  integrity sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==
-
 "@esbuild/win32-x64@0.18.20":
   version "0.18.20"
   resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz#786c5f41f043b07afb1af37683d7c33668858f6d"
   integrity sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==
 
-"@esbuild/win32-x64@0.21.5":
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz#acad351d582d157bb145535db2a6ff53dd514b5c"
-  integrity sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==
-
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz#a23514e8fb9af1269d5f7788aa556798d61c6b59"
@@ -2653,20 +2504,32 @@
   dependencies:
     eslint-visitor-keys "^3.3.0"
 
-"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.11.0", "@eslint-community/regexpp@^4.6.1":
+"@eslint-community/regexpp@^4.10.0", "@eslint-community/regexpp@^4.6.1":
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.0.tgz#b0ffd0312b4a3fd2d6f77237e7248a5ad3a680ae"
   integrity sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==
 
-"@eslint/config-array@^0.18.0":
-  version "0.18.0"
-  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.18.0.tgz#37d8fe656e0d5e3dbaea7758ea56540867fd074d"
-  integrity sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==
+"@eslint-community/regexpp@^4.12.1":
+  version "4.12.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0"
+  integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==
+
+"@eslint/config-array@^0.19.0":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@eslint/config-array/-/config-array-0.19.1.tgz#734aaea2c40be22bbb1f2a9dac687c57a6a4c984"
+  integrity sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==
   dependencies:
-    "@eslint/object-schema" "^2.1.4"
+    "@eslint/object-schema" "^2.1.5"
     debug "^4.3.1"
     minimatch "^3.1.2"
 
+"@eslint/core@^0.9.0":
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/@eslint/core/-/core-0.9.1.tgz#31763847308ef6b7084a4505573ac9402c51f9d1"
+  integrity sha512-GuUdqkyyzQI5RMIWkHhvTWLCyLo1jNK3vzkSyaExH5kHPDHcuL2VOpHjmMY+y3+NC69qAKToBqldTBgYeLSr9Q==
+  dependencies:
+    "@types/json-schema" "^7.0.15"
+
 "@eslint/eslintrc@^2.1.4":
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-2.1.4.tgz#388a269f0f25c1b6adc317b5a2c55714894c70ad"
@@ -2682,10 +2545,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/eslintrc@^3.1.0":
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.1.0.tgz#dbd3482bfd91efa663cbe7aa1f506839868207b6"
-  integrity sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==
+"@eslint/eslintrc@^3.2.0":
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-3.2.0.tgz#57470ac4e2e283a6bf76044d63281196e370542c"
+  integrity sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
@@ -2702,15 +2565,27 @@
   resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
   integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
-"@eslint/js@9.9.1", "@eslint/js@^9.7.0":
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.9.1.tgz#4a97e85e982099d6c7ee8410aacb55adaa576f06"
-  integrity sha512-xIDQRsfg5hNBqHz04H1R3scSVwmI+KUbqjsQKHKQ1DAUSaUjYPReZZmS/5PNiKu1fUvzDd6H7DEDKACSEhu+TQ==
+"@eslint/js@9.16.0":
+  version "9.16.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-9.16.0.tgz#3df2b2dd3b9163056616886c86e4082f45dbf3f4"
+  integrity sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==
 
-"@eslint/object-schema@^2.1.4":
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.4.tgz#9e69f8bb4031e11df79e03db09f9dbbae1740843"
-  integrity sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==
+"@eslint/object-schema@^2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@eslint/object-schema/-/object-schema-2.1.5.tgz#8670a8f6258a2be5b2c620ff314a1d984c23eb2e"
+  integrity sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==
+
+"@eslint/plugin-kit@^0.2.3":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@eslint/plugin-kit/-/plugin-kit-0.2.4.tgz#2b78e7bb3755784bb13faa8932a1d994d6537792"
+  integrity sha512-zSkKow6H5Kdm0ZUQUB2kV5JIXqoG0+uH5YADhaEHswm664N9Db8dXSi0nMJpacpMf+MyyglF1vnZohpEg5yUtg==
+  dependencies:
+    levn "^0.4.1"
+
+"@fastify/busboy@^2.0.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@fastify/busboy/-/busboy-2.1.1.tgz#b9da6a878a371829a0502c9b6c1c143ef6663f4d"
+  integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==
 
 "@fontsource/source-sans-pro@^5.0.3":
   version "5.0.3"
@@ -2743,7 +2618,7 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.4.2"
 
-"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
+"@gar/promisify@^1.1.3":
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
@@ -2758,56 +2633,45 @@
     google-gax "^4.3.3"
     protobufjs "^7.2.6"
 
-"@google-cloud/paginator@^3.0.7":
-  version "3.0.7"
-  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-3.0.7.tgz#fb6f8e24ec841f99defaebf62c75c2e744dd419b"
-  integrity "sha1-+2+OJOyEH5ne+uv2LHXC50TdQZs= sha512-jJNutk0arIQhmpUUQJPJErsojqo834KcyB6X7a1mxuic8i1tKXxde8E69IZxNZawRIlZdIK2QY4WALvlK5MzYQ=="
+"@google-cloud/paginator@^5.0.0":
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@google-cloud/paginator/-/paginator-5.0.2.tgz#86ad773266ce9f3b82955a8f75e22cd012ccc889"
+  integrity sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==
   dependencies:
     arrify "^2.0.0"
     extend "^3.0.2"
 
-"@google-cloud/projectify@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-3.0.0.tgz#302b25f55f674854dce65c2532d98919b118a408"
-  integrity "sha1-MCsl9V9nSFTc5lwlMtmJGbEYpAg= sha512-HRkZsNmjScY6Li8/kb70wjGlDDyLkVk3KvoEo9uIoxSjYLJasGiCch9+PqRVDOCGUFvEIqyogl+BeqILL4OJHA=="
+"@google-cloud/projectify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/projectify/-/projectify-4.0.0.tgz#d600e0433daf51b88c1fa95ac7f02e38e80a07be"
+  integrity sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==
 
-"@google-cloud/promisify@^3.0.0":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-3.0.1.tgz#8d724fb280f47d1ff99953aee0c1669b25238c2e"
-  integrity "sha1-jXJPsoD0fR/5mVOu4MFmmyUjjC4= sha512-z1CjRjtQyBOYL+5Qr9DdYIfrdLBe746jRTYfaYU6MeXkqp7UfYs/jX16lFFVzZ7PGEJvqZNqYUEtb1mvDww4pA=="
+"@google-cloud/promisify@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/promisify/-/promisify-4.0.0.tgz#a906e533ebdd0f754dca2509933334ce58b8c8b1"
+  integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
-"@google-cloud/storage@^6.9.3":
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-6.12.0.tgz#a5d3093cc075252dca5bd19a3cfda406ad3a9de1"
-  integrity "sha1-pdMJPMB1JS3KW9GaPP2kBq06neE= sha512-78nNAY7iiZ4O/BouWMWTD/oSF2YtYgYB3GZirn0To6eBOugjXVoK+GXgUXOl+HlqbAOyHxAVXOlsj3snfbQ1dw=="
+"@google-cloud/storage@^7.7.0":
+  version "7.14.0"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.14.0.tgz#eda9715f68507949214af804c906eba6d168a214"
+  integrity sha512-H41bPL2cMfSi4EEnFzKvg7XSb7T67ocSXrmF7MPjfgFB0L6CKGzfIYJheAZi1iqXjz6XaCT1OBf6HCG5vDBTOQ==
   dependencies:
-    "@google-cloud/paginator" "^3.0.7"
-    "@google-cloud/projectify" "^3.0.0"
-    "@google-cloud/promisify" "^3.0.0"
+    "@google-cloud/paginator" "^5.0.0"
+    "@google-cloud/projectify" "^4.0.0"
+    "@google-cloud/promisify" "^4.0.0"
     abort-controller "^3.0.0"
     async-retry "^1.3.3"
-    compressible "^2.0.12"
-    duplexify "^4.0.0"
-    ent "^2.2.0"
-    extend "^3.0.2"
-    fast-xml-parser "^4.2.2"
-    gaxios "^5.0.0"
-    google-auth-library "^8.0.1"
+    duplexify "^4.1.3"
+    fast-xml-parser "^4.4.1"
+    gaxios "^6.0.2"
+    google-auth-library "^9.6.3"
+    html-entities "^2.5.2"
     mime "^3.0.0"
-    mime-types "^2.0.8"
     p-limit "^3.0.1"
-    retry-request "^5.0.0"
-    teeny-request "^8.0.0"
+    retry-request "^7.0.0"
+    teeny-request "^9.0.0"
     uuid "^8.0.0"
 
-"@grpc/grpc-js@1.10.9":
-  version "1.10.9"
-  resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.9.tgz#468cc1549a3fe37b760a16745fb7685d91f4f10c"
-  integrity sha512-5tcgUctCG0qoNyfChZifz2tJqbRbXVO9J7X6duFcOjY3HUNCxg5D0ZCK7EP9vIcZ0zRpLU9bWkyCqVCLZ46IbQ==
-  dependencies:
-    "@grpc/proto-loader" "^0.7.13"
-    "@js-sdsl/ordered-map" "^4.4.2"
-
 "@grpc/grpc-js@^1.10.9":
   version "1.10.10"
   resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.10.10.tgz#476d315feeb9dbb0f2d6560008c92688c30f13e0"
@@ -2816,7 +2680,7 @@
     "@grpc/proto-loader" "^0.7.13"
     "@js-sdsl/ordered-map" "^4.4.2"
 
-"@grpc/proto-loader@0.7.13", "@grpc/proto-loader@^0.7.13":
+"@grpc/proto-loader@^0.7.13":
   version "0.7.13"
   resolved "https://registry.yarnpkg.com/@grpc/proto-loader/-/proto-loader-0.7.13.tgz#f6a44b2b7c9f7b609f5748c6eac2d420e37670cf"
   integrity sha512-AiXO/bfe9bmxBjxxtYxFAXGZvMaN5s8kO+jBHAJCON8rJoB5YS/D6X7ZNc6XQkuHNmyl4CYaMI1fJ/Gn27RGGw==
@@ -2826,31 +2690,30 @@
     protobufjs "^7.2.5"
     yargs "^17.7.2"
 
-"@hapi/hoek@^9.0.0", "@hapi/hoek@^9.3.0":
+"@hapi/hoek@^9.0.0":
   version "9.3.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.3.0.tgz#8368869dcb735be2e7f5cb7647de78e167a251fb"
   integrity sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==
 
-"@hapi/topo@^5.0.0", "@hapi/topo@^5.1.0":
+"@hapi/topo@^5.0.0":
   version "5.1.0"
   resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012"
   integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@hubspot/api-client@7.1.2":
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/@hubspot/api-client/-/api-client-7.1.2.tgz#a405b0a18b8caa27f129fd510b2555e5a5cc2708"
-  integrity sha512-JVQqh0fdHf97ePk0Hg/7BJsiXNlS9HQRPiM/CLgvVWt5CIviSLQ/kHLZXREmZqTWu7BisjCgHxnSx/d7gRdr2g==
+"@humanfs/core@^0.19.1":
+  version "0.19.1"
+  resolved "https://registry.yarnpkg.com/@humanfs/core/-/core-0.19.1.tgz#17c55ca7d426733fe3c561906b8173c336b40a77"
+  integrity sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==
+
+"@humanfs/node@^0.16.6":
+  version "0.16.6"
+  resolved "https://registry.yarnpkg.com/@humanfs/node/-/node-0.16.6.tgz#ee2a10eaabd1131987bf0488fd9b820174cd765e"
+  integrity sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==
   dependencies:
-    bluebird "^3.7.2"
-    bottleneck "^2.19.5"
-    btoa "^1.2.1"
-    es6-promise "^4.2.4"
-    form-data "^2.5.0"
-    lodash "^4.17.21"
-    node-fetch "^2.6.0"
-    url-parse "^1.4.3"
+    "@humanfs/core" "^0.19.1"
+    "@humanwhocodes/retry" "^0.3.0"
 
 "@humanwhocodes/config-array@^0.11.14":
   version "0.11.14"
@@ -2872,9 +2735,14 @@
   integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@humanwhocodes/retry@^0.3.0":
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.0.tgz#6d86b8cb322660f03d3f0aa94b99bdd8e172d570"
-  integrity sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.3.1.tgz#c72a5c76a9fbaf3488e231b13dc52c0da7bab42a"
+  integrity sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==
+
+"@humanwhocodes/retry@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/retry/-/retry-0.4.1.tgz#9a96ce501bc62df46c4031fbd970e3cc6b10f07b"
+  integrity sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==
 
 "@hutson/parse-repository-url@^3.0.0":
   version "3.0.2"
@@ -2903,6 +2771,11 @@
     wrap-ansi "^8.1.0"
     wrap-ansi-cjs "npm:wrap-ansi@^7.0.0"
 
+"@isaacs/ttlcache@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@isaacs/ttlcache/-/ttlcache-1.4.1.tgz#21fb23db34e9b6220c6ba023a0118a2dd3461ea2"
+  integrity sha512-RQgQ4uQ+pLbqXfOmieB91ejmLwvSgv9nLx6sT6sD83s7umBypgg+OIBOBbEUiJXrfpnp9j0mRhYYdzp9uqq3lA==
+
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
@@ -3140,264 +3013,279 @@
     "@types/yargs" "^17.0.8"
     chalk "^4.0.0"
 
-"@jimp/bmp@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/bmp/-/bmp-0.22.12.tgz#0316044dc7b1a90274aef266d50349347fb864d4"
-  integrity sha512-aeI64HD0npropd+AR76MCcvvRaa+Qck6loCOS03CkkxGHN5/r336qTM5HPUdHKMDOGzqknuVPA8+kK1t03z12g==
+"@jimp/core@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-1.1.4.tgz#54f0c0877bb015361f2cf7d1e1de6fed07e026a9"
+  integrity sha512-Pokt0rq2qT9oTbQkYVd4z8nIA0eHu2yI3Gd5SmkKQjQa/lRVWRFazqAJMpPkIQt32gSf2rRUVopp7O7wkjjV8w==
   dependencies:
-    "@jimp/utils" "^0.22.12"
-    bmp-js "^0.1.0"
-
-"@jimp/core@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/core/-/core-0.22.12.tgz#70785ea7d10b138fb65bcfe9f712826f00a10e1d"
-  integrity sha512-l0RR0dOPyzMKfjUW1uebzueFEDtCOj9fN6pyTYWWOM/VS4BciXQ1VVrJs8pO3kycGYZxncRKhCoygbNr8eEZQA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-    any-base "^1.1.0"
-    buffer "^5.2.0"
+    "@jimp/file-ops" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    await-to-js "^3.0.0"
     exif-parser "^0.1.12"
-    file-type "^16.5.4"
-    isomorphic-fetch "^3.0.0"
-    pixelmatch "^4.0.2"
-    tinycolor2 "^1.6.0"
+    file-type "^16.0.0"
+    mime "3"
 
-"@jimp/custom@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/custom/-/custom-0.22.12.tgz#236f2a3f016b533c50869ff22ad1ac00dd0c36be"
-  integrity sha512-xcmww1O/JFP2MrlGUMd3Q78S3Qu6W3mYTXYuIqFq33EorgYHV/HqymHfXy9GjiCJ7OI+7lWx6nYFOzU7M4rd1Q==
+"@jimp/diff@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/diff/-/diff-1.1.4.tgz#505b6f9f738f9a6495f36960662738937fea529b"
+  integrity sha512-Xc/g1SfphHT9+aeghCxQou8cCmzIArLot31PNXYhx/Bip0Px1wtZHW22sFgCPjGJS6pE/74qRjM0V8VJQYup3w==
   dependencies:
-    "@jimp/core" "^0.22.12"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    pixelmatch "^5.3.0"
 
-"@jimp/gif@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/gif/-/gif-0.22.12.tgz#6caccb45df497fb971b7a88690345596e22163c0"
-  integrity sha512-y6BFTJgch9mbor2H234VSjd9iwAhaNf/t3US5qpYIs0TSbAvM02Fbc28IaDETj9+4YB4676sz4RcN/zwhfu1pg==
+"@jimp/file-ops@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/file-ops/-/file-ops-1.1.4.tgz#3a1670c1ffdd72a848c10a80187b53556fd05131"
+  integrity sha512-vJqidRRZlQfaOS/DE9FnkFDmu6Fyx5ZtqTRfBDRr8fAPPDC+N6Fh4//0YQ2CO1xstI35WoPPkJDu6Geq+f1b5Q==
+
+"@jimp/js-bmp@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/js-bmp/-/js-bmp-1.1.4.tgz#c8c777e2100db8fa69583e7c2ca4cf1d145b7e51"
+  integrity sha512-fO8dhqfDF08Zw4SXdXD2GqLakR4KInUY6dWkNyOLH+fADsi2jmx/UgcdNiZMGm/iaQSdTdUovgpmLJrr5kQ3Kg==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    bmp-ts "^1.0.9"
+
+"@jimp/js-gif@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/js-gif/-/js-gif-1.1.4.tgz#5f6d18b250ca3d241de0fd1a0421cff679956ee3"
+  integrity sha512-/+W2hCPljZg4xEC82W4Zl/gy3ZzQVD05jYovviuHx+T3d/8y/GZWElDp6dHkBefnZ1P3ZEC+sBtLUIyuAz7c4A==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
     gifwrap "^0.10.1"
-    omggif "^1.0.9"
+    omggif "^1.0.10"
 
-"@jimp/jpeg@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/jpeg/-/jpeg-0.22.12.tgz#b5c74a5aac9826245311370dda8c71a1fcca05ed"
-  integrity sha512-Rq26XC/uQWaQKyb/5lksCTCxXhtY01NJeBN+dQv5yNYedN0i7iYu+fXEoRsfaJ8xZzjoANH8sns7rVP4GE7d/Q==
+"@jimp/js-jpeg@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/js-jpeg/-/js-jpeg-1.1.4.tgz#b84065aca4f5631497321883f09e841fae7ffc1a"
+  integrity sha512-Qt7U2MLuLd7fpA9m7LEUvf4oEjYofJtxi7a4XApkHOtRC7+l2KBEpiw2EGwCd1AQ8dnryaO5ehFqALhiIjcv+w==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
     jpeg-js "^0.4.4"
 
-"@jimp/plugin-blit@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-0.22.12.tgz#0fa8320767fda77434b4408798655ff7c7e415d4"
-  integrity sha512-xslz2ZoFZOPLY8EZ4dC29m168BtDx95D6K80TzgUi8gqT7LY6CsajWO0FAxDwHz6h0eomHMfyGX0stspBrTKnQ==
+"@jimp/js-png@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/js-png/-/js-png-1.1.4.tgz#128670c6f3de2d7291bb53cbac7fdce95838c2c4"
+  integrity sha512-F+8d0cHlS5MJnvle5TbQRhe7UIyqbZJlrqYemrfARTeoyhUQo5NYfeOmnnyABl1Jiwvhe7cWzKnlXRkhJZzS6g==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    pngjs "^7.0.0"
 
-"@jimp/plugin-blur@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-0.22.12.tgz#0c37b2ff4e588b45f4307b4f13d3d0eef813920d"
-  integrity sha512-S0vJADTuh1Q9F+cXAwFPlrKWzDj2F9t/9JAbUvaaDuivpyWuImEKXVz5PUZw2NbpuSHjwssbTpOZ8F13iJX4uw==
+"@jimp/js-tiff@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/js-tiff/-/js-tiff-1.1.4.tgz#e85a7e228e91098c01f84045f9f0e63bfab1d121"
+  integrity sha512-kopUh2c2vxNjeAljniP8jQnWGWdhlFUfP6RySAnRpRDbp9LhTrpYGngKf/fOxv8MMEXOifGNvQlvzgOrnmF4sQ==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    utif2 "^4.1.0"
 
-"@jimp/plugin-circle@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-0.22.12.tgz#9fffda83d3fc5bad8c1e1492b15b1433cb42e16e"
-  integrity sha512-SWVXx1yiuj5jZtMijqUfvVOJBwOifFn0918ou4ftoHgegc5aHWW5dZbYPjvC9fLpvz7oSlptNl2Sxr1zwofjTg==
+"@jimp/plugin-blit@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blit/-/plugin-blit-1.1.4.tgz#07a0ec5c5890697cf4905b5eaf58403920c6848a"
+  integrity sha512-mwiZp7tSId/2LyFzct456rMulbi+J9Mm9jQ1jhWt7TPM4qjobFXHem5glyU1aNf9CpHcsOP83RUj5me7DavvEg==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
 
-"@jimp/plugin-color@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-0.22.12.tgz#1e49f2e7387186507e917b0686599767c15be336"
-  integrity sha512-xImhTE5BpS8xa+mAN6j4sMRWaUgUDLoaGHhJhpC+r7SKKErYDR0WQV4yCE4gP+N0gozD0F3Ka1LUSaMXrn7ZIA==
+"@jimp/plugin-blur@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-blur/-/plugin-blur-1.1.4.tgz#e55fba4af64f095d51036b2dcbdd2d9f93d3c81a"
+  integrity sha512-XH+NGrKOQbs5Q0WF4HToWSUz5ts4xRABFcAIDgs9O34iYdTL3K9lPMHAOH+LrB+2uWMzguQQncdEJrPKgNXC4Q==
   dependencies:
-    "@jimp/utils" "^0.22.12"
+    "@jimp/core" "1.1.4"
+    "@jimp/utils" "1.1.4"
+
+"@jimp/plugin-circle@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-circle/-/plugin-circle-1.1.4.tgz#bad7981483219554587ded91e63ec4aa69eb0884"
+  integrity sha512-zOemNyA5VIgWnC+NQys7FCqpFt6jN7Hvp//G9pL+oD9sXDLQbkR65ZHdpI7iglVtxsq3yc7hFe2ojCRCu3AbSg==
+  dependencies:
+    "@jimp/types" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-color@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-color/-/plugin-color-1.1.4.tgz#bf142840d7570e7964a136f278de6f8134686417"
+  integrity sha512-j7xJqO9Cr45sLw+UYwCRtoeWl8/mZsBmZEAGdpx4ny2vHD0IMD3S56NcTuSLJ9zFtuyIEJkQFUNFUDaxVxVjag==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    tinycolor2 "^1.6.0"
+    zod "^3.23.8"
+
+"@jimp/plugin-contain@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-1.1.4.tgz#185b9b3fdb85d61b38c8ea9ac060bb05df4e9e68"
+  integrity sha512-XIMURmXFDdZYyKsETyopBloqndJKk7ohtE6ujO/o//O5/Op9A15deh8yais39A5j8uSyHEsvBwdGtGm4co7rnw==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/plugin-blit" "1.1.4"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-cover@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-1.1.4.tgz#3b270c4526e24652f772f8a1aa940dc88118e24a"
+  integrity sha512-VxaQhcCYeJRQcNXrLbOUcn/KAVmVgTNexLucjUvm8uSWCyDfO+HJ6okL/qyux2h05asyCcFXz7zeNswEqjePSg==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/plugin-crop" "1.1.4"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/types" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-crop@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-1.1.4.tgz#4d6729532f9229b6e54ccf45a72c147872ab3f9f"
+  integrity sha512-RejGsKWoG0ji2YwvlKKIEnCxZFGHZ7dwcmFIHiWOZs+fhT+HoHbDy9QEIT+MmgWeeIVm0B3MrA/oBMLEwaJbzg==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-displace@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-1.1.4.tgz#63b536a9f550cb03d233970478640fa5973cfae3"
+  integrity sha512-X+yMdj4DZu/p5YZ9Go7k3HfkC2XTw/5am/p9Fn2xoOJwGa+LIDCAAJ/xuVw+qJMuyvhjIa5rck39yePvBumLyg==
+  dependencies:
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-dither@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-1.1.4.tgz#96ae3a59b66f5f9ee9b7dc0a4e7d572a6c38e2a0"
+  integrity sha512-GvyRicPVpxlyol304C4v3T/OpJiuER4ibIhMTAKPx393ByvRgoo1r69nVRfEbmYoKAlwxEA+DISoDgBWYFq4yw==
+  dependencies:
+    "@jimp/types" "1.1.4"
+
+"@jimp/plugin-fisheye@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-1.1.4.tgz#1f2b611e939c9546c5d9d9abe416d1e10407d88a"
+  integrity sha512-mX2yUzndi9esrcEIv9wQIChTLhehZ0SNjRY81BMS9vxa3poxrLyNDq2GHSVmWcehSpkMmATVYKQy6AcLcfynSA==
+  dependencies:
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-flip@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-1.1.4.tgz#ef8c6734a16b4385cb70bd8b84a2dbd14941f295"
+  integrity sha512-dhhM1tY21QqnaSvgh9Evpq09+IgAfeZJwLTTJnoWN5j+suE/+K9fIlMSx8XKbv3hBvOBVPHUrq8xoiTLHryr5w==
+  dependencies:
+    "@jimp/types" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-hash@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-hash/-/plugin-hash-1.1.4.tgz#3af4a37bf31fbfb15a3263245efd07da10b7981f"
+  integrity sha512-nmjnQwxcNVTq7qlkUuX5OzdwO/F+mnE2QT+TZ6VEAphPT8Iu7ZaJfYd3wxAbon9UrbxZULFnhiEOs6yE2dWYaw==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/js-bmp" "1.1.4"
+    "@jimp/js-jpeg" "1.1.4"
+    "@jimp/js-png" "1.1.4"
+    "@jimp/js-tiff" "1.1.4"
+    "@jimp/plugin-color" "1.1.4"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    any-base "^1.1.0"
+
+"@jimp/plugin-mask@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-1.1.4.tgz#6ad63a0f8c3c5b99439ba79e2a48bb00bfbc7e36"
+  integrity sha512-86Duc7r9kdv26oaApwHtFULMHxLCBoBdeAA/PyH1RRsZy2eu+M8hGFYf99vJlLBgJslyToGjxIgDE1nsuB1uHA==
+  dependencies:
+    "@jimp/types" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-print@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-1.1.4.tgz#dc3c4c9130cda0c3571b3c352546f0d69aae4046"
+  integrity sha512-EMkakkwi1qrcmQ4nexD2w5ZEUxgesFd7lcYR7DBCXKBYabvC9RDHXaWTxzeFa0VWy3/ZnpoJJ3Qq8I8WqHvjmw==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/js-jpeg" "1.1.4"
+    "@jimp/js-png" "1.1.4"
+    "@jimp/plugin-blit" "1.1.4"
+    "@jimp/types" "1.1.4"
+    parse-bmfont-ascii "^1.0.6"
+    parse-bmfont-binary "^1.0.6"
+    parse-bmfont-xml "^1.1.6"
+    zod "^3.23.8"
+
+"@jimp/plugin-quantize@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-quantize/-/plugin-quantize-1.1.4.tgz#a883eeef1f6144354bb868921895a89ca40d557f"
+  integrity sha512-+DuC7ZXjNGFoZtsYU2MxXz06E48AIBNg1G/2sq2bXu+PJEU0xvQctEvJEdl+xhRo4sQNQpwOzCZtBvY49VqfNA==
+  dependencies:
+    image-q "^4.0.0"
+    zod "^3.23.8"
+
+"@jimp/plugin-resize@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-1.1.4.tgz#2107bda637dfa05e01aab341b2ba96cbb8b78835"
+  integrity sha512-+KY0A5agiOpV60cfs28DZCl3t/8QRVO9kyzrdDqCLkhc/7g2YYrdyhkJZYUq5GBJirkpGGzXZQR2t+g7Sc9dEQ==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/types" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-rotate@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-1.1.4.tgz#2c1c963ba5e522a81514fe3870e1c6c823113a47"
+  integrity sha512-9yRcL5cFcA88kVDt9nco1BUipAjw6uto6AOJi2Bp3FFfdJ84F3rU6Jvcbl4aDyywoJ+J93gKXRo/GAEPk8xpvg==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/plugin-crop" "1.1.4"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/plugin-threshold@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-1.1.4.tgz#6625758b6392124d284dbed07156c63fb155b874"
+  integrity sha512-d2uTz8iNuW3ogjH/OVEmPtiSzIpr99Dk5mTOXmnojSqT/5Ufs2ngJf3JQ2wIwOyb6pXph+xRqseQjhf1EUXasA==
+  dependencies:
+    "@jimp/core" "1.1.4"
+    "@jimp/plugin-color" "1.1.4"
+    "@jimp/plugin-hash" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
+    zod "^3.23.8"
+
+"@jimp/types@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-1.1.4.tgz#b46881102fc6d353451e18ccf06a3dab4dbfb0d5"
+  integrity sha512-Ck7ShGOeRjN1E2NH9YQs1UDD8Sh54XzSjLhbNq3gtbXrDgSAUH2e47K1VLoUHVBdq7COTDlDCBPOFb/kgQz0zQ==
+  dependencies:
+    zod "^3.23.8"
+
+"@jimp/utils@1.1.4":
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-1.1.4.tgz#5af44854cc74be08253e6ed7dee82a9058765406"
+  integrity sha512-mkfoOtC3/vVibCQz3MQkbt8FMtuJI56ekcoDBJqcY9Pjyyd7nbOhfWhiLiLYIfcrslJX8pLEq4ewR2PTNRXTfA==
+  dependencies:
+    "@jimp/types" "1.1.4"
     tinycolor2 "^1.6.0"
 
-"@jimp/plugin-contain@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-contain/-/plugin-contain-0.22.12.tgz#ed5ed9af3d4afd02a7568ff8d60603cff340e3f3"
-  integrity sha512-Eo3DmfixJw3N79lWk8q/0SDYbqmKt1xSTJ69yy8XLYQj9svoBbyRpSnHR+n9hOw5pKXytHwUW6nU4u1wegHNoQ==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-cover@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-cover/-/plugin-cover-0.22.12.tgz#4abbfabe4c78c71d8d46e707c35a65dc55f08afd"
-  integrity sha512-z0w/1xH/v/knZkpTNx+E8a7fnasQ2wHG5ze6y5oL2dhH1UufNua8gLQXlv8/W56+4nJ1brhSd233HBJCo01BXA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-crop@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-crop/-/plugin-crop-0.22.12.tgz#e28329a9f285071442998560b040048d2ef5c32e"
-  integrity sha512-FNuUN0OVzRCozx8XSgP9MyLGMxNHHJMFt+LJuFjn1mu3k0VQxrzqbN06yIl46TVejhyAhcq5gLzqmSCHvlcBVw==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-displace@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-displace/-/plugin-displace-0.22.12.tgz#2e4b2b989a23da6687c49f2f628e1e6d686ec9b6"
-  integrity sha512-qpRM8JRicxfK6aPPqKZA6+GzBwUIitiHaZw0QrJ64Ygd3+AsTc7BXr+37k2x7QcyCvmKXY4haUrSIsBug4S3CA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-dither@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-dither/-/plugin-dither-0.22.12.tgz#3cc5f3a58dbf85653c4e532d31a756a4fc8cabf7"
-  integrity sha512-jYgGdSdSKl1UUEanX8A85v4+QUm+PE8vHFwlamaKk89s+PXQe7eVE3eNeSZX4inCq63EHL7cX580dMqkoC3ZLw==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-fisheye@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-fisheye/-/plugin-fisheye-0.22.12.tgz#77aef2f3ec59c0bafbd2dbc94b89eab60ce05a3e"
-  integrity sha512-LGuUTsFg+fOp6KBKrmLkX4LfyCy8IIsROwoUvsUPKzutSqMJnsm3JGDW2eOmWIS/jJpPaeaishjlxvczjgII+Q==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-flip@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-flip/-/plugin-flip-0.22.12.tgz#7e2154592da01afcf165a3f9d1d25032aa8d8c57"
-  integrity sha512-m251Rop7GN8W0Yo/rF9LWk6kNclngyjIJs/VXHToGQ6EGveOSTSQaX2Isi9f9lCDLxt+inBIb7nlaLLxnvHX8Q==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-gaussian@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-gaussian/-/plugin-gaussian-0.22.12.tgz#49a40950cedbbea6c84b3a6bccc45365fe78d6b7"
-  integrity sha512-sBfbzoOmJ6FczfG2PquiK84NtVGeScw97JsCC3rpQv1PHVWyW+uqWFF53+n3c8Y0P2HWlUjflEla2h/vWShvhg==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-invert@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-invert/-/plugin-invert-0.22.12.tgz#c569e85c1f59911a9a33ef36a51c9cf26065078e"
-  integrity sha512-N+6rwxdB+7OCR6PYijaA/iizXXodpxOGvT/smd/lxeXsZ/empHmFFFJ/FaXcYh19Tm04dGDaXcNF/dN5nm6+xQ==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-mask@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-mask/-/plugin-mask-0.22.12.tgz#0ac0d9c282f403255b126556521f90fb8e2997f0"
-  integrity sha512-4AWZg+DomtpUA099jRV8IEZUfn1wLv6+nem4NRJC7L/82vxzLCgXKTxvNvBcNmJjT9yS1LAAmiJGdWKXG63/NA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-normalize@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-normalize/-/plugin-normalize-0.22.12.tgz#6c44d216f2489cf9b0e0f1e03aa5dfb97f198c53"
-  integrity sha512-0So0rexQivnWgnhacX4cfkM2223YdExnJTTy6d06WbkfZk5alHUx8MM3yEzwoCN0ErO7oyqEWRnEkGC+As1FtA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-print@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-print/-/plugin-print-0.22.12.tgz#6a49020947a9bf21a5a28324425670a25587ca65"
-  integrity sha512-c7TnhHlxm87DJeSnwr/XOLjJU/whoiKYY7r21SbuJ5nuH+7a78EW1teOaj5gEr2wYEd7QtkFqGlmyGXY/YclyQ==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-    load-bmfont "^1.4.1"
-
-"@jimp/plugin-resize@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-resize/-/plugin-resize-0.22.12.tgz#f92acbf73beb97dd1fe93b166ef367a323b81e81"
-  integrity sha512-3NyTPlPbTnGKDIbaBgQ3HbE6wXbAlFfxHVERmrbqAi8R3r6fQPxpCauA8UVDnieg5eo04D0T8nnnNIX//i/sXg==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-rotate@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-rotate/-/plugin-rotate-0.22.12.tgz#2235d45aeb4914ff70d99e95750a6d9de45a0d9f"
-  integrity sha512-9YNEt7BPAFfTls2FGfKBVgwwLUuKqy+E8bDGGEsOqHtbuhbshVGxN2WMZaD4gh5IDWvR+emmmPPWGgaYNYt1gA==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-scale@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-scale/-/plugin-scale-0.22.12.tgz#91f1ec3d114ff44092b946a16e66b14d918e32ed"
-  integrity sha512-dghs92qM6MhHj0HrV2qAwKPMklQtjNpoYgAB94ysYpsXslhRTiPisueSIELRwZGEr0J0VUxpUY7HgJwlSIgGZw==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-shadow@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-shadow/-/plugin-shadow-0.22.12.tgz#52e3a1d55f61ddfcfb3265544f8d23b887a667b8"
-  integrity sha512-FX8mTJuCt7/3zXVoeD/qHlm4YH2bVqBuWQHXSuBK054e7wFRnRnbSLPUqAwSeYP3lWqpuQzJtgiiBxV3+WWwTg==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugin-threshold@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugin-threshold/-/plugin-threshold-0.22.12.tgz#1efe20e154bf3a1fc4a5cc016092dbacaa60c958"
-  integrity sha512-4x5GrQr1a/9L0paBC/MZZJjjgjxLYrqSmWd+e+QfAEPvmRxdRoQ5uKEuNgXnm9/weHQBTnQBQsOY2iFja+XGAw==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-
-"@jimp/plugins@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/plugins/-/plugins-0.22.12.tgz#45a3b96d2d24cec21d4f8b79d1cfcec6fcb2f1d4"
-  integrity sha512-yBJ8vQrDkBbTgQZLty9k4+KtUQdRjsIDJSPjuI21YdVeqZxYywifHl4/XWILoTZsjTUASQcGoH0TuC0N7xm3ww==
-  dependencies:
-    "@jimp/plugin-blit" "^0.22.12"
-    "@jimp/plugin-blur" "^0.22.12"
-    "@jimp/plugin-circle" "^0.22.12"
-    "@jimp/plugin-color" "^0.22.12"
-    "@jimp/plugin-contain" "^0.22.12"
-    "@jimp/plugin-cover" "^0.22.12"
-    "@jimp/plugin-crop" "^0.22.12"
-    "@jimp/plugin-displace" "^0.22.12"
-    "@jimp/plugin-dither" "^0.22.12"
-    "@jimp/plugin-fisheye" "^0.22.12"
-    "@jimp/plugin-flip" "^0.22.12"
-    "@jimp/plugin-gaussian" "^0.22.12"
-    "@jimp/plugin-invert" "^0.22.12"
-    "@jimp/plugin-mask" "^0.22.12"
-    "@jimp/plugin-normalize" "^0.22.12"
-    "@jimp/plugin-print" "^0.22.12"
-    "@jimp/plugin-resize" "^0.22.12"
-    "@jimp/plugin-rotate" "^0.22.12"
-    "@jimp/plugin-scale" "^0.22.12"
-    "@jimp/plugin-shadow" "^0.22.12"
-    "@jimp/plugin-threshold" "^0.22.12"
-    timm "^1.6.1"
-
-"@jimp/png@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/png/-/png-0.22.12.tgz#e033586caf38d9c9d33808e92eb87c4d7f0aa1eb"
-  integrity sha512-Mrp6dr3UTn+aLK8ty/dSKELz+Otdz1v4aAXzV5q53UDD2rbB5joKVJ/ChY310B+eRzNxIovbUF1KVrUsYdE8Hg==
-  dependencies:
-    "@jimp/utils" "^0.22.12"
-    pngjs "^6.0.0"
-
-"@jimp/tiff@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/tiff/-/tiff-0.22.12.tgz#67cac3f2ded6fde3ef631fbf74bea0fa53800123"
-  integrity sha512-E1LtMh4RyJsoCAfAkBRVSYyZDTtLq9p9LUiiYP0vPtXyxX4BiYBUYihTLSBlCQg5nF2e4OpQg7SPrLdJ66u7jg==
-  dependencies:
-    utif2 "^4.0.1"
-
-"@jimp/types@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/types/-/types-0.22.12.tgz#6f83761ba171cb8cd5998fa66a5cbfb0b22d3d8c"
-  integrity sha512-wwKYzRdElE1MBXFREvCto5s699izFHNVvALUv79GXNbsOVqlwlOxlWJ8DuyOGIXoLP4JW/m30YyuTtfUJgMRMA==
-  dependencies:
-    "@jimp/bmp" "^0.22.12"
-    "@jimp/gif" "^0.22.12"
-    "@jimp/jpeg" "^0.22.12"
-    "@jimp/png" "^0.22.12"
-    "@jimp/tiff" "^0.22.12"
-    timm "^1.6.1"
-
-"@jimp/utils@^0.22.12":
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/@jimp/utils/-/utils-0.22.12.tgz#8ffaed8f2dc2962539ccaf14727ac60793c7a537"
-  integrity sha512-yJ5cWUknGnilBq97ZXOyOS0HhsHOyAyjHwYfHxGbSyMTohgQI6sVyE8KPgDwH8HHW/nMKXk8TrSwAE71zt716Q==
-  dependencies:
-    regenerator-runtime "^0.13.3"
-
-"@jridgewell/gen-mapping@^0.3.2", "@jridgewell/gen-mapping@^0.3.5":
+"@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
   integrity sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==
@@ -3437,7 +3325,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -3445,7 +3333,7 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
-"@js-joda/core@^5.5.3":
+"@js-joda/core@^5.6.1":
   version "5.6.3"
   resolved "https://registry.yarnpkg.com/@js-joda/core/-/core-5.6.3.tgz#41ae1c07de1ebe0f6dde1abcbc9700a09b9c6056"
   integrity sha512-T1rRxzdqkEXcou0ZprN1q9yDRlvzCPLqmlNt5IIsGBzoEVgLCCYrKEwc84+TvsXuAc95VAZwtWD2zVsKPY4bcA==
@@ -3460,24 +3348,21 @@
   resolved "https://registry.yarnpkg.com/@jsdevtools/ono/-/ono-7.1.3.tgz#9df03bbd7c696a5c58885c34aa06da41c8543796"
   integrity sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==
 
-"@koa/cors@^5.0.0":
+"@koa/cors@5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@koa/cors/-/cors-5.0.0.tgz#0029b5f057fa0d0ae0e37dd2c89ece315a0daffd"
   integrity sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==
   dependencies:
     vary "^1.1.2"
 
-"@koa/router@8.0.8":
-  version "8.0.8"
-  resolved "https://registry.yarnpkg.com/@koa/router/-/router-8.0.8.tgz#95f32d11373d03d89dcb63fabe9ac6f471095236"
-  integrity sha512-FnT93N4NUehnXr+juupDmG2yfi0JnWdCmNEuIXpCG4TtG+9xvtrLambBH3RclycopVUOEYAim2lydiNBI7IRVg==
+"@koa/router@13.1.0":
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/@koa/router/-/router-13.1.0.tgz#43f4c554444ea4f4a148a5735a9525c6d16fd1b5"
+  integrity sha512-mNVu1nvkpSd8Q8gMebGbCkDWJ51ODetrFvLKYusej+V0ByD4btqHYnPIzTBLXnQMVUlm/oxVwqmWBY3zQfZilw==
   dependencies:
-    debug "^4.1.1"
-    http-errors "^1.7.3"
+    http-errors "^2.0.0"
     koa-compose "^4.1.0"
-    methods "^1.1.2"
-    path-to-regexp "1.x"
-    urijs "^1.19.2"
+    path-to-regexp "^6.3.0"
 
 "@lerna/child-process@7.4.2":
   version "7.4.2"
@@ -3666,14 +3551,6 @@
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/fs@^1.0.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
-  integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
-  dependencies:
-    "@gar/promisify" "^1.0.1"
-    semver "^7.3.5"
-
 "@npmcli/fs@^2.1.0":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-2.1.2.tgz#a9e2541a4a2fec2e69c29b35e6060973da79b865"
@@ -3711,14 +3588,6 @@
     npm-bundled "^3.0.0"
     npm-normalize-package-bin "^3.0.0"
 
-"@npmcli/move-file@^1.0.1":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
-  integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
-  dependencies:
-    mkdirp "^1.0.4"
-    rimraf "^3.0.2"
-
 "@npmcli/move-file@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-2.0.1.tgz#26f6bdc379d87f75e55739bab89db525b06100e4"
@@ -3953,10 +3822,15 @@
   dependencies:
     "@octokit/openapi-types" "^18.0.0"
 
-"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.0.1":
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.7.0.tgz#b139c81999c23e3c8d3c0a7234480e945920fc40"
-  integrity sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==
+"@opentelemetry/api@>=1.0.0 <1.9.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.8.0.tgz#5aa7abb48f23f693068ed2999ae627d2f7d902ec"
+  integrity sha512-I/s6F7yKUDdtMsoBWXJe8Qz40Tui5vsuKCWJEWVL+5q9sSWRzzx6v2KeNsOBEwd94j0eWkpWCH4yB6rZg9Mf0w==
+
+"@opentelemetry/api@^1.0.1":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.9.0.tgz#d03eba68273dc0f7509e2a3d5cba21eae10379fe"
+  integrity sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==
 
 "@opentelemetry/core@^1.14.0":
   version "1.19.0"
@@ -4070,26 +3944,6 @@
   resolved "https://registry.yarnpkg.com/@redis/time-series/-/time-series-1.0.4.tgz#af85eb080f6934580e4d3b58046026b6c2b18717"
   integrity sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==
 
-"@rollup/plugin-alias@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-alias/-/plugin-alias-5.1.0.tgz#99a94accc4ff9a3483be5baeedd5d7da3b597e93"
-  integrity sha512-lpA3RZ9PdIG7qqhEfv79tBffNaoDuukFDrmhLqg9ifv99u/ehn+lOg30x2zmhf8AQqQUZaMk/B9fZraQ6/acDQ==
-  dependencies:
-    slash "^4.0.0"
-
-"@rollup/plugin-commonjs@16.0.0", "@rollup/plugin-commonjs@^16.0.0":
-  version "16.0.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-16.0.0.tgz#169004d56cd0f0a1d0f35915d31a036b0efe281f"
-  integrity sha512-LuNyypCP3msCGVQJ7ki8PqYdpjfEkE/xtFa5DqlF+7IBD0JsfMZ87C58heSwIMint58sAUZbt3ITqOmdQv/dXw==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    commondir "^1.0.1"
-    estree-walker "^2.0.1"
-    glob "^7.1.6"
-    is-reference "^1.2.1"
-    magic-string "^0.25.7"
-    resolve "^1.17.0"
-
 "@rollup/plugin-commonjs@^17.1.0":
   version "17.1.0"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-17.1.0.tgz#757ec88737dffa8aa913eb392fade2e45aef2a2d"
@@ -4115,14 +3969,6 @@
     is-reference "1.2.1"
     magic-string "^0.30.3"
 
-"@rollup/plugin-image@^3.0.3":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-image/-/plugin-image-3.0.3.tgz#025b557180bae20f2349ff5130ef2114169feaac"
-  integrity sha512-qXWQwsXpvD4trSb8PeFPFajp8JLpRtqqOeNYRUKnEQNHm7e5UP7fuSRcbjQAJ7wDZBbnJvSdY5ujNBQd9B1iFg==
-  dependencies:
-    "@rollup/pluginutils" "^5.0.1"
-    mini-svg-data-uri "^1.4.4"
-
 "@rollup/plugin-inject@^5.0.4", "@rollup/plugin-inject@^5.0.5":
   version "5.0.5"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-inject/-/plugin-inject-5.0.5.tgz#616f3a73fe075765f91c5bec90176608bed277a3"
@@ -4139,18 +3985,6 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@^11.2.1":
-  version "11.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.1.tgz#82aa59397a29cd4e13248b106e6a4a1880362a60"
-  integrity sha512-yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
-    deepmerge "^4.2.2"
-    is-module "^1.0.0"
-    resolve "^1.19.0"
-
 "@rollup/plugin-node-resolve@^15.2.3":
   version "15.2.3"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-15.2.3.tgz#e5e0b059bd85ca57489492f295ce88c2d4b0daf9"
@@ -4163,15 +3997,7 @@
     is-module "^1.0.0"
     resolve "^1.22.1"
 
-"@rollup/plugin-replace@^2.4.2":
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a"
-  integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg==
-  dependencies:
-    "@rollup/pluginutils" "^3.1.0"
-    magic-string "^0.25.7"
-
-"@rollup/plugin-replace@^5.0.2", "@rollup/plugin-replace@^5.0.3":
+"@rollup/plugin-replace@^5.0.3":
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-5.0.7.tgz#150c9ee9db8031d9e4580a61a0edeaaed3d37687"
   integrity sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==
@@ -4205,14 +4031,6 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
-"@rollup/pluginutils@^4.1.0":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
-  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
-  dependencies:
-    estree-walker "^2.0.1"
-    picomatch "^2.2.2"
-
 "@rollup/pluginutils@^5.0.1":
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-5.0.2.tgz#012b8f53c71e4f6f9cb317e311df1404f56e7a33"
@@ -4302,23 +4120,6 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.21.2.tgz#e4291e3c1bc637083f87936c333cdbcad22af63b"
   integrity sha512-6UUxd0+SKomjdzuAcp+HAmxw1FlGBnl1v2yEPSabtx4lBfdXHDVsW7+lQkgz9cNFJGY3AWR7+V8P5BqkD9L9nA==
 
-"@roxi/routify@2.18.0":
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.0.tgz#8f88bedd936312d0dbe44cbc11ab179b1f938ec2"
-  integrity sha512-MVB50HN+VQWLzfjLplcBjsSBvwOiExKOmht2DuWR3WQ60JxQi9pSejkB06tFVkFKNXz2X5iYtKDqKBTdae/gRg==
-  dependencies:
-    "@roxi/ssr" "^0.2.1"
-    "@types/node" ">=4.2.0 < 13"
-    chalk "^4.0.0"
-    cheap-watch "^1.0.2"
-    commander "^7.1.0"
-    configent "^2.1.4"
-    esm "^3.2.25"
-    fs-extra "^9.0.1"
-    log-symbols "^3.0.0"
-    picomatch "^2.2.2"
-    rollup-pluginutils "^2.8.2"
-
 "@roxi/routify@2.18.12":
   version "2.18.12"
   resolved "https://registry.yarnpkg.com/@roxi/routify/-/routify-2.18.12.tgz#901ca95b96f274ddddaefbf18424557ee1ae3fae"
@@ -4354,22 +4155,14 @@
     koa "^2.13.4"
     node-mocks-http "^1.11.0"
 
-"@shopify/jest-koa-mocks@5.3.0":
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/@shopify/jest-koa-mocks/-/jest-koa-mocks-5.3.0.tgz#0b9b6ce01a7ef945df7272aa08cda559c11b39f5"
-  integrity sha512-Yy9uS298/aWhT/bjfhUAcFRaq7pq7j0ybaI6U/vWQ5IcdWD3E73iqptkw+FNC+Z9cdV9QT8osFd0r0frFNb9Nw==
-  dependencies:
-    koa "^2.13.4"
-    node-mocks-http "^1.11.0"
-
-"@sideway/address@^4.1.3", "@sideway/address@^4.1.5":
+"@sideway/address@^4.1.3":
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.5.tgz#4bc149a0076623ced99ca8208ba780d65a99b9d5"
   integrity sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==
   dependencies:
     "@hapi/hoek" "^9.0.0"
 
-"@sideway/formula@^3.0.0", "@sideway/formula@^3.0.1":
+"@sideway/formula@^3.0.0":
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/@sideway/formula/-/formula-3.0.1.tgz#80fcbcbaf7ce031e0ef2dd29b1bfc7c3f583611f"
   integrity sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==
@@ -4408,11 +4201,6 @@
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
   integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
 
-"@sindresorhus/is@^4.0.0":
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f"
-  integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==
-
 "@sinonjs/commons@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-2.0.0.tgz#fd4ca5b063554307e8327b4564bd56d3b73924a3"
@@ -4427,441 +4215,545 @@
   dependencies:
     "@sinonjs/commons" "^2.0.0"
 
-"@smithy/abort-controller@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-2.0.10.tgz#a6d0d24973ac35b59cc450c34decd68485fbe2c0"
-  integrity "sha1-ptDSSXOsNbWcxFDDTezWhIX74sA= sha512-xn7PnFD3m4rQIG00h1lPuDVnC2QMtTFhzRLX3y56KkgFaCysS7vpNevNBgmNUtmJ4eVFc+66Zucwo2KDLdicOg=="
+"@smithy/abort-controller@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-1.1.0.tgz#2da0d73c504b93ca8bb83bdc8d6b8208d73f418b"
+  integrity sha512-5imgGUlZL4dW4YWdMYAKLmal9ny/tlenM81QZY7xYyb76z9Z/QOg7oM5Ak9HQl8QfFTlGVWwcMXl+54jroRgEQ==
   dependencies:
-    "@smithy/types" "^2.3.4"
+    "@smithy/types" "^1.2.0"
     tslib "^2.5.0"
 
-"@smithy/chunked-blob-reader-native@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-2.0.0.tgz#f6d0eeeb5481026b68b054f45540d924c194d558"
-  integrity "sha1-9tDu61SBAmtosFT0VUDZJMGU1Vg= sha512-HM8V2Rp1y8+1343tkZUKZllFhEQPNmpNdgFAncbTsxkZ18/gqjk23XXv3qGyXWp412f3o43ZZ1UZHVcHrpRnCQ=="
+"@smithy/abort-controller@^3.1.8":
+  version "3.1.8"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-3.1.8.tgz#ce0c10ddb2b39107d70b06bbb8e4f6e368bc551d"
+  integrity sha512-+3DOBcUn5/rVjlxGvUPKc416SExarAQ+Qe0bqk30YSUjbepwpS7QN0cyKUSifvLJhdMZ0WPzPP5ymut0oonrpQ==
   dependencies:
-    "@smithy/util-base64" "^2.0.0"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/chunked-blob-reader-native@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-3.0.1.tgz#39045ed278ee1b6f4c12715c7565678557274c29"
+  integrity sha512-VEYtPvh5rs/xlyqpm5NRnfYLZn+q0SRPELbvBV+C/G7IQ+ouTuo+NKKa3ShG5OaFR8NYVMXls9hPYLTvIKKDrQ==
+  dependencies:
+    "@smithy/util-base64" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/chunked-blob-reader@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-4.0.0.tgz#754099909957fb1986c16eb88afad75919d7129d"
+  integrity sha512-jSqRnZvkT4egkq/7b6/QRCNXmmYVcHwnJldqJ3IhVpQE2atObVJ137xmGeuGFhjFUr8gCEVAOKwSY79OvpbDaQ==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/config-resolver@^3.0.11", "@smithy/config-resolver@^3.0.12":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-3.0.12.tgz#f355f95fcb5ee932a90871a488a4f2128e8ad3ac"
+  integrity sha512-YAJP9UJFZRZ8N+UruTeq78zkdjUHmzsY62J4qKWZ4SXB4QXJ/+680EfXXgkYA2xj77ooMqtUY9m406zGNqwivQ==
+  dependencies:
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-config-provider" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.10"
+    tslib "^2.6.2"
+
+"@smithy/core@^2.5.2", "@smithy/core@^2.5.3":
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-2.5.3.tgz#1d5723f676b0d6ec08c515272f0ac03aa59fac72"
+  integrity sha512-96uW8maifUSmehaeW7uydWn7wBc98NEeNI3zN8vqakGpyCQgzyJaA64Z4FCOUmAdCJkhppd/7SZ798Fo4Xx37g==
+  dependencies:
+    "@smithy/middleware-serde" "^3.0.10"
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-body-length-browser" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.10"
+    "@smithy/util-stream" "^3.3.1"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/credential-provider-imds@^3.2.6", "@smithy/credential-provider-imds@^3.2.7":
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.7.tgz#6eedf87ba0238723ec46d8ce0f18e276685a702d"
+  integrity sha512-cEfbau+rrWF8ylkmmVAObOmjbTIzKyUC5TkBL58SbLywD0RCBC4JAUKbmtSm2w5KUJNRPGgpGFMvE2FKnuNlWQ==
+  dependencies:
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/property-provider" "^3.1.10"
+    "@smithy/types" "^3.7.1"
+    "@smithy/url-parser" "^3.0.10"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-codec@^3.1.9":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-3.1.9.tgz#4271354e75e57d30771fca307da403896c657430"
+  integrity sha512-F574nX0hhlNOjBnP+noLtsPFqXnWh2L0+nZKCwcu7P7J8k+k+rdIDs+RMnrMwrzhUE4mwMgyN0cYnEn0G8yrnQ==
+  dependencies:
+    "@aws-crypto/crc32" "5.2.0"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-hex-encoding" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-browser@^3.0.12":
+  version "3.0.13"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.13.tgz#191dcf9181e7ab0914ec43d51518d471b9d466ae"
+  integrity sha512-Nee9m+97o9Qj6/XeLz2g2vANS2SZgAxV4rDBMKGHvFJHU/xz88x2RwCkwsvEwYjSX4BV1NG1JXmxEaDUzZTAtw==
+  dependencies:
+    "@smithy/eventstream-serde-universal" "^3.0.12"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-config-resolver@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.10.tgz#5c0b2ae0bb8e11cfa77851098e46f7350047ec8d"
+  integrity sha512-K1M0x7P7qbBUKB0UWIL5KOcyi6zqV5mPJoL0/o01HPJr0CSq3A9FYuJC6e11EX6hR8QTIR++DBiGrYveOu6trw==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-node@^3.0.11":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.12.tgz#7312383e821b5807abf2fe12316c2a8967d022f0"
+  integrity sha512-kiZymxXvZ4tnuYsPSMUHe+MMfc4FTeFWJIc0Q5wygJoUQM4rVHNghvd48y7ppuulNMbuYt95ah71pYc2+o4JOA==
+  dependencies:
+    "@smithy/eventstream-serde-universal" "^3.0.12"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/eventstream-serde-universal@^3.0.12":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.12.tgz#803d7beb29a3de4a64e91af97331a4654741c35f"
+  integrity sha512-1i8ifhLJrOZ+pEifTlF0EfZzMLUGQggYQ6WmZ4d5g77zEKf7oZ0kvh1yKWHPjofvOwqrkwRDVuxuYC8wVd662A==
+  dependencies:
+    "@smithy/eventstream-codec" "^3.1.9"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/fetch-http-handler@^4.1.0", "@smithy/fetch-http-handler@^4.1.1":
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-4.1.1.tgz#cead80762af4cdea11e7eeb627ea1c4835265dfa"
+  integrity sha512-bH7QW0+JdX0bPBadXt8GwMof/jz0H28I84hU1Uet9ISpzUqXqRQ3fEZJ+ANPOhzSEczYvANNl3uDQDYArSFDtA==
+  dependencies:
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/querystring-builder" "^3.0.10"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-base64" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/hash-blob-browser@^3.1.8":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.9.tgz#1f2c3ef6afbb0ce3e58a0129753850bb9267aae8"
+  integrity sha512-wOu78omaUuW5DE+PVWXiRKWRZLecARyP3xcq5SmkXUw9+utgN8HnSnBfrjL2B/4ZxgqPjaAJQkC/+JHf1ITVaQ==
+  dependencies:
+    "@smithy/chunked-blob-reader" "^4.0.0"
+    "@smithy/chunked-blob-reader-native" "^3.0.1"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/hash-node@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-3.0.10.tgz#93c857b4bff3a48884886440fd9772924887e592"
+  integrity sha512-3zWGWCHI+FlJ5WJwx73Mw2llYR8aflVyZN5JhoqLxbdPZi6UyKSdCeXAWJw9ja22m6S6Tzz1KZ+kAaSwvydi0g==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-buffer-from" "^3.0.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/hash-stream-node@^3.1.8":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-3.1.9.tgz#97eb416811b7e7b9d036f0271588151b619759e9"
+  integrity sha512-3XfHBjSP3oDWxLmlxnt+F+FqXpL3WlXs+XXaB6bV9Wo8BBu87fK1dSEsyH7Z4ZHRmwZ4g9lFMdf08m9hoX1iRA==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/invalid-dependency@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-3.0.10.tgz#8616dee555916c24dec3e33b1e046c525efbfee3"
+  integrity sha512-Lp2L65vFi+cj0vFMu2obpPW69DU+6O5g3086lmI4XcnRCG8PxvpWC7XyaVwJCxsZFzueHjXnrOH/E0pl0zikfA==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/is-array-buffer@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz#f84f0d9f9a36601a9ca9381688bd1b726fd39111"
+  integrity sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/is-array-buffer@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-3.0.0.tgz#9a95c2d46b8768946a9eec7f935feaddcffa5e7a"
+  integrity sha512-+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/md5-js@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-3.0.10.tgz#52ab927cf03cd1d24fed82d8ba936faf5632436e"
+  integrity sha512-m3bv6dApflt3fS2Y1PyWPUtRP7iuBlvikEOGwu0HsCZ0vE7zcIX+dBoh3e+31/rddagw8nj92j0kJg2TfV+SJA==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-content-length@^3.0.11":
+  version "3.0.12"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-3.0.12.tgz#3b248ed1e8f1e0ae67171abb8eae9da7ab7ca613"
+  integrity sha512-1mDEXqzM20yywaMDuf5o9ue8OkJ373lSPbaSjyEvkWdqELhFMyNNgKGWL/rCSf4KME8B+HlHKuR8u9kRj8HzEQ==
+  dependencies:
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/middleware-endpoint@^3.2.2", "@smithy/middleware-endpoint@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-3.2.3.tgz#7dd3df0052fc55891522631a7751e613b6efd68a"
+  integrity sha512-Hdl9296i/EMptaX7agrSzJZDiz5Y8XPUeBbctTmMtnCguGpqfU3jVsTUan0VLaOhsnquqWLL8Bl5HrlbVGT1og==
+  dependencies:
+    "@smithy/core" "^2.5.3"
+    "@smithy/middleware-serde" "^3.0.10"
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/shared-ini-file-loader" "^3.1.11"
+    "@smithy/types" "^3.7.1"
+    "@smithy/url-parser" "^3.0.10"
+    "@smithy/util-middleware" "^3.0.10"
+    tslib "^2.6.2"
+
+"@smithy/middleware-retry@^3.0.26":
+  version "3.0.27"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-3.0.27.tgz#2e4dda420178835cd2d416479505d313b601ba21"
+  integrity sha512-H3J/PjJpLL7Tt+fxDKiOD25sMc94YetlQhCnYeNmina2LZscAdu0ZEZPas/kwePHABaEtqp7hqa5S4UJgMs1Tg==
+  dependencies:
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/service-error-classification" "^3.0.10"
+    "@smithy/smithy-client" "^3.4.4"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-middleware" "^3.0.10"
+    "@smithy/util-retry" "^3.0.10"
+    tslib "^2.6.2"
+    uuid "^9.0.1"
+
+"@smithy/middleware-serde@^3.0.10", "@smithy/middleware-serde@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-3.0.10.tgz#5f6c0b57b10089a21d355bd95e9b7d40378454d7"
+  integrity sha512-MnAuhh+dD14F428ubSJuRnmRsfOpxSzvRhaGVTvd/lrUDE3kxzCCmH8lnVTvoNQnV2BbJ4c15QwZ3UdQBtFNZA==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^3.0.10", "@smithy/middleware-stack@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-3.0.10.tgz#73e2fde5d151440844161773a17ee13375502baf"
+  integrity sha512-grCHyoiARDBBGPyw2BeicpjgpsDFWZZxptbVKb3CRd/ZA15F/T6rZjCCuBUjJwdck1nwUuIxYtsS4H9DDpbP5w==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/node-config-provider@^3.1.10", "@smithy/node-config-provider@^3.1.11":
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-3.1.11.tgz#95feba85a5cb3de3fe9adfff1060b35fd556d023"
+  integrity sha512-URq3gT3RpDikh/8MBJUB+QGZzfS7Bm6TQTqoh4CqE8NBuyPkWa5eUXj0XFcFfeZVgg3WMh1u19iaXn8FvvXxZw==
+  dependencies:
+    "@smithy/property-provider" "^3.1.10"
+    "@smithy/shared-ini-file-loader" "^3.1.11"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/node-http-handler@^1.0.2":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-1.1.0.tgz#887cee930b520e08043c9f41e463f8d8f5dae127"
+  integrity sha512-d3kRriEgaIiGXLziAM8bjnaLn1fthCJeTLZIwEIpzQqe6yPX0a+yQoLCTyjb2fvdLwkMoG4p7THIIB5cj5lkbg==
+  dependencies:
+    "@smithy/abort-controller" "^1.1.0"
+    "@smithy/protocol-http" "^1.2.0"
+    "@smithy/querystring-builder" "^1.1.0"
+    "@smithy/types" "^1.2.0"
     tslib "^2.5.0"
 
-"@smithy/chunked-blob-reader@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/chunked-blob-reader/-/chunked-blob-reader-2.0.0.tgz#c44fe2c780eaf77f9e5381d982ac99a880cce51b"
-  integrity "sha1-xE/ix4Dq93+eU4HZgqyZqIDM5Rs= sha512-k+J4GHJsMSAIQPChGBrjEmGS+WbPonCXesoqP9fynIqjn7rdOThdH8FAeCmokP9mxTYKQAKoHCLPzNlm6gh7Wg=="
+"@smithy/node-http-handler@^3.3.0", "@smithy/node-http-handler@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-3.3.1.tgz#788fc1c22c21a0cf982f4025ccf9f64217f3164f"
+  integrity sha512-fr+UAOMGWh6bn4YSEezBCpJn9Ukp9oR4D32sCjCo7U81evE11YePOQ58ogzyfgmjIO79YeOdfXXqr0jyhPQeMg==
+  dependencies:
+    "@smithy/abort-controller" "^3.1.8"
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/querystring-builder" "^3.0.10"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/property-provider@^3.1.10", "@smithy/property-provider@^3.1.9":
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-3.1.10.tgz#ae00447c1060c194c3e1b9475f7c8548a70f8486"
+  integrity sha512-n1MJZGTorTH2DvyTVj+3wXnd4CzjJxyXeOgnTlgNVFxaaMeT4OteEp4QrzF8p9ee2yg42nvyVK6R/awLCakjeQ==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/protocol-http@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-1.2.0.tgz#a554e4dabb14508f0bc2cdef9c3710e2b294be04"
+  integrity sha512-GfGfruksi3nXdFok5RhgtOnWe5f6BndzYfmEXISD+5gAGdayFGpjWu5pIqIweTudMtse20bGbc+7MFZXT1Tb8Q==
+  dependencies:
+    "@smithy/types" "^1.2.0"
+    tslib "^2.5.0"
+
+"@smithy/protocol-http@^4.1.6", "@smithy/protocol-http@^4.1.7":
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-4.1.7.tgz#5c67e62beb5deacdb94f2127f9a344bdf1b2ed6e"
+  integrity sha512-FP2LepWD0eJeOTm0SjssPcgqAlDFzOmRXqXmGhfIM52G7Lrox/pcpQf6RP4F21k0+O12zaqQt5fCDOeBtqY6Cg==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/querystring-builder@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-1.1.0.tgz#de6306104640ade34e59be33949db6cc64aa9d7f"
+  integrity sha512-gDEi4LxIGLbdfjrjiY45QNbuDmpkwh9DX4xzrR2AzjjXpxwGyfSpbJaYhXARw9p17VH0h9UewnNQXNwaQyYMDA==
+  dependencies:
+    "@smithy/types" "^1.2.0"
+    "@smithy/util-uri-escape" "^1.1.0"
+    tslib "^2.5.0"
+
+"@smithy/querystring-builder@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-3.0.10.tgz#db8773af85ee3977c82b8e35a5cdd178c621306d"
+  integrity sha512-nT9CQF3EIJtIUepXQuBFb8dxJi3WVZS3XfuDksxSCSn+/CzZowRLdhDn+2acbBv8R6eaJqPupoI/aRFIImNVPQ==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-uri-escape" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-parser@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-3.0.10.tgz#62db744a1ed2cf90f4c08d2c73d365e033b4a11c"
+  integrity sha512-Oa0XDcpo9SmjhiDD9ua2UyM3uU01ZTuIrNdZvzwUTykW1PM8o2yJvMh1Do1rY5sUQg4NDV70dMi0JhDx4GyxuQ==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/service-error-classification@^3.0.10":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-3.0.10.tgz#941c549daf0e9abb84d3def1d9e1e3f0f74f5ba6"
+  integrity sha512-zHe642KCqDxXLuhs6xmHVgRwy078RfqxP2wRDpIyiF8EmsWXptMwnMwbVa50lw+WOGNrYm9zbaEg0oDe3PTtvQ==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+
+"@smithy/shared-ini-file-loader@^3.1.10", "@smithy/shared-ini-file-loader@^3.1.11":
+  version "3.1.11"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.11.tgz#0b4f98c4a66480956fbbefc4627c5dc09d891aea"
+  integrity sha512-AUdrIZHFtUgmfSN4Gq9nHu3IkHMa1YDcN+s061Nfm+6pQ0mJy85YQDB0tZBCmls0Vuj22pLwDPmL92+Hvfwwlg==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/signature-v4@^4.2.2":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-4.2.3.tgz#abbca5e5fe9158422b3125b2956791a325a27f22"
+  integrity sha512-pPSQQ2v2vu9vc8iew7sszLd0O09I5TRc5zhY71KA+Ao0xYazIG+uLeHbTJfIWGO3BGVLiXjUr3EEeCcEQLjpWQ==
+  dependencies:
+    "@smithy/is-array-buffer" "^3.0.0"
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-hex-encoding" "^3.0.0"
+    "@smithy/util-middleware" "^3.0.10"
+    "@smithy/util-uri-escape" "^3.0.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/smithy-client@^3.4.3", "@smithy/smithy-client@^3.4.4":
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-3.4.4.tgz#460870dc97d945fa2f390890359cf09d01131e0f"
+  integrity sha512-dPGoJuSZqvirBq+yROapBcHHvFjChoAQT8YPWJ820aPHHiowBlB3RL1Q4kPT1hx0qKgJuf+HhyzKi5Gbof4fNA==
+  dependencies:
+    "@smithy/core" "^2.5.3"
+    "@smithy/middleware-endpoint" "^3.2.3"
+    "@smithy/middleware-stack" "^3.0.10"
+    "@smithy/protocol-http" "^4.1.7"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-stream" "^3.3.1"
+    tslib "^2.6.2"
+
+"@smithy/types@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-1.2.0.tgz#9dc65767b0ee3d6681704fcc67665d6fc9b6a34e"
+  integrity sha512-z1r00TvBqF3dh4aHhya7nz1HhvCg4TRmw51fjMrh5do3h+ngSstt/yKlNbHeb9QxJmFbmN8KEVSWgb1bRvfEoA==
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/config-resolver@^2.0.10", "@smithy/config-resolver@^2.0.11":
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-2.0.11.tgz#20c4711b4e80f94527ee9e4e092cf024471bb09d"
-  integrity "sha1-IMRxG06A+UUn7p5OCSzwJEcbsJ0= sha512-q97FnlUmbai1c4JlQJgLVBsvSxgV/7Nvg/JK76E1nRq/U5UM56Eqo3dn2fY7JibqgJLg4LPsGdwtIyqyOk35CQ=="
+"@smithy/types@^3.7.0", "@smithy/types@^3.7.1":
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-3.7.1.tgz#4af54c4e28351e9101996785a33f2fdbf93debe7"
+  integrity sha512-XKLcLXZY7sUQgvvWyeaL/qwNPp6V3dWcUjqrQKjSb+tzYiCy340R/c64LV5j+Tnb2GhmunEX0eou+L+m2hJNYA==
   dependencies:
-    "@smithy/node-config-provider" "^2.0.13"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-config-provider" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.3"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^2.0.0", "@smithy/credential-provider-imds@^2.0.13":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-2.0.13.tgz#9904912bc236d25d870add10b6eb138570bf5732"
-  integrity "sha1-mQSRK8I20l2HCt0QtusThXC/VzI= sha512-/xe3wNoC4j+BeTemH9t2gSKLBfyZmk8LXB2pQm/TOEYi+QhBgT+PSolNDfNAhrR68eggNE17uOimsrnwSkCt4w=="
+"@smithy/url-parser@^3.0.10", "@smithy/url-parser@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-3.0.10.tgz#f389985a79766cff4a99af14979f01a17ce318da"
+  integrity sha512-j90NUalTSBR2NaZTuruEgavSdh8MLirf58LoGSk4AtQfyIymogIhgnGUU2Mga2bkMkpSoC9gxb74xBXL5afKAQ==
   dependencies:
-    "@smithy/node-config-provider" "^2.0.13"
-    "@smithy/property-provider" "^2.0.11"
-    "@smithy/types" "^2.3.4"
-    "@smithy/url-parser" "^2.0.10"
-    tslib "^2.5.0"
+    "@smithy/querystring-parser" "^3.0.10"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
 
-"@smithy/eventstream-codec@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-codec/-/eventstream-codec-2.0.10.tgz#dbd46d0ed13abc61b1f08ab249f3097602752933"
-  integrity "sha1-29RtDtE6vGGx8IqySfMJdgJ1KTM= sha512-3SSDgX2nIsFwif6m+I4+ar4KDcZX463Noes8ekBgQHitULiWvaDZX8XqPaRQSQ4bl1vbeVXHklJfv66MnVO+lw=="
+"@smithy/util-base64@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-3.0.0.tgz#f7a9a82adf34e27a72d0719395713edf0e493017"
+  integrity sha512-Kxvoh5Qtt0CDsfajiZOCpJxgtPHXOKwmM+Zy4waD43UoEMA+qPxxa98aE/7ZhdnBFZFXMOiBR5xbcaMhLtznQQ==
   dependencies:
-    "@aws-crypto/crc32" "3.0.0"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-hex-encoding" "^2.0.0"
-    tslib "^2.5.0"
+    "@smithy/util-buffer-from" "^3.0.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
 
-"@smithy/eventstream-serde-browser@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-2.0.10.tgz#93054f85194655d7eba27125f4935d247bdc2a8f"
-  integrity "sha1-kwVPhRlGVdfronEl9JNdJHvcKo8= sha512-/NSUNrWedO9Se80jo/2WcPvqobqCM/0drZ03Kqn1GZpGwVTsdqNj7frVTCUJs/W/JEzOShdMv8ewoKIR7RWPmA=="
+"@smithy/util-body-length-browser@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-3.0.0.tgz#86ec2f6256310b4845a2f064e2f571c1ca164ded"
+  integrity sha512-cbjJs2A1mLYmqmyVl80uoLTJhAcfzMOyPgjwAYusWKMdLeNtzmMz9YxNl3/jRLoxSS3wkqkf0jwNdtXWtyEBaQ==
   dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@smithy/eventstream-serde-config-resolver@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-2.0.10.tgz#ea2f6675a4270fc3eccbb9fda4086f611887b510"
-  integrity "sha1-6i9mdaQnD8Psy7n9pAhvYRiHtRA= sha512-ag1U0vsC5rhRm7okFzsS6YsvyTRe62jIgJ82+Wr4qoOASx7eCDWdjoqLnrdDY0S4UToF9hZAyo4Du/xrSSSk4g=="
+"@smithy/util-body-length-node@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-3.0.0.tgz#99a291bae40d8932166907fe981d6a1f54298a6d"
+  integrity sha512-Tj7pZ4bUloNUP6PzwhN7K386tmSmEET9QtQg0TgdNOnxhZvCssHji+oZTUIuzxECRfG8rdm2PMw2WCFs6eIYkA==
   dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@smithy/eventstream-serde-node@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-node/-/eventstream-serde-node-2.0.10.tgz#54af54b9719aa8f74fae5885a72e69b33d5661cf"
-  integrity "sha1-VK9UuXGaqPdPrliFpy5psz1WYc8= sha512-3+VeofxoVCa+dvqcuzEpnFve8EQJKaYR7UslDFpj6UTZfa7Hxr8o1/cbFkTftFo71PxzYVsR+bsD56EbAO432A=="
+"@smithy/util-buffer-from@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz#6fc88585165ec73f8681d426d96de5d402021e4b"
+  integrity sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==
   dependencies:
-    "@smithy/eventstream-serde-universal" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    "@smithy/is-array-buffer" "^2.2.0"
+    tslib "^2.6.2"
 
-"@smithy/eventstream-serde-universal@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-2.0.10.tgz#575a6160a12508341c9c345bf3da7422a590aaae"
-  integrity "sha1-V1phYKElCDQcnDRb89p0IqWQqq4= sha512-JhJJU1ULLsn5kxKfFe8zOF2tibjxlPIvIB71Kn20aa/OFs+lvXBR0hBGswpovyYyckXH3qU8VxuIOEuS+2G+3A=="
+"@smithy/util-buffer-from@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-3.0.0.tgz#559fc1c86138a89b2edaefc1e6677780c24594e3"
+  integrity sha512-aEOHCgq5RWFbP+UDPvPot26EJHjOC+bRgse5A8V3FSShqd5E5UN4qc7zkwsvJPPAVsf73QwYcHN1/gt/rtLwQA==
   dependencies:
-    "@smithy/eventstream-codec" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    "@smithy/is-array-buffer" "^3.0.0"
+    tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^2.1.5", "@smithy/fetch-http-handler@^2.2.1":
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-2.2.1.tgz#a8abbd339c2c3d76456f4d16e65cf934727fc7ad"
-  integrity "sha1-qKu9M5wsPXZFb00W5lz5NHJ/x60= sha512-bXyM8PBAIKxVV++2ZSNBEposTDjFQ31XWOdHED+2hWMNvJHUoQqFbECg/uhcVOa6vHie2/UnzIZfXBSTpDBnEw=="
+"@smithy/util-config-provider@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-3.0.0.tgz#62c6b73b22a430e84888a8f8da4b6029dd5b8efe"
+  integrity sha512-pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==
   dependencies:
-    "@smithy/protocol-http" "^3.0.6"
-    "@smithy/querystring-builder" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-base64" "^2.0.0"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@smithy/hash-blob-browser@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-blob-browser/-/hash-blob-browser-2.0.10.tgz#fa761e02c9a21b9c4bf827139d65376d50356c69"
-  integrity "sha1-+nYeAsmiG5xL+CcTnWU3bVA1bGk= sha512-U2+wIWWloOZ9DaRuz2sk9f7A6STRTlwdcv+q6abXDvS0TRDk8KGgUmfV5lCZy8yxFxZIA0hvHDNqcd25r4Hrew=="
+"@smithy/util-defaults-mode-browser@^3.0.26":
+  version "3.0.27"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.27.tgz#d5df39faee8ad4bb5a6920b208469caa9dda2ccb"
+  integrity sha512-GV8NvPy1vAGp7u5iD/xNKUxCorE4nQzlyl057qRac+KwpH5zq8wVq6rE3lPPeuFLyQXofPN6JwxL1N9ojGapiQ==
   dependencies:
-    "@smithy/chunked-blob-reader" "^2.0.0"
-    "@smithy/chunked-blob-reader-native" "^2.0.0"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/hash-node@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-2.0.10.tgz#af13889a008880bdc30278b148e0e0b2a6e2d243"
-  integrity "sha1-rxOImgCIgL3DAnixSODgsqbi0kM= sha512-jSTf6uzPk/Vf+8aQ7tVXeHfjxe9wRXSCqIZcBymSDTf7/YrVxniBdpyN74iI8ZUOx/Pyagc81OK5FROLaEjbXQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-buffer-from" "^2.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/hash-stream-node@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-stream-node/-/hash-stream-node-2.0.10.tgz#6e693b4362fbb031b8fc60e105220874d044ec8d"
-  integrity "sha1-bmk7Q2L7sDG4/GDhBSIIdNBE7I0= sha512-L58XEGrownZZSpF7Lp0gc0hy+eYKXuPgNz3pQgP5lPFGwBzHdldx2X6o3c6swD6RkcPvTRh0wTUVVGwUotbgnQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/invalid-dependency@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-2.0.10.tgz#b708e7cfc35214ce664db6aa67465567b97ffd36"
-  integrity "sha1-twjnz8NSFM5mTbaqZ0ZVZ7l//TY= sha512-zw9p/zsmJ2cFcW4KMz3CJoznlbRvEA6HG2mvEaX5eAca5dq4VGI2MwPDTfmteC/GsnURS4ogoMQ0p6aHM2SDVQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/is-array-buffer@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-2.0.0.tgz#8fa9b8040651e7ba0b2f6106e636a91354ff7d34"
-  integrity "sha1-j6m4BAZR57oLL2EG5japE1T/fTQ= sha512-z3PjFjMyZNI98JFRJi/U0nGoLWMSJlDjAW4QUX2WNZLas5C0CmVV6LJ01JI0k90l7FvpmixjWxPFmENSClQ7ug=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/md5-js@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/md5-js/-/md5-js-2.0.10.tgz#8480de1b42abc581cf515e2b8e35542e9248f520"
-  integrity "sha1-hIDeG0KrxYHPUV4rjjVULpJI9SA= sha512-eA/Ova4/UdQUbMlrbBmnewmukH0zWU6C67HFFR/719vkFNepbnliGjmGksQ9vylz9eD4nfGkZZ5NKZMAcUuzjQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/middleware-content-length@^2.0.11":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-2.0.12.tgz#e6f874f5eef880561f774a4376b73f04b97efc53"
-  integrity "sha1-5vh09e74gFYfd0pDdrc/BLl+/FM= sha512-QRhJTo5TjG7oF7np6yY4ZO9GDKFVzU/GtcqUqyEa96bLHE3yZHgNmsolOQ97pfxPHmFhH4vDP//PdpAIN3uI1Q=="
-  dependencies:
-    "@smithy/protocol-http" "^3.0.6"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/middleware-endpoint@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-2.0.10.tgz#c11d9f75549116453eea0e812e17ec7917ce5bb1"
-  integrity "sha1-wR2fdVSRFkU+6g6BLhfseRfOW7E= sha512-O6m4puZc16xfenotZUHL4bRlMrwf4gTp+0I5l954M5KNd3dOK18P+FA/IIUgnXF/dX6hlCUcJkBp7nAzwrePKA=="
-  dependencies:
-    "@smithy/middleware-serde" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    "@smithy/url-parser" "^2.0.10"
-    "@smithy/util-middleware" "^2.0.3"
-    tslib "^2.5.0"
-
-"@smithy/middleware-retry@^2.0.12":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-2.0.13.tgz#ef33b1511a4b01a77e54567165b78e6d0c266e88"
-  integrity "sha1-7zOxURpLAad+VFZxZbeObQwmbog= sha512-zuOva8xgWC7KYG8rEXyWIcZv2GWszO83DCTU6IKcf/FKu6OBmSE+EYv3EUcCGY+GfiwCX0EyJExC9Lpq9b0w5Q=="
-  dependencies:
-    "@smithy/node-config-provider" "^2.0.13"
-    "@smithy/protocol-http" "^3.0.6"
-    "@smithy/service-error-classification" "^2.0.3"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-middleware" "^2.0.3"
-    "@smithy/util-retry" "^2.0.3"
-    tslib "^2.5.0"
-    uuid "^8.3.2"
-
-"@smithy/middleware-serde@^2.0.10", "@smithy/middleware-serde@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-2.0.10.tgz#4b0e5f838c7d7621cabf7cfdd6cec4c7f4d52a3f"
-  integrity "sha1-Sw5fg4x9diHKv3z91s7Ex/TVKj8= sha512-+A0AFqs768256H/BhVEsBF6HijFbVyAwYRVXY/izJFkTalVWJOp4JA0YdY0dpXQd+AlW0tzs+nMQCE1Ew+DcgQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/middleware-stack@^2.0.2", "@smithy/middleware-stack@^2.0.4":
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-2.0.4.tgz#cf199dd4d6eb3a3562e6757804faa91165693395"
-  integrity "sha1-zxmd1NbrOjVi5nV4BPqpEWVpM5U= sha512-MW0KNKfh8ZGLagMZnxcLJWPNXoKqW6XV/st5NnCBmmA2e2JhrUjU0AJ5Ca/yjTyNEKs3xH7AQDwp1YmmpEpmQQ=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/node-config-provider@^2.0.12", "@smithy/node-config-provider@^2.0.13":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-2.0.13.tgz#26c95cebbb8bf9ef5dd703ab4e00ff80de34e15f"
-  integrity "sha1-Jslc67uL+e9d1wOrTgD/gN404V8= sha512-pPpLqYuJcOq1sj1EGu+DoZK47DUS4gepqSTNgRezmrjnzNlSU2/Dcc9Ebzs+WZ0Z5vXKazuE+k+NksFLo07/AA=="
-  dependencies:
-    "@smithy/property-provider" "^2.0.11"
-    "@smithy/shared-ini-file-loader" "^2.0.12"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/node-http-handler@^2.1.5", "@smithy/node-http-handler@^2.1.6":
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-2.1.6.tgz#c2913363bbf28f315461bd54ef9a5394f1686776"
-  integrity "sha1-wpEzY7vyjzFUYb1U75pTlPFoZ3Y= sha512-NspvD3aCwiUNtoSTcVHz0RZz1tQ/SaRIe1KPF+r0mAdCZ9eWuhIeJT8ZNPYa1ITn7/Lgg64IyFjqPynZ8KnYQw=="
-  dependencies:
-    "@smithy/abort-controller" "^2.0.10"
-    "@smithy/protocol-http" "^3.0.6"
-    "@smithy/querystring-builder" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/property-provider@^2.0.0", "@smithy/property-provider@^2.0.11":
-  version "2.0.11"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-2.0.11.tgz#c6e03e4f6f886851339c3dfaf8cd8ae3b2878fa3"
-  integrity "sha1-xuA+T2+IaFEznD36+M2K47KHj6M= sha512-kzuOadu6XvrnlF1iXofpKXYmo4oe19st9/DE8f5gHNaFepb4eTkR8gD8BSdTnNnv7lxfv6uOwZPg4VS6hemX1w=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/protocol-http@^3.0.5", "@smithy/protocol-http@^3.0.6":
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-3.0.6.tgz#c33c128cc0f7096bf4fcdcc6d14d156ba5cd5b7c"
-  integrity "sha1-wzwSjMD3CWv0/NzG0U0Va6XNW3w= sha512-F0jAZzwznMmHaggiZgc7YoS08eGpmLvhVktY/Taz6+OAOHfyIqWSDNgFqYR+WHW9z5fp2XvY4mEUrQgYMQ71jw=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/querystring-builder@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-2.0.10.tgz#b06aa958b6ec1c56254d8cc41a19882625fd1c05"
-  integrity "sha1-sGqpWLbsHFYlTYzEGhmIJiX9HAU= sha512-uujJGp8jzrrU1UHme8sUKEbawQTcTmUWsh8rbGXYD/lMwNLQ+9jQ9dMDWbbH9Hpoa9RER1BeL/38WzGrbpob2w=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-uri-escape" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/querystring-parser@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-2.0.10.tgz#074d770a37feafb0d550094dd8463bdff58515f5"
-  integrity "sha1-B013Cjf+r7DVUAlN2EY73/WFFfU= sha512-WSD4EU60Q8scacT5PIpx4Bahn6nWpt+MiYLcBkFt6fOj7AssrNeaNIU2Z0g40ftVmrwLcEOIKGX92ynbVDb3ZA=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/service-error-classification@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-2.0.3.tgz#4c7de61d06db5f72437557d429bd74c74988b19e"
-  integrity "sha1-TH3mHQbbX3JDdVfUKb10x0mIsZ4= sha512-b+m4QCHXb7oKAkM/jHwHrl5gpqhFoMTHF643L0/vAEkegrcUWyh1UjyoHttuHcP5FnHVVy4EtpPtLkEYD+xMFw=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-
-"@smithy/shared-ini-file-loader@^2.0.12", "@smithy/shared-ini-file-loader@^2.0.6":
-  version "2.0.12"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-2.0.12.tgz#30c8a7a36f49734fde2f052bfaeaaf40c1980b55"
-  integrity "sha1-MMino29Jc0/eLwUr+uqvQMGYC1U= sha512-umi0wc4UBGYullAgYNUVfGLgVpxQyES47cnomTqzCKeKO5oudO4hyDNj+wzrOjqDFwK2nWYGVgS8Y0JgGietrw=="
-  dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/signature-v4@^2.0.0":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-2.0.10.tgz#89161b3f59071b77713cdf06f98b2e6780580742"
-  integrity "sha1-iRYbP1kHG3dxPN8G+YsuZ4BYB0I= sha512-S6gcP4IXfO/VMswovrhxPpqvQvMal7ZRjM4NvblHSPpE5aNBYx67UkHFF3kg0hR3tJKqNpBGbxwq0gzpdHKLRA=="
-  dependencies:
-    "@smithy/eventstream-codec" "^2.0.10"
-    "@smithy/is-array-buffer" "^2.0.0"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-hex-encoding" "^2.0.0"
-    "@smithy/util-middleware" "^2.0.3"
-    "@smithy/util-uri-escape" "^2.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/smithy-client@^2.1.6", "@smithy/smithy-client@^2.1.9":
-  version "2.1.9"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-2.1.9.tgz#5a0a185947ae4e66d12d2a6135628dd2fc36924c"
-  integrity "sha1-WgoYWUeuTmbRLSphNWKN0vw2kkw= sha512-HTicQSn/lOcXKJT+DKJ4YMu51S6PzbWsO8Z6Pwueo30mSoFKXg5P0BDkg2VCDqCVR0mtddM/F6hKhjW6YAV/yg=="
-  dependencies:
-    "@smithy/middleware-stack" "^2.0.4"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-stream" "^2.0.14"
-    tslib "^2.5.0"
-
-"@smithy/types@^2.3.3", "@smithy/types@^2.3.4":
-  version "2.3.4"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-2.3.4.tgz#3b9bc15000af0a0b1f4fda741f78c1580ba15e92"
-  integrity "sha1-O5vBUACvCgsfT9p0H3jBWAuhXpI= sha512-D7xlM9FOMFyFw7YnMXn9dK2KuN6+JhnrZwVt1fWaIu8hCk5CigysweeIT/H/nCo4YV+s8/oqUdLfexbkPZtvqw=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/url-parser@^2.0.10", "@smithy/url-parser@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-2.0.10.tgz#3261a463b87901d7686f66a9f26efb9f57d8d555"
-  integrity "sha1-MmGkY7h5Addob2ap8m77n1fY1VU= sha512-4TXQFGjHcqru8aH5VRB4dSnOFKCYNX6SR1Do6fwxZ+ExT2onLsh2W77cHpks7ma26W5jv6rI1u7d0+KX9F0aOw=="
-  dependencies:
-    "@smithy/querystring-parser" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/util-base64@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-2.0.0.tgz#1beeabfb155471d1d41c8d0603be1351f883c444"
-  integrity "sha1-G+6r+xVUcdHUHI0GA74TUfiDxEQ= sha512-Zb1E4xx+m5Lud8bbeYi5FkcMJMnn+1WUnJF3qD7rAdXpaL7UjkFQLdmW5fHadoKbdHpwH9vSR8EyTJFHJs++tA=="
-  dependencies:
-    "@smithy/util-buffer-from" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-body-length-browser@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-2.0.0.tgz#5447853003b4c73da3bc5f3c5e82c21d592d1650"
-  integrity "sha1-VEeFMAO0xz2jvF88XoLCHVktFlA= sha512-JdDuS4ircJt+FDnaQj88TzZY3+njZ6O+D3uakS32f2VNnDo3vyEuNdBOh/oFd8Df1zSZOuH1HEChk2AOYDezZg=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-body-length-node@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-2.1.0.tgz#313a5f7c5017947baf5fa018bfc22628904bbcfa"
-  integrity "sha1-MTpffFAXlHuvX6AYv8ImKJBLvPo= sha512-/li0/kj/y3fQ3vyzn36NTLGmUwAICb7Jbe/CsWCktW363gh1MOcpEcSO3mJ344Gv2dqz8YJCLQpb6hju/0qOWw=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-buffer-from@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-2.0.0.tgz#7eb75d72288b6b3001bc5f75b48b711513091deb"
-  integrity "sha1-frddciiLazABvF91tItxFRMJHes= sha512-/YNnLoHsR+4W4Vf2wL5lGv0ksg8Bmk3GEGxn2vEQt52AQaPSCuaO5PM5VM7lP1K9qHRKHwrPGktqVoAHKWHxzw=="
-  dependencies:
-    "@smithy/is-array-buffer" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-config-provider@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-2.0.0.tgz#4dd6a793605559d94267312fd06d0f58784b4c38"
-  integrity "sha1-Tdank2BVWdlCZzEv0G0PWHhLTDg= sha512-xCQ6UapcIWKxXHEU4Mcs2s7LcFQRiU3XEluM2WcCjjBtQkUN71Tb+ydGmJFPxMUrW/GWMgQEEGipLym4XG0jZg=="
-  dependencies:
-    tslib "^2.5.0"
-
-"@smithy/util-defaults-mode-browser@^2.0.10":
-  version "2.0.13"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-2.0.13.tgz#8136955f1bef6e66cb8a8702693e7685dcd33e26"
-  integrity "sha1-gTaVXxvvbmbLiocCaT52hdzTPiY= sha512-UmmOdUzaQjqdsl1EjbpEaQxM0VDFqTj6zDuI26/hXN7L/a1k1koTwkYpogHMvunDX3fjrQusg5gv1Td4UsGyog=="
-  dependencies:
-    "@smithy/property-provider" "^2.0.11"
-    "@smithy/smithy-client" "^2.1.9"
-    "@smithy/types" "^2.3.4"
+    "@smithy/property-provider" "^3.1.10"
+    "@smithy/smithy-client" "^3.4.4"
+    "@smithy/types" "^3.7.1"
     bowser "^2.11.0"
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^2.0.12":
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-2.0.15.tgz#24f7b9de978206909ced7b522f24e7f450187372"
-  integrity "sha1-JPe53peCBpCc7XtSLyTn9FAYc3I= sha512-g6J7MHAibVPMTlXyH3mL+Iet4lMJKFVhsOhJmn+IKG81uy9m42CkRSDlwdQSJAcprLQBIaOPdFxNXQvrg2w1Uw=="
+"@smithy/util-defaults-mode-node@^3.0.26":
+  version "3.0.27"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.27.tgz#a7248c9d9cb620827ab57ef9d1867bfe8aef42d0"
+  integrity sha512-7+4wjWfZqZxZVJvDutO+i1GvL6bgOajEkop4FuR6wudFlqBiqwxw3HoH6M9NgeCd37km8ga8NPp2JacQEtAMPg==
   dependencies:
-    "@smithy/config-resolver" "^2.0.11"
-    "@smithy/credential-provider-imds" "^2.0.13"
-    "@smithy/node-config-provider" "^2.0.13"
-    "@smithy/property-provider" "^2.0.11"
-    "@smithy/smithy-client" "^2.1.9"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    "@smithy/config-resolver" "^3.0.12"
+    "@smithy/credential-provider-imds" "^3.2.7"
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/property-provider" "^3.1.10"
+    "@smithy/smithy-client" "^3.4.4"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
 
-"@smithy/util-hex-encoding@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-2.0.0.tgz#0aa3515acd2b005c6d55675e377080a7c513b59e"
-  integrity "sha1-CqNRWs0rAFxtVWdeN3CAp8UTtZ4= sha512-c5xY+NUnFqG6d7HFh1IFfrm3mGl29lC+vF+geHv4ToiuJCBmIfzx6IeHLg+OgRdPFKDXIw6pvi+p3CsscaMcMA=="
+"@smithy/util-endpoints@^2.1.5":
+  version "2.1.6"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-2.1.6.tgz#720cbd1a616ad7c099b77780f0cb0f1f9fc5d2df"
+  integrity sha512-mFV1t3ndBh0yZOJgWxO9J/4cHZVn5UG1D8DeCc6/echfNkeEJWu9LD7mgGH5fHrEdR7LDoWw7PQO6QiGpHXhgA==
+  dependencies:
+    "@smithy/node-config-provider" "^3.1.11"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/util-hex-encoding@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-3.0.0.tgz#32938b33d5bf2a15796cd3f178a55b4155c535e6"
+  integrity sha512-eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-middleware@^3.0.10", "@smithy/util-middleware@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-3.0.10.tgz#ab8be99f1aaafe5a5490c344f27a264b72b7592f"
+  integrity sha512-eJO+/+RsrG2RpmY68jZdwQtnfsxjmPxzMlQpnHKjFPwrYqvlcT+fHdT+ZVwcjlWSrByOhGr9Ff2GG17efc192A==
+  dependencies:
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/util-retry@^3.0.10", "@smithy/util-retry@^3.0.9":
+  version "3.0.10"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-3.0.10.tgz#fc13e1b30e87af0cbecadf29ca83b171e2040440"
+  integrity sha512-1l4qatFp4PiU6j7UsbasUHL2VU023NRB/gfaa1M0rDqVrRN4g3mCArLRyH3OuktApA4ye+yjWQHjdziunw2eWA==
+  dependencies:
+    "@smithy/service-error-classification" "^3.0.10"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
+
+"@smithy/util-stream@^3.3.0", "@smithy/util-stream@^3.3.1":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-3.3.1.tgz#a2636f435637ef90d64df2bb8e71cd63236be112"
+  integrity sha512-Ff68R5lJh2zj+AUTvbAU/4yx+6QPRzg7+pI7M1FbtQHcRIp7xvguxVsQBKyB3fwiOwhAKu0lnNyYBaQfSW6TNw==
+  dependencies:
+    "@smithy/fetch-http-handler" "^4.1.1"
+    "@smithy/node-http-handler" "^3.3.1"
+    "@smithy/types" "^3.7.1"
+    "@smithy/util-base64" "^3.0.0"
+    "@smithy/util-buffer-from" "^3.0.0"
+    "@smithy/util-hex-encoding" "^3.0.0"
+    "@smithy/util-utf8" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/util-uri-escape@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-1.1.0.tgz#a8c5edaf19c0efdb9b51661e840549cf600a1808"
+  integrity sha512-/jL/V1xdVRt5XppwiaEU8Etp5WHZj609n0xMTuehmCqdoOFbId1M+aEeDWZsQ+8JbEB/BJ6ynY2SlYmOaKtt8w==
   dependencies:
     tslib "^2.5.0"
 
-"@smithy/util-middleware@^2.0.2", "@smithy/util-middleware@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-2.0.3.tgz#478cbf957eaffa36aed624350be342bbf15d3c42"
-  integrity "sha1-R4y/lX6v+jau1iQ1C+NCu/FdPEI= sha512-+FOCFYOxd2HO7v/0hkFSETKf7FYQWa08wh/x/4KUeoVBnLR4juw8Qi+TTqZI6E2h5LkzD9uOaxC9lAjrpVzaaA=="
+"@smithy/util-uri-escape@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-3.0.0.tgz#e43358a78bf45d50bb736770077f0f09195b6f54"
+  integrity sha512-LqR7qYLgZTD7nWLBecUi4aqolw8Mhza9ArpNEQ881MJJIU2sE5iHCK6TdyqqzcDLy0OPe10IY4T8ctVdtynubg==
   dependencies:
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/util-retry@^2.0.2", "@smithy/util-retry@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-2.0.3.tgz#a053855ddb51800bd679da03454cf626bc440918"
-  integrity "sha1-oFOFXdtRgAvWedoDRUz2JrxECRg= sha512-gw+czMnj82i+EaH7NL7XKkfX/ZKrCS2DIWwJFPKs76bMgkhf0y1C94Lybn7f8GkBI9lfIOUdPYtzm19zQOC8sw=="
-  dependencies:
-    "@smithy/service-error-classification" "^2.0.3"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
-
-"@smithy/util-stream@^2.0.12", "@smithy/util-stream@^2.0.14":
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-2.0.14.tgz#3fdd934e2bced80331dcaff18aefbcfe39ebf3cd"
-  integrity "sha1-P92TTivO2AMx3K/xiu+8/jnr880= sha512-XjvlDYe+9DieXhLf7p+EgkXwFtl34kHZcWfHnc5KaILbhyVfDLWuqKTFx6WwCFqb01iFIig8trGwExRIqqkBYg=="
-  dependencies:
-    "@smithy/fetch-http-handler" "^2.2.1"
-    "@smithy/node-http-handler" "^2.1.6"
-    "@smithy/types" "^2.3.4"
-    "@smithy/util-base64" "^2.0.0"
-    "@smithy/util-buffer-from" "^2.0.0"
-    "@smithy/util-hex-encoding" "^2.0.0"
-    "@smithy/util-utf8" "^2.0.0"
-    tslib "^2.5.0"
-
-"@smithy/util-uri-escape@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-2.0.0.tgz#19955b1a0f517a87ae77ac729e0e411963dfda95"
-  integrity "sha1-GZVbGg9Reoeud6xyng5BGWPf2pU= sha512-ebkxsqinSdEooQduuk9CbKcI+wheijxEb3utGXkCoYQkJnwTnLbH1JXGimJtUkQwNQbsbuYwG2+aFVyZf5TLaw=="
-  dependencies:
-    tslib "^2.5.0"
+    tslib "^2.6.2"
 
 "@smithy/util-utf8@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.0.0.tgz#b4da87566ea7757435e153799df9da717262ad42"
-  integrity "sha1-tNqHVm6ndXQ14VN5nfnacXJirUI= sha512-rctU1VkziY84n5OXe3bPNpKR001ZCME2JCaBBFgtiM2hfKbHFudc/BkMuPab8hRbLd0j3vbnBTTZ1igBf0wgiQ=="
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-2.3.0.tgz#dd96d7640363259924a214313c3cf16e7dd329c5"
+  integrity sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==
   dependencies:
-    "@smithy/util-buffer-from" "^2.0.0"
-    tslib "^2.5.0"
+    "@smithy/util-buffer-from" "^2.2.0"
+    tslib "^2.6.2"
 
-"@smithy/util-waiter@^2.0.9":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-2.0.10.tgz#6cd28af8340ab54fa9adf10d193c4476a5673363"
-  integrity "sha1-bNKK+DQKtU+prfENGTxEdqVnM2M= sha512-yQjwWVrwYw+/f3hFQccE3zZF7lk6N6xtNcA6jvhWFYhnyKAm6B2mX8Gzftl0TbgoPUpzCvKYlvhaEpVtRpVfVw=="
+"@smithy/util-utf8@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-3.0.0.tgz#1a6a823d47cbec1fd6933e5fc87df975286d9d6a"
+  integrity sha512-rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==
   dependencies:
-    "@smithy/abort-controller" "^2.0.10"
-    "@smithy/types" "^2.3.4"
-    tslib "^2.5.0"
+    "@smithy/util-buffer-from" "^3.0.0"
+    tslib "^2.6.2"
+
+"@smithy/util-waiter@^3.1.8":
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/@smithy/util-waiter/-/util-waiter-3.1.9.tgz#1330ce2e79b58419d67755d25bce7a226e32dc6d"
+  integrity sha512-/aMXPANhMOlMPjfPtSrDfPeVP8l56SJlz93xeiLmhLe5xvlXA5T3abZ2ilEsDEPeY9T/wnN/vNGn9wa1SbufWA==
+  dependencies:
+    "@smithy/abort-controller" "^3.1.8"
+    "@smithy/types" "^3.7.1"
+    tslib "^2.6.2"
 
 "@socket.io/component-emitter@~3.1.0":
   version "3.1.0"
@@ -5219,14 +5111,7 @@
   dependencies:
     defer-to-connect "^1.0.1"
 
-"@szmarczak/http-timer@^4.0.5":
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
-  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
-  dependencies:
-    defer-to-connect "^2.0.0"
-
-"@techpass/passport-openidconnect@0.3.3", "@techpass/passport-openidconnect@^0.3.0":
+"@techpass/passport-openidconnect@0.3.3":
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/@techpass/passport-openidconnect/-/passport-openidconnect-0.3.3.tgz#6c01c78bd8da0ca8917378dfbe18024702620352"
   integrity sha512-i2X/CofjnGBqpTmw6b+Ex3Co/NrR2xjnIHvnOJk62XIlJJHNSTwmhJ1PkXoA5RGKlxZWchADFGjLTJnebvRj7A==
@@ -5237,15 +5122,15 @@
     request "^2.88.0"
     webfinger "^0.4.2"
 
-"@techteamer/ocsp@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@techteamer/ocsp/-/ocsp-1.0.0.tgz#7b82b02093fbe351e915bb37685ac1ac5a1233d3"
-  integrity sha512-lNAOoFHaZN+4huo30ukeqVrUmfC+avoEBYQ11QAnAw1PFhnI5oBCg8O/TNiCoEWix7gNGBIEjrQwtPREqKMPog==
+"@techteamer/ocsp@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@techteamer/ocsp/-/ocsp-1.0.1.tgz#420f80c64ff0f74a70b65c88e4031c03a9da6ded"
+  integrity sha512-q4pW5wAC6Pc3JI8UePwE37CkLQ5gDGZMgjSX4MEEm4D4Di59auDQ8UNIDzC4gRnPNmmcwjpPxozq8p5pjiOmOw==
   dependencies:
     asn1.js "^5.4.1"
     asn1.js-rfc2560 "^5.0.1"
     asn1.js-rfc5280 "^3.0.0"
-    async "^3.2.1"
+    async "^3.2.4"
     simple-lru-cache "^0.0.2"
 
 "@tediousjs/connection-string@^0.5.0":
@@ -5303,11 +5188,6 @@
   resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.9"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.9.tgz#df4907fc07a886922637b15e02d4cebc4c0021b2"
@@ -5393,13 +5273,6 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
-"@types/bcrypt@^5.0.2":
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-5.0.2.tgz#22fddc11945ea4fbc3655b3e8b8847cc9f811477"
-  integrity sha512-6atioO8Y75fNcbmj0G7UjI9lXN2pQ/IGJ2FWT4a/btd0Lk9lQalHLKhkgKVZ3r+spnmWUKfbMi1GEe9wyHQfNQ==
-  dependencies:
-    "@types/node" "*"
-
 "@types/bluebird@*":
   version "3.5.38"
   resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.38.tgz#7a671e66750ccd21c9fc9d264d0e1e5330bc9908"
@@ -5413,16 +5286,6 @@
     "@types/connect" "*"
     "@types/node" "*"
 
-"@types/cacheable-request@^6.0.1":
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183"
-  integrity sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==
-  dependencies:
-    "@types/http-cache-semantics" "*"
-    "@types/keyv" "^3.1.4"
-    "@types/node" "*"
-    "@types/responselike" "^1.0.0"
-
 "@types/caseless@*":
   version "0.12.2"
   resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8"
@@ -5545,28 +5408,14 @@
     "@types/node" "*"
     "@types/ssh2" "*"
 
-"@types/dockerode@^3.3.24":
-  version "3.3.24"
-  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.24.tgz#bea354a4fcd0824a80fd5ea5ede3e8cda71137a7"
-  integrity sha512-679y69OYusf7Fr2HtdjXPUF6hnHxSA9K4EsuagsMuPno/XpJHjXxCOy2I5YL8POnWbzjsQAi0pyKIYM9HSpQog==
+"@types/dockerode@^3.3.29":
+  version "3.3.32"
+  resolved "https://registry.yarnpkg.com/@types/dockerode/-/dockerode-3.3.32.tgz#289dab161e59a0d62956194b394d7dc8145bae18"
+  integrity sha512-xxcG0g5AWKtNyh7I7wswLdFvym4Mlqks5ZlKzxEUrGHS0r0PUOfxm2T0mspwu10mHQqu3Ck3MI3V2HqvLWE1fg==
   dependencies:
     "@types/docker-modem" "*"
     "@types/node" "*"
-
-"@types/eslint@*":
-  version "9.6.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
-  integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
-  dependencies:
-    "@types/estree" "*"
-    "@types/json-schema" "*"
-
-"@types/eslint__js@^8.42.3":
-  version "8.42.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint__js/-/eslint__js-8.42.3.tgz#d1fa13e5c1be63a10b4e3afe992779f81c1179a0"
-  integrity sha512-alfG737uhmPdnvkrLdZLcEKJ/B8s9Y4hrZ+YAdzUeoArBlSUERA2E87ROfOaS4jd/C45fzOoZzidLc1IPwLqOw==
-  dependencies:
-    "@types/eslint" "*"
+    "@types/ssh2" "*"
 
 "@types/estree@*", "@types/estree@1.0.5", "@types/estree@^1.0.0", "@types/estree@^1.0.1":
   version "1.0.5"
@@ -5578,6 +5427,11 @@
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
+"@types/estree@^1.0.6":
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.6.tgz#628effeeae2064a1b4e79f78e81d87b7e5fc7b50"
+  integrity sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==
+
 "@types/express-serve-static-core@^4.17.33":
   version "4.17.33"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz#de35d30a9d637dc1450ad18dd583d75d5733d543"
@@ -5621,11 +5475,6 @@
   resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.3.tgz#ef8e3d1a8d46c387f04ab0f2e8ab8cb0c5078661"
   integrity sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==
 
-"@types/http-cache-semantics@*":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz#b979ebad3919799c979b17c72621c0bc0a31c6c4"
-  integrity sha512-1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==
-
 "@types/http-errors@*":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-2.0.1.tgz#20172f9578b225f6c7da63446f56d4ce108d5a65"
@@ -5665,7 +5514,7 @@
     expect "^29.0.0"
     pretty-format "^29.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.9":
+"@types/json-schema@^7.0.15", "@types/json-schema@^7.0.6":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
   integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
@@ -5687,13 +5536,6 @@
   resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72"
   integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw==
 
-"@types/keyv@^3.1.4":
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.4.tgz#3ccdb1c6751b0c7e52300bcdacd5bcbf8faa75b6"
-  integrity sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==
-  dependencies:
-    "@types/node" "*"
-
 "@types/koa-compose@*":
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d"
@@ -5701,37 +5543,13 @@
   dependencies:
     "@types/koa" "*"
 
-"@types/koa-passport@^4.0.3":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/@types/koa-passport/-/koa-passport-4.0.3.tgz#063ec6310edee76cf854aadaa717b97f04b104fb"
-  integrity sha512-tNMYd/bcv0Zw7fc0CzEBYM9uUzVtn4XWzdUYfkTgSkEljP6nap7eI4E5x43ukrUQvztgXSYFkz3Uk+ujFeUzTg==
-  dependencies:
-    "@types/koa" "*"
-    "@types/passport" "*"
-
-"@types/koa-send@*", "@types/koa-send@^4.1.6":
+"@types/koa-send@^4.1.6":
   version "4.1.6"
   resolved "https://registry.yarnpkg.com/@types/koa-send/-/koa-send-4.1.6.tgz#15d90e95e3ccce669a15b6a3c56c3a650a167cea"
   integrity sha512-vgnNGoOJkx7FrF0Jl6rbK1f8bBecqAchKpXtKuXzqIEdXTDO6dsSTjr+eZ5m7ltSjH4K/E7auNJEQCAd0McUPA==
   dependencies:
     "@types/koa" "*"
 
-"@types/koa-session@^6.4.5":
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/@types/koa-session/-/koa-session-6.4.5.tgz#ac10bac507f4bb722fa6c55c33607b5c8769f779"
-  integrity sha512-Vc6+fslnPuMH2v9y80WYeo39UMo8mweuNNthKCwYU2ZE6l5vnRrzRU3BRvexKwsoI5sxsRl5CxDsBlLI8kY/XA==
-  dependencies:
-    "@types/cookies" "*"
-    "@types/koa" "*"
-
-"@types/koa-static@^4.0.2":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@types/koa-static/-/koa-static-4.0.4.tgz#ce6f2a5d14cc7ef19f9bf6ee8e4f3eadfcc77323"
-  integrity sha512-j1AUzzl7eJYEk9g01hNTlhmipFh8RFbOQmaMNLvLcNNAkPw0bdTs3XTa3V045XFlrWN0QYnblbDJv2RzawTn6A==
-  dependencies:
-    "@types/koa" "*"
-    "@types/koa-send" "*"
-
 "@types/koa@*":
   version "2.13.5"
   resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.13.5.tgz#64b3ca4d54e08c0062e89ec666c9f45443b21a61"
@@ -5760,17 +5578,17 @@
     "@types/koa-compose" "*"
     "@types/node" "*"
 
-"@types/koa__cors@^5.0.0":
+"@types/koa__cors@5.0.0":
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/@types/koa__cors/-/koa__cors-5.0.0.tgz#74567a045b599266e2cd3940cef96cedecc2ef1f"
   integrity sha512-LCk/n25Obq5qlernGOK/2LUwa/2YJb2lxHUkkvYFDOpLXlVI6tKcdfCHRBQnOY4LwH6el5WOLs6PD/a8Uzau6g==
   dependencies:
     "@types/koa" "*"
 
-"@types/koa__router@8.0.8":
-  version "8.0.8"
-  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-8.0.8.tgz#b1e0e9a512498777d3366bbdf0e853df27ec831c"
-  integrity sha512-9pGCaDtzCsj4HJ8HmGuqzk8+s57sPj4njWd08GG5o92n5Xp9io2snc40CPpXFhoKcZ8OKhuu6ht4gNou9e1C2w==
+"@types/koa__router@12.0.4":
+  version "12.0.4"
+  resolved "https://registry.yarnpkg.com/@types/koa__router/-/koa__router-12.0.4.tgz#a1f9afec9dc7e7d9fa1252d1938c44b403e19a28"
+  integrity sha512-Y7YBbSmfXZpa/m5UGGzb7XadJIRBRnwNY9cdAojZGp65Cpe5MAP3mOZE7e3bImt8dfKS4UFcR16SLH8L/z7PBw==
   dependencies:
     "@types/koa" "*"
 
@@ -5814,10 +5632,10 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
   integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
-"@types/mssql@9.1.4":
-  version "9.1.4"
-  resolved "https://registry.yarnpkg.com/@types/mssql/-/mssql-9.1.4.tgz#d485b06494a76d15b957e0952305c55053bac366"
-  integrity sha512-st2ryK+viraRuptxcGs+66J0RrABytxhGxUlpWcOniNPzpnxIaeNhPJVM3lZn1r+s/6lQARYID6Z+MBoseSD8g==
+"@types/mssql@9.1.5":
+  version "9.1.5"
+  resolved "https://registry.yarnpkg.com/@types/mssql/-/mssql-9.1.5.tgz#1574a5870aeb029c6d787861af101161b9b8d3b6"
+  integrity sha512-Q9EsgXwuRoX5wvUSu24YfbKMbFChv7pZ/jeCzPkj47ehcuXYsBcfogwrtVFosSjinD4Q/MY2YPGk9Yy1cM2Ywg==
   dependencies:
     "@types/node" "*"
     "@types/tedious" "*"
@@ -5832,42 +5650,35 @@
     form-data "^3.0.0"
 
 "@types/node-fetch@^2.5.0", "@types/node-fetch@^2.6.4":
-  version "2.6.11"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.11.tgz#9b39b78665dae0e82a08f02f4967d62c66f95d24"
-  integrity sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==
+  version "2.6.12"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.12.tgz#8ab5c3ef8330f13100a7479e2cd56d3386830a03"
+  integrity sha512-8nneRWKCg3rMtF69nLQJnOYUcbafYeFSjqkw3jCRLsqkWFlHaoQrr5mXmofFGOx3DKn7UfmBMyov8ySvLRVldA==
   dependencies:
     "@types/node" "*"
     form-data "^4.0.0"
 
-"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=13.13.4", "@types/node@>=13.7.0", "@types/node@>=8.1.0":
-  version "22.5.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.5.1.tgz#de01dce265f6b99ed32b295962045d10b5b99560"
-  integrity sha512-KkHsxej0j9IW1KKOOAA/XBA0z08UFSrRQHErzEfA3Vgq57eXIMYboIlHJuYIfd+lwCQjtKqUu3UnmKbtUc9yRw==
+"@types/node@*", "@types/node@>=10.0.0", "@types/node@>=13.13.4", "@types/node@>=13.7.0", "@types/node@>=18":
+  version "22.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.9.1.tgz#bdf91c36e0e7ecfb7257b2d75bf1b206b308ca71"
+  integrity sha512-p8Yy/8sw1caA8CdRIQBG5tiLHmxtQKObCijiAa9Ez+d4+PRffM4054xbju0msf+cvhJpnFEeNjxmVT/0ipktrg==
   dependencies:
-    undici-types "~6.19.2"
+    undici-types "~6.19.8"
 
 "@types/node@16.9.1":
   version "16.9.1"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.9.1.tgz#0611b37db4246c937feef529ddcc018cf8e35708"
   integrity sha512-QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==
 
-"@types/node@20.10.0":
-  version "20.10.0"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617"
-  integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ==
-  dependencies:
-    undici-types "~5.26.4"
-
-"@types/node@>=4.2.0 < 13", "@types/node@^12.20.52":
-  version "12.20.55"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
-  integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
-
 "@types/node@>=8.0.0 <15":
   version "14.18.37"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.37.tgz#0bfcd173e8e1e328337473a8317e37b3b14fd30d"
   integrity sha512-7GgtHCs/QZrBrDzgIJnQtuSvhFSwhyYSI2uafSwZoNt1iOGhEN5fwNrQMjtONyHm9+/LoA4453jH0CMYcr06Pg==
 
+"@types/node@^12.20.52":
+  version "12.20.55"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
+  integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
+
 "@types/node@^18.11.18":
   version "18.19.10"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.10.tgz#4de314ab66faf6bc8ba691021a091ddcdf13a158"
@@ -5875,32 +5686,18 @@
   dependencies:
     undici-types "~5.26.4"
 
-"@types/node@^20.4.5":
-  version "20.14.5"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.14.5.tgz#fe35e3022ebe58b8f201580eb24e1fcfc0f2487d"
-  integrity sha512-aoRR+fJkZT2l0aGOJhuA8frnCSoNX6W7U2mpNq63+BxBIj5BQFt8rHy627kijCmm63ijdSdwvGgpUsU6MBsZZA==
+"@types/node@^20.17.9", "@types/node@^20.4.5":
+  version "20.17.9"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.17.9.tgz#5f141d4b7ee125cdee5faefe28de095398865bab"
+  integrity sha512-0JOXkRyLanfGPE2QRCwgxhzlBAvaRdCNMcvbd7jFfpmD4eEXll7LRwy5ymJmyeZqk7Nh7eD2LeUyQ68BbndmXw==
   dependencies:
-    undici-types "~5.26.4"
-
-"@types/nodemailer@^6.4.4":
-  version "6.4.15"
-  resolved "https://registry.yarnpkg.com/@types/nodemailer/-/nodemailer-6.4.15.tgz#494be695e11c438f7f5df738fb4ab740312a6ed2"
-  integrity sha512-0EBJxawVNjPkng1zm2vopRctuWVCxk34JcIlRuXSf54habUWdz1FB7wHDqOqvDa8Mtpt0Q3LTXQkAs2LNyK5jQ==
-  dependencies:
-    "@types/node" "*"
+    undici-types "~6.19.2"
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
   integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
-"@types/oauth@*":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@types/oauth/-/oauth-0.9.5.tgz#acc4209bfa1c8d7d3aaf2c9ad0b32216a29616c1"
-  integrity sha512-+oQ3C2Zx6ambINOcdIARF5Z3Tu3x//HipE889/fqo3sgpQZbe9c6ExdQFtN6qlhpR7p83lTZfPJt0tCAW29dog==
-  dependencies:
-    "@types/node" "*"
-
 "@types/oracledb@6.5.1":
   version "6.5.1"
   resolved "https://registry.yarnpkg.com/@types/oracledb/-/oracledb-6.5.1.tgz#17d021cabc9d216dfa6d3d65ae3ee585c33baab3"
@@ -5908,36 +5705,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/passport-google-oauth@^1.0.42":
-  version "1.0.45"
-  resolved "https://registry.yarnpkg.com/@types/passport-google-oauth/-/passport-google-oauth-1.0.45.tgz#c986c787ec9706b4a596d2bae43342b50b54973d"
-  integrity sha512-O3Y3DDKnf9lR8+DSaUOCEGF6aFjVYdI8TLhQYtySZ3Sq75c5tGYJ0KJRDZw0GsyLD/Que0nqFkP/GnDVwZZL9w==
-  dependencies:
-    "@types/express" "*"
-    "@types/passport" "*"
-
-"@types/passport-microsoft@1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/passport-microsoft/-/passport-microsoft-1.0.0.tgz#a2ddc2200843570d38c35c53f6388e33df915b58"
-  integrity sha512-vD9ajSUc9Sz/8gdCj0ODUbPYQDxcI/imIDdgMPh//c5yMK/PgV6SNUXFLBzJo89Y30LU6bYAfXKn40WJqtMBiA==
-  dependencies:
-    "@types/passport-oauth2" "*"
-
-"@types/passport-oauth2@*":
-  version "1.4.17"
-  resolved "https://registry.yarnpkg.com/@types/passport-oauth2/-/passport-oauth2-1.4.17.tgz#d5d54339d44f6883d03e69dc0cc0e2114067abb4"
-  integrity sha512-ODiAHvso6JcWJ6ZkHHroVp05EHGhqQN533PtFNBkg8Fy5mERDqsr030AX81M0D69ZcaMvhF92SRckEk2B0HYYg==
-  dependencies:
-    "@types/express" "*"
-    "@types/oauth" "*"
-    "@types/passport" "*"
-
-"@types/passport@*":
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/@types/passport/-/passport-1.0.16.tgz#5a2918b180a16924c4d75c31254c31cdca5ce6cf"
-  integrity sha512-FD0qD5hbPWQzaM0wHUnJ/T0BBCJBxCeemtnCwc/ThhTg3x9jfrAcRUmj5Dopza+MfFS9acTe3wk7rcVnRIp/0A==
-  dependencies:
-    "@types/express" "*"
+"@types/parse-json@^4.0.0":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.2.tgz#5950e50960793055845e956c427fc2b0d70c5239"
+  integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==
 
 "@types/pg@8.6.6":
   version "8.6.6"
@@ -6073,10 +5844,10 @@
     "@types/pouchdb-core" "*"
     "@types/pouchdb-find" "*"
 
-"@types/pouchdb@6.4.0", "@types/pouchdb@^6.4.0":
-  version "6.4.0"
-  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.0.tgz#f9c41ca64b23029f9bf2eb4bf6956e6431cb79f8"
-  integrity sha512-eGCpX+NXhd5VLJuJMzwe3L79fa9+IDTrAG3CPaf4s/31PD56hOrhDJTSmRELSXuiqXr6+OHzzP0PldSaWsFt7w==
+"@types/pouchdb@6.4.2", "@types/pouchdb@^6.4.0":
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/@types/pouchdb/-/pouchdb-6.4.2.tgz#54777533d86f4abd1a3989b272e085323623bbe1"
+  integrity sha512-YsI47rASdtzR+3V3JE2UKY58snhm0AglHBpyckQBkRYoCbTvGagXHtV0x5n8nzN04jQmvTG+Sm85cIzKT3KXBA==
   dependencies:
     "@types/pouchdb-adapter-cordova-sqlite" "*"
     "@types/pouchdb-adapter-fruitdown" "*"
@@ -6152,47 +5923,28 @@
     "@types/tough-cookie" "*"
     form-data "^2.5.0"
 
-"@types/resolve@0.0.8":
-  version "0.0.8"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
-  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
-  dependencies:
-    "@types/node" "*"
-
-"@types/resolve@1.17.1":
-  version "1.17.1"
-  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
-  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/resolve@1.20.2":
   version "1.20.2"
   resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.2.tgz#97d26e00cd4a0423b4af620abecf3e6f442b7975"
   integrity sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==
 
-"@types/responselike@^1.0.0":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.3.tgz#cc29706f0a397cfe6df89debfe4bf5cea159db50"
-  integrity sha512-H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/retry@*":
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.5.tgz#f090ff4bd8d2e5b940ff270ab39fd5ca1834a07e"
   integrity sha512-3xSjTp3v03X/lSQLkczaN9UIEwJMoMCA1+Nb5HfbJEQWogdeQIyVtTvxPXDQjZ5zws8rFQfVfRdz03ARihPJgw==
 
+"@types/sanitize-html@^2.13.0":
+  version "2.13.0"
+  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.13.0.tgz#ac3620e867b7c68deab79c72bd117e2049cdd98e"
+  integrity sha512-X31WxbvW9TjIhZZNyNBZ/p5ax4ti7qsNDBDEnH4zAgmEh35YnFD1UiS6z9Cd34kKm0LslFW0KPmTQzu/oGtsqQ==
+  dependencies:
+    htmlparser2 "^8.0.0"
+
 "@types/semver@7.3.7":
   version "7.3.7"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.7.tgz#b9eb89d7dfa70d5d1ce525bc1411a35347f533a3"
   integrity sha512-4g1jrL98mdOIwSOUh6LTlB0Cs9I0dQPwINUhBg7C6pN4HLr8GS8xsksJxilW6S6dQHVi2K/o+lQuQcg7LroCnw==
 
-"@types/semver@^7.3.12":
-  version "7.5.8"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
-  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
-
 "@types/serve-static@*":
   version "1.15.1"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.1.tgz#86b1753f0be4f9a1bee68d459fcda5be4ea52b5d"
@@ -6208,12 +5960,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/server-destroy@^1.0.1":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@types/server-destroy/-/server-destroy-1.0.4.tgz#bd94af933e73e04795042edf38af267ddebd4e98"
-  integrity sha512-+x8oAQ4Xp1wtDi2Hlmi7gUNXZNVhB5EoSQpi0qEmINdDN5Ab724WLGAalEdT1SudVY/NzMhbfZO7vU+klT0R+A==
-  dependencies:
-    "@types/node" "*"
+"@types/shortid@^2.2.0":
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/@types/shortid/-/shortid-2.2.0.tgz#905990fc4275f77e60ab0cd9f791b91a3d4bff04"
+  integrity sha512-jBG2FgBxcaSf0h662YloTGA32M8UtNbnTPekUr/eCmWXq0JWQXgNEQ/P5Gf05Cv66QZtE1Ttr83I1AJBPdzCBg==
 
 "@types/ssh2-streams@*":
   version "0.1.12"
@@ -6305,9 +6055,9 @@
   integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==
 
 "@types/triple-beam@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.2.tgz#38ecb64f01aa0d02b7c8f4222d7c38af6316fef8"
-  integrity sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/triple-beam/-/triple-beam-1.3.5.tgz#74fef9ffbaa198eb8b588be029f38b00299caa2c"
+  integrity sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==
 
 "@types/tunnel@^0.0.3":
   version "0.0.3"
@@ -6316,7 +6066,7 @@
   dependencies:
     "@types/node" "*"
 
-"@types/uuid@8.3.4", "@types/uuid@^8.3.4":
+"@types/uuid@8.3.4":
   version "8.3.4"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc"
   integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw==
@@ -6366,74 +6116,47 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@typescript-eslint/eslint-plugin@7.18.0", "@typescript-eslint/eslint-plugin@^7.16.1":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz#b16d3cf3ee76bf572fdf511e79c248bdec619ea3"
-  integrity sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==
+"@typescript-eslint/eslint-plugin@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.17.0.tgz#2ee073c421f4e81e02d10e731241664b6253b23c"
+  integrity sha512-HU1KAdW3Tt8zQkdvNoIijfWDMvdSweFYm4hWh+KwhPstv+sCmWb89hCIP8msFm9N1R/ooh9honpSuvqKWlYy3w==
   dependencies:
     "@eslint-community/regexpp" "^4.10.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/type-utils" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
+    "@typescript-eslint/scope-manager" "8.17.0"
+    "@typescript-eslint/type-utils" "8.17.0"
+    "@typescript-eslint/utils" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
     graphemer "^1.4.0"
     ignore "^5.3.1"
     natural-compare "^1.4.0"
     ts-api-utils "^1.3.0"
 
-"@typescript-eslint/parser@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.0.tgz#2b402cadeadd3f211c25820e5433413347b27391"
-  integrity sha512-GZmjMh4AJ/5gaH4XF2eXA8tMnHWP+Pm1mjQR2QN4Iz+j/zO04b9TOvJYOX2sCNIQHtRStKTxRY1FX7LhpJT4Gw==
+"@typescript-eslint/parser@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-8.17.0.tgz#2ee972bb12fa69ac625b85813dc8d9a5a053ff52"
+  integrity sha512-Drp39TXuUlD49F7ilHHCG7TTg8IkA+hxCuULdmzWYICxGXvDXmDmWEjJYZQYgf6l/TFfYNE167m7isnc3xlIEg==
   dependencies:
-    "@typescript-eslint/scope-manager" "6.9.0"
-    "@typescript-eslint/types" "6.9.0"
-    "@typescript-eslint/typescript-estree" "6.9.0"
-    "@typescript-eslint/visitor-keys" "6.9.0"
+    "@typescript-eslint/scope-manager" "8.17.0"
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/typescript-estree" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
     debug "^4.3.4"
 
-"@typescript-eslint/parser@7.18.0", "@typescript-eslint/parser@^7.16.1":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-7.18.0.tgz#83928d0f1b7f4afa974098c64b5ce6f9051f96a0"
-  integrity sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==
+"@typescript-eslint/scope-manager@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-8.17.0.tgz#a3f49bf3d4d27ff8d6b2ea099ba465ef4dbcaa3a"
+  integrity sha512-/ewp4XjvnxaREtqsZjF4Mfn078RD/9GmiEAtTeLQ7yFdKnqwTOgRMSvFz4et9U5RiJQ15WTGXPLj89zGusvxBg==
   dependencies:
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-    debug "^4.3.4"
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
 
-"@typescript-eslint/scope-manager@5.62.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c"
-  integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==
+"@typescript-eslint/type-utils@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-8.17.0.tgz#d326569f498cdd0edf58d5bb6030b4ad914e63d3"
+  integrity sha512-q38llWJYPd63rRnJ6wY/ZQqIzPrBCkPdpIsaCfkR3Q4t3p6sb422zougfad4TFW9+ElIFLVDzWGiGAfbb/v2qw==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
-
-"@typescript-eslint/scope-manager@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.9.0.tgz#2626e9a7fe0e004c3e25f3b986c75f584431134e"
-  integrity sha512-1R8A9Mc39n4pCCz9o79qRO31HGNDvC7UhPhv26TovDsWPBDx+Sg3rOZdCELIA3ZmNoWAuxaMOT7aWtGRSYkQxw==
-  dependencies:
-    "@typescript-eslint/types" "6.9.0"
-    "@typescript-eslint/visitor-keys" "6.9.0"
-
-"@typescript-eslint/scope-manager@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83"
-  integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==
-  dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-
-"@typescript-eslint/type-utils@7.18.0", "@typescript-eslint/type-utils@^7.2.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz#2165ffaee00b1fbbdd2d40aa85232dab6998f53b"
-  integrity sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==
-  dependencies:
-    "@typescript-eslint/typescript-estree" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
+    "@typescript-eslint/typescript-estree" "8.17.0"
+    "@typescript-eslint/utils" "8.17.0"
     debug "^4.3.4"
     ts-api-utils "^1.3.0"
 
@@ -6447,51 +6170,20 @@
   resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f"
   integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==
 
-"@typescript-eslint/types@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.9.0.tgz#86a0cbe7ac46c0761429f928467ff3d92f841098"
-  integrity sha512-+KB0lbkpxBkBSiVCuQvduqMJy+I1FyDbdwSpM3IoBS7APl4Bu15lStPjgBIdykdRqQNYqYNMa8Kuidax6phaEw==
+"@typescript-eslint/types@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-8.17.0.tgz#ef84c709ef8324e766878834970bea9a7e3b72cf"
+  integrity sha512-gY2TVzeve3z6crqh2Ic7Cr+CAv6pfb0Egee7J5UAVWCpVvDI/F71wNfolIim4FE6hT15EbpZFVUj9j5i38jYXA==
 
-"@typescript-eslint/types@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9"
-  integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==
-
-"@typescript-eslint/typescript-estree@5.62.0", "@typescript-eslint/typescript-estree@^5.13.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
-  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+"@typescript-eslint/typescript-estree@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-8.17.0.tgz#40b5903bc929b1e8dd9c77db3cb52cfb199a2a34"
+  integrity sha512-JqkOopc1nRKZpX+opvKqnM3XUlM7LpFMD0lYxTqOTKQfCWAmxw45e3qlOCsEqEB2yuacujivudOFpCnqkBDNMw==
   dependencies:
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/visitor-keys" "5.62.0"
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/visitor-keys" "8.17.0"
     debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.3.7"
-    tsutils "^3.21.0"
-
-"@typescript-eslint/typescript-estree@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.0.tgz#d0601b245be873d8fe49f3737f93f8662c8693d4"
-  integrity sha512-NJM2BnJFZBEAbCfBP00zONKXvMqihZCrmwCaik0UhLr0vAgb6oguXxLX1k00oQyD+vZZ+CJn3kocvv2yxm4awQ==
-  dependencies:
-    "@typescript-eslint/types" "6.9.0"
-    "@typescript-eslint/visitor-keys" "6.9.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
-    is-glob "^4.0.3"
-    semver "^7.5.4"
-    ts-api-utils "^1.0.1"
-
-"@typescript-eslint/typescript-estree@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931"
-  integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==
-  dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/visitor-keys" "7.18.0"
-    debug "^4.3.4"
-    globby "^11.1.0"
+    fast-glob "^3.3.2"
     is-glob "^4.0.3"
     minimatch "^9.0.4"
     semver "^7.6.0"
@@ -6510,29 +6202,28 @@
     semver "^7.3.5"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@7.18.0", "@typescript-eslint/utils@^7.3.1":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f"
-  integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==
+"@typescript-eslint/typescript-estree@^5.13.0":
+  version "5.62.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b"
+  integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==
+  dependencies:
+    "@typescript-eslint/types" "5.62.0"
+    "@typescript-eslint/visitor-keys" "5.62.0"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@8.17.0", "@typescript-eslint/utils@^6.0.0 || ^7.0.0 || ^8.0.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-8.17.0.tgz#41c05105a2b6ab7592f513d2eeb2c2c0236d8908"
+  integrity sha512-bQC8BnEkxqG8HBGKwG9wXlZqg37RKSMY7v/X8VEWD8JG2JuTHuNK0VFvMPMUKQcbk6B+tf05k+4AShAEtCtJ/w==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
-    "@typescript-eslint/scope-manager" "7.18.0"
-    "@typescript-eslint/types" "7.18.0"
-    "@typescript-eslint/typescript-estree" "7.18.0"
-
-"@typescript-eslint/utils@^5.10.0":
-  version "5.62.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86"
-  integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@types/json-schema" "^7.0.9"
-    "@types/semver" "^7.3.12"
-    "@typescript-eslint/scope-manager" "5.62.0"
-    "@typescript-eslint/types" "5.62.0"
-    "@typescript-eslint/typescript-estree" "5.62.0"
-    eslint-scope "^5.1.1"
-    semver "^7.3.7"
+    "@typescript-eslint/scope-manager" "8.17.0"
+    "@typescript-eslint/types" "8.17.0"
+    "@typescript-eslint/typescript-estree" "8.17.0"
 
 "@typescript-eslint/visitor-keys@4.33.0":
   version "4.33.0"
@@ -6550,27 +6241,24 @@
     "@typescript-eslint/types" "5.62.0"
     eslint-visitor-keys "^3.3.0"
 
-"@typescript-eslint/visitor-keys@6.9.0":
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.0.tgz#cc69421c10c4ac997ed34f453027245988164e80"
-  integrity sha512-dGtAfqjV6RFOtIP8I0B4ZTBRrlTT8NHHlZZSchQx3qReaoDeXhYM++M4So2AgFK9ZB0emRPA6JI1HkafzA2Ibg==
+"@typescript-eslint/visitor-keys@8.17.0":
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-8.17.0.tgz#4dbcd0e28b9bf951f4293805bf34f98df45e1aa8"
+  integrity sha512-1Hm7THLpO6ww5QU6H/Qp+AusUUl+z/CAm3cNZZ0jQvon9yicgO7Rwd+/WWRpMKLYV6p2UvdbR27c86rzCPpreg==
   dependencies:
-    "@typescript-eslint/types" "6.9.0"
-    eslint-visitor-keys "^3.4.1"
-
-"@typescript-eslint/visitor-keys@7.18.0":
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7"
-  integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==
-  dependencies:
-    "@typescript-eslint/types" "7.18.0"
-    eslint-visitor-keys "^3.4.3"
+    "@typescript-eslint/types" "8.17.0"
+    eslint-visitor-keys "^4.2.0"
 
 "@ungap/structured-clone@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406"
   integrity sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==
 
+"@vitest/eslint-plugin@^1.1.14":
+  version "1.1.14"
+  resolved "https://registry.yarnpkg.com/@vitest/eslint-plugin/-/eslint-plugin-1.1.14.tgz#dc3bb332461282cfab213b76e5e42bd2dad5929b"
+  integrity sha512-ej0cT5rUt7uvwxuu7Qxkm7fI+eaOq8vD34qGpuRoXCdvOybOlE5GDqtgvVCYbxLANkcRJfm5VDU1TnJmQRHi9g==
+
 "@vitest/expect@0.29.8":
   version "0.29.8"
   resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-0.29.8.tgz#6ecdd031b4ea8414717d10b65ccd800908384612"
@@ -6580,23 +6268,6 @@
     "@vitest/utils" "0.29.8"
     chai "^4.3.7"
 
-"@vitest/expect@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-2.0.5.tgz#f3745a6a2c18acbea4d39f5935e913f40d26fa86"
-  integrity sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==
-  dependencies:
-    "@vitest/spy" "2.0.5"
-    "@vitest/utils" "2.0.5"
-    chai "^5.1.1"
-    tinyrainbow "^1.2.0"
-
-"@vitest/pretty-format@2.0.5", "@vitest/pretty-format@^2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/pretty-format/-/pretty-format-2.0.5.tgz#91d2e6d3a7235c742e1a6cc50e7786e2f2979b1e"
-  integrity sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==
-  dependencies:
-    tinyrainbow "^1.2.0"
-
 "@vitest/runner@0.29.8":
   version "0.29.8"
   resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-0.29.8.tgz#ede8a7be8a074ea1180bc1d1595bd879ed15971c"
@@ -6606,23 +6277,6 @@
     p-limit "^4.0.0"
     pathe "^1.1.0"
 
-"@vitest/runner@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-2.0.5.tgz#89197e712bb93513537d6876995a4843392b2a84"
-  integrity sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==
-  dependencies:
-    "@vitest/utils" "2.0.5"
-    pathe "^1.1.2"
-
-"@vitest/snapshot@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-2.0.5.tgz#a2346bc5013b73c44670c277c430e0334690a162"
-  integrity sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==
-  dependencies:
-    "@vitest/pretty-format" "2.0.5"
-    magic-string "^0.30.10"
-    pathe "^1.1.2"
-
 "@vitest/spy@0.29.8":
   version "0.29.8"
   resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-0.29.8.tgz#2e0c3b30e04d317b2197e3356234448aa432e131"
@@ -6630,13 +6284,6 @@
   dependencies:
     tinyspy "^1.0.2"
 
-"@vitest/spy@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-2.0.5.tgz#590fc07df84a78b8e9dd976ec2090920084a2b9f"
-  integrity sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==
-  dependencies:
-    tinyspy "^3.0.0"
-
 "@vitest/utils@0.29.8":
   version "0.29.8"
   resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-0.29.8.tgz#423da85fd0c6633f3ab496cf7d2fc0119b850df8"
@@ -6647,15 +6294,52 @@
     loupe "^2.3.6"
     pretty-format "^27.5.1"
 
-"@vitest/utils@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-2.0.5.tgz#6f8307a4b6bc6ceb9270007f73c67c915944e926"
-  integrity sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==
+"@vue/compiler-core@3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.5.13.tgz#b0ae6c4347f60c03e849a05d34e5bf747c9bda05"
+  integrity sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==
   dependencies:
-    "@vitest/pretty-format" "2.0.5"
-    estree-walker "^3.0.3"
-    loupe "^3.1.1"
-    tinyrainbow "^1.2.0"
+    "@babel/parser" "^7.25.3"
+    "@vue/shared" "3.5.13"
+    entities "^4.5.0"
+    estree-walker "^2.0.2"
+    source-map-js "^1.2.0"
+
+"@vue/compiler-dom@3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz#bb1b8758dbc542b3658dda973b98a1c9311a8a58"
+  integrity sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==
+  dependencies:
+    "@vue/compiler-core" "3.5.13"
+    "@vue/shared" "3.5.13"
+
+"@vue/compiler-sfc@^3.3.4":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz#461f8bd343b5c06fac4189c4fef8af32dea82b46"
+  integrity sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==
+  dependencies:
+    "@babel/parser" "^7.25.3"
+    "@vue/compiler-core" "3.5.13"
+    "@vue/compiler-dom" "3.5.13"
+    "@vue/compiler-ssr" "3.5.13"
+    "@vue/shared" "3.5.13"
+    estree-walker "^2.0.2"
+    magic-string "^0.30.11"
+    postcss "^8.4.48"
+    source-map-js "^1.2.0"
+
+"@vue/compiler-ssr@3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz#e771adcca6d3d000f91a4277c972a996d07f43ba"
+  integrity sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==
+  dependencies:
+    "@vue/compiler-dom" "3.5.13"
+    "@vue/shared" "3.5.13"
+
+"@vue/shared@3.5.13":
+  version "3.5.13"
+  resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.5.13.tgz#87b309a6379c22b926e696893237826f64339b6f"
+  integrity sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==
 
 "@xyflow/svelte@^0.1.18":
   version "0.1.18"
@@ -6744,7 +6428,7 @@ abortcontroller-polyfill@^1.4.0:
   resolved "https://registry.yarnpkg.com/abortcontroller-polyfill/-/abortcontroller-polyfill-1.7.5.tgz#6738495f4e901fbb57b6c0611d0c75f76c485bed"
   integrity sha512-JMJ5soJWP18htbbxJjG7bG6yuI6pRhgJ0scHHTfkUjf6wjP912xZWvM+A4sJK3gqd9E8fcPbDnOefbA9Th/FIQ==
 
-abstract-leveldown@^6.2.1, abstract-leveldown@^6.3.0:
+abstract-leveldown@^6.2.1:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a"
   integrity sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ==
@@ -6755,12 +6439,17 @@ abstract-leveldown@^6.2.1, abstract-leveldown@^6.3.0:
     level-supports "~1.0.0"
     xtend "~4.0.0"
 
-abstract-leveldown@~0.12.0, abstract-leveldown@~0.12.1:
-  version "0.12.4"
-  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz#29e18e632e60e4e221d5810247852a63d7b2e410"
-  integrity sha512-TOod9d5RDExo6STLMGa+04HGkl+TlMfbDnTyN93/ETJ9DpQ0DaYLqcMZlbXvdc4W3vVo1Qrl+WhSp8zvDsJ+jA==
+abstract-leveldown@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-7.2.0.tgz#08d19d4e26fb5be426f7a57004851b39e1795a2e"
+  integrity sha512-DnhQwcFEaYsvYDnACLZhMmCWd3rkOeEvglpa4q5i/5Jlm3UIsWaxVzuXvDLFCSCWRO3yy2/+V/G7FusFgejnfQ==
   dependencies:
-    xtend "~3.0.0"
+    buffer "^6.0.3"
+    catering "^2.0.0"
+    is-buffer "^2.0.5"
+    level-concat-iterator "^3.0.0"
+    level-supports "^2.0.1"
+    queue-microtask "^1.2.3"
 
 abstract-leveldown@~2.7.1:
   version "2.7.2"
@@ -6804,41 +6493,29 @@ acorn-globals@^7.0.0:
     acorn "^8.1.0"
     acorn-walk "^8.0.2"
 
-acorn-import-assertions@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
-  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
-
-acorn-jsx-walk@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx-walk/-/acorn-jsx-walk-2.0.0.tgz#a5ed648264e68282d7c2aead80216bfdf232573a"
-  integrity sha512-uuo6iJj4D4ygkdzd6jPtcxs8vZgDX9YFIkqczGImoypX2fQ4dVImmu3UzA4ynixCIMTrEOWW+95M2HuBaCEOVA==
+acorn-import-attributes@^1.9.5:
+  version "1.9.5"
+  resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
+  integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
 
 acorn-jsx@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
-acorn-loose@^8.4.0:
-  version "8.4.0"
-  resolved "https://registry.yarnpkg.com/acorn-loose/-/acorn-loose-8.4.0.tgz#26d3e219756d1e180d006f5bcc8d261a28530f55"
-  integrity sha512-M0EUka6rb+QC4l9Z3T0nJEzNOO7JcoJlYMrBlyBCiFSXRyxjLKayd4TbQs2FDRWQU1h9FR7QVNHt+PEaoNL5rQ==
-  dependencies:
-    acorn "^8.11.0"
-
 acorn-walk@^7.1.1:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
   integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==
 
-acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0, acorn-walk@^8.3.3:
+acorn-walk@^8.0.2, acorn-walk@^8.1.1, acorn-walk@^8.2.0:
   version "8.3.3"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.3.3.tgz#9caeac29eefaa0c41e3d4c65137de4d6f34df43e"
   integrity sha512-MxXdReSRhGO7VlFe1bRG/oI7/mdLV9B9JJT0N8vZOhF7gFRR5l3M8W9G8JxmKV+JC5mGqJ0QvqfSOLsCPa4nUw==
   dependencies:
     acorn "^8.11.0"
 
-acorn@^5.2.1, acorn@^5.7.3:
+acorn@^5.2.1:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
@@ -6848,11 +6525,16 @@ acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.11.3, acorn@^8.12.0, acorn@^8.12.1, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
+acorn@^8.1.0, acorn@^8.10.0, acorn@^8.11.0, acorn@^8.11.3, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.1, acorn@^8.8.2, acorn@^8.9.0:
   version "8.12.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.12.1.tgz#71616bdccbe25e27a54439e0046e89ca76df2248"
   integrity sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==
 
+acorn@^8.14.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.14.0.tgz#063e2c70cac5fb4f6467f0b11152e04c682795b0"
+  integrity sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==
+
 add-stream@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
@@ -6865,14 +6547,14 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2:
+agent-base@^7.0.2, agent-base@^7.1.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.1.tgz#bdbded7dfb096b751a2a087eeeb9664725b2e317"
   integrity sha512-H0TSyFNDMomMNJQBn8wFV5YC/2eJ+VXECwOadZJT554xP6cODZHPX3H9QMQECxvrgiSOP1pHjy1sMWQVYJOUOA==
   dependencies:
     debug "^4.3.4"
 
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
+agentkeepalive@^4.2.1:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.5.0.tgz#2673ad1389b3c418c5a20c5d7364f93ca04be923"
   integrity sha512-5GG/5IbQQpC9FpkRGsSvZI5QYeSCzlJHdpBQntCsuTOxhKD8lqKhrleg2Yi7yvMIf82Ycmmqln9U8V9qwEiJew==
@@ -6915,7 +6597,7 @@ ajv@^6.12.3, ajv@^6.12.4:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.1.0, ajv@^8.17.1, ajv@^8.4.0:
+ajv@^8.0.0, ajv@^8.1.0, ajv@^8.4.0:
   version "8.17.1"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.17.1.tgz#37d9a5c776af6bc92d7f4f9510eba4c0a60d11a6"
   integrity sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==
@@ -7047,38 +6729,6 @@ archive-type@^4.0.0:
   dependencies:
     file-type "^4.2.0"
 
-archiver-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-2.1.0.tgz#e8a460e94b693c3e3da182a098ca6285ba9249e2"
-  integrity sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==
-  dependencies:
-    glob "^7.1.4"
-    graceful-fs "^4.2.0"
-    lazystream "^1.0.0"
-    lodash.defaults "^4.2.0"
-    lodash.difference "^4.5.0"
-    lodash.flatten "^4.4.0"
-    lodash.isplainobject "^4.0.6"
-    lodash.union "^4.6.0"
-    normalize-path "^3.0.0"
-    readable-stream "^2.0.0"
-
-archiver-utils@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-3.0.4.tgz#a0d201f1cf8fce7af3b5a05aea0a337329e96ec7"
-  integrity sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==
-  dependencies:
-    glob "^7.2.3"
-    graceful-fs "^4.2.0"
-    lazystream "^1.0.0"
-    lodash.defaults "^4.2.0"
-    lodash.difference "^4.5.0"
-    lodash.flatten "^4.4.0"
-    lodash.isplainobject "^4.0.6"
-    lodash.union "^4.6.0"
-    normalize-path "^3.0.0"
-    readable-stream "^3.6.0"
-
 archiver-utils@^5.0.0, archiver-utils@^5.0.2:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/archiver-utils/-/archiver-utils-5.0.2.tgz#63bc719d951803efc72cf961a56ef810760dd14d"
@@ -7092,7 +6742,7 @@ archiver-utils@^5.0.0, archiver-utils@^5.0.2:
     normalize-path "^3.0.0"
     readable-stream "^4.0.0"
 
-archiver@7.0.1:
+archiver@7.0.1, archiver@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/archiver/-/archiver-7.0.1.tgz#c9d91c350362040b8927379c7aa69c0655122f61"
   integrity sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==
@@ -7105,19 +6755,6 @@ archiver@7.0.1:
     tar-stream "^3.0.0"
     zip-stream "^6.0.1"
 
-archiver@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/archiver/-/archiver-5.3.2.tgz#99991d5957e53bd0303a392979276ac4ddccf3b0"
-  integrity sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==
-  dependencies:
-    archiver-utils "^2.1.0"
-    async "^3.2.4"
-    buffer-crc32 "^0.2.1"
-    readable-stream "^3.6.0"
-    readdir-glob "^1.1.2"
-    tar-stream "^2.2.0"
-    zip-stream "^4.1.0"
-
 are-we-there-yet@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
@@ -7283,15 +6920,6 @@ asn1.js-rfc5280@^3.0.0:
   dependencies:
     asn1.js "^5.0.0"
 
-asn1.js@^4.10.1:
-  version "4.10.1"
-  resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
-  integrity sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==
-  dependencies:
-    bn.js "^4.0.0"
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
 asn1.js@^5.0.0, asn1.js@^5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07"
@@ -7319,11 +6947,6 @@ assertion-error@^1.1.0:
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
   integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
 
-assertion-error@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-2.0.1.tgz#f641a196b335690b1070bf00b6e7593fec190bf7"
-  integrity sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==
-
 ast-module-types@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/ast-module-types/-/ast-module-types-2.7.1.tgz#3f7989ef8dfa1fdb82dfe0ab02bdfc7c77a57dd3"
@@ -7347,18 +6970,11 @@ async-lock@^1.4.1:
 async-retry@^1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/async-retry/-/async-retry-1.3.3.tgz#0e7f36c04d8478e7a58bdbed80cedf977785f280"
-  integrity "sha1-Dn82wE2EeOeli9vtgM7fl3eF8oA= sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw=="
+  integrity sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==
   dependencies:
     retry "0.13.1"
 
-async@^2.6.3:
-  version "2.6.4"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.4.tgz#706b7ff6084664cd7eae713f6f965433b5504221"
-  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
-  dependencies:
-    lodash "^4.17.14"
-
-async@^3.2.1, async@^3.2.3, async@^3.2.4:
+async@^3.2.3, async@^3.2.4:
   version "3.2.5"
   resolved "https://registry.yarnpkg.com/async/-/async-3.2.5.tgz#ebd52a8fdaf7a2289a24df399f8d8485c8a46b66"
   integrity sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==
@@ -7397,25 +7013,31 @@ available-typed-arrays@^1.0.7:
   dependencies:
     possible-typed-array-names "^1.0.0"
 
+await-to-js@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/await-to-js/-/await-to-js-3.0.0.tgz#70929994185616f4675a91af6167eb61cc92868f"
+  integrity sha512-zJAaP9zxTcvTHRlejau3ZOY4V7SRpiByf3/dxx2uyKxxor19tpmpV2QRsTKikckwhaPmr2dVpxxMr7jOCYVp5g==
+
 aws-cloudfront-sign@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/aws-cloudfront-sign/-/aws-cloudfront-sign-3.0.2.tgz#da5273b0301bcd70312c8c76293d5fec6d414f0a"
   integrity sha512-Z/yOGZ3Hd1rhYbY13mtRiLCbCDC1Xf/v+dQUyUwMLnyunD/nfDZd/2LMZ9MKxxOhVb2RzEmEwY0F9f+riPaSWQ==
 
-aws-sdk@2.1030.0:
-  version "2.1030.0"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1030.0.tgz#24a856af3d2b8b37c14a8f59974993661c66fd82"
-  integrity sha512-to0STOb8DsSGuSsUb/WCbg/UFnMGfIYavnJH5ZlRCHzvCFjTyR+vfE8ku+qIZvfFM4+5MNTQC/Oxfun2X/TuyA==
+aws-sdk@2.1692.0:
+  version "2.1692.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.1692.0.tgz#9dac5f7bfcc5ab45825cc8591b12753aa7d2902c"
+  integrity sha512-x511uiJ/57FIsbgUe5csJ13k3uzu25uWQE+XqfBis/sB0SFoiElJWXRkgEAUh0U6n40eT3ay5Ue4oPkRMu1LYw==
   dependencies:
     buffer "4.9.2"
     events "1.1.1"
     ieee754 "1.1.13"
-    jmespath "0.15.0"
+    jmespath "0.16.0"
     querystring "0.2.0"
     sax "1.2.1"
     url "0.10.3"
-    uuid "3.3.2"
-    xml2js "0.4.19"
+    util "^0.12.4"
+    uuid "8.0.0"
+    xml2js "0.6.2"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -7423,16 +7045,16 @@ aws-sign2@~0.7.0:
   integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
+  integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axios@1.1.3, axios@1.6.3, axios@^0.21.1, axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.5.0, axios@^1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.3.tgz#7f50f23b3aa246eff43c54834272346c396613f4"
-  integrity sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==
+axios@1.1.3, axios@1.7.7, axios@^0.21.1, axios@^1.0.0, axios@^1.1.3, axios@^1.4.0, axios@^1.6.2, axios@^1.6.8:
+  version "1.7.7"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.7.7.tgz#2f554296f9892a72ac8d8e4c5b79c14a91d0a47f"
+  integrity sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==
   dependencies:
-    follow-redirects "^1.15.0"
+    follow-redirects "^1.15.6"
     form-data "^4.0.0"
     proxy-from-env "^1.1.0"
 
@@ -7649,24 +7271,14 @@ before-after-hook@^2.2.0:
   integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
 
 big-integer@^1.6.43:
-  version "1.6.51"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686"
-  integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==
+  version "1.6.52"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85"
+  integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==
 
-big.js@^5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
-  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
-
-bignumber.js@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-2.4.0.tgz#838a992da9f9d737e0f4b2db0be62bb09dd0c5e8"
-  integrity sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==
-
-bignumber.js@^9.0.0:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.1.tgz#c4df7dc496bd849d4c9464344c1aa74228b4dac6"
-  integrity sha512-pHm4LsMJ6lzgNGVfZHjMoO8sdoRhOzOH4MLmY65Jg70bpxCKu5iOHNJyfF6OyvYw7t8Fpf35RuzUyqnQsj8Vig==
+bignumber.js@^9.0.0, bignumber.js@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-9.1.2.tgz#b7c4242259c008903b13707983b5f4bbd31eda0c"
+  integrity sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
@@ -7678,13 +7290,6 @@ binascii@0.0.2:
   resolved "https://registry.yarnpkg.com/binascii/-/binascii-0.0.2.tgz#a7f8a8801dbccf8b1756b743daa0fee9e2d9e0ee"
   integrity sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
-  dependencies:
-    file-uri-to-path "1.0.0"
-
 bl@^1.0.0:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/bl/-/bl-1.2.3.tgz#1e8dd80142eac80d7158c9dccc047fb620e035e7"
@@ -7702,62 +7307,45 @@ bl@^4.0.3, bl@^4.1.0:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-bl@^6.0.3:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.13.tgz#dc5f288d3f849771bb6112b29477abee4c0a9d96"
-  integrity sha512-tMncAcpsyjZgAVbVFupVIaB2xud13xxT59fdHkuszY2jdZkqIWfpQdmII1fOe3kOGAz0mNLTIHEm+KxpYsQKKg==
+bl@^6.0.11:
+  version "6.0.16"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-6.0.16.tgz#29b190f1a754e2d168de3dc8c74ed8d12bf78e6e"
+  integrity sha512-V/kz+z2Mx5/6qDfRCilmrukUXcXuCoXKg3/3hDvzKKoSUx8CJKudfIoT29XZc3UE9xBvxs5qictiHdprwtteEg==
   dependencies:
     "@types/readable-stream" "^4.0.0"
     buffer "^6.0.3"
     inherits "^2.0.4"
     readable-stream "^4.2.0"
 
-bl@~0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"
-  integrity sha512-pfqikmByp+lifZCS0p6j6KreV6kNU6Apzpm2nKOk+94cZb/jvle55+JxWiByUQ0Wo/+XnDXEy5MxxKMb6r0VIw==
-  dependencies:
-    readable-stream "~1.0.26"
-
 bluebird@^3.5.1, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-bmp-js@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/bmp-js/-/bmp-js-0.1.0.tgz#e05a63f796a6c1ff25f4771ec7adadc148c07233"
-  integrity sha512-vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==
+bmp-ts@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/bmp-ts/-/bmp-ts-1.0.9.tgz#0fd124ba812be9b786b29e5b186ee76d74ff5538"
+  integrity sha512-cTEHk2jLrPyi+12M3dhpEbnnPOsaZuq7C45ylbbQIiWgDFZq4UVYPEY5mlqjvsj/6gJv9qX5sa+ebDzLXT28Vw==
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
+bn.js@^4.0.0:
   version "4.12.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
   integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
-bn.js@^5.0.0, bn.js@^5.2.1:
+bn.js@^5.2.1:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70"
   integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==
 
-boolbase@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
-
 boolean@^3.0.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/boolean/-/boolean-3.2.0.tgz#9e5294af4e98314494cbb17979fa54ca159f116b"
   integrity sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==
 
-bottleneck@^2.19.5:
-  version "2.19.5"
-  resolved "https://registry.yarnpkg.com/bottleneck/-/bottleneck-2.19.5.tgz#5df0b90f59fd47656ebe63c78a98419205cadd91"
-  integrity sha512-VHiNCbI1lKdl44tGrhNfU3lup0Tj/ZBMJB5/2ZbNXRCPuRCO7ed2mgcK4r17y+KB2EfuYuRaVlwNbAeaWGSpbw==
-
 bowser@^2.11.0:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/bowser/-/bowser-2.11.0.tgz#5ca3c35757a7aa5771500c70a73a9f91ef420a8f"
-  integrity "sha1-XKPDV1enqldxUAxwpzqfke9CCo8= sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA=="
+  integrity sha512-AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==
 
 boxen@^5.0.0:
   version "5.1.2"
@@ -7795,11 +7383,6 @@ braces@^3.0.3, braces@~3.0.2:
   dependencies:
     fill-range "^7.1.1"
 
-brorand@^1.0.1, brorand@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
-  integrity sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==
-
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
@@ -7810,71 +7393,7 @@ browser-request@^0.3.3:
   resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17"
   integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg==
 
-browserify-aes@^1.0.4, browserify-aes@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
-  integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
-  dependencies:
-    buffer-xor "^1.0.3"
-    cipher-base "^1.0.0"
-    create-hash "^1.1.0"
-    evp_bytestokey "^1.0.3"
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-browserify-cipher@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
-  integrity sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==
-  dependencies:
-    browserify-aes "^1.0.4"
-    browserify-des "^1.0.0"
-    evp_bytestokey "^1.0.0"
-
-browserify-des@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.2.tgz#3af4f1f59839403572f1c66204375f7a7f703e9c"
-  integrity sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==
-  dependencies:
-    cipher-base "^1.0.1"
-    des.js "^1.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-browserify-fs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-fs/-/browserify-fs-1.0.0.tgz#f075aa8a729d4d1716d066620e386fcc1311a96f"
-  integrity sha512-8LqHRPuAEKvyTX34R6tsw4bO2ro6j9DmlYBhiYWHRM26Zv2cBw1fJOU0NeUQ0RkXkPn/PFBjhA0dm4AgaBurTg==
-  dependencies:
-    level-filesystem "^1.0.1"
-    level-js "^2.1.3"
-    levelup "^0.18.2"
-
-browserify-rsa@^4.0.0, browserify-rsa@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.1.0.tgz#b2fd06b5b75ae297f7ce2dc651f918f5be158c8d"
-  integrity sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==
-  dependencies:
-    bn.js "^5.0.0"
-    randombytes "^2.0.1"
-
-browserify-sign@^4.0.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.3.tgz#7afe4c01ec7ee59a89a558a4b75bd85ae62d4208"
-  integrity sha512-JWCZW6SKhfhjJxO8Tyiiy+XYB7cqd2S5/+WeYHsKdNKFlCBhKbblba1A/HN/90YwtxKc8tCErjffZl++UNmGiw==
-  dependencies:
-    bn.js "^5.2.1"
-    browserify-rsa "^4.1.0"
-    create-hash "^1.2.0"
-    create-hmac "^1.1.7"
-    elliptic "^6.5.5"
-    hash-base "~3.0"
-    inherits "^2.0.4"
-    parse-asn1 "^5.1.7"
-    readable-stream "^2.3.8"
-    safe-buffer "^5.2.1"
-
-browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+browserslist@^4.21.3, browserslist@^4.21.5:
   version "4.21.5"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
   integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
@@ -7898,15 +7417,10 @@ bser@2.1.1:
   dependencies:
     node-int64 "^0.4.0"
 
-bson@^6.7.0:
-  version "6.8.0"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-6.8.0.tgz#5063c41ba2437c2b8ff851b50d9e36cb7aaa7525"
-  integrity sha512-iOJg8pr7wq2tg/zSlCCHMi3hMm5JTOxLTagf3zxhcenHsFp+c6uOs6K7W5UE7A4QIJGtqh/ZovFNMP4mOPJynQ==
-
-btoa@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/btoa/-/btoa-1.2.1.tgz#01a9909f8b2c93f6bf680ba26131eb30f7fa3d73"
-  integrity sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==
+bson@^6.7.0, bson@^6.9.0:
+  version "6.10.0"
+  resolved "https://registry.yarnpkg.com/bson/-/bson-6.10.0.tgz#559c767cc8b605c3ab14e5896214c8f2abdd6a12"
+  integrity sha512-ROchNosXMJD2cbQGm84KoP7vOGPO6/bOAW0veMMbzhXLqoZptcaYRVLitwvuhwhjjpU1qP4YZRWLhgETdgqUQw==
 
 buffer-alloc-unsafe@^1.1.0:
   version "1.1.0"
@@ -7921,31 +7435,21 @@ buffer-alloc@^1.2.0:
     buffer-alloc-unsafe "^1.1.0"
     buffer-fill "^1.0.0"
 
-buffer-crc32@^0.2.1, buffer-crc32@^0.2.13, buffer-crc32@~0.2.3:
-  version "0.2.13"
-  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
-
 buffer-crc32@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-1.0.0.tgz#a10993b9055081d55304bd9feb4a072de179f405"
   integrity sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==
 
+buffer-crc32@~0.2.3:
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
+
 buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
 
-buffer-equal@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"
-  integrity sha512-RgSV6InVQ9ODPdLWJ5UAqBqJBOg370Nz6ZQtRzpt6nUjc8v0St97uJ4PYC6NztqIScrAXafKM3mZPMygSe1ggA==
-
-buffer-es6@^4.9.2, buffer-es6@^4.9.3:
-  version "4.9.3"
-  resolved "https://registry.yarnpkg.com/buffer-es6/-/buffer-es6-4.9.3.tgz#f26347b82df76fd37e18bcb5288c4970cfd5c404"
-  integrity sha512-Ibt+oXxhmeYJSsCkODPqNpPmyegefiD8rfutH1NYGhMZQhSp95Rz7haemgnJ6dxa6LT+JLLbtgOMORRluwKktw==
-
 buffer-fill@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
@@ -7966,11 +7470,6 @@ buffer-writer@2.0.0:
   resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04"
   integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==
 
-buffer-xor@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9"
-  integrity sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==
-
 buffer@4.9.2:
   version "4.9.2"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
@@ -7988,7 +7487,7 @@ buffer@6.0.3, buffer@^6.0.3:
     base64-js "^1.3.1"
     ieee754 "^1.2.1"
 
-buffer@^5.1.0, buffer@^5.2.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.1.0, buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -8008,7 +7507,7 @@ buildcheck@~0.0.6:
   resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
   integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
-builtin-modules@^3.1.0, builtin-modules@^3.3.0:
+builtin-modules@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
   integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
@@ -8060,30 +7559,6 @@ cac@^6.7.14:
   resolved "https://registry.yarnpkg.com/cac/-/cac-6.7.14.tgz#804e1e6f506ee363cb0e3ccbb09cad5dd9870959"
   integrity sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==
 
-cacache@^15.2.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
-  integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
-  dependencies:
-    "@npmcli/fs" "^1.0.0"
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
-
 cacache@^16.1.0:
   version "16.1.3"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-16.1.3.tgz#a02b9f34ecfaf9a78c9f4bc16fceb94d5d67a38e"
@@ -8135,11 +7610,6 @@ cache-content-type@^1.0.0:
     mime-types "^2.1.18"
     ylru "^1.2.0"
 
-cacheable-lookup@^5.0.3:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz#5a6b865b2c44357be3d5ebc2a467b032719a7005"
-  integrity sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==
-
 cacheable-request@^2.1.1:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
@@ -8166,19 +7636,6 @@ cacheable-request@^6.0.0:
     normalize-url "^4.1.0"
     responselike "^1.0.2"
 
-cacheable-request@^7.0.2:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
-  integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^4.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^6.0.1"
-    responselike "^2.0.0"
-
 call-bind@^1.0.2, call-bind@^1.0.5, call-bind@^1.0.6, call-bind@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
@@ -8195,6 +7652,11 @@ call-me-maybe@^1.0.1:
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
   integrity sha512-wCyFsDQkKPwwF8BDwOiWNx/9K45L/hvggQiDbve+viMNMQnWhrlYIuBk09offfwCRtCO9P6XwUttufzU11WCVw==
 
+callsite@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/callsite/-/callsite-1.0.0.tgz#280398e5d664bd74038b6f0905153e6e8af1bc20"
+  integrity sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -8214,22 +7676,12 @@ camelcase@^5.0.0, camelcase@^5.3.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
+camelcase@^6.2.0, camelcase@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001449:
+caniuse-lite@^1.0.30001449:
   version "1.0.30001460"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001460.tgz#31d2e26f0a2309860ed3eff154e03890d9d851a7"
   integrity sha512-Bud7abqjvEjipUkpLs4D7gR0l8hBYBHoa+tGtKJHvT2AYzLp1z7EmVkUT4ERpVUfca8S2HGIVs883D8pUH1ZzQ==
@@ -8239,6 +7691,11 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
+catering@^2.0.0, catering@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/catering/-/catering-2.1.1.tgz#66acba06ed5ee28d5286133982a927de9a04b510"
+  integrity sha512-K7Qy8O9p76sL3/3m7/zLKbRkyOlSZAgzEaLhyj2mXS8PsCud2Eo4hAb8aLtZqHh0QGqLcb9dlJSu6lHRVENm1w==
+
 chai@^4.3.7:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/chai/-/chai-4.5.0.tgz#707e49923afdd9b13a8b0b47d33d732d13812fd8"
@@ -8252,17 +7709,6 @@ chai@^4.3.7:
     pathval "^1.1.1"
     type-detect "^4.1.0"
 
-chai@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/chai/-/chai-5.1.1.tgz#f035d9792a22b481ead1c65908d14bb62ec1c82c"
-  integrity sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==
-  dependencies:
-    assertion-error "^2.0.1"
-    check-error "^2.1.1"
-    deep-eql "^5.0.1"
-    loupe "^3.1.0"
-    pathval "^2.0.0"
-
 chalk@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
@@ -8301,6 +7747,11 @@ chance@1.1.8:
   resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.8.tgz#5d6c2b78c9170bf6eb9df7acdda04363085be909"
   integrity sha512-v7fi5Hj2VbR6dJEGRWLmJBA83LJMS47pkAbmROFxHWd9qmE1esHRZW8Clf1Fhzr3rjxnNZVCjOEv/ivFxeIMtg==
 
+chance@^1.1.12:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/chance/-/chance-1.1.12.tgz#6a263cf241674af50a1b903357f9d328a6f252fb"
+  integrity sha512-vVBIGQVnwtUG+SYe0ge+3MvF78cvSpuCOEUJr7sVEk2vSBuMW6OXNJjSzdtzrlxNUEaoqH2GBd5Y/+18BEB01Q==
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -8311,7 +7762,7 @@ chardet@^0.7.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-cheap-watch@^1.0.2, cheap-watch@^1.0.4:
+cheap-watch@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/cheap-watch/-/cheap-watch-1.0.4.tgz#0bcb4a3a8fbd9d5327936493f6b56baa668d8fef"
   integrity sha512-QR/9FrtRL5fjfUJBhAKCdi0lSRQ3rVRRum3GF9wDKp2TJbEIMGhUEr2yU8lORzm9Isdjx7/k9S0DFDx+z5VGtw==
@@ -8323,11 +7774,6 @@ check-error@^1.0.3:
   dependencies:
     get-func-name "^2.0.2"
 
-check-error@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/check-error/-/check-error-2.1.1.tgz#87eb876ae71ee388fa0471fe423f494be1d96ccc"
-  integrity sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==
-
 chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
@@ -8343,6 +7789,13 @@ chokidar@3.5.3, chokidar@^3.5.2, chokidar@^3.5.3:
   optionalDependencies:
     fsevents "~2.3.2"
 
+chokidar@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
+  integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
+  dependencies:
+    readdirp "^4.0.1"
+
 chownr@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
@@ -8363,14 +7816,6 @@ ci-info@^3.2.0, ci-info@^3.6.1:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.8.0.tgz#81408265a5380c929f0bc665d62256628ce9ef91"
   integrity sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==
 
-cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.4.tgz#8760e4ecc272f4c363532f926d874aae2c1397de"
-  integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
 cjs-module-lexer@^1.0.0, cjs-module-lexer@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
@@ -8488,11 +7933,6 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clone@~0.1.9:
-  version "0.1.19"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.1.19.tgz#613fb68639b26a494ac53253e15b1a6bd88ada85"
-  integrity sha512-IO78I0y6JcSpEPHzK4obKdsL7E7oLdRVDVOLwr2Hkbjsb+Eoz0dxW6tef0WizoKu0gLC4oZSZuEF4U2K6w1WQw==
-
 cluster-key-slot@1.1.2, cluster-key-slot@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz#88ddaa46906e303b5de30d3153b7d9fe0a0c19ac"
@@ -8591,11 +8031,6 @@ color@^3.1.3:
     color-convert "^1.9.3"
     color-string "^1.6.0"
 
-colord@^2.9.1:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
-  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
-
 colorette@2.0.19, colorette@^2.0.7:
   version "2.0.19"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798"
@@ -8644,11 +8079,6 @@ commander@^11.0.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-11.1.0.tgz#62fdce76006a68e5c1ab3314dc92e800eb83d906"
   integrity sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==
 
-commander@^12.1.0:
-  version "12.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-12.1.0.tgz#01423b36f501259fdaac4d0e4d60c96c991585d3"
-  integrity sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==
-
 commander@^2.16.0, commander@^2.19.0, commander@^2.20.0, commander@^2.20.3, commander@^2.5.0, commander@^2.7.1, commander@^2.8.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -8659,7 +8089,7 @@ commander@^5.1.0:
   resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
   integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
 
-commander@^7.1.0, commander@^7.2.0:
+commander@^7.2.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
@@ -8702,16 +8132,6 @@ component-emitter@^1.3.0:
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
   integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
 
-compress-commons@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-4.1.2.tgz#6542e59cb63e1f46a8b21b0e06f9a32e4c8b06df"
-  integrity sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==
-  dependencies:
-    buffer-crc32 "^0.2.13"
-    crc32-stream "^4.0.2"
-    normalize-path "^3.0.0"
-    readable-stream "^3.6.0"
-
 compress-commons@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/compress-commons/-/compress-commons-6.0.2.tgz#26d31251a66b9d6ba23a84064ecd3a6a71d2609e"
@@ -8723,7 +8143,7 @@ compress-commons@^6.0.2:
     normalize-path "^3.0.0"
     readable-stream "^4.0.0"
 
-compressible@^2.0.0, compressible@^2.0.12:
+compressible@^2.0.0:
   version "2.0.18"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
@@ -8735,16 +8155,6 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-stream@^1.4.4:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
 concat-stream@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-2.0.0.tgz#414cf5af790a48c60ab9be4527d56d5e41133cb1"
@@ -8755,13 +8165,6 @@ concat-stream@^2.0.0:
     readable-stream "^3.0.2"
     typedarray "^0.0.6"
 
-concat-with-sourcemaps@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
-  integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
-  dependencies:
-    source-map "^0.6.1"
-
 condense-newlines@^0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/condense-newlines/-/condense-newlines-0.2.1.tgz#3de985553139475d32502c83b02f60684d24c55f"
@@ -8784,7 +8187,7 @@ config-chain@^1.1.13:
     ini "^1.3.4"
     proto-list "~1.2.1"
 
-configent@^2.1.4, configent@^2.2.0:
+configent@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/configent/-/configent-2.2.0.tgz#2de230fc43f22c47cfd99016aa6962d6f9546994"
   integrity sha512-yIN6zfOWk2nycNJ2JFNiWEai0oiqAhISIht8+pbEBP8bdcpwoQ74AhCZPbUv9aRVJwo7wh1MbCBDUV44UJa7Kw==
@@ -8813,14 +8216,6 @@ console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
-console-stamp@^3.0.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/console-stamp/-/console-stamp-3.1.2.tgz#35dac393e16069a4d9d37b71ca6d5d13d7f3f8fd"
-  integrity sha512-ab66x3NxOTxPuq71dI6gXEiw2X6ql4Le5gZz0bm7FW3FSCB00eztra/oQUuCoCGlsyKOxtULnHwphzMrRtzMBg==
-  dependencies:
-    chalk "^4.1.2"
-    dateformat "^4.6.3"
-
 consolidate@^0.16.0:
   version "0.16.0"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.16.0.tgz#a11864768930f2f19431660a65906668f5fbdc16"
@@ -8923,11 +8318,16 @@ convert-source-map@^2.0.0:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
   integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-cookie@^0.4.1, cookie@~0.4.1:
+cookie@^0.4.1:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
+cookie@~0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.7.2.tgz#556369c472a2ba910f2979891b526b3436237ed7"
+  integrity sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==
+
 cookiejar@^2.1.4:
   version "2.1.4"
   resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.4.tgz#ee669c1fea2cf42dc31585469d193fef0d65771b"
@@ -8986,6 +8386,17 @@ cors@~2.8.5:
     object-assign "^4"
     vary "^1"
 
+cosmiconfig@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.1.0.tgz#1443b9afa596b670082ea46cbd8f6a62b84635f6"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
+  dependencies:
+    "@types/parse-json" "^4.0.0"
+    import-fresh "^3.2.1"
+    parse-json "^5.0.0"
+    path-type "^4.0.0"
+    yaml "^1.10.0"
+
 cosmiconfig@^8.2.0:
   version "8.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.2.0.tgz#f7d17c56a590856cd1e7cee98734dca272b0d8fd"
@@ -9009,14 +8420,6 @@ crc-32@^1.2.0:
   resolved "https://registry.yarnpkg.com/crc-32/-/crc-32-1.2.2.tgz#3cad35a934b8bf71f25ca524b6da51fb7eace2ff"
   integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
 
-crc32-stream@^4.0.2:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-4.0.3.tgz#85dd677eb78fa7cad1ba17cc506a597d41fc6f33"
-  integrity sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==
-  dependencies:
-    crc-32 "^1.2.0"
-    readable-stream "^3.4.0"
-
 crc32-stream@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/crc32-stream/-/crc32-stream-6.0.0.tgz#8529a3868f8b27abb915f6c3617c0fadedbf9430"
@@ -9032,37 +8435,6 @@ crc@^3.4.4:
   dependencies:
     buffer "^5.1.0"
 
-create-ecdh@^4.0.0:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz#d6e7f4bffa66736085a0762fd3a632684dabcc4e"
-  integrity sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==
-  dependencies:
-    bn.js "^4.1.0"
-    elliptic "^6.5.3"
-
-create-hash@^1.1.0, create-hash@^1.1.2, create-hash@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
-  integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
-  dependencies:
-    cipher-base "^1.0.1"
-    inherits "^2.0.1"
-    md5.js "^1.3.4"
-    ripemd160 "^2.0.1"
-    sha.js "^2.4.0"
-
-create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
-  integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
-  dependencies:
-    cipher-base "^1.0.3"
-    create-hash "^1.1.0"
-    inherits "^2.0.1"
-    ripemd160 "^2.0.0"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 create-jest@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/create-jest/-/create-jest-29.7.0.tgz#a355c5b3cb1e1af02ba177fe7afd7feee49a5320"
@@ -9100,43 +8472,15 @@ cron-validate@1.4.5:
   dependencies:
     yup "0.32.9"
 
-cross-spawn@^6.0.0:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
-cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+cross-spawn@7.0.6, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3, cross-spawn@^7.0.5:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-crypto-browserify@^3.11.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec"
-  integrity sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==
-  dependencies:
-    browserify-cipher "^1.0.0"
-    browserify-sign "^4.0.0"
-    create-ecdh "^4.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.0"
-    diffie-hellman "^5.0.0"
-    inherits "^2.0.1"
-    pbkdf2 "^3.0.3"
-    public-encrypt "^4.0.0"
-    randombytes "^2.0.0"
-    randomfill "^1.0.3"
-
 crypto-random-string@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
@@ -9147,30 +8491,6 @@ crypto-randomuuid@^1.0.0:
   resolved "https://registry.yarnpkg.com/crypto-randomuuid/-/crypto-randomuuid-1.0.0.tgz#acf583e5e085e867ae23e107ff70279024f9e9e7"
   integrity sha512-/RC5F4l1SCqD/jazwUF6+t34Cd8zTSAGZ7rvvZu1whZUhD2a5MOGKjSGowoGcpj/cbVZk1ZODIooJEQQq3nNAA==
 
-css-declaration-sorter@^6.3.1:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.3.1.tgz#be5e1d71b7a992433fb1c542c7a1b835e45682ec"
-  integrity sha512-fBffmak0bPAnyqc/HO8C3n2sHrp9wcqQz6ES9koRF2/mLOVAx9zIQ3Y7R29sYCteTPqMCwns4WYQoCX91Xl3+w==
-
-css-select@^4.1.3:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
-css-tree@^1.1.2, css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
 css-tree@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
@@ -9179,11 +8499,6 @@ css-tree@^2.3.1:
     mdn-data "2.0.30"
     source-map-js "^1.0.1"
 
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -9194,62 +8509,6 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^5.2.14:
-  version "5.2.14"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz#309def4f7b7e16d71ab2438052093330d9ab45d8"
-  integrity sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==
-  dependencies:
-    css-declaration-sorter "^6.3.1"
-    cssnano-utils "^3.1.0"
-    postcss-calc "^8.2.3"
-    postcss-colormin "^5.3.1"
-    postcss-convert-values "^5.1.3"
-    postcss-discard-comments "^5.1.2"
-    postcss-discard-duplicates "^5.1.0"
-    postcss-discard-empty "^5.1.1"
-    postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.7"
-    postcss-merge-rules "^5.1.4"
-    postcss-minify-font-values "^5.1.0"
-    postcss-minify-gradients "^5.1.1"
-    postcss-minify-params "^5.1.4"
-    postcss-minify-selectors "^5.2.1"
-    postcss-normalize-charset "^5.1.0"
-    postcss-normalize-display-values "^5.1.0"
-    postcss-normalize-positions "^5.1.1"
-    postcss-normalize-repeat-style "^5.1.1"
-    postcss-normalize-string "^5.1.0"
-    postcss-normalize-timing-functions "^5.1.0"
-    postcss-normalize-unicode "^5.1.1"
-    postcss-normalize-url "^5.1.0"
-    postcss-normalize-whitespace "^5.1.1"
-    postcss-ordered-values "^5.1.3"
-    postcss-reduce-initial "^5.1.2"
-    postcss-reduce-transforms "^5.1.0"
-    postcss-svgo "^5.1.0"
-    postcss-unique-selectors "^5.1.1"
-
-cssnano-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
-  integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
-
-cssnano@^5.0.1:
-  version "5.1.15"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf"
-  integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==
-  dependencies:
-    cssnano-preset-default "^5.2.14"
-    lilconfig "^2.0.3"
-    yaml "^1.10.2"
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -9425,59 +8684,60 @@ dateformat@^4.6.3:
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5"
   integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==
 
-dayjs@^1.10.8, dayjs@^1.8.15:
+dayjs@^1.10.8:
   version "1.11.13"
   resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.13.tgz#92430b0139055c3ebb60150aa13e860a4b5a366c"
   integrity sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==
 
-dc-polyfill@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.3.tgz#fe9eefc86813439dd46d6f9ad9582ec079c39720"
-  integrity sha512-Wyk5n/5KUj3GfVKV2jtDbtChC/Ff9fjKsBcg4ZtYW1yQe3DXNHcGURvmoxhqQdfOQ9TwyMjnfyv1lyYcOkFkFA==
+dc-polyfill@^0.1.4:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/dc-polyfill/-/dc-polyfill-0.1.6.tgz#c2940fa68ffb24a7bf127cc6cfdd15b39f0e7f02"
+  integrity sha512-UV33cugmCC49a5uWAApM+6Ev9ZdvIUMTrtCO9fj96TPGOQiea54oeO3tiEVdVeo3J9N2UdJEmbS4zOkkEA35uQ==
 
-dd-trace@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.2.0.tgz#6ca2d76ece95f08d98468d7782c22f24192afa53"
-  integrity sha512-Z5ql3ZKzVW3DPstHPkTPcIPvKljHNtzTYY/WuZRlgT4XK7rMaN0j5nA8LlUh7m+tOPWs05IiKngbYVZjsqhRgA==
+dd-trace@5.26.0:
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/dd-trace/-/dd-trace-5.26.0.tgz#cc55061f66742bf01d0d7dc9f75c0e4937c82f40"
+  integrity sha512-AQ4usxrbAG41f7CKUUe7fayZgfrh24D0L0vNzcU2mMJOmqQ3bXeDz9uSHkF3aFY8Epcsegrep3ifjRC0/zOxTw==
   dependencies:
-    "@datadog/native-appsec" "7.0.0"
-    "@datadog/native-iast-rewriter" "2.2.2"
-    "@datadog/native-iast-taint-tracking" "1.6.4"
-    "@datadog/native-metrics" "^2.0.0"
-    "@datadog/pprof" "5.0.0"
+    "@datadog/libdatadog" "^0.2.2"
+    "@datadog/native-appsec" "8.3.0"
+    "@datadog/native-iast-rewriter" "2.5.0"
+    "@datadog/native-iast-taint-tracking" "3.2.0"
+    "@datadog/native-metrics" "^3.0.1"
+    "@datadog/pprof" "5.4.1"
     "@datadog/sketches-js" "^2.1.0"
-    "@opentelemetry/api" "^1.0.0"
+    "@isaacs/ttlcache" "^1.4.1"
+    "@opentelemetry/api" ">=1.0.0 <1.9.0"
     "@opentelemetry/core" "^1.14.0"
     crypto-randomuuid "^1.0.0"
-    dc-polyfill "^0.1.2"
+    dc-polyfill "^0.1.4"
     ignore "^5.2.4"
-    import-in-the-middle "^1.7.3"
+    import-in-the-middle "1.11.2"
     int64-buffer "^0.1.9"
-    ipaddr.js "^2.1.0"
     istanbul-lib-coverage "3.2.0"
     jest-docblock "^29.7.0"
     koalas "^1.0.2"
     limiter "1.1.5"
     lodash.sortby "^4.7.0"
     lru-cache "^7.14.0"
-    methods "^1.1.2"
     module-details-from-path "^1.0.3"
     msgpack-lite "^0.1.26"
-    node-abort-controller "^3.1.1"
     opentracing ">=0.12.1"
-    path-to-regexp "^0.1.2"
-    pprof-format "^2.0.7"
+    path-to-regexp "^0.1.10"
+    pprof-format "^2.1.0"
     protobufjs "^7.2.5"
     retry "^0.13.1"
+    rfdc "^1.3.1"
     semver "^7.5.4"
+    shell-quote "^1.8.1"
     tlhunter-sorted-set "^0.1.0"
 
-debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@^4.3.5, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b"
-  integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2, debug@~4.3.4:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
   dependencies:
-    ms "2.1.2"
+    ms "^2.1.3"
 
 debug@4.3.4:
   version "4.3.4"
@@ -9486,13 +8746,20 @@ debug@4.3.4:
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.0, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
+debug@^4.3.5:
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a"
+  integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==
+  dependencies:
+    ms "^2.1.3"
+
 debuglog@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
@@ -9605,11 +8872,6 @@ deep-eql@^4.1.3:
   dependencies:
     type-detect "^4.0.0"
 
-deep-eql@^5.0.1:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/deep-eql/-/deep-eql-5.0.2.tgz#4b756d8d770a9257300825d52a2c2cff99c3a341"
-  integrity sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==
-
 deep-equal@^2.0.5:
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-2.2.3.tgz#af89dafb23a396c7da3e862abc0be27cf51d56e1"
@@ -9649,11 +8911,6 @@ deep-is@^0.1.3, deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge-ts@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/deepmerge-ts/-/deepmerge-ts-5.1.0.tgz#c55206cc4c7be2ded89b9c816cf3608884525d7a"
-  integrity sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==
-
 deepmerge@^4.2.2:
   version "4.3.1"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
@@ -9671,18 +8928,6 @@ defer-to-connect@^1.0.1:
   resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
   integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
 
-defer-to-connect@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
-  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
-
-deferred-leveldown@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"
-  integrity sha512-+WCbb4+ez/SZ77Sdy1iadagFiVzMB89IKOBhglgnUkVxOxRWmmFsz8UDSNWh4Rhq+3wr/vMFlYj+rdEwWUDdng==
-  dependencies:
-    abstract-leveldown "~0.12.1"
-
 deferred-leveldown@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058"
@@ -9705,7 +8950,7 @@ define-lazy-prop@^2.0.0:
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3, define-properties@^1.2.0, define-properties@^1.2.1:
+define-properties@^1.2.0, define-properties@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.2.1.tgz#10781cc616eb951a80a034bafcaa7377f6af2b6c"
   integrity sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==
@@ -9719,11 +8964,6 @@ defined@^1.0.0:
   resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.1.tgz#c0b9db27bfaffd95d6f61399419b893df0f91ebf"
   integrity sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==
 
-defined@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-0.0.0.tgz#f35eea7d705e933baf13b2f03b3f83d921403b3e"
-  integrity sha512-zpqiCT8bODLu3QSmLLic8xJnYWBFjOSu/fBCm189oAiTtPq/PSanNACKZDS7kgSyCJY7P+IcODzlIogBK/9RBg==
-
 delay@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/delay/-/delay-5.0.0.tgz#137045ef1b96e5071060dd5be60bf9334436bd1d"
@@ -9749,6 +8989,35 @@ denque@^2.1.0:
   resolved "https://registry.yarnpkg.com/denque/-/denque-2.1.0.tgz#e93e1a6569fb5e66f16a3c2a2964617d349d6ab1"
   integrity sha512-HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==
 
+depcheck@^1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/depcheck/-/depcheck-1.4.7.tgz#57976e2fa43625f477efc0f19ad868ef94f8a26c"
+  integrity sha512-1lklS/bV5chOxwNKA/2XUUk/hPORp8zihZsXflr8x0kLwmcZ9Y9BsS6Hs3ssvA+2wUVbG0U2Ciqvm1SokNjPkA==
+  dependencies:
+    "@babel/parser" "^7.23.0"
+    "@babel/traverse" "^7.23.2"
+    "@vue/compiler-sfc" "^3.3.4"
+    callsite "^1.0.0"
+    camelcase "^6.3.0"
+    cosmiconfig "^7.1.0"
+    debug "^4.3.4"
+    deps-regex "^0.2.0"
+    findup-sync "^5.0.0"
+    ignore "^5.2.4"
+    is-core-module "^2.12.0"
+    js-yaml "^3.14.1"
+    json5 "^2.2.3"
+    lodash "^4.17.21"
+    minimatch "^7.4.6"
+    multimatch "^5.0.0"
+    please-upgrade-node "^3.2.0"
+    readdirp "^3.6.0"
+    require-package-name "^2.0.1"
+    resolve "^1.22.3"
+    resolve-from "^5.0.0"
+    semver "^7.5.4"
+    yargs "^16.2.0"
+
 depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
@@ -9759,34 +9028,6 @@ depd@^1.1.0, depd@~1.1.2:
   resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
   integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
-dependency-cruiser@^16.3.7:
-  version "16.4.0"
-  resolved "https://registry.yarnpkg.com/dependency-cruiser/-/dependency-cruiser-16.4.0.tgz#a1b7d452acddf05045ae4f7942a2e9337aedad35"
-  integrity sha512-la/NnD23m6esCox8KMiZ/pcmtec6G/r7LgnJvkBepcErdzlGaxWnyaxtpoYB3fgODrU/7E2u81/nX5FNu5zfyw==
-  dependencies:
-    acorn "^8.12.1"
-    acorn-jsx "^5.3.2"
-    acorn-jsx-walk "^2.0.0"
-    acorn-loose "^8.4.0"
-    acorn-walk "^8.3.3"
-    ajv "^8.17.1"
-    commander "^12.1.0"
-    enhanced-resolve "^5.17.1"
-    ignore "^5.3.2"
-    interpret "^3.1.1"
-    is-installed-globally "^1.0.0"
-    json5 "^2.2.3"
-    memoize "^10.0.0"
-    picocolors "^1.0.1"
-    picomatch "^4.0.2"
-    prompts "^2.4.2"
-    rechoir "^0.8.0"
-    safe-regex "^2.1.1"
-    semver "^7.6.3"
-    teamcity-service-messages "^0.1.14"
-    tsconfig-paths-webpack-plugin "^4.1.0"
-    watskeburt "^4.1.0"
-
 dependency-tree@^9.0.0:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/dependency-tree/-/dependency-tree-9.0.0.tgz#9288dd6daf35f6510c1ea30d9894b75369aa50a2"
@@ -9803,24 +9044,26 @@ deprecation@^2.0.0:
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
 
+deps-regex@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/deps-regex/-/deps-regex-0.2.0.tgz#3ee7ddae5fd784f3accf29d5a711aa6e10044137"
+  integrity sha512-PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q==
+
 dequal@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.3.tgz#2644214f1997d39ed0ee0ece72335490a7ac67be"
   integrity sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==
 
-des.js@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
-  integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
-  dependencies:
-    inherits "^2.0.1"
-    minimalistic-assert "^1.0.0"
-
 destroy@^1.0.4:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
+
 detect-indent@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d"
@@ -10017,15 +9260,6 @@ diff@^5.1.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-5.2.0.tgz#26ded047cd1179b78b9537d5ef725503ce1ae531"
   integrity sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==
 
-diffie-hellman@^5.0.0:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
-  integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
-  dependencies:
-    bn.js "^4.1.0"
-    miller-rabin "^4.0.0"
-    randombytes "^2.0.0"
-
 dir-glob@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
@@ -10033,11 +9267,6 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-discontinuous-range@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
-  integrity sha512-c68LpLbO+7kP/b1Hr1qs8/BJ09F5khZGTxqxZuhzxpmwJKOgRFHJWIb9/KmqnqHhLdO55aOxFH/EGBvUQbL/RQ==
-
 docker-compose@0.23.17:
   version "0.23.17"
   resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.17.tgz#8816bef82562d9417dc8c790aa4871350f93a2ba"
@@ -10052,17 +9281,10 @@ docker-compose@0.24.0:
   dependencies:
     yaml "^1.10.2"
 
-docker-compose@^0.23.6:
-  version "0.23.19"
-  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.23.19.tgz#9947726e2fe67bdfa9e8efe1ff15aa0de2e10eb8"
-  integrity sha512-v5vNLIdUqwj4my80wxFDkNH+4S85zsRuH29SO7dCWVWPCMt/ohZBsGN6g6KXWifT0pzQ7uOxqEKCYCDPJ8Vz4g==
-  dependencies:
-    yaml "^1.10.2"
-
-docker-compose@^0.24.6:
-  version "0.24.6"
-  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.24.6.tgz#d1f490a641bdb7ccc07c4d446b264f026f9a1f15"
-  integrity sha512-VidlUyNzXMaVsuM79sjSvwC4nfojkP2VneL+Zfs538M2XFnffZDhx6veqnz/evCNIYGyz5O+1fgL6+g0NLWTBA==
+docker-compose@^0.24.8:
+  version "0.24.8"
+  resolved "https://registry.yarnpkg.com/docker-compose/-/docker-compose-0.24.8.tgz#6c125e6b9e04cf68ced47e2596ef2bb93ee9694e"
+  integrity sha512-plizRs/Vf15H+GCVxq2EUvyPK7ei9b/cVesHvjnX4xaXjM9spHe2Ytq0BitndFgvTJ3E3NljPNUEl7BAN43iZw==
   dependencies:
     yaml "^2.2.2"
 
@@ -10109,15 +9331,6 @@ dom-accessibility-api@^0.6.3:
   resolved "https://registry.yarnpkg.com/dom-accessibility-api/-/dom-accessibility-api-0.6.3.tgz#993e925cc1d73f2c662e7d75dd5a5445259a8fd8"
   integrity sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w==
 
-dom-serializer@^1.0.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
 dom-serializer@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-2.0.0.tgz#e41b802e1eedf9f6cae183ce5e622d789d7d8e53"
@@ -10132,7 +9345,7 @@ dom-walk@^0.1.0:
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
   integrity sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==
 
-domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
+domelementtype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
   integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
@@ -10151,13 +9364,6 @@ domexception@^4.0.0:
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^4.2.0, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
 domhandler@^5.0.1, domhandler@^5.0.2:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-5.0.3.tgz#cc385f7f751f1d1fc650c21374804254538c7d31"
@@ -10165,15 +9371,6 @@ domhandler@^5.0.1, domhandler@^5.0.2:
   dependencies:
     domelementtype "^2.3.0"
 
-domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
 domutils@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-3.0.1.tgz#696b3875238338cb186b6c0612bd4901c89a4f1c"
@@ -10257,33 +9454,15 @@ duplexer@^0.1.1:
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-duplexify@^4.0.0, duplexify@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
-  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
+duplexify@^4.0.0, duplexify@^4.1.2, duplexify@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.3.tgz#a07e1c0d0a2c001158563d32592ba58bddb0236f"
+  integrity sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==
   dependencies:
     end-of-stream "^1.4.1"
     inherits "^2.0.3"
     readable-stream "^3.1.1"
-    stream-shift "^1.0.0"
-
-dynalite@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/dynalite/-/dynalite-3.2.2.tgz#34b4f4dd69638f17c0f7551a867959972c892441"
-  integrity sha512-sx9ZjTgMs/D4gHnba4rnBkw29648dHwHmywJet132KAbiq1ZyWx9W1fMd/eP9cPwTKDXyCBuTYOChE0qMDjaXQ==
-  dependencies:
-    async "^2.6.3"
-    big.js "^5.2.2"
-    buffer-crc32 "^0.2.13"
-    lazy "^1.0.11"
-    levelup "^4.4.0"
-    lock "^1.1.0"
-    memdown "^5.1.0"
-    minimist "^1.2.5"
-    once "^1.4.0"
-    subleveldown "^5.0.1"
-  optionalDependencies:
-    leveldown "^5.6.0"
+    stream-shift "^1.0.2"
 
 eastasianwidth@^0.2.0:
   version "0.2.0"
@@ -10343,18 +9522,10 @@ electron-to-chromium@^1.4.284:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.317.tgz#9a3d38a1a37f26a417d3d95dafe198ff11ed072b"
   integrity sha512-JhCRm9v30FMNzQSsjl4kXaygU+qHBD0Yh7mKxyjmF0V8VwYVB6qpBRX28GyAucrM9wDCpSUctT6FpMUQxbyKuA==
 
-elliptic@^6.5.3, elliptic@^6.5.5:
-  version "6.5.7"
-  resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.7.tgz#8ec4da2cb2939926a1b9a73619d768207e647c8b"
-  integrity sha512-ESVCtTwiA+XhY3wyh24QqRGBoP3rEdDUl3EDUUo9tft074fi19IrdpH7hLCMMP3CIj7jb3W96rn8lt/BqIlt5Q==
-  dependencies:
-    bn.js "^4.11.9"
-    brorand "^1.1.0"
-    hash.js "^1.0.0"
-    hmac-drbg "^1.0.1"
-    inherits "^2.0.4"
-    minimalistic-assert "^1.0.1"
-    minimalistic-crypto-utils "^1.0.1"
+email-validator@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/email-validator/-/email-validator-2.0.4.tgz#b8dfaa5d0dae28f1b03c95881d904d4e40bfe7ed"
+  integrity sha512-gYCwo7kh5S3IDyZPLZf6hSS0MnZT8QmJFqYvbqlDZSbwdZlY6QZWxJ4i/6UhITOJ4XzyI647Bm2MXKCLqnJ4nQ==
 
 emittery@^0.13.1:
   version "0.13.1"
@@ -10386,7 +9557,7 @@ encodeurl@^1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encoding-down@^6.2.0, encoding-down@^6.3.0:
+encoding-down@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b"
   integrity sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw==
@@ -10396,7 +9567,7 @@ encoding-down@^6.2.0, encoding-down@^6.3.0:
     level-codec "^9.0.0"
     level-errors "^2.0.0"
 
-encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.13:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -10433,23 +9604,23 @@ engine.io-parser@~5.2.1:
   resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.2.tgz#37b48e2d23116919a3453738c5720455e64e1c49"
   integrity sha512-RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==
 
-engine.io@~6.5.2:
-  version "6.5.5"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.5.tgz#430b80d8840caab91a50e9e23cb551455195fc93"
-  integrity sha512-C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==
+engine.io@~6.6.0:
+  version "6.6.2"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.6.2.tgz#32bd845b4db708f8c774a4edef4e5c8a98b3da72"
+  integrity sha512-gmNvsYi9C8iErnZdVcJnvCpSKbWTt1E8+JZo8b+daLninywUWi5NQ5STSHZ9rFjFO7imNcvb8Pc5pe/wMR5xEw==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
     "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "2.0.0"
-    cookie "~0.4.1"
+    cookie "~0.7.2"
     cors "~2.8.5"
     debug "~4.3.1"
     engine.io-parser "~5.2.1"
     ws "~8.17.1"
 
-enhanced-resolve@^5.17.1, enhanced-resolve@^5.7.0, enhanced-resolve@^5.8.3:
+enhanced-resolve@^5.8.3:
   version "5.17.1"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
   integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
@@ -10464,17 +9635,7 @@ enquirer@~2.3.6:
   dependencies:
     ansi-colors "^4.1.1"
 
-ent@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity "sha1-6WQhkyWiHQX0RGai9obtbOX13R0= sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA=="
-
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
-entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
+entities@^4.2.0, entities@^4.3.0, entities@^4.4.0, entities@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-4.5.0.tgz#5d268ea5e7113ec74c4d033b79ea5a35a488fb48"
   integrity sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==
@@ -10489,17 +9650,12 @@ envinfo@7.8.1:
   resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
-err-code@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
-  integrity sha512-CJAN+O0/yA1CKfRn9SXOGctSpEM7DCon/r/5r2eXFMY2zCCJBasFhcM5I+1kh3Ap11FsQCX+vGHceNPvpWKhoA==
-
 err-code@^2.0.2:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-errno@^0.1.1, errno@~0.1.1, errno@~0.1.7:
+errno@~0.1.1, errno@~0.1.7:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
@@ -10513,10 +9669,10 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.2:
-  version "1.23.3"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.3.tgz#8f0c5a35cd215312573c5a27c87dfd6c881a0aa0"
-  integrity sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==
+es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23.0, es-abstract@^1.23.3:
+  version "1.23.5"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.23.5.tgz#f4599a4946d57ed467515ed10e4f157289cd52fb"
+  integrity sha512-vlmniQ0WNPwXqA0BnmwV3Ng7HxiGlh6r5U6JcTMNx8OilcAGqVJBHJcPjqOMaczU9fRuRK5Px2BdVyPRnKMMVQ==
   dependencies:
     array-buffer-byte-length "^1.0.1"
     arraybuffer.prototype.slice "^1.0.3"
@@ -10533,7 +9689,7 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     function.prototype.name "^1.1.6"
     get-intrinsic "^1.2.4"
     get-symbol-description "^1.0.2"
-    globalthis "^1.0.3"
+    globalthis "^1.0.4"
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
     has-proto "^1.0.3"
@@ -10549,10 +9705,10 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     is-string "^1.0.7"
     is-typed-array "^1.1.13"
     is-weakref "^1.0.2"
-    object-inspect "^1.13.1"
+    object-inspect "^1.13.3"
     object-keys "^1.1.1"
     object.assign "^4.1.5"
-    regexp.prototype.flags "^1.5.2"
+    regexp.prototype.flags "^1.5.3"
     safe-array-concat "^1.1.2"
     safe-regex-test "^1.0.3"
     string.prototype.trim "^1.2.9"
@@ -10565,20 +9721,6 @@ es-abstract@^1.17.5, es-abstract@^1.22.1, es-abstract@^1.22.3, es-abstract@^1.23
     unbox-primitive "^1.0.2"
     which-typed-array "^1.1.15"
 
-es-aggregate-error@^1.0.9:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/es-aggregate-error/-/es-aggregate-error-1.0.13.tgz#7f28b77c9d8d09bbcd3a466e4be9fe02fa985201"
-  integrity sha512-KkzhUUuD2CUMqEc8JEqsXEMDHzDPE8RCjZeUBitsnB1eNcAJWQPiciKsMXe3Yytj4Flw1XLl46Qcf9OxvZha7A==
-  dependencies:
-    define-data-property "^1.1.4"
-    define-properties "^1.2.1"
-    es-abstract "^1.23.2"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    globalthis "^1.0.3"
-    has-property-descriptors "^1.0.2"
-    set-function-name "^2.0.2"
-
 es-define-property@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
@@ -10652,11 +9794,6 @@ es6-error@^4.0.1, es6-error@^4.1.1:
   resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
   integrity sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==
 
-es6-promise@^4.2.4:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
-
 esbuild-node-externals@^1.14.0:
   version "1.14.0"
   resolved "https://registry.yarnpkg.com/esbuild-node-externals/-/esbuild-node-externals-1.14.0.tgz#fc2950c67a068dc2b538fd1381ad7d8e20a6f54d"
@@ -10693,35 +9830,6 @@ esbuild@^0.18.10, esbuild@^0.18.17:
     "@esbuild/win32-ia32" "0.18.20"
     "@esbuild/win32-x64" "0.18.20"
 
-esbuild@^0.21.3:
-  version "0.21.5"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.21.5.tgz#9ca301b120922959b766360d8ac830da0d02997d"
-  integrity sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==
-  optionalDependencies:
-    "@esbuild/aix-ppc64" "0.21.5"
-    "@esbuild/android-arm" "0.21.5"
-    "@esbuild/android-arm64" "0.21.5"
-    "@esbuild/android-x64" "0.21.5"
-    "@esbuild/darwin-arm64" "0.21.5"
-    "@esbuild/darwin-x64" "0.21.5"
-    "@esbuild/freebsd-arm64" "0.21.5"
-    "@esbuild/freebsd-x64" "0.21.5"
-    "@esbuild/linux-arm" "0.21.5"
-    "@esbuild/linux-arm64" "0.21.5"
-    "@esbuild/linux-ia32" "0.21.5"
-    "@esbuild/linux-loong64" "0.21.5"
-    "@esbuild/linux-mips64el" "0.21.5"
-    "@esbuild/linux-ppc64" "0.21.5"
-    "@esbuild/linux-riscv64" "0.21.5"
-    "@esbuild/linux-s390x" "0.21.5"
-    "@esbuild/linux-x64" "0.21.5"
-    "@esbuild/netbsd-x64" "0.21.5"
-    "@esbuild/openbsd-x64" "0.21.5"
-    "@esbuild/sunos-x64" "0.21.5"
-    "@esbuild/win32-arm64" "0.21.5"
-    "@esbuild/win32-ia32" "0.21.5"
-    "@esbuild/win32-x64" "0.21.5"
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -10764,10 +9872,12 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-compat-utils@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz#f45e3b5ced4c746c127cf724fb074cd4e730d653"
-  integrity sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==
+eslint-compat-utils@^0.5.1:
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz#7fc92b776d185a70c4070d03fd26fde3d59652e4"
+  integrity sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==
+  dependencies:
+    semver "^7.5.4"
 
 eslint-config-airbnb-base@^15.0.0:
   version "15.0.0"
@@ -10795,19 +9905,7 @@ eslint-module-utils@^2.8.0:
   dependencies:
     debug "^3.2.7"
 
-eslint-plugin-functional@^6.6.3:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-functional/-/eslint-plugin-functional-6.6.3.tgz#85b895afb91835c5ffa2eb97f473fd4182aa5228"
-  integrity sha512-sVbbvNvwX3HVkXAykKyoNLv57r4DPF7f1sy+/8j4YtzLYVQPGljMUWv3T6Kd4lwnnjmcKuj0EkIbS+knL6P5jw==
-  dependencies:
-    "@typescript-eslint/utils" "^7.3.1"
-    deepmerge-ts "^5.1.0"
-    escape-string-regexp "^4.0.0"
-    is-immutable-type "^4.0.0"
-    semver "^7.6.0"
-    ts-api-utils "^1.3.0"
-
-eslint-plugin-import@^2.26.0, eslint-plugin-import@^2.29.0:
+eslint-plugin-import@^2.26.0:
   version "2.29.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz#d45b37b5ef5901d639c15270d74d46d161150643"
   integrity sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==
@@ -10830,37 +9928,36 @@ eslint-plugin-import@^2.26.0, eslint-plugin-import@^2.29.0:
     semver "^6.3.1"
     tsconfig-paths "^3.15.0"
 
-eslint-plugin-jest@^27.9.0:
-  version "27.9.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz#7c98a33605e1d8b8442ace092b60e9919730000b"
-  integrity sha512-QIT7FH7fNmd9n4se7FFKHbsLKGQiw885Ds6Y/sxKgCZ6natwCsXdgPOADnYVxN2QrRweF0FZWbJ6S7Rsn7llug==
+eslint-plugin-jest@28.9.0:
+  version "28.9.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-28.9.0.tgz#19168dfaed124339cd2252c4c4d1ac3688aeb243"
+  integrity sha512-rLu1s1Wf96TgUUxSw6loVIkNtUjq1Re7A9QdCCHSohnvXEBAjuL420h0T/fMmkQlNsQP2GhQzEUpYHPfxBkvYQ==
   dependencies:
-    "@typescript-eslint/utils" "^5.10.0"
+    "@typescript-eslint/utils" "^6.0.0 || ^7.0.0 || ^8.0.0"
 
-eslint-plugin-local-rules@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-2.0.0.tgz#cda95d7616cc0e2609d76c347c187ca2be1e252e"
-  integrity sha512-sWueme0kUcP0JC1+6OBDQ9edBDVFJR92WJHSRbhiRExlenMEuUisdaVBPR+ItFBFXo2Pdw6FD2UfGZWkz8e93g==
+eslint-plugin-local-rules@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-local-rules/-/eslint-plugin-local-rules-3.0.2.tgz#84c02ea1d604ecb00970779ad27f00738ff361ae"
+  integrity sha512-IWME7GIYHXogTkFsToLdBCQVJ0U4kbSuVyDT+nKoR4UgtnVrrVeNWuAZkdEu1nxkvi9nsPccGehEEF6dgA28IQ==
 
-eslint-plugin-svelte@^2.34.0:
-  version "2.35.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-svelte/-/eslint-plugin-svelte-2.35.1.tgz#7b1e3c263b09dbc9293c25fe02d03d309725d2b9"
-  integrity sha512-IF8TpLnROSGy98Z3NrsKXWDSCbNY2ReHDcrYTuXZMbfX7VmESISR78TWgO9zdg4Dht1X8coub5jKwHzP0ExRug==
+eslint-plugin-svelte@2.46.1:
+  version "2.46.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-svelte/-/eslint-plugin-svelte-2.46.1.tgz#22691c8685420cd4eabf0cbaa31a0cfb8395595b"
+  integrity sha512-7xYr2o4NID/f9OEYMqxsEQsCsj4KaMy4q5sANaKkAb6/QeCjYFxRmDm2S3YC3A3pl1kyPZ/syOx/i7LcWYSbIw==
   dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@jridgewell/sourcemap-codec" "^1.4.14"
-    debug "^4.3.1"
-    eslint-compat-utils "^0.1.2"
+    "@eslint-community/eslint-utils" "^4.4.0"
+    "@jridgewell/sourcemap-codec" "^1.4.15"
+    eslint-compat-utils "^0.5.1"
     esutils "^2.0.3"
-    known-css-properties "^0.29.0"
-    postcss "^8.4.5"
+    known-css-properties "^0.35.0"
+    postcss "^8.4.38"
     postcss-load-config "^3.1.4"
     postcss-safe-parser "^6.0.0"
-    postcss-selector-parser "^6.0.11"
-    semver "^7.5.3"
-    svelte-eslint-parser ">=0.33.0 <1.0.0"
+    postcss-selector-parser "^6.1.0"
+    semver "^7.6.2"
+    svelte-eslint-parser "^0.43.0"
 
-eslint-scope@5.1.1, eslint-scope@^5.1.1:
+eslint-scope@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -10868,7 +9965,7 @@ eslint-scope@5.1.1, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.0.0, eslint-scope@^7.2.2:
+eslint-scope@^7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f"
   integrity sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==
@@ -10876,10 +9973,10 @@ eslint-scope@^7.0.0, eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-scope@^8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.0.2.tgz#5cbb33d4384c9136083a71190d548158fe128f94"
-  integrity sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==
+eslint-scope@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-8.2.0.tgz#377aa6f1cb5dc7592cfd0b7f892fd0cf352ce442"
+  integrity sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
@@ -10889,17 +9986,57 @@ eslint-visitor-keys@^2.0.0, eslint-visitor-keys@^2.1.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint-visitor-keys@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz#e3adc021aa038a2a8e0b2f8b0ce8f66b9483b1fb"
-  integrity sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==
+eslint-visitor-keys@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz#687bacb2af884fcdda8a6e7d65c606f46a14cd45"
+  integrity sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==
 
-eslint@^8.52.0, eslint@^8.56.0:
+eslint@9.16.0:
+  version "9.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.16.0.tgz#66832e66258922ac0a626f803a9273e37747f2a6"
+  integrity sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==
+  dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.12.1"
+    "@eslint/config-array" "^0.19.0"
+    "@eslint/core" "^0.9.0"
+    "@eslint/eslintrc" "^3.2.0"
+    "@eslint/js" "9.16.0"
+    "@eslint/plugin-kit" "^0.2.3"
+    "@humanfs/node" "^0.16.6"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@humanwhocodes/retry" "^0.4.1"
+    "@types/estree" "^1.0.6"
+    "@types/json-schema" "^7.0.15"
+    ajv "^6.12.4"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.5"
+    debug "^4.3.2"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^8.2.0"
+    eslint-visitor-keys "^4.2.0"
+    espree "^10.3.0"
+    esquery "^1.5.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^8.0.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    ignore "^5.2.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.1.2"
+    natural-compare "^1.4.0"
+    optionator "^0.9.3"
+
+eslint@^8.56.0:
   version "8.57.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
   integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
@@ -10943,61 +10080,21 @@ eslint@^8.52.0, eslint@^8.56.0:
     strip-ansi "^6.0.1"
     text-table "^0.2.0"
 
-eslint@^9.7.0:
-  version "9.9.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-9.9.1.tgz#147ac9305d56696fb84cf5bdecafd6517ddc77ec"
-  integrity sha512-dHvhrbfr4xFQ9/dq+jcVneZMyRYLjggWjk6RVsIiHsP8Rz6yZ8LvZ//iU4TrZF+SXWG+JkNF2OyiZRvzgRDqMg==
-  dependencies:
-    "@eslint-community/eslint-utils" "^4.2.0"
-    "@eslint-community/regexpp" "^4.11.0"
-    "@eslint/config-array" "^0.18.0"
-    "@eslint/eslintrc" "^3.1.0"
-    "@eslint/js" "9.9.1"
-    "@humanwhocodes/module-importer" "^1.0.1"
-    "@humanwhocodes/retry" "^0.3.0"
-    "@nodelib/fs.walk" "^1.2.8"
-    ajv "^6.12.4"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^8.0.2"
-    eslint-visitor-keys "^4.0.0"
-    espree "^10.1.0"
-    esquery "^1.5.0"
-    esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^8.0.0"
-    find-up "^5.0.0"
-    glob-parent "^6.0.2"
-    ignore "^5.2.0"
-    imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    is-path-inside "^3.0.3"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
-    minimatch "^3.1.2"
-    natural-compare "^1.4.0"
-    optionator "^0.9.3"
-    strip-ansi "^6.0.1"
-    text-table "^0.2.0"
-
 esm@^3.2.25:
   version "3.2.25"
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^10.0.1, espree@^10.1.0:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-10.1.0.tgz#8788dae611574c0f070691f522e4116c5a11fc56"
-  integrity sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==
+espree@^10.0.1, espree@^10.3.0:
+  version "10.3.0"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-10.3.0.tgz#29267cf5b0cb98735b65e64ba07e0ed49d1eed8a"
+  integrity sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==
   dependencies:
-    acorn "^8.12.0"
+    acorn "^8.14.0"
     acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^4.0.0"
+    eslint-visitor-keys "^4.2.0"
 
-espree@^9.0.0, espree@^9.6.0, espree@^9.6.1:
+espree@^9.6.0, espree@^9.6.1:
   version "9.6.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-9.6.1.tgz#a2a17b8e434690a5432f2f8018ce71d331a48c6f"
   integrity sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==
@@ -11050,16 +10147,6 @@ estraverse@^5.1.0, estraverse@^5.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e"
-  integrity sha512-6/I1dwNKk0N9iGOU3ydzAAurz4NPo/ttxZNCqgIVbWFvWyzWBSNonRrJ5CpjDuyBfmM7ENN7WCzUi9aT/UPXXQ==
-
-estree-walker@^0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39"
-  integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
-
 estree-walker@^0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
@@ -11112,14 +10199,6 @@ events@^3.0.0, events@^3.3.0:
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
-evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02"
-  integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==
-  dependencies:
-    md5.js "^1.3.4"
-    safe-buffer "^5.1.1"
-
 execa@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
@@ -11135,19 +10214,6 @@ execa@5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
-  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
-  dependencies:
-    cross-spawn "^6.0.0"
-    get-stream "^4.0.0"
-    is-stream "^1.1.0"
-    npm-run-path "^2.0.0"
-    p-finally "^1.0.0"
-    signal-exit "^3.0.0"
-    strip-eof "^1.0.0"
-
 execa@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -11163,21 +10229,6 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
-execa@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-8.0.1.tgz#51f6a5943b580f963c3ca9c6321796db8cc39b8c"
-  integrity sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==
-  dependencies:
-    cross-spawn "^7.0.3"
-    get-stream "^8.0.1"
-    human-signals "^5.0.0"
-    is-stream "^3.0.0"
-    merge-stream "^2.0.0"
-    npm-run-path "^5.1.0"
-    onetime "^6.0.0"
-    signal-exit "^4.1.0"
-    strip-final-newline "^3.0.0"
-
 exif-parser@^0.1.12:
   version "0.1.12"
   resolved "https://registry.yarnpkg.com/exif-parser/-/exif-parser-0.1.12.tgz#58a9d2d72c02c1f6f02a0ef4a9166272b7760922"
@@ -11193,7 +10244,7 @@ expand-template@^2.0.3:
   resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
   integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
 
-expand-tilde@^2.0.2:
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
   integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
@@ -11288,6 +10339,17 @@ fast-glob@^3.2.11, fast-glob@^3.2.9:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
+fast-glob@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
+  integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
+  dependencies:
+    "@nodelib/fs.stat" "^2.0.2"
+    "@nodelib/fs.walk" "^1.2.3"
+    glob-parent "^5.1.2"
+    merge2 "^1.3.0"
+    micromatch "^4.0.4"
+
 fast-json-patch@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
@@ -11330,13 +10392,18 @@ fast-url-parser@^1.1.3:
   dependencies:
     punycode "^1.3.2"
 
-fast-xml-parser@4.2.5, fast-xml-parser@4.4.1, fast-xml-parser@^4.1.3, fast-xml-parser@^4.2.2, fast-xml-parser@^4.2.5:
+fast-xml-parser@4.4.1, fast-xml-parser@^4.2.5, fast-xml-parser@^4.4.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f"
   integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw==
   dependencies:
     strnum "^1.0.5"
 
+fastest-levenshtein@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
 fastq@^1.6.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
@@ -11358,6 +10425,11 @@ fd-slicer@~1.1.0:
   dependencies:
     pend "~1.2.0"
 
+fdir@^6.2.0:
+  version "6.4.2"
+  resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.2.tgz#ddaa7ce1831b161bc3657bb99cb36e1622702689"
+  integrity sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==
+
 fecha@^4.2.0:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/fecha/-/fecha-4.2.3.tgz#4d9ccdbc61e8629b259fdca67e65891448d569fd"
@@ -11377,13 +10449,6 @@ fengari@^0.1.4:
     sprintf-js "^1.1.1"
     tmp "^0.0.33"
 
-fetch-cookie@0.10.1:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.10.1.tgz#5ea88f3d36950543c87997c27ae2aeafb4b5c4d4"
-  integrity sha512-beB+VEd4cNeVG1PY+ee74+PkuCQnik78pgLi5Ah/7qdUfov8IctU0vLUbBT8/10Ma5GMBeI4wtxhGrEfKNYs2g==
-  dependencies:
-    tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0"
-
 fetch-cookie@0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-0.11.0.tgz#e046d2abadd0ded5804ce7e2cae06d4331c15407"
@@ -11391,6 +10456,14 @@ fetch-cookie@0.11.0:
   dependencies:
     tough-cookie "^2.3.3 || ^3.0.1 || ^4.0.0"
 
+fetch-cookie@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/fetch-cookie/-/fetch-cookie-2.2.0.tgz#01086b6b5b1c3e08f15ffd8647b02ca100377365"
+  integrity sha512-h9AgfjURuCgA2+2ISl8GbavpUdR+WGAM2McW/ovn4tVccegp8ZqCKWSBR8uRdM8dDNlx5WdKRWxBYUwteLDCNQ==
+  dependencies:
+    set-cookie-parser "^2.4.8"
+    tough-cookie "^4.0.0"
+
 fflate@^0.4.8:
   version "0.4.8"
   resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.4.8.tgz#f90b82aefbd8ac174213abb338bd7ef848f0f5ae"
@@ -11427,7 +10500,7 @@ file-type@^12.1.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-12.4.2.tgz#a344ea5664a1d01447ee7fb1b635f72feb6169d9"
   integrity sha512-UssQP5ZgIOKelfsaB5CuGAL+Y+q7EmONuiwF3N5HAH0t27rvrttgi6Ra9k/+DVaY9UF6+ybxu5pOXLUdA8N7Vg==
 
-file-type@^16.5.4:
+file-type@^16.0.0:
   version "16.5.4"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-16.5.4.tgz#474fb4f704bee427681f98dd390058a172a6c2fd"
   integrity sha512-/yFHK0aGjFEgDJjEKP0pWCplsPFPhwyfwevf/pVxiN0tmE4L9LmwWxWukdJSHdoCli4VgQLehjJtwQBnqmsKcw==
@@ -11456,11 +10529,6 @@ file-type@^6.1.0:
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
   integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
 filelist@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
@@ -11548,6 +10616,16 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+findup-sync@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2"
+  integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.3"
+    micromatch "^4.0.4"
+    resolve-dir "^1.0.1"
+
 flat-cache@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
@@ -11569,11 +10647,16 @@ flat@^5.0.2:
   resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
   integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
 
-flatted@^3.1.0, flatted@^3.2.9:
+flatted@^3.1.0:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.1.tgz#21db470729a6734d4997002f439cb308987f567a"
   integrity sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==
 
+flatted@^3.2.9:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.2.tgz#adba1448a9841bec72b42c532ea23dbbedef1a27"
+  integrity sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==
+
 flatten@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
@@ -11584,10 +10667,10 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.15.0:
-  version "1.15.6"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b"
-  integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==
+follow-redirects@^1.15.6:
+  version "1.15.9"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.9.tgz#a604fa10e443bf98ca94228d9eebcc2e8a2c8ee1"
+  integrity sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -11596,11 +10679,6 @@ for-each@^0.3.3:
   dependencies:
     is-callable "^1.1.3"
 
-foreach@~2.0.1:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.6.tgz#87bcc8a1a0e74000ff2bf9802110708cfb02eb6e"
-  integrity sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg==
-
 foreground-child@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-3.1.1.tgz#1d173e776d75d2772fed08efe4a0de1ea1b12d0d"
@@ -11678,6 +10756,15 @@ formidable@^2.1.2:
     once "^1.4.0"
     qs "^6.11.0"
 
+formidable@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/formidable/-/formidable-3.5.2.tgz#207c33fecdecb22044c82ba59d0c63a12fb81d77"
+  integrity sha512-Jqc1btCy3QzRbJaICGwKcBfGWuLADRerLzDqi2NwSt/UkXLsHJw2TVResiaoBufHVHy9aSgClOHCeJsSsFLTbg==
+  dependencies:
+    dezalgo "^1.0.4"
+    hexoid "^2.0.0"
+    once "^1.4.0"
+
 fresh@^0.5.2, fresh@~0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
@@ -11705,7 +10792,7 @@ fs-extra@^11.1.0, fs-extra@^11.1.1:
     jsonfile "^6.0.1"
     universalify "^2.0.0"
 
-fs-extra@^9.0.0, fs-extra@^9.0.1, fs-extra@^9.1.0:
+fs-extra@^9.0.0, fs-extra@^9.1.0:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -11734,7 +10821,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
-fsevents@^2.3.2, fsevents@~2.3.2, fsevents@~2.3.3:
+fsevents@^2.3.2, fsevents@~2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
   integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
@@ -11754,7 +10841,7 @@ function.prototype.name@^1.1.6:
     es-abstract "^1.22.1"
     functions-have-names "^1.2.3"
 
-functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1:
+functional-red-black-tree@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
   integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
@@ -11764,13 +10851,6 @@ functions-have-names@^1.2.3:
   resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
   integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
 
-fwd-stream@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/fwd-stream/-/fwd-stream-1.0.4.tgz#ed281cabed46feecf921ee32dc4c50b372ac7cfa"
-  integrity sha512-q2qaK2B38W07wfPSQDKMiKOD5Nzv2XyuvQlrmh1q0pxyHNanKHq8lwQ6n9zHucAwA5EbzRJKEgds2orn88rYTg==
-  dependencies:
-    readable-stream "~1.0.26-4"
-
 gauge@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-3.0.2.tgz#03bf4441c044383908bcfa0656ad91803259b395"
@@ -11810,16 +10890,16 @@ gaxios@^5.0.0, gaxios@^5.0.1:
     is-stream "^2.0.0"
     node-fetch "^2.6.9"
 
-gaxios@^6.0.0, gaxios@^6.1.1:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.0.tgz#37b7c5961cb67d8d4b0ae8110dcd83cc6791eb6d"
-  integrity sha512-DSrkyMTfAnAm4ks9Go20QGOcXEyW/NmZhvTYBU2rb4afBB393WIMQPWPEDMl/k8xqiNN9HYq2zao3oWXsdl2Tg==
+gaxios@^6.0.0, gaxios@^6.0.2, gaxios@^6.1.1:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/gaxios/-/gaxios-6.7.1.tgz#ebd9f7093ede3ba502685e73390248bb5b7f71fb"
+  integrity sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==
   dependencies:
     extend "^3.0.2"
     https-proxy-agent "^7.0.1"
     is-stream "^2.0.0"
     node-fetch "^2.6.9"
-    uuid "^10.0.0"
+    uuid "^9.0.1"
 
 gcp-metadata@^5.3.0:
   version "5.3.0"
@@ -11844,13 +10924,6 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
-generic-names@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-4.0.0.tgz#0bd8a2fd23fe8ea16cbd0a279acd69c06933d9a3"
-  integrity sha512-ySFolZQfw9FoDb3ed9d80Cm9f0+r7qj+HJkWjeD9RBfpxEVTlVhol+gvaQB/78WbwYfbnNh8nWHHBSlg072y6A==
-  dependencies:
-    loader-utils "^3.2.0"
-
 generic-pool@3.9.0, generic-pool@^3.8.2:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/generic-pool/-/generic-pool-3.9.0.tgz#36f4a678e963f4fdb8707eab050823abc4e8f5e4"
@@ -11956,7 +11029,7 @@ get-stream@^2.2.0:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-get-stream@^4.0.0, get-stream@^4.1.0:
+get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -11975,11 +11048,6 @@ get-stream@^6.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
   integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==
 
-get-stream@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-8.0.1.tgz#def9dfd71742cd7754a7761ed43749a27d02eca2"
-  integrity sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==
-
 get-symbol-description@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.2.tgz#533744d5aa20aca4e079c8e5daf7fd44202821f5"
@@ -12111,7 +11179,7 @@ glob@7.1.6:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^10.0.0, glob@^10.2.2, glob@^10.3.7:
+glob@^10.0.0, glob@^10.2.2:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
   integrity sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==
@@ -12134,7 +11202,7 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3:
+glob@^7.0.5, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
   integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
@@ -12179,13 +11247,6 @@ global-agent@3.0.0:
     semver "^7.3.2"
     serialize-error "^7.0.1"
 
-global-directory@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/global-directory/-/global-directory-4.0.1.tgz#4d7ac7cfd2cb73f304c53b8810891748df5e361e"
-  integrity sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==
-  dependencies:
-    ini "4.1.1"
-
 global-dirs@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.1.tgz#0c488971f066baceda21447aecb1a8b911d22485"
@@ -12193,6 +11254,26 @@ global-dirs@^3.0.0:
   dependencies:
     ini "2.0.0"
 
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
 global@~4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406"
@@ -12201,29 +11282,18 @@ global@~4.4.0:
     min-document "^2.19.0"
     process "^0.11.10"
 
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
+globals@15.13.0, globals@^11.1.0, globals@^13.19.0, globals@^14.0.0:
+  version "15.13.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-15.13.0.tgz#bbec719d69aafef188ecd67954aae76a696010fc"
+  integrity sha512-49TewVEz0UxZjr1WYYsWpPrhyC/B/pA8Bq0fUmet2n+eR7yn0IvNzNaoBwnK6mdkzcN+se7Ez9zUgULTz2QH4g==
 
-globals@^13.19.0:
-  version "13.20.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
-  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+globalthis@^1.0.1, globalthis@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.4.tgz#7430ed3a975d97bfb59bcce41f5cabbafa651236"
+  integrity sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==
   dependencies:
-    type-fest "^0.20.2"
-
-globals@^14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-14.0.0.tgz#898d7413c29babcf6bafe56fcadded858ada724e"
-  integrity sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==
-
-globalthis@^1.0.1, globalthis@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
-  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
-  dependencies:
-    define-properties "^1.1.3"
+    define-properties "^1.2.1"
+    gopd "^1.0.1"
 
 globalyzer@0.1.0:
   version "0.1.0"
@@ -12269,10 +11339,10 @@ google-auth-library@^8.0.1:
     jws "^4.0.0"
     lru-cache "^6.0.0"
 
-google-auth-library@^9.3.0:
-  version "9.11.0"
-  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.11.0.tgz#bd6da364bcde4e0cc4ed70a0e0df5112b6a671dd"
-  integrity sha512-epX3ww/mNnhl6tL45EQ/oixsY8JLEgUFoT4A5E/5iAR4esld9Kqv6IJGk7EmGuOgDvaarwF95hU2+v7Irql9lw==
+google-auth-library@^9.3.0, google-auth-library@^9.6.3:
+  version "9.15.0"
+  resolved "https://registry.yarnpkg.com/google-auth-library/-/google-auth-library-9.15.0.tgz#1b009c08557929c881d72f953f17e839e91b009b"
+  integrity sha512-7ccSEJFDFO7exFbO6NRyC+xH8/mZ1GZGG2xxx9iHxZWcjUjJpjWxIMw3cofAKcueZ6DATiukmmprD7yavQHOyQ==
   dependencies:
     base64-js "^1.3.0"
     ecdsa-sig-formatter "^1.0.11"
@@ -12321,23 +11391,6 @@ gopd@^1.0.1:
   dependencies:
     get-intrinsic "^1.1.3"
 
-got@^11.8.6:
-  version "11.8.6"
-  resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a"
-  integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==
-  dependencies:
-    "@sindresorhus/is" "^4.0.0"
-    "@szmarczak/http-timer" "^4.0.5"
-    "@types/cacheable-request" "^6.0.1"
-    "@types/responselike" "^1.0.0"
-    cacheable-lookup "^5.0.3"
-    cacheable-request "^7.0.2"
-    decompress-response "^6.0.0"
-    http2-wrapper "^1.0.0-beta.5.2"
-    lowercase-keys "^2.0.0"
-    p-cancelable "^2.0.0"
-    responselike "^2.0.0"
-
 got@^8.3.1:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
@@ -12524,31 +11577,6 @@ has-yarn@^2.1.0:
   resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
   integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
 
-hash-base@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"
-  integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "^3.6.0"
-    safe-buffer "^5.2.0"
-
-hash-base@~3.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918"
-  integrity sha512-EeeoJKjTyt868liAlVmcv2ZsUfGHlE3Q+BICOXcZiwN3osr5Q/zFGYmTJpoIzuaSTAwndFy+GqhEwlU4L3j4Ow==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
-hash.js@^1.0.0, hash.js@^1.0.3:
-  version "1.1.7"
-  resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42"
-  integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==
-  dependencies:
-    inherits "^2.0.3"
-    minimalistic-assert "^1.0.1"
-
 hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -12569,14 +11597,10 @@ hexoid@^1.0.0:
   resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-1.0.0.tgz#ad10c6573fb907de23d9ec63a711267d9dc9bc18"
   integrity sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==
 
-hmac-drbg@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1"
-  integrity sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==
-  dependencies:
-    hash.js "^1.0.3"
-    minimalistic-assert "^1.0.0"
-    minimalistic-crypto-utils "^1.0.1"
+hexoid@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hexoid/-/hexoid-2.0.0.tgz#fb36c740ebbf364403fa1ec0c7efd268460ec5b9"
+  integrity sha512-qlspKUK7IlSQv2o+5I7yhUd7TxlOG2Vr5LTa3ve2XSNVKAL/n/u/7KLvKmFNimomDIKvZFXWHv0T12mv7rT8Aw==
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
@@ -12630,6 +11654,11 @@ html-encoding-sniffer@^3.0.0:
   dependencies:
     whatwg-encoding "^2.0.0"
 
+html-entities@^2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.5.2.tgz#201a3cf95d3a15be7099521620d19dfb4f65359f"
+  integrity sha512-K//PSRMQk4FZ78Kyau+mZurHn3FH0Vwr+H36eE0rPbeYkRRi9YxceYPhuN60UwWorxyKHhqoAJl2OFKa4BVtaA==
+
 html-escaper@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
@@ -12678,7 +11707,7 @@ http-cookie-agent@^4.0.2:
   dependencies:
     agent-base "^6.0.2"
 
-http-errors@2.0.0:
+http-errors@2.0.0, http-errors@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
   integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
@@ -12728,6 +11757,14 @@ http-proxy-agent@^5.0.0:
     agent-base "6"
     debug "4"
 
+http-proxy-agent@^7.0.0:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz#9a8b1f246866c028509486585f62b8f2c18c270e"
+  integrity sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==
+  dependencies:
+    agent-base "^7.1.0"
+    debug "^4.3.4"
+
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
@@ -12737,14 +11774,6 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-http2-wrapper@^1.0.0-beta.5.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/http2-wrapper/-/http2-wrapper-1.0.3.tgz#b8f55e0c1f25d4ebd08b3b0c2c079f9590800b3d"
-  integrity sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==
-  dependencies:
-    quick-lru "^5.1.1"
-    resolve-alpn "^1.0.0"
-
 https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6"
@@ -12753,7 +11782,7 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.1:
+https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1, https-proxy-agent@^7.0.2:
   version "7.0.5"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz#9e8b5013873299e11fab6fd548405da2d6c602b2"
   integrity sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==
@@ -12766,11 +11795,6 @@ human-signals@^2.1.0:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
-human-signals@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-5.0.0.tgz#42665a284f9ae0dade3ba41ebc37eb4b852f3a28"
-  integrity sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==
-
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -12783,11 +11807,6 @@ husky@^8.0.3:
   resolved "https://registry.yarnpkg.com/husky/-/husky-8.0.3.tgz#4936d7212e46d1dea28fef29bb3a108872cd9184"
   integrity sha512-+dQSyqPh4x1hlO1swXBiNb2HzTDN1I2IGLQx1GrBuiqFJfoMrnZWwVmatvSiO+Iz8fBUnf+lekwNo4c2LlXItg==
 
-husky@^9.1.4:
-  version "9.1.5"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-9.1.5.tgz#2b6edede53ee1adbbd3a3da490628a23f5243b83"
-  integrity sha512-rowAVRUBfI0b4+niA4SJMhfQwc107VLkBUgEYYAOQAbqDCnra1nYh83hF/MDmhYs9t9n1E3DuKOrs2LYNC+0Ag==
-
 ical-generator@4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ical-generator/-/ical-generator-4.1.0.tgz#2a336c951864c5583a2aa715d16f2edcdfd2d90b"
@@ -12809,21 +11828,6 @@ iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-  integrity sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==
-
-icss-utils@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
-  integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
-
-idb-wrapper@^1.5.0:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/idb-wrapper/-/idb-wrapper-1.7.2.tgz#8251afd5e77fe95568b1c16152eb44b396767ea2"
-  integrity sha512-zfNREywMuf0NzDo9mVsL0yegjsirJxHpKHvWcyRozIqQy89g0a3U+oBPOCN4cc0oCiOuYgZHimzaW/R46G1Mpg==
-
 identity-obj-proxy@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz#94d2bda96084453ef36fbc5aaec37e0f79f1fc14"
@@ -12860,7 +11864,7 @@ ignore-walk@^6.0.0:
   dependencies:
     minimatch "^7.4.2"
 
-ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1, ignore@^5.3.2:
+ignore@^5.0.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.1:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
   integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
@@ -12882,23 +11886,6 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==
 
-immediate@~3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c"
-  integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg==
-
-immutable@^4.3.4:
-  version "4.3.7"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.3.7.tgz#c70145fc90d89fb02021e65c84eb0226e4e5a381"
-  integrity sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==
-
-import-cwd@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-3.0.0.tgz#20845547718015126ea9b3676b7592fb8bd4cf92"
-  integrity sha512-4pnzH16plW+hgvRECbDWpQl3cqtvSofHWh44met7ESfZ8UZOWWddm8hEyDTqREJ9RbYHY8gi8DqmaelApoOGMg==
-  dependencies:
-    import-from "^3.0.0"
-
 import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
@@ -12907,20 +11894,13 @@ import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-from@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/import-from/-/import-from-3.0.0.tgz#055cfec38cd5a27d8057ca51376d7d3bf0891966"
-  integrity sha512-CiuXOFFSzkU5x/CR0+z7T91Iht4CXgfCxVOFRhh2Zyhg5wOpWvvDLQUsWl+gcN+QscYBjez8hDCt85O7RLDttQ==
-  dependencies:
-    resolve-from "^5.0.0"
-
-import-in-the-middle@^1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.7.3.tgz#ffa784cdd57a47d2b68d2e7dd33070ff06baee43"
-  integrity sha512-R2I11NRi0lI3jD2+qjqyVlVEahsejw7LDnYEbGb47QEFjczE3bZYsmWheCTQA+LFs2DzOQxR7Pms7naHW1V4bQ==
+import-in-the-middle@1.11.2:
+  version "1.11.2"
+  resolved "https://registry.yarnpkg.com/import-in-the-middle/-/import-in-the-middle-1.11.2.tgz#dd848e72b63ca6cd7c34df8b8d97fc9baee6174f"
+  integrity sha512-gK6Rr6EykBcc6cVWRSBR5TWf8nn6hZMYSRYqCcHa0l0d1fPK7JSYo6+Mlmck76jIX9aL/IZ71c06U2VpFwl1zA==
   dependencies:
     acorn "^8.8.2"
-    acorn-import-assertions "^1.9.0"
+    acorn-import-attributes "^1.9.5"
     cjs-module-lexer "^1.2.2"
     module-details-from-path "^1.0.3"
 
@@ -12952,7 +11932,7 @@ indexes-of@^1.0.1:
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
   integrity sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==
 
-indexof@~0.0.1:
+indexof@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==
@@ -12990,11 +11970,6 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-4.1.1.tgz#d95b3d843b1e906e56d6747d5447904ff50ce7a1"
-  integrity sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==
-
 ini@^1.3.2, ini@^1.3.4, ini@^1.3.8, ini@~1.3.0:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
@@ -13072,11 +12047,6 @@ interpret@^2.2.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
-interpret@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
-  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
-
 into-stream@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
@@ -13085,11 +12055,6 @@ into-stream@^3.1.0:
     from2 "^2.1.1"
     p-is-promise "^1.1.0"
 
-invert-kv@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz#7393f5afa59ec9ff5f67a27620d11c226e3eec02"
-  integrity sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==
-
 ioredis-mock@8.9.0:
   version "8.9.0"
   resolved "https://registry.yarnpkg.com/ioredis-mock/-/ioredis-mock-8.9.0.tgz#5d694c4b81d3835e4291e0b527f947e260981779"
@@ -13138,12 +12103,7 @@ ip@^2.0.0:
   resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da"
   integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ==
 
-ipaddr.js@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.1.0.tgz#2119bc447ff8c257753b196fc5f1ce08a4cdf39f"
-  integrity sha512-LlbxQ7xKzfBusov6UMi4MFpEg0m+mAm9xyNGEduwXMEDuf4WfzB/RZwMVYEd7IKGvh4IUkEXYxtAVu9T3OelJQ==
-
-is-arguments@^1.1.1:
+is-arguments@^1.0.4, is-arguments@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
@@ -13191,6 +12151,11 @@ is-boolean-object@^1.1.0:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-buffer@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.5.tgz#ebc252e400d22ff8d77fa09888821a24a658c191"
+  integrity sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==
+
 is-builtin-module@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
@@ -13222,12 +12187,12 @@ is-class-hotfix@~0.0.6:
   resolved "https://registry.yarnpkg.com/is-class-hotfix/-/is-class-hotfix-0.0.6.tgz#a527d31fb23279281dde5f385c77b5de70a72435"
   integrity sha512-0n+pzCC6ICtVr/WXnN2f03TK/3BfXY7me4cjCAqT8TYXEl0+JBRoqBo94JJHXcyDSLUeWbNX8Fvy5g5RJdAstQ==
 
-is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1:
-  version "2.13.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
-  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+is-core-module@^2.12.0, is-core-module@^2.13.0, is-core-module@^2.13.1, is-core-module@^2.5.0, is-core-module@^2.8.1:
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.15.1.tgz#a7363a25bee942fefab0de13bf6aa372c82dcc37"
+  integrity sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==
   dependencies:
-    hasown "^2.0.0"
+    hasown "^2.0.2"
 
 is-data-view@^1.0.1:
   version "1.0.1"
@@ -13248,11 +12213,6 @@ is-docker@^2.0.0, is-docker@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-electron@^2.2.0:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/is-electron/-/is-electron-2.2.2.tgz#3778902a2044d76de98036f5dc58089ac4d80bb9"
-  integrity sha512-FO/Rhvz5tuw4MCWkpMzHFKWD2LsfHzIb7i6MdPYZ/KW7AlxawyLkqdy+jPZP1WubqEADE3O4FUENlJHDfQASRg==
-
 is-extendable@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -13302,15 +12262,6 @@ is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   dependencies:
     is-extglob "^2.1.1"
 
-is-immutable-type@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-immutable-type/-/is-immutable-type-4.0.0.tgz#d62ad1ff411eef8dfa3a87222960ec3b645db1a1"
-  integrity sha512-gyFBCXv+NikTs8/PGZhgjbMmFZQ5jvHGZIsVu6+/9Bk4K7imlWBIDN7hTr9fNioGzFg71I4YM3z8f0aKXarTAw==
-  dependencies:
-    "@typescript-eslint/type-utils" "^7.2.0"
-    ts-api-utils "^1.3.0"
-    ts-declaration-location "^1.0.0"
-
 is-installed-globally@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
@@ -13319,14 +12270,6 @@ is-installed-globally@^0.4.0:
     global-dirs "^3.0.0"
     is-path-inside "^3.0.2"
 
-is-installed-globally@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-1.0.0.tgz#08952c43758c33d815692392f7f8437b9e436d5a"
-  integrity sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==
-  dependencies:
-    global-directory "^4.0.1"
-    is-path-inside "^4.0.0"
-
 is-interactive@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
@@ -13396,21 +12339,11 @@ is-object@^1.0.1:
   resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.2.tgz#a56552e1c665c9e950b4a025461da87e72f86fcf"
   integrity sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==
 
-is-object@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/is-object/-/is-object-0.1.2.tgz#00efbc08816c33cfc4ac8251d132e10dc65098d7"
-  integrity sha512-GkfZZlIZtpkFrqyAXPQSRBMsaHAw+CgoKe2HXAkjd/sfoI9+hS8PT4wg2rJxdQyUKr7N2vHJbg7/jQtE5l5vBQ==
-
 is-path-inside@^3.0.2, is-path-inside@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-path-inside@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-4.0.0.tgz#805aeb62c47c1b12fc3fd13bfb3ed1e7430071db"
-  integrity sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==
-
 is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
@@ -13516,11 +12449,6 @@ is-stream@^2.0.0, is-stream@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
-is-stream@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-3.0.0.tgz#e6bfd7aa6bef69f4f472ce9bb681e3e57b4319ac"
-  integrity sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==
-
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
@@ -13551,7 +12479,7 @@ is-type-of@^1.0.0:
     is-class-hotfix "~0.0.6"
     isstream "~0.1.2"
 
-is-typed-array@^1.1.13:
+is-typed-array@^1.1.13, is-typed-array@^1.1.3:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.13.tgz#d6c5ca56df62334959322d7d7dd1cca50debe229"
   integrity sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==
@@ -13608,6 +12536,11 @@ is-whitespace@^0.3.0:
   resolved "https://registry.yarnpkg.com/is-whitespace/-/is-whitespace-0.3.0.tgz#1639ecb1be036aec69a54cbb401cfbed7114ab7f"
   integrity sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==
 
+is-windows@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
+  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
+
 is-wsl@^2.1.1, is-wsl@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
@@ -13620,11 +12553,6 @@ is-yarn-global@^0.3.0:
   resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
   integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
 
-is@~0.2.6:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/is/-/is-0.2.7.tgz#3b34a2c48f359972f35042849193ae7264b63562"
-  integrity sha512-ajQCouIvkcSnl2iRdK70Jug9mohIHVX9uKpoWnl115ov0R5mzBvRrXxrnHbsA+8AdwCwc/sfw7HXmd4I5EJBdQ==
-
 isarray@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
@@ -13640,11 +12568,6 @@ isarray@^2.0.5:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbuffer@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/isbuffer/-/isbuffer-0.0.0.tgz#38c146d9df528b8bf9b0701c3d43cf12df3fc39b"
-  integrity sha512-xU+NoHp+YtKQkaM2HsQchYn0sltxMxew0HavMfHbjnucBoTSGbw745tL+Z7QBANleWM1eEQMenEpi174mIeS4g==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -13679,14 +12602,6 @@ isolated-vm@^4.7.2:
   dependencies:
     prebuild-install "^7.1.1"
 
-isomorphic-fetch@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz#0267b005049046d2421207215d45d6a262b8b8b4"
-  integrity sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==
-  dependencies:
-    node-fetch "^2.6.1"
-    whatwg-fetch "^3.4.1"
-
 isstream@~0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
@@ -13879,15 +12794,6 @@ jest-docblock@^29.7.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-dynalite@^3.6.1:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/jest-dynalite/-/jest-dynalite-3.6.1.tgz#8bae305a3c33d9a8036f563827b173b54a323ca5"
-  integrity sha512-MERtTt8Pj39vFmbItMC3YuIaqLf1kh/pJIE0DRcjeP/2Fa8Nni9IxwN6XWIMgXNbFKtlOM6ppH+Bsy0rWIdPiw==
-  dependencies:
-    "@aws/dynamodb-auto-marshaller" "^0.7.1"
-    dynalite "^3.2.1"
-    setimmediate "^1.0.5"
-
 jest-each@^29.7.0:
   version "29.7.0"
   resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-29.7.0.tgz#162a9b3f2328bdd991beaabffbb74745e56577d1"
@@ -14194,20 +13100,43 @@ jest@29.7.0:
     import-local "^3.0.2"
     jest-cli "^29.7.0"
 
-jimp@0.22.12:
-  version "0.22.12"
-  resolved "https://registry.yarnpkg.com/jimp/-/jimp-0.22.12.tgz#f99d1f3ec0d9d930cb7bd8f5b479859ee3a15694"
-  integrity sha512-R5jZaYDnfkxKJy1dwLpj/7cvyjxiclxU3F4TrI/J4j2rS0niq6YDUMoPn5hs8GDpO+OZGo7Ky057CRtWesyhfg==
+jimp@1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/jimp/-/jimp-1.1.4.tgz#943356f27559815690a3c2e29fa67ecfd9a92658"
+  integrity sha512-DL82Spu4H7B332nhddz5Cq9J0WEa5mc9d6BJQfeLHf2LOAMg79A+74KRKKzogaLgqK8APGfoWLwca7KjjvBgig==
   dependencies:
-    "@jimp/custom" "^0.22.12"
-    "@jimp/plugins" "^0.22.12"
-    "@jimp/types" "^0.22.12"
-    regenerator-runtime "^0.13.3"
+    "@jimp/core" "1.1.4"
+    "@jimp/diff" "1.1.4"
+    "@jimp/js-bmp" "1.1.4"
+    "@jimp/js-gif" "1.1.4"
+    "@jimp/js-jpeg" "1.1.4"
+    "@jimp/js-png" "1.1.4"
+    "@jimp/js-tiff" "1.1.4"
+    "@jimp/plugin-blit" "1.1.4"
+    "@jimp/plugin-blur" "1.1.4"
+    "@jimp/plugin-circle" "1.1.4"
+    "@jimp/plugin-color" "1.1.4"
+    "@jimp/plugin-contain" "1.1.4"
+    "@jimp/plugin-cover" "1.1.4"
+    "@jimp/plugin-crop" "1.1.4"
+    "@jimp/plugin-displace" "1.1.4"
+    "@jimp/plugin-dither" "1.1.4"
+    "@jimp/plugin-fisheye" "1.1.4"
+    "@jimp/plugin-flip" "1.1.4"
+    "@jimp/plugin-hash" "1.1.4"
+    "@jimp/plugin-mask" "1.1.4"
+    "@jimp/plugin-print" "1.1.4"
+    "@jimp/plugin-quantize" "1.1.4"
+    "@jimp/plugin-resize" "1.1.4"
+    "@jimp/plugin-rotate" "1.1.4"
+    "@jimp/plugin-threshold" "1.1.4"
+    "@jimp/types" "1.1.4"
+    "@jimp/utils" "1.1.4"
 
-jmespath@0.15.0:
-  version "0.15.0"
-  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
-  integrity sha512-+kHj8HXArPfpPEKGLZ+kB5ONRTCiGQXo8RQYL0hH8t6pWXUBBK5KkkQmTNOwKK4LEsd0yTsgtjJVm4UBSZea4w==
+jmespath@0.16.0:
+  version "0.16.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.16.0.tgz#b15b0a85dfd4d930d43e69ed605943c802785076"
+  integrity sha512-9FzQjJ7MATs1tSpnco1K6ayiYE3figslrXA72G2HQ/n76RzvYlofyi5QM+iX4YRs/pu3yzxlVQSST23+dMDknw==
 
 joi@17.6.0:
   version "17.6.0"
@@ -14220,17 +13149,6 @@ joi@17.6.0:
     "@sideway/formula" "^3.0.0"
     "@sideway/pinpoint" "^2.0.0"
 
-joi@^17.13.1:
-  version "17.13.3"
-  resolved "https://registry.yarnpkg.com/joi/-/joi-17.13.3.tgz#0f5cc1169c999b30d344366d384b12d92558bcec"
-  integrity sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==
-  dependencies:
-    "@hapi/hoek" "^9.3.0"
-    "@hapi/topo" "^5.1.0"
-    "@sideway/address" "^4.1.5"
-    "@sideway/formula" "^3.0.1"
-    "@sideway/pinpoint" "^2.0.0"
-
 joycon@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03"
@@ -14268,7 +13186,7 @@ js-yaml@4.1.0, js-yaml@^4.0.0, js-yaml@^4.1.0:
   dependencies:
     argparse "^2.0.1"
 
-js-yaml@^3.10.0, js-yaml@^3.13.1:
+js-yaml@^3.10.0, js-yaml@^3.13.1, js-yaml@^3.14.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -14276,11 +13194,6 @@ js-yaml@^3.10.0, js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsbi@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-4.3.0.tgz#b54ee074fb6fcbc00619559305c8f7e912b04741"
-  integrity sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g==
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
@@ -14351,11 +13264,6 @@ jsdom@^21.1.1:
     ws "^8.13.0"
     xml-name-validator "^4.0.0"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
-
 jsesc@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.0.2.tgz#bb8b09a6597ba426425f2e4a07245c3d00b9343e"
@@ -14383,11 +13291,6 @@ json-buffer@3.0.1:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
   integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
-json-format-highlight@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/json-format-highlight/-/json-format-highlight-1.0.4.tgz#2e44277edabcec79a3d2c84e984c62e2258037b9"
-  integrity sha512-RqenIjKr1I99XfXPAml9G7YlEZg/GnsH7emWyWJh2yuGXqHW8spN7qx6/ME+MoIBb35/fxrMC9Jauj6nvGe4Mg==
-
 json-parse-better-errors@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
@@ -14423,16 +13326,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-json-stable-stringify@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz#52d4361b47d49168bcc4e564189a42e5a7439454"
-  integrity sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==
-  dependencies:
-    call-bind "^1.0.5"
-    isarray "^2.0.5"
-    jsonify "^0.0.1"
-    object-keys "^1.1.1"
-
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -14464,11 +13357,6 @@ jsonfile@^6.0.1:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonify@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.1.tgz#2aa3111dae3d34a0f151c63f3a45d995d9420978"
-  integrity sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==
-
 jsonparse@^1.2.0, jsonparse@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
@@ -14550,11 +13438,6 @@ jws@^4.0.0:
     jwa "^2.0.0"
     safe-buffer "^5.0.1"
 
-jwt-decode@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
-  integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
-
 keygrip@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
@@ -14576,7 +13459,7 @@ keyv@^3.0.0:
   dependencies:
     json-buffer "3.0.0"
 
-keyv@^4.0.0, keyv@^4.5.4:
+keyv@^4.5.4:
   version "4.5.4"
   resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
   integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
@@ -14626,10 +13509,10 @@ knex@2.4.2:
     tarn "^3.0.2"
     tildify "2.0.0"
 
-known-css-properties@^0.29.0:
-  version "0.29.0"
-  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.29.0.tgz#e8ba024fb03886f23cb882e806929f32d814158f"
-  integrity sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==
+known-css-properties@^0.35.0:
+  version "0.35.0"
+  resolved "https://registry.yarnpkg.com/known-css-properties/-/known-css-properties-0.35.0.tgz#f6f8e40ab4e5700fa32f5b2ef5218a56bc853bd6"
+  integrity sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==
 
 koa-body@4.2.0:
   version "4.2.0"
@@ -14677,7 +13560,7 @@ koa-mount@^4.0.0:
     debug "^4.0.1"
     koa-compose "^4.1.0"
 
-koa-passport@4.1.4, koa-passport@^4.1.4:
+koa-passport@4.1.4:
   version "4.1.4"
   resolved "https://registry.yarnpkg.com/koa-passport/-/koa-passport-4.1.4.tgz#5f1665c1c2a37ace79af9f970b770885ca30ccfa"
   integrity sha512-dJBCkl4X+zdYxbI2V2OtoGy0PUenpvp2ZLLWObc8UJhsId0iQpTFT8RVcuA0709AL2txGwRHnSPoT1bYNGa6Kg==
@@ -14718,7 +13601,7 @@ koa-send@5.0.1, koa-send@^5.0.0:
     http-errors "^1.7.3"
     resolve-path "^1.4.0"
 
-koa-session@5.13.1, koa-session@^5.12.0:
+koa-session@5.13.1:
   version "5.13.1"
   resolved "https://registry.yarnpkg.com/koa-session/-/koa-session-5.13.1.tgz#a47e39015a4b464e21e3e1e2deeca48eb83916ee"
   integrity sha512-TfYiun6xiFosyfIJKnEw0aoG5XmLIwM+K3OVWfkz84qY0NP2gbk0F/olRn0/Hrxq0f14s8amHVXeWyKYH3Cx3Q==
@@ -14736,7 +13619,7 @@ koa-static@5.0.0, koa-static@^5.0.0:
     debug "^3.1.0"
     koa-send "^5.0.0"
 
-koa-useragent@4.1.0, koa-useragent@^4.1.0:
+koa-useragent@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/koa-useragent/-/koa-useragent-4.1.0.tgz#d3f128b552c6da3e5e9e9e9c887b2922b16e4468"
   integrity sha512-x/HUDZ1zAmNNh5hA9hHbPm9p3UVg2prlpHzxCXQCzbibrNS0kmj7MkCResCbAbG7ZT6FVxNSMjR94ZGamdMwxA==
@@ -14836,11 +13719,6 @@ latest-version@^5.1.0:
   dependencies:
     package-json "^6.3.0"
 
-lazy@^1.0.11:
-  version "1.0.11"
-  resolved "https://registry.yarnpkg.com/lazy/-/lazy-1.0.11.tgz#daa068206282542c088288e975c297c1ae77b690"
-  integrity sha512-Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==
-
 lazystream@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.1.tgz#494c831062f1f9408251ec44db1cba29242a2638"
@@ -14848,13 +13726,6 @@ lazystream@^1.0.0:
   dependencies:
     readable-stream "^2.0.5"
 
-lcid@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz#6ef5d2df60e52f82eb228a4c373e8d1f397253cf"
-  integrity sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==
-  dependencies:
-    invert-kv "^2.0.0"
-
 leaflet@^1.7.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.3.tgz#52ec436954964e2d3d39e0d433da4b2500d74414"
@@ -14941,15 +13812,6 @@ lerna@7.4.2:
     yargs "16.2.0"
     yargs-parser "20.2.4"
 
-level-blobs@^0.1.7:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/level-blobs/-/level-blobs-0.1.7.tgz#9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf"
-  integrity sha512-n0iYYCGozLd36m/Pzm206+brIgXP8mxPZazZ6ZvgKr+8YwOZ8/PPpYC5zMUu2qFygRN8RO6WC/HH3XWMW7RMVg==
-  dependencies:
-    level-peek "1.0.6"
-    once "^1.3.0"
-    readable-stream "^1.0.26-4"
-
 level-codec@9.0.2, level-codec@^9.0.0:
   version "9.0.2"
   resolved "https://registry.yarnpkg.com/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc"
@@ -14957,6 +13819,13 @@ level-codec@9.0.2, level-codec@^9.0.0:
   dependencies:
     buffer "^5.6.0"
 
+level-concat-iterator@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-3.1.0.tgz#5235b1f744bc34847ed65a50548aa88d22e881cf"
+  integrity sha512-BWRCMHBxbIqPxJ8vHOvKUsaO0v1sLYZtjN3K2iZJsRBYtp+ONsY6Jfi6hy9K3+zolgQRryhIn2NRZjZnWJ9NmQ==
+  dependencies:
+    catering "^2.1.0"
+
 level-concat-iterator@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz#1d1009cf108340252cb38c51f9727311193e6263"
@@ -14969,40 +13838,6 @@ level-errors@^2.0.0, level-errors@~2.0.0:
   dependencies:
     errno "~0.1.1"
 
-level-filesystem@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/level-filesystem/-/level-filesystem-1.2.0.tgz#a00aca9919c4a4dfafdca6a8108d225aadff63b3"
-  integrity sha512-PhXDuCNYpngpxp3jwMT9AYBMgOvB6zxj3DeuIywNKmZqFj2djj9XfT2XDVslfqmo0Ip79cAd3SBy3FsfOZPJ1g==
-  dependencies:
-    concat-stream "^1.4.4"
-    errno "^0.1.1"
-    fwd-stream "^1.0.4"
-    level-blobs "^0.1.7"
-    level-peek "^1.0.6"
-    level-sublevel "^5.2.0"
-    octal "^1.0.0"
-    once "^1.3.0"
-    xtend "^2.2.0"
-
-level-fix-range@2.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-2.0.0.tgz#c417d62159442151a19d9a2367868f1724c2d548"
-  integrity sha512-WrLfGWgwWbYPrHsYzJau+5+te89dUbENBg3/lsxOs4p2tYOhCHjbgXxBAj4DFqp3k/XBwitcRXoCh8RoCogASA==
-  dependencies:
-    clone "~0.1.9"
-
-level-fix-range@~1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-1.0.2.tgz#bf15b915ae36d8470c821e883ddf79cd16420828"
-  integrity sha512-9llaVn6uqBiSlBP+wKiIEoBa01FwEISFgHSZiyec2S0KpyLUkGR4afW/FCZ/X8y+QJvzS0u4PGOlZDdh1/1avQ==
-
-"level-hooks@>=4.4.0 <5":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/level-hooks/-/level-hooks-4.5.0.tgz#1b9ae61922930f3305d1a61fc4d83c8102c0dd93"
-  integrity sha512-fxLNny/vL/G4PnkLhWsbHnEaRi+A/k8r5EH/M77npZwYL62RHi2fV0S824z3QdpAk6VTgisJwIRywzBHLK4ZVA==
-  dependencies:
-    string-range "~1.2"
-
 level-iterator-stream@~4.0.0:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz#7ceba69b713b0d7e22fcc0d1f128ccdc8a24f79c"
@@ -15012,18 +13847,6 @@ level-iterator-stream@~4.0.0:
     readable-stream "^3.4.0"
     xtend "^4.0.2"
 
-level-js@^2.1.3:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/level-js/-/level-js-2.2.4.tgz#bc055f4180635d4489b561c9486fa370e8c11697"
-  integrity sha512-lZtjt4ZwHE00UMC1vAb271p9qzg8vKlnDeXfIesH3zL0KxhHRDjClQLGLWhyR0nK4XARnd4wc/9eD1ffd4PshQ==
-  dependencies:
-    abstract-leveldown "~0.12.0"
-    idb-wrapper "^1.5.0"
-    isbuffer "~0.0.0"
-    ltgt "^2.1.2"
-    typedarray-to-buffer "~1.0.0"
-    xtend "~2.1.2"
-
 level-js@^5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/level-js/-/level-js-5.0.2.tgz#5e280b8f93abd9ef3a305b13faf0b5397c969b55"
@@ -15034,13 +13857,6 @@ level-js@^5.0.0:
     inherits "^2.0.3"
     ltgt "^2.1.2"
 
-level-option-wrap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/level-option-wrap/-/level-option-wrap-1.1.0.tgz#ad20e68d9f3c22c8897531cc6aa7af596b1ed129"
-  integrity sha512-gQouC22iCqHuBLNl4BHxEZUxLvUKALAtT/Q0c6ziOxZQ8c02G/gyxHWNbLbxUzRNfMrRnbt6TZT3gNe8VBqQeg==
-  dependencies:
-    defined "~0.0.0"
-
 level-packager@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939"
@@ -15049,22 +13865,10 @@ level-packager@^5.1.0:
     encoding-down "^6.3.0"
     levelup "^4.3.2"
 
-level-peek@1.0.6, level-peek@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/level-peek/-/level-peek-1.0.6.tgz#bec51c72a82ee464d336434c7c876c3fcbcce77f"
-  integrity sha512-TKEzH5TxROTjQxWMczt9sizVgnmJ4F3hotBI48xCTYvOKd/4gA/uY0XjKkhJFo6BMic8Tqjf6jFMLWeg3MAbqQ==
-  dependencies:
-    level-fix-range "~1.0.2"
-
-level-sublevel@^5.2.0:
-  version "5.2.3"
-  resolved "https://registry.yarnpkg.com/level-sublevel/-/level-sublevel-5.2.3.tgz#744c12c72d2e72be78dde3b9b5cd84d62191413a"
-  integrity sha512-tO8jrFp+QZYrxx/Gnmjawuh1UBiifpvKNAcm4KCogesWr1Nm2+ckARitf+Oo7xg4OHqMW76eAqQ204BoIlscjA==
-  dependencies:
-    level-fix-range "2.0"
-    level-hooks ">=4.4.0 <5"
-    string-range "~1.2.1"
-    xtend "~2.0.4"
+level-supports@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/level-supports/-/level-supports-2.1.0.tgz#9af908d853597ecd592293b2fad124375be79c5f"
+  integrity sha512-E486g1NCjW5cF78KGPrMDRBYzPuueMZ6VBXHT6gC7A8UYWGiM14fGgp+s/L1oFfDWSPV/+SFkYCmZ0SiESkRKA==
 
 level-supports@~1.0.0:
   version "1.0.1"
@@ -15089,7 +13893,7 @@ level@6.0.1:
     level-packager "^5.1.0"
     leveldown "^5.4.0"
 
-leveldown@5.6.0, leveldown@^5.4.0, leveldown@^5.6.0:
+leveldown@5.6.0, leveldown@^5.4.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98"
   integrity sha512-iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ==
@@ -15098,7 +13902,16 @@ leveldown@5.6.0, leveldown@^5.4.0, leveldown@^5.6.0:
     napi-macros "~2.0.0"
     node-gyp-build "~4.1.0"
 
-levelup@4.4.0, levelup@^4.3.2, levelup@^4.4.0:
+leveldown@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce"
+  integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A==
+  dependencies:
+    abstract-leveldown "^7.2.0"
+    napi-macros "~2.0.0"
+    node-gyp-build "^4.3.0"
+
+levelup@4.4.0, levelup@^4.3.2:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6"
   integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ==
@@ -15109,19 +13922,6 @@ levelup@4.4.0, levelup@^4.3.2, levelup@^4.4.0:
     level-supports "~1.0.0"
     xtend "~4.0.0"
 
-levelup@^0.18.2:
-  version "0.18.6"
-  resolved "https://registry.yarnpkg.com/levelup/-/levelup-0.18.6.tgz#e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb"
-  integrity sha512-uB0auyRqIVXx+hrpIUtol4VAPhLRcnxcOsd2i2m6rbFIDarO5dnrupLOStYYpEcu8ZT087Z9HEuYw1wjr6RL6Q==
-  dependencies:
-    bl "~0.8.1"
-    deferred-leveldown "~0.2.0"
-    errno "~0.1.1"
-    prr "~0.0.0"
-    readable-stream "~1.0.26"
-    semver "~2.3.1"
-    xtend "~3.0.0"
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -15172,7 +13972,7 @@ lie@3.1.1:
   dependencies:
     immediate "~3.0.5"
 
-lilconfig@^2.0.3, lilconfig@^2.0.5:
+lilconfig@^2.0.5:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
@@ -15192,20 +13992,6 @@ lines-and-columns@~2.0.3:
   resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-2.0.3.tgz#b2f0badedb556b747020ab8ea7f0373e22efac1b"
   integrity sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==
 
-load-bmfont@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/load-bmfont/-/load-bmfont-1.4.1.tgz#c0f5f4711a1e2ccff725a7b6078087ccfcddd3e9"
-  integrity sha512-8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==
-  dependencies:
-    buffer-equal "0.0.1"
-    mime "^1.3.4"
-    parse-bmfont-ascii "^1.0.3"
-    parse-bmfont-binary "^1.0.5"
-    parse-bmfont-xml "^1.1.4"
-    phin "^2.9.1"
-    xhr "^2.0.1"
-    xtend "^4.0.0"
-
 load-json-file@6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-6.2.0.tgz#5c7770b42cafa97074ca2848707c61662f4251a1"
@@ -15226,10 +14012,10 @@ load-json-file@^4.0.0:
     pify "^3.0.0"
     strip-bom "^3.0.0"
 
-loader-utils@^3.2.0:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.1.tgz#4fb104b599daafd82ef3e1a41fb9265f87e1f576"
-  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
+load-tsconfig@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/load-tsconfig/-/load-tsconfig-0.2.5.tgz#453b8cd8961bfb912dea77eb6c168fe8cca3d3a1"
+  integrity sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==
 
 local-pkg@^0.4.2:
   version "0.4.3"
@@ -15271,11 +14057,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-lock@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lock/-/lock-1.1.0.tgz#53157499d1653b136ca66451071fca615703fa55"
-  integrity sha512-NZQIJJL5Rb9lMJ0Yl1JoVr9GSdo4HTPsUEWsSFzB8dE8DSoiLCVavWZPi7Rnlv/o73u6I24S/XYc/NmG4l8EKA==
-
 lodash-es@^4.17.15, lodash-es@^4.17.21:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -15301,11 +14082,6 @@ lodash.defaults@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
-lodash.difference@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
-  integrity sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==
-
 lodash.flatten@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
@@ -15366,7 +14142,7 @@ lodash.keys@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-4.2.0.tgz#a08602ac12e4fb83f91fc1fb7a360a4d9ba35205"
   integrity sha512-J79MkJcp7Df5mizHiVNpjoHXLi4HLjh9VLS/M7lQSGoQ+0oQ+lWEigREkqKyizPB1IawvQLLKY8mzEcm1tkyxQ==
 
-lodash.memoize@4.x, lodash.memoize@^4.1.2:
+lodash.memoize@4.x:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==
@@ -15396,16 +14172,6 @@ lodash.sortby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==
 
-lodash.union@^4.6.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
-  integrity sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==
-
 lodash.without@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
@@ -15416,7 +14182,7 @@ lodash.xor@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.xor/-/lodash.xor-4.5.0.tgz#4d48ed7e98095b0632582ba714d3ff8ae8fb1db6"
   integrity sha512-sVN2zimthq7aZ5sPGXnSz32rZPuqcparVW50chJQe+mzTYV+IsxSsl/2gnkWWE2Of7K3myBQBqtLKOUEHJKRsQ==
 
-lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
+lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -15436,12 +14202,12 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-logform@^2.3.2, logform@^2.4.0:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/logform/-/logform-2.5.1.tgz#44c77c34becd71b3a42a3970c77929e52c6ed48b"
-  integrity sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg==
+logform@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/logform/-/logform-2.7.0.tgz#cfca97528ef290f2e125a08396805002b2d060d1"
+  integrity sha512-TFYA4jnP7PVbmlBIfhlSe+WKxs9dklXMTEGcBCIvLhE/Tn3H6Gk1norupVW7m5Cnd4bLcr08AytbyV/xj7f/kQ==
   dependencies:
-    "@colors/colors" "1.5.0"
+    "@colors/colors" "1.6.0"
     "@types/triple-beam" "^1.3.2"
     fecha "^4.2.0"
     ms "^2.1.1"
@@ -15463,11 +14229,6 @@ lookpath@1.1.0:
   resolved "https://registry.yarnpkg.com/lookpath/-/lookpath-1.1.0.tgz#932d68371a2f0b4a5644f03d6a2b4728edba96d2"
   integrity sha512-B9NM7XpVfkyWqfOBI/UW0kVhGw7pJztsduch+1wkbYDi90mYK6/InFul3lG0hYko/VEcVMARVBJ5daFRc5aKCw==
 
-lossless-json@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/lossless-json/-/lossless-json-4.0.1.tgz#d45229e3abb213a0235812780ca894ea8c5b2c6b"
-  integrity sha512-l0L+ppmgPDnb+JGxNLndPtJZGNf6+ZmVaQzoxQm3u6TXmhdnsA+YtdVR8DjzZd/em58686CQhOFDPewfJ4l7MA==
-
 loupe@^2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/loupe/-/loupe-2.3.7.tgz#6e69b7d4db7d3ab436328013d37d1c8c3540c697"
@@ -15475,13 +14236,6 @@ loupe@^2.3.6:
   dependencies:
     get-func-name "^2.0.1"
 
-loupe@^3.1.0, loupe@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/loupe/-/loupe-3.1.1.tgz#71d038d59007d890e3247c5db97c1ec5a92edc54"
-  integrity sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==
-  dependencies:
-    get-func-name "^2.0.1"
-
 lowercase-keys@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
@@ -15578,13 +14332,6 @@ madge@^6.0.0:
     typescript "^3.9.5"
     walkdir "^0.4.1"
 
-magic-string@^0.22.5:
-  version "0.22.5"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
-  integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==
-  dependencies:
-    vlq "^0.2.2"
-
 magic-string@^0.25.7:
   version "0.25.9"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
@@ -15599,10 +14346,10 @@ magic-string@^0.26.7:
   dependencies:
     sourcemap-codec "^1.4.8"
 
-magic-string@^0.30.10, magic-string@^0.30.3, magic-string@^0.30.4:
-  version "0.30.11"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.11.tgz#301a6f93b3e8c2cb13ac1a7a673492c0dfd12954"
-  integrity sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==
+magic-string@^0.30.11, magic-string@^0.30.3, magic-string@^0.30.4:
+  version "0.30.13"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.30.13.tgz#92438e3ff4946cf54f18247c981e5c161c46683c"
+  integrity sha512-8rYBO+MsWkgjDSOvLomYnzhdwEG51olQ4zL5KXnNJWV5MNmrb4rTZdrtkhxjnD/QyZUqR/Z/XDsUs/4ej2nx0g==
   dependencies:
     "@jridgewell/sourcemap-codec" "^1.5.0"
 
@@ -15613,7 +14360,7 @@ make-dir@4.0.0:
   dependencies:
     semver "^7.5.3"
 
-make-dir@^1.0.0, make-dir@^1.3.0:
+make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
@@ -15683,28 +14430,6 @@ make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1, make-fetch-happen@^11.1.0:
     socks-proxy-agent "^7.0.0"
     ssri "^10.0.0"
 
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
-  dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
-    https-proxy-agent "^5.0.0"
-    is-lambda "^1.0.1"
-    lru-cache "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
-    promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
-
 makeerror@1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -15712,13 +14437,6 @@ makeerror@1.0.12:
   dependencies:
     tmpl "1.0.5"
 
-map-age-cleaner@^0.1.1:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
-  integrity sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==
-  dependencies:
-    p-defer "^1.0.0"
-
 map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
@@ -15741,20 +14459,6 @@ matcher@^3.0.0:
   dependencies:
     escape-string-regexp "^4.0.0"
 
-md5.js@^1.3.4:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f"
-  integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-    safe-buffer "^5.1.2"
-
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
 mdn-data@2.0.30:
   version "2.0.30"
   resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
@@ -15765,15 +14469,6 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-mem@^4.0.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
-  integrity sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==
-  dependencies:
-    map-age-cleaner "^0.1.1"
-    mimic-fn "^2.0.0"
-    p-is-promise "^2.0.0"
-
 memdown@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/memdown/-/memdown-1.4.1.tgz#b4e4e192174664ffbae41361aa500f3119efe215"
@@ -15786,25 +14481,6 @@ memdown@1.4.1:
     ltgt "~2.2.0"
     safe-buffer "~5.1.1"
 
-memdown@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/memdown/-/memdown-5.1.0.tgz#608e91a9f10f37f5b5fe767667a8674129a833cb"
-  integrity sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw==
-  dependencies:
-    abstract-leveldown "~6.2.1"
-    functional-red-black-tree "~1.0.1"
-    immediate "~3.2.3"
-    inherits "~2.0.1"
-    ltgt "~2.2.0"
-    safe-buffer "~5.2.0"
-
-memoize@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/memoize/-/memoize-10.0.0.tgz#43fa66b2022363c7c50cf5dfab732a808a3d7147"
-  integrity sha512-H6cBLgsi6vMWOcCpvVCdFFnl3kerEXbrYh9q+lY6VXvQSmM6CkmV08VOwT+WE2tzIEqRPFfAq3fm4v/UIW6mSA==
-  dependencies:
-    mimic-function "^5.0.0"
-
 memory-pager@^1.0.2:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
@@ -15860,14 +14536,6 @@ micromatch@^4.0.4, micromatch@^4.0.5:
     braces "^3.0.3"
     picomatch "^2.3.1"
 
-miller-rabin@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/miller-rabin/-/miller-rabin-4.0.1.tgz#f080351c865b0dc562a8462966daa53543c78a4d"
-  integrity sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==
-  dependencies:
-    bn.js "^4.0.0"
-    brorand "^1.0.1"
-
 mime-db@1.52.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
   version "1.52.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
@@ -15881,7 +14549,7 @@ mime-kind@^3.0.0:
     file-type "^12.1.0"
     mime-types "^2.1.24"
 
-mime-types@^2.0.8, mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.24, mime-types@^2.1.29, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.24, mime-types@^2.1.29, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
   version "2.1.35"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
   integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
@@ -15893,31 +14561,21 @@ mime@2.6.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
+mime@3, mime@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
+  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
+
 mime@^1.3.4:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
-mime@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-3.0.0.tgz#b374550dca3a0c18443b0c950a6a58f1931cf7a7"
-  integrity sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==
-
-mimic-fn@^2.0.0, mimic-fn@^2.1.0:
+mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-fn@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
-  integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
-
-mimic-function@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-function/-/mimic-function-5.0.1.tgz#acbe2b3349f99b9deaca7fb70e48b83e94e67076"
-  integrity sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==
-
 mimic-response@^1.0.0, mimic-response@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
@@ -15940,22 +14598,12 @@ min-indent@^1.0.0:
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
-mini-svg-data-uri@^1.4.4:
-  version "1.4.4"
-  resolved "https://registry.yarnpkg.com/mini-svg-data-uri/-/mini-svg-data-uri-1.4.4.tgz#8ab0aabcdf8c29ad5693ca595af19dd2ead09939"
-  integrity sha512-r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==
-
-minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
+minimalistic-assert@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimalistic-crypto-utils@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
-  integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
-
-"minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
+"minimatch@2 || 3", minimatch@^3.0.3, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
@@ -15969,13 +14617,6 @@ minimatch@3.0.5:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^10.0.0:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.0.1.tgz#ce0521856b453c86e25f2c4c0d03e6ff7ddc440b"
-  integrity sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimatch@^5.0.1, minimatch@^5.1.0:
   version "5.1.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.6.tgz#1cfcb8cf5522ea69952cd2af95ae09477f122a96"
@@ -15983,7 +14624,7 @@ minimatch@^5.0.1, minimatch@^5.1.0:
   dependencies:
     brace-expansion "^2.0.1"
 
-minimatch@^7.4.2:
+minimatch@^7.4.2, minimatch@^7.4.6:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
   integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
@@ -16025,17 +14666,6 @@ minipass-collect@^1.0.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
 minipass-fetch@^2.0.3:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.1.2.tgz#95560b50c472d81a3bc76f20ede80eaed76d8add"
@@ -16073,7 +14703,7 @@ minipass-json-stream@^1.0.1:
     jsonparse "^1.3.1"
     minipass "^3.0.0"
 
-minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
+minipass-pipeline@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
@@ -16087,7 +14717,7 @@ minipass-sized@^1.0.3:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
   version "3.3.6"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.3.6.tgz#7bba384db3a1520d18c9c0e5251c3444e95dd94a"
   integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
@@ -16109,7 +14739,7 @@ minipass@^5.0.0:
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.1.2.tgz#93a9626ce5e5e66bd4db86849e7515e92340a707"
   integrity sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
@@ -16182,22 +14812,17 @@ module-lookup-amd@^7.0.1:
     requirejs-config-file "^4.0.0"
 
 moment-timezone@^0.5.15:
-  version "0.5.41"
-  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.41.tgz#a7ad3285fd24aaf5f93b8119a9d749c8039c64c5"
-  integrity sha512-e0jGNZDOHfBXJGz8vR/sIMXvBIGJJcqFjmlg9lmE+5KX1U7/RZNMswfD8nKnNCnQdKTIj50IaRKwl1fvMLyyRg==
+  version "0.5.46"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.46.tgz#a21aa6392b3c6b3ed916cd5e95858a28d893704a"
+  integrity sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==
   dependencies:
     moment "^2.29.4"
 
-moment@^2.27.0:
+moment@^2.29.4:
   version "2.30.1"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
   integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 mongodb-connection-string-url@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mongodb-connection-string-url/-/mongodb-connection-string-url-3.0.0.tgz#b4f87f92fd8593f3b9365f592515a06d304a1e9c"
@@ -16215,17 +14840,17 @@ mongodb@6.7.0:
     bson "^6.7.0"
     mongodb-connection-string-url "^3.0.0"
 
-moo@^0.5.0, moo@^0.5.1:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/moo/-/moo-0.5.2.tgz#f9fe82473bc7c184b0d32e2215d3f6e67278733c"
-  integrity sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==
+mri@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/mri/-/mri-1.2.0.tgz#6721480fec2a11a4889861115a48b6cbe7cc8f0b"
+  integrity sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==
 
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0, ms@^2.1.1:
+ms@^2.0.0, ms@^2.1.1, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -16261,17 +14886,17 @@ msgpackr@1.10.1, msgpackr@^1.5.2:
   optionalDependencies:
     msgpackr-extract "^3.0.2"
 
-mssql@10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/mssql/-/mssql-10.0.1.tgz#96053ae91b96fdc0469b9d8ca34663d448075bdf"
-  integrity sha512-k0Xkav/3OppZs8Kj+FIo7k7ejbcsVNxp5/ePayxfXzuBZhxD/Y/RhIhrtfHyH6FmlJnBQPj7eDI2IN7B0BiSxQ==
+mssql@11.0.1:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/mssql/-/mssql-11.0.1.tgz#a32ab7763bfbb3f5d970e47563df3911fc04e21d"
+  integrity sha512-KlGNsugoT90enKlR8/G36H0kTxPthDhmtNUCwEHvgRza5Cjpjoj+P2X6eMpFUDN7pFrJZsKadL4x990G8RBE1w==
   dependencies:
     "@tediousjs/connection-string" "^0.5.0"
     commander "^11.0.0"
     debug "^4.3.3"
     rfdc "^1.3.0"
     tarn "^3.0.2"
-    tedious "^16.4.0"
+    tedious "^18.2.1"
 
 multi-part-lite@^1.0.0:
   version "1.0.0"
@@ -16286,7 +14911,7 @@ multi-part@^3.0.0:
     mime-kind "^3.0.0"
     multi-part-lite "^1.0.0"
 
-multimatch@5.0.0:
+multimatch@5.0.0, multimatch@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-5.0.0.tgz#932b800963cea7a31a033328fa1e0c3a1874dbe6"
   integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
@@ -16337,11 +14962,6 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.15.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.0.tgz#31bc433fc33213c97bad36404bb68063de604de3"
-  integrity sha512-nbajikzWTMwsW+eSsNm3QwlOs7het9gGJU5dDZzRTQGk03vyBOauxgI4VakDzE0PtsGTmXPsXTbbjVhRwR5mpw==
-
 nan@^2.17.0, nan@^2.18.0:
   version "2.18.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.18.0.tgz#26a6faae7ffbeb293a39660e88a76b82e30b7554"
@@ -16392,42 +15012,17 @@ ndjson@^1.4.3:
     split2 "^2.1.0"
     through2 "^2.0.3"
 
-nearley@^2.19.5:
-  version "2.20.1"
-  resolved "https://registry.yarnpkg.com/nearley/-/nearley-2.20.1.tgz#246cd33eff0d012faf197ff6774d7ac78acdd474"
-  integrity sha512-+Mc8UaAebFzgV+KpI5n7DasuuQCHA89dmwm7JXw3TV43ukfNQ9DnBH3Mdb2g/I4Fdxc26pwimBWvjIw0UAILSQ==
-  dependencies:
-    commander "^2.19.0"
-    moo "^0.5.0"
-    railroad-diagrams "^1.0.0"
-    randexp "0.4.6"
-
 negotiator@0.6.3, negotiator@^0.6.3:
   version "0.6.3"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
-negotiator@^0.6.2:
-  version "0.6.4"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.4.tgz#777948e2452651c570b712dd01c23e262713fff7"
-  integrity sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==
-
 neo-async@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-neon-env@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/neon-env/-/neon-env-0.1.3.tgz#071e86fde3c698e9314f057d209e0b79ddab16e9"
-  integrity sha512-Zo+L6Nm19gJrjyfhxn/ZDm8eIIDzr75o64ZhijBau4LNuhLzjEAteRg3gchIvgaN8XTo5BxN6iTNP5clZQ0agA==
-
-nice-try@^1.0.4:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
-  integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
-
-nock@13.5.4, nock@^13.5.4:
+nock@13.5.4:
   version "13.5.4"
   resolved "https://registry.yarnpkg.com/nock/-/nock-13.5.4.tgz#8918f0addc70a63736170fef7106a9721e0dc479"
   integrity sha512-yAyTfdeNJGGBFxWdzSKCBYxs5FxLbCg5X5Q4ets974hcQzG1+qCxvIyOo4j2Ry6MUlhWVMX4OoYDefAIIwupjw==
@@ -16436,6 +15031,15 @@ nock@13.5.4, nock@^13.5.4:
     json-stringify-safe "^5.0.1"
     propagate "^2.0.0"
 
+nock@^13.5.4, nock@^13.5.6:
+  version "13.5.6"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.5.6.tgz#5e693ec2300bbf603b61dae6df0225673e6c4997"
+  integrity sha512-o2zOYiCpzRqSzPj0Zt/dQ/DqZeYoaQ7TUonc/xUPjCGl9WeHpNbxgVvOquXYAaJzI0M9BXV3HTzG0p8IUAbBTQ==
+  dependencies:
+    debug "^4.1.0"
+    json-stringify-safe "^5.0.1"
+    propagate "^2.0.0"
+
 node-abi@^3.3.0:
   version "3.54.0"
   resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.54.0.tgz#f6386f7548817acac6434c6cba02999c9aebcc69"
@@ -16443,7 +15047,7 @@ node-abi@^3.3.0:
   dependencies:
     semver "^7.3.5"
 
-node-abort-controller@^3.0.1, node-abort-controller@^3.1.1:
+node-abort-controller@^3.0.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/node-abort-controller/-/node-abort-controller-3.1.1.tgz#a94377e964a9a37ac3976d848cb5c765833b8548"
   integrity sha512-AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==
@@ -16468,14 +15072,14 @@ node-domexception@1.0.0:
   resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
   integrity sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==
 
-node-fetch@2.6.0, node-fetch@2.6.7, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9, node-fetch@^2.7.0:
+node-fetch@2.6.7, node-fetch@2.6.9, node-fetch@^2.6.0, node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9:
   version "2.6.7"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
   integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1.2.1, node-forge@^1.3.1:
+node-forge@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
@@ -16491,31 +15095,15 @@ node-gyp-build@<4.0, node-gyp-build@^3.9.0:
   integrity sha512-zLcTg6P4AbcHPq465ZMFNXx7XpKKJh+7kkN699NiQWisR2uWYOWNWqRHAmbnmKiL4e9aLSlmy5U7rEMUXV59+A==
 
 node-gyp-build@^4.3.0, node-gyp-build@^4.5.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.6.0.tgz#0c52e4cbf54bbd28b709820ef7b6a3c2d6209055"
-  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
+  version "4.8.4"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.8.4.tgz#8a70ee85464ae52327772a90d66c6077a900cfc8"
+  integrity sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==
 
 node-gyp-build@~4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.1.1.tgz#d7270b5d86717068d114cc57fff352f96d745feb"
   integrity sha512-dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ==
 
-node-gyp@^8.2.0:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
-  dependencies:
-    env-paths "^2.2.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
-    npmlog "^6.0.0"
-    rimraf "^3.0.2"
-    semver "^7.3.5"
-    tar "^6.1.2"
-    which "^2.0.2"
-
 node-gyp@^9.0.0:
   version "9.3.1"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-9.3.1.tgz#1e19f5f290afcc9c46973d68700cbd21a96192e4"
@@ -16577,11 +15165,6 @@ node-source-walk@^5.0.0:
   dependencies:
     "@babel/parser" "^7.0.0"
 
-nodemailer@6.9.13:
-  version "6.9.13"
-  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.13.tgz#5b292bf1e92645f4852ca872c56a6ba6c4a3d3d6"
-  integrity sha512-7o38Yogx6krdoBf3jCAqnIN4oSQFx+fMa0I7dK1D+me9kBxx12D+/33wSb+fhOCtIxvYJ+4x4IMEhmhCKfAiOA==
-
 nodemailer@6.9.9:
   version "6.9.9"
   resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.9.9.tgz#4549bfbf710cc6addec5064dd0f19874d24248d9"
@@ -16681,11 +15264,6 @@ normalize-url@^4.1.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
-
 notepack.io@~3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/notepack.io/-/notepack.io-3.0.1.tgz#2c2c9de1bd4e64a79d34e33c413081302a0d4019"
@@ -16781,13 +15359,6 @@ npm-registry-fetch@^14.0.0, npm-registry-fetch@^14.0.3, npm-registry-fetch@^14.0
     npm-package-arg "^10.0.0"
     proc-log "^3.0.0"
 
-npm-run-path@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
-  integrity sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==
-  dependencies:
-    path-key "^2.0.0"
-
 npm-run-path@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
@@ -16795,13 +15366,6 @@ npm-run-path@^4.0.1:
   dependencies:
     path-key "^3.0.0"
 
-npm-run-path@^5.1.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-5.3.0.tgz#e23353d0ebb9317f174e93417e4a4d82d0249e9f"
-  integrity sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==
-  dependencies:
-    path-key "^4.0.0"
-
 npmlog@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-5.0.1.tgz#f06678e80e29419ad67ab964e0fa69959c1eb8b0"
@@ -16822,17 +15386,10 @@ npmlog@^6.0.0, npmlog@^6.0.2:
     gauge "^4.0.3"
     set-blocking "^2.0.0"
 
-nth-check@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.1.1.tgz#c9eab428effce36cd6b92c924bdb000ef1f1ed1d"
-  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
-  dependencies:
-    boolbase "^1.0.0"
-
 nunjucks@^3.2.3:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.4.tgz#f0878eef528ce7b0aa35d67cc6898635fd74649e"
-  integrity "sha1-8IeO71KM57CqNdZ8xomGNf10ZJ4= sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ=="
+  integrity sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==
   dependencies:
     a-sync-waterfall "^1.0.0"
     asap "^2.0.3"
@@ -16932,20 +15489,15 @@ object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-hash@^2.0.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
-  integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-
 object-hash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-3.0.0.tgz#73f97f753e7baffc0e2cc9d6e079079744ac82e9"
   integrity sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==
 
-object-inspect@^1.13.1:
-  version "1.13.1"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
-  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+object-inspect@^1.13.1, object-inspect@^1.13.3:
+  version "1.13.3"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.3.tgz#f14c183de51130243d6d18ae149375ff50ea488a"
+  integrity sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==
 
 object-is@^1.1.5:
   version "1.1.6"
@@ -16960,20 +15512,6 @@ object-keys@^1.1.1:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-keys@~0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.2.0.tgz#cddec02998b091be42bf1035ae32e49f1cb6ea67"
-  integrity sha512-XODjdR2pBh/1qrjPcbSeSgEtKbYo7LqYNq64/TPuCf7j9SfDD3i21yatKoIy39yIWNvVM59iutfQQpCv1RfFzA==
-  dependencies:
-    foreach "~2.0.1"
-    indexof "~0.0.1"
-    is "~0.2.6"
-
-object-keys@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
-  integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==
-
 object-sizeof@2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/object-sizeof/-/object-sizeof-2.6.1.tgz#1e2b6a01d182c268dbb07ee3403f539de45f63d3"
@@ -17028,12 +15566,7 @@ object.values@^1.1.7:
     define-properties "^1.2.0"
     es-abstract "^1.22.1"
 
-octal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b"
-  integrity sha512-nnda7W8d+A3vEIY+UrDQzzboPf1vhs4JYVhff5CDkq9QNoZY7Xrxeo/htox37j9dZf7yNHevZzqtejWgy1vCqQ==
-
-omggif@^1.0.10, omggif@^1.0.9:
+omggif@^1.0.10:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/omggif/-/omggif-1.0.10.tgz#ddaaf90d4a42f532e9e7cb3a95ecdd47f17c7b19"
   integrity sha512-LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw==
@@ -17076,18 +15609,20 @@ onetime@^5.1.0, onetime@^5.1.2:
   dependencies:
     mimic-fn "^2.1.0"
 
-onetime@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-6.0.0.tgz#7c24c18ed1fd2e9bca4bd26806a33613c77d34b4"
-  integrity sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==
-  dependencies:
-    mimic-fn "^4.0.0"
-
 only@~0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
   integrity sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==
 
+open@8.4.2, open@^8.0.0, open@^8.4.0, open@~8.4.0:
+  version "8.4.2"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
+  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
 open@^7.3.1:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
@@ -17096,15 +15631,6 @@ open@^7.3.1:
     is-docker "^2.0.0"
     is-wsl "^2.1.1"
 
-open@^8.0.0, open@^8.4.0, open@~8.4.0:
-  version "8.4.2"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
-  integrity sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==
-  dependencies:
-    define-lazy-prop "^2.0.0"
-    is-docker "^2.1.1"
-    is-wsl "^2.2.0"
-
 openai@4.59.0:
   version "4.59.0"
   resolved "https://registry.yarnpkg.com/openai/-/openai-4.59.0.tgz#3961d11a9afb5920e1bd475948a87969e244fc08"
@@ -17220,15 +15746,6 @@ oracledb@6.5.1:
   resolved "https://registry.yarnpkg.com/oracledb/-/oracledb-6.5.1.tgz#814d985035acdb1a6470b1152af0ca3767569ede"
   integrity sha512-JzoSGei1wnvmqgKnAZK1W650mzHTZXx+7hClV4mwsbY/ZjUtrpnojNJMYJ2jkOhj7XG5oJPfXc4GqDKaNzkxqg==
 
-os-locale@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
-  integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
-  dependencies:
-    execa "^1.0.0"
-    lcid "^2.0.0"
-    mem "^4.0.0"
-
 os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
@@ -17244,16 +15761,6 @@ p-cancelable@^1.0.0:
   resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
   integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
 
-p-cancelable@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
-  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
-
-p-defer@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz#9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"
-  integrity sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==
-
 p-event@^2.1.0:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6"
@@ -17271,11 +15778,6 @@ p-is-promise@^1.1.0:
   resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha512-zL7VE4JVS2IFSkR2GQKDSPEVxkoH43/p7oEnwpdCndKYJO0HVeRB7fA8TJwuLOTBREtK0ea8eHaxdwcpob5dmg==
 
-p-is-promise@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz#918cebaea248a62cf7ffab8e3bca8c5f882fc42e"
-  integrity sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==
-
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -17354,7 +15856,7 @@ p-pipe@3.1.0:
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e"
   integrity sha512-08pj8ATpzMR0Y80x50yJHn37NF6vjrqHutASaX5LiH5npS9XPvrUmscd9MF5R4fuYRHOxQR1FfMIlF7AzwoPqw==
 
-p-queue@6.6.2, p-queue@^6.6.2:
+p-queue@6.6.2:
   version "6.6.2"
   resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-6.6.2.tgz#2068a9dcf8e67dd0ec3e7a2bcb76810faa85e426"
   integrity sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==
@@ -17454,35 +15956,23 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-asn1@^5.0.0, parse-asn1@^5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.7.tgz#73cdaaa822125f9647165625eb45f8a051d2df06"
-  integrity sha512-CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==
-  dependencies:
-    asn1.js "^4.10.1"
-    browserify-aes "^1.2.0"
-    evp_bytestokey "^1.0.3"
-    hash-base "~3.0"
-    pbkdf2 "^3.1.2"
-    safe-buffer "^5.2.1"
-
-parse-bmfont-ascii@^1.0.3:
+parse-bmfont-ascii@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/parse-bmfont-ascii/-/parse-bmfont-ascii-1.0.6.tgz#11ac3c3ff58f7c2020ab22769079108d4dfa0285"
   integrity sha512-U4RrVsUFCleIOBsIGYOMKjn9PavsGOXxbvYGtMOEfnId0SVNsgehXh1DxUdVPLoxd5mvcEtvmKs2Mmf0Mpa1ZA==
 
-parse-bmfont-binary@^1.0.5:
+parse-bmfont-binary@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/parse-bmfont-binary/-/parse-bmfont-binary-1.0.6.tgz#d038b476d3e9dd9db1e11a0b0e53a22792b69006"
   integrity sha512-GxmsRea0wdGdYthjuUeWTMWPqm2+FAd4GI8vCvhgJsFnoGhTrLhXDDupwTo7rXVAgaLIGoVHDZS9p/5XbSqeWA==
 
-parse-bmfont-xml@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.4.tgz#015319797e3e12f9e739c4d513872cd2fa35f389"
-  integrity sha512-bjnliEOmGv3y1aMEfREMBJ9tfL3WR0i0CKPj61DnSLaoxWR3nLrsQrEbCId/8rF4NyRF0cCqisSVXyQYWM+mCQ==
+parse-bmfont-xml@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/parse-bmfont-xml/-/parse-bmfont-xml-1.1.6.tgz#016b655da7aebe6da38c906aca16bf0415773767"
+  integrity sha512-0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==
   dependencies:
     xml-parse-from-string "^1.0.0"
-    xml2js "^0.4.5"
+    xml2js "^0.5.0"
 
 parse-headers@^2.0.0:
   version "2.0.5"
@@ -17567,7 +16057,7 @@ passport-google-oauth20@2.x.x:
   dependencies:
     passport-oauth2 "1.x.x"
 
-passport-google-oauth@2.0.0, passport-google-oauth@^2.0.0:
+passport-google-oauth@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/passport-google-oauth/-/passport-google-oauth-2.0.0.tgz#f6eb4bc96dd6c16ec0ecfdf4e05ec48ca54d4dae"
   integrity sha512-JKxZpBx6wBQXX1/a1s7VmdBgwOugohH+IxCy84aPTZNq/iIPX6u7Mqov1zY7MKRz3niFPol0KJz8zPLBoHKtYA==
@@ -17582,14 +16072,6 @@ passport-local@1.0.0:
   dependencies:
     passport-strategy "1.x.x"
 
-passport-microsoft@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/passport-microsoft/-/passport-microsoft-1.0.0.tgz#78954cf3201fdce61beeb6587a3b158f8e9db86c"
-  integrity sha512-L1JHeCbSObSZZXiG7jU2KoKie6nzZLwGt38HXz1GasKrsCQdOnf5kH8ltV4BWNUfBL2Pt1csWn1iuBSerprrcg==
-  dependencies:
-    passport-oauth2 "1.6.1"
-    pkginfo "0.4.x"
-
 passport-oauth1@1.x.x:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/passport-oauth1/-/passport-oauth1-1.3.0.tgz#5d57f1415c8e28e46b461a12ec1b492934f7c354"
@@ -17604,17 +16086,6 @@ passport-oauth2-refresh@^2.1.0:
   resolved "https://registry.yarnpkg.com/passport-oauth2-refresh/-/passport-oauth2-refresh-2.1.0.tgz#c31cd133826383f5539d16ad8ab4f35ca73ce4a4"
   integrity sha512-4ML7ooCESCqiTgdDBzNUFTBcPR8zQq9iM6eppEUGMMvLdsjqRL93jKwWm4Az3OJcI+Q2eIVyI8sVRcPFvxcF/A==
 
-passport-oauth2@1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.6.1.tgz#c5aee8f849ce8bd436c7f81d904a3cd1666f181b"
-  integrity sha512-ZbV43Hq9d/SBSYQ22GOiglFsjsD1YY/qdiptA+8ej+9C1dL1TVB+mBE5kDH/D4AJo50+2i8f4bx0vg4/yDDZCQ==
-  dependencies:
-    base64url "3.x.x"
-    oauth "0.9.x"
-    passport-strategy "1.x.x"
-    uid2 "0.0.x"
-    utils-merge "1.x.x"
-
 passport-oauth2@1.x.x:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/passport-oauth2/-/passport-oauth2-1.7.0.tgz#5c4766c8531ac45ffe9ec2c09de9809e2c841fc4"
@@ -17655,21 +16126,11 @@ path-is-absolute@1.0.1, path-is-absolute@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
-path-key@^2.0.0, path-key@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
-  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
-
 path-key@^3.0.0, path-key@^3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
-path-key@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-key/-/path-key-4.0.0.tgz#295588dc3aee64154f877adb9d780b81c554bf18"
-  integrity sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==
-
 path-parse@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
@@ -17691,22 +16152,15 @@ path-scurry@^1.11.1, path-scurry@^1.6.1:
     lru-cache "^10.2.0"
     minipass "^5.0.0 || ^6.0.2 || ^7.0.0"
 
-path-to-regexp@1.x:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
-  integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
-  dependencies:
-    isarray "0.0.1"
+path-to-regexp@^0.1.10:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.12.tgz#d5e1a12e478a976d432ef3c58d534b9923164bb7"
+  integrity sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==
 
-path-to-regexp@^0.1.2:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
-
-path-to-regexp@^6.1.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.2.1.tgz#d54934d6798eb9e5ef14e7af7962c945906918e5"
-  integrity sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==
+path-to-regexp@^6.1.0, path-to-regexp@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-6.3.0.tgz#2b6a26a337737a8e1416f9272ed0766b1c0389f4"
+  integrity sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==
 
 path-type@^3.0.0:
   version "3.0.0"
@@ -17730,27 +16184,11 @@ pathval@^1.1.1:
   resolved "https://registry.yarnpkg.com/pathval/-/pathval-1.1.1.tgz#8534e77a77ce7ac5a2512ea21e0fdb8fcf6c3d8d"
   integrity sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==
 
-pathval@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/pathval/-/pathval-2.0.0.tgz#7e2550b422601d4f6b8e26f1301bc8f15a741a25"
-  integrity sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==
-
 pause@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
   integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
 
-pbkdf2@^3.0.3, pbkdf2@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
-  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
-  dependencies:
-    create-hash "^1.1.2"
-    create-hmac "^1.1.4"
-    ripemd160 "^2.0.1"
-    safe-buffer "^5.0.1"
-    sha.js "^2.4.8"
-
 peek-readable@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/peek-readable/-/peek-readable-4.1.0.tgz#4ece1111bf5c2ad8867c314c81356847e8a62e72"
@@ -17775,17 +16213,12 @@ periscopic@^3.1.0:
     estree-walker "^3.0.0"
     is-reference "^3.0.0"
 
-pg-cloudflare@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz#e6d5833015b170e23ae819e8c5d7eaedb472ca98"
-  integrity sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==
-
 pg-connection-string@2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34"
   integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==
 
-pg-connection-string@^2.5.0, pg-connection-string@^2.7.0:
+pg-connection-string@^2.5.0:
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.7.0.tgz#f1d3489e427c62ece022dba98d5262efcb168b37"
   integrity sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==
@@ -17795,46 +16228,16 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-mem@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/pg-mem/-/pg-mem-3.0.3.tgz#0c8862f9bd096a3dcd2addf97e96675fd687a7ad"
-  integrity sha512-Bwg8T46AEMjAmqFT5KIuR2ukRE4GzkVSic7U8CAXqlzFr631N9fTGo4JqNgBHrRCT1qR4Nt2bjZA1AL9JhP4uw==
-  dependencies:
-    functional-red-black-tree "^1.0.1"
-    immutable "^4.3.4"
-    json-stable-stringify "^1.0.1"
-    lru-cache "^6.0.0"
-    moment "^2.27.0"
-    object-hash "^2.0.3"
-    pgsql-ast-parser "^12.0.1"
-
-pg-pool@^3.6.0, pg-pool@^3.7.0:
+pg-pool@^3.6.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.7.0.tgz#d4d3c7ad640f8c6a2245adc369bafde4ebb8cbec"
   integrity sha512-ZOBQForurqh4zZWjrgSwwAtzJ7QiRX0ovFkZr2klsen3Nm0aoh33Ls0fzfv3imeH/nw/O27cjdz5kzYJfeGp/g==
 
-pg-protocol@*, pg-protocol@^1.6.0, pg-protocol@^1.7.0:
+pg-protocol@*, pg-protocol@^1.6.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.7.0.tgz#ec037c87c20515372692edac8b63cf4405448a93"
   integrity sha512-hTK/mE36i8fDDhgDFjy6xNOG+LCorxLG3WO17tku+ij6sVHXh1jQUJ8hYAnRhNla4QVD2H8er/FOjc/+EgC6yQ==
 
-pg-query-native@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/pg-query-native/-/pg-query-native-1.3.1.tgz#66ac04d6e0a4d3f964cadc4b7b452461f843b004"
-  integrity sha512-EXajlKmSVIKqZip7VL05lvwsUqq5LfiNKYodhWcTfrTvK1w6TatkVPoyp0rhHv7+msR9hhT9t7BgJaaGK1QFLA==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.15.0"
-    node-gyp "^8.2.0"
-
-pg-query-parser@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/pg-query-parser/-/pg-query-parser-0.3.0.tgz#f7fc0d909674b02b69c46b91c37d12a9fde90ef6"
-  integrity sha512-7RF8ijM2PtXTQ0B6TZVtP9fYBc1nc6ULq6f5CGlq29qXQFkTaumlQqSxlNAYOMVQGA1Vt2sSfqeViqM+nQiVEQ==
-  dependencies:
-    lodash "^4.17.21"
-    pg-query-native "^1.3.1"
-
 pg-types@^2.1.0, pg-types@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
@@ -17859,19 +16262,6 @@ pg@8.10.0:
     pg-types "^2.1.0"
     pgpass "1.x"
 
-pg@^8.12.0:
-  version "8.13.0"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.13.0.tgz#e3d245342eb0158112553fcc1890a60720ae2a3d"
-  integrity sha512-34wkUTh3SxTClfoHB3pQ7bIMvw9dpFU1audQQeZG837fmHfHpr14n/AELVDoOYVDW2h5RDWU78tFjkD+erSBsw==
-  dependencies:
-    pg-connection-string "^2.7.0"
-    pg-pool "^3.7.0"
-    pg-protocol "^1.7.0"
-    pg-types "^2.1.0"
-    pgpass "1.x"
-  optionalDependencies:
-    pg-cloudflare "^1.1.1"
-
 pgpass@1.x:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
@@ -17879,35 +16269,17 @@ pgpass@1.x:
   dependencies:
     split2 "^4.1.0"
 
-pgsql-ast-parser@^12.0.1:
-  version "12.0.1"
-  resolved "https://registry.yarnpkg.com/pgsql-ast-parser/-/pgsql-ast-parser-12.0.1.tgz#7b9d9880cb62df4b4c595c258b8e7a4b5f44ce53"
-  integrity sha512-pe8C6Zh5MsS+o38WlSu18NhrTjAv1UNMeDTs2/Km2ZReZdYBYtwtbWGZKK2BM2izv5CrQpbmP0oI10wvHOwv4A==
-  dependencies:
-    moo "^0.5.1"
-    nearley "^2.19.5"
-
-phin@^2.9.1:
-  version "2.9.3"
-  resolved "https://registry.yarnpkg.com/phin/-/phin-2.9.3.tgz#f9b6ac10a035636fb65dfc576aaaa17b8743125c"
-  integrity sha512-CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==
-
-picocolors@^1.0.0, picocolors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
-  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
+picocolors@^1.0.0, picocolors@^1.0.1, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3, picomatch@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
   integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
 
-picomatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-4.0.2.tgz#77c742931e8f3b8820946c76cd0c1f13730d1dab"
-  integrity sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==
-
-pify@5.0.0, pify@^5.0.0:
+pify@5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f"
   integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
@@ -18049,12 +16421,12 @@ pirates@^4.0.4:
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
   integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
 
-pixelmatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-4.0.2.tgz#8f47dcec5011b477b67db03c243bc1f3085e8854"
-  integrity sha512-J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==
+pixelmatch@^5.3.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/pixelmatch/-/pixelmatch-5.3.0.tgz#5e5321a7abedfb7962d60dbf345deda87cb9560a"
+  integrity sha512-o8mkY4E/+LNUf6LzX96ht6k6CEDi65k9G2rjMtBe9Oo+VPKSvl+0GKHuH/AlG+GA5LPG/i5hrekkxUc3s2HU+Q==
   dependencies:
-    pngjs "^3.0.0"
+    pngjs "^6.0.0"
 
 pkg-dir@^4.2.0:
   version "4.2.0"
@@ -18072,78 +16444,34 @@ pkg-types@^1.1.1:
     mlly "^1.7.1"
     pathe "^1.1.2"
 
-pkginfo@0.4.x:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/pkginfo/-/pkginfo-0.4.1.tgz#b5418ef0439de5425fc4995042dced14fb2a84ff"
-  integrity sha512-8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ==
+please-upgrade-node@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942"
+  integrity sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==
+  dependencies:
+    semver-compare "^1.0.0"
 
 pluralize@^8.0.0:
   version "8.0.0"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-8.0.0.tgz#1a6fa16a38d12a1901e0320fa017051c539ce3b1"
   integrity sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==
 
-pngjs@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-3.4.0.tgz#99ca7d725965fb655814eaf65f38f12bbdbf555f"
-  integrity sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==
-
 pngjs@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-6.0.0.tgz#ca9e5d2aa48db0228a52c419c3308e87720da821"
   integrity sha512-TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==
 
+pngjs@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pngjs/-/pngjs-7.0.0.tgz#a8b7446020ebbc6ac739db6c5415a65d17090e26"
+  integrity sha512-LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==
+
 possible-typed-array-names@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
   integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
-postcss-calc@^8.2.3:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
-  integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-    postcss-value-parser "^4.2.0"
-
-postcss-colormin@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.1.tgz#86c27c26ed6ba00d96c79e08f3ffb418d1d1988f"
-  integrity sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==
-  dependencies:
-    browserslist "^4.21.4"
-    caniuse-api "^3.0.0"
-    colord "^2.9.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-convert-values@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
-  integrity sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==
-  dependencies:
-    browserslist "^4.21.4"
-    postcss-value-parser "^4.2.0"
-
-postcss-discard-comments@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
-  integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
-
-postcss-discard-duplicates@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
-  integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
-
-postcss-discard-empty@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
-  integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
-
-postcss-discard-overridden@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
-  integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-
-postcss-load-config@^3.0.0, postcss-load-config@^3.1.4:
+postcss-load-config@^3.1.4:
   version "3.1.4"
   resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.4.tgz#1ab2571faf84bb078877e1d07905eabe9ebda855"
   integrity sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==
@@ -18151,222 +16479,24 @@ postcss-load-config@^3.0.0, postcss-load-config@^3.1.4:
     lilconfig "^2.0.5"
     yaml "^1.10.2"
 
-postcss-merge-longhand@^5.1.7:
-  version "5.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz#24a1bdf402d9ef0e70f568f39bdc0344d568fb16"
-  integrity sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    stylehacks "^5.1.1"
-
-postcss-merge-rules@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c"
-  integrity sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==
-  dependencies:
-    browserslist "^4.21.4"
-    caniuse-api "^3.0.0"
-    cssnano-utils "^3.1.0"
-    postcss-selector-parser "^6.0.5"
-
-postcss-minify-font-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
-  integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-gradients@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
-  integrity sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==
-  dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^3.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-params@^5.1.4:
-  version "5.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
-  integrity sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==
-  dependencies:
-    browserslist "^4.21.4"
-    cssnano-utils "^3.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-selectors@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
-  integrity sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
-postcss-modules-extract-imports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
-  integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
-
-postcss-modules-local-by-default@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
-  integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
-  dependencies:
-    icss-utils "^5.0.0"
-    postcss-selector-parser "^6.0.2"
-    postcss-value-parser "^4.1.0"
-
-postcss-modules-scope@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
-  integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
-  dependencies:
-    postcss-selector-parser "^6.0.4"
-
-postcss-modules-values@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
-  integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
-  dependencies:
-    icss-utils "^5.0.0"
-
-postcss-modules@^4.0.0:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-4.3.1.tgz#517c06c09eab07d133ae0effca2c510abba18048"
-  integrity sha512-ItUhSUxBBdNamkT3KzIZwYNNRFKmkJrofvC2nWab3CPKhYBQ1f27XXh1PAPE27Psx58jeelPsxWB/+og+KEH0Q==
-  dependencies:
-    generic-names "^4.0.0"
-    icss-replace-symbols "^1.1.0"
-    lodash.camelcase "^4.3.0"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
-    postcss-modules-values "^4.0.0"
-    string-hash "^1.1.1"
-
-postcss-normalize-charset@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
-  integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
-
-postcss-normalize-display-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
-  integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-positions@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
-  integrity sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-repeat-style@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
-  integrity sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-string@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
-  integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-timing-functions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
-  integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-unicode@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
-  integrity sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==
-  dependencies:
-    browserslist "^4.21.4"
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-url@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
-  integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
-  dependencies:
-    normalize-url "^6.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-whitespace@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
-  integrity sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-ordered-values@^5.1.3:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz#b6fd2bd10f937b23d86bc829c69e7732ce76ea38"
-  integrity sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==
-  dependencies:
-    cssnano-utils "^3.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-reduce-initial@^5.1.2:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz#798cd77b3e033eae7105c18c9d371d989e1382d6"
-  integrity sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==
-  dependencies:
-    browserslist "^4.21.4"
-    caniuse-api "^3.0.0"
-
-postcss-reduce-transforms@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
-  integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
 postcss-safe-parser@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1"
   integrity sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==
 
-postcss-scss@^4.0.8:
+postcss-scss@^4.0.9:
   version "4.0.9"
   resolved "https://registry.yarnpkg.com/postcss-scss/-/postcss-scss-4.0.9.tgz#a03c773cd4c9623cb04ce142a52afcec74806685"
   integrity sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==
 
-postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.13"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
-  integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
+postcss-selector-parser@^6.1.0:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz#27ecb41fb0e3b6ba7a1ec84fff347f734c7929de"
+  integrity sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
-  integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    svgo "^2.7.0"
-
-postcss-unique-selectors@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
-  integrity sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
-postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
-  integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
-
 postcss-values-parser@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz#da8b472d901da1e205b47bdc98637b9e9e550e5f"
@@ -18385,7 +16515,7 @@ postcss-values-parser@^6.0.2:
     is-url-superb "^4.0.0"
     quote-unquote "^1.0.0"
 
-postcss@^8.1.7, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27, postcss@^8.4.29, postcss@^8.4.35, postcss@^8.4.41, postcss@^8.4.5:
+postcss@^8.1.7, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.27:
   version "8.4.41"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
   integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
@@ -18394,6 +16524,15 @@ postcss@^8.1.7, postcss@^8.2.9, postcss@^8.3.11, postcss@^8.4.12, postcss@^8.4.2
     picocolors "^1.0.1"
     source-map-js "^1.2.0"
 
+postcss@^8.4.38, postcss@^8.4.39, postcss@^8.4.48:
+  version "8.4.49"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.49.tgz#4ea479048ab059ab3ae61d082190fabfd994fe19"
+  integrity sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==
+  dependencies:
+    nanoid "^3.3.7"
+    picocolors "^1.1.1"
+    source-map-js "^1.2.1"
+
 postgres-array@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postgres-array/-/postgres-array-2.0.0.tgz#48f8fce054fbc69671999329b8834b772652d82e"
@@ -18416,7 +16555,7 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-posthog-js@^1.118.0, posthog-js@^1.13.4:
+posthog-js@^1.118.0:
   version "1.160.0"
   resolved "https://registry.yarnpkg.com/posthog-js/-/posthog-js-1.160.0.tgz#ad686f3c161c7dc2ba716281b5cef94c64ce41b1"
   integrity sha512-K/RRgmPYIpP69nnveCJfkclb8VU+R+jsgqlrKaLGsM5CtQM9g01WOzAiT3u36WLswi58JiFMXgJtECKQuoqTgQ==
@@ -18441,19 +16580,18 @@ pouch-stream@^0.4.0:
     inherits "^2.0.1"
     readable-stream "^1.0.27-1"
 
-pouchdb-abstract-mapreduce@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-7.2.2.tgz#dd1b10a83f8d24361dce9aaaab054614b39f766f"
-  integrity sha512-7HWN/2yV2JkwMnGnlp84lGvFtnm0Q55NiBUdbBcaT810+clCGKvhssBCrXnmwShD1SXTwT83aszsgiSfW+SnBA==
+pouchdb-abstract-mapreduce@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-abstract-mapreduce/-/pouchdb-abstract-mapreduce-9.0.0.tgz#d5f189a6f8980931835c41ea1f0b692368ce4686"
+  integrity sha512-SnTtqwAEiAa3uxKbc1J7LfiBViwEkKe2xkK92zxyTXPqWBvMnh4UU3GXxx7GrXTM4L9llsQ3lSjpbH4CNqG1Mw==
   dependencies:
-    pouchdb-binary-utils "7.2.2"
-    pouchdb-collate "7.2.2"
-    pouchdb-collections "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-mapreduce-utils "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-utils "7.2.2"
+    pouchdb-binary-utils "9.0.0"
+    pouchdb-collate "9.0.0"
+    pouchdb-errors "9.0.0"
+    pouchdb-fetch "9.0.0"
+    pouchdb-mapreduce-utils "9.0.0"
+    pouchdb-md5 "9.0.0"
+    pouchdb-utils "9.0.0"
 
 pouchdb-adapter-leveldb-core@7.2.2:
   version "7.2.2"
@@ -18514,10 +16652,15 @@ pouchdb-binary-utils@7.2.2:
   dependencies:
     buffer-from "1.1.1"
 
-pouchdb-collate@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-7.2.2.tgz#fc261f5ef837c437e3445fb0abc3f125d982c37c"
-  integrity sha512-/SMY9GGasslknivWlCVwXMRMnQ8myKHs4WryQ5535nq1Wj/ehpqWloMwxEQGvZE1Sda3LOm7/5HwLTcB8Our+w==
+pouchdb-binary-utils@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-binary-utils/-/pouchdb-binary-utils-9.0.0.tgz#eafed32c21e92ef4b253456f9e53c4cf2cfd99fd"
+  integrity sha512-2OMtgDZi82vqs+zNDE0YiYjOaWkYCUcZJZKK3WkRr+XYRu+2B7umJrnygJFhUwoGedBbHSrlQBLhdNV3F1AX1A==
+
+pouchdb-collate@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-collate/-/pouchdb-collate-9.0.0.tgz#654f6766927ada60603ba25b6b2ae533564fa302"
+  integrity sha512-TrnEDNZEmIIl+W3xKUO8h+geqVLQ90oZe5ujPkl8myUzpREULWXWQBnV5EzPXVEKDBpJlb8T3I6oy/zdWGQpdA==
 
 pouchdb-collections@7.2.2:
   version "7.2.2"
@@ -18531,27 +16674,31 @@ pouchdb-errors@7.2.2:
   dependencies:
     inherits "2.0.4"
 
-pouchdb-fetch@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-7.2.2.tgz#492791236d60c899d7e9973f9aca0d7b9cc02230"
-  integrity sha512-lUHmaG6U3zjdMkh8Vob9GvEiRGwJfXKE02aZfjiVQgew+9SLkuOxNw3y2q4d1B6mBd273y1k2Lm0IAziRNxQnA==
-  dependencies:
-    abort-controller "3.0.0"
-    fetch-cookie "0.10.1"
-    node-fetch "2.6.0"
+pouchdb-errors@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-errors/-/pouchdb-errors-9.0.0.tgz#f84269ce3327abef9455c0a90a51c26d7dca20c6"
+  integrity sha512-961PSMLhW0UqqdJ566g+CdLZ5pkBJRd6l4WWpCDdD0USvE4xYfYGzv43w7nZZBw1k3Xdy092yqPge7yX/tfnyw==
 
-pouchdb-find@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-7.2.2.tgz#1227afdd761812d508fe0794b3e904518a721089"
-  integrity sha512-BmFeFVQ0kHmDehvJxNZl9OmIztCjPlZlVSdpijuFbk/Fi1EFPU1BAv3kLC+6DhZuOqU/BCoaUBY9sn66pPY2ag==
+pouchdb-fetch@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-fetch/-/pouchdb-fetch-9.0.0.tgz#a2cf407c75c9fc68a1924b08c9b574d28e1be7dd"
+  integrity sha512-TbE3cUcAJQrwb9kr44tDP0X+NAbcqgjsTvcL30L4xzBNJeCPTIRjukYX80s154SHJUXBxcWRiPsMmNqpXsjfCA==
   dependencies:
-    pouchdb-abstract-mapreduce "7.2.2"
-    pouchdb-collate "7.2.2"
-    pouchdb-errors "7.2.2"
-    pouchdb-fetch "7.2.2"
-    pouchdb-md5 "7.2.2"
-    pouchdb-selector-core "7.2.2"
-    pouchdb-utils "7.2.2"
+    fetch-cookie "2.2.0"
+    node-fetch "2.6.9"
+
+pouchdb-find@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-find/-/pouchdb-find-9.0.0.tgz#3d1b80d2adc9f9fd86c2ad559cd0144e406cb539"
+  integrity sha512-vvVhq4eEOmSkwSRwf2NBYtdhURB7ryJ7sUI4WDN00GuLUj2g8jAXBJuZIryVgdYt/5S5cfn70iRL6Eow+LFhpA==
+  dependencies:
+    pouchdb-abstract-mapreduce "9.0.0"
+    pouchdb-collate "9.0.0"
+    pouchdb-errors "9.0.0"
+    pouchdb-fetch "9.0.0"
+    pouchdb-md5 "9.0.0"
+    pouchdb-selector-core "9.0.0"
+    pouchdb-utils "9.0.0"
 
 pouchdb-json@7.2.2:
   version "7.2.2"
@@ -18560,15 +16707,12 @@ pouchdb-json@7.2.2:
   dependencies:
     vuvuzela "1.0.3"
 
-pouchdb-mapreduce-utils@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-7.2.2.tgz#13a46a3cc2a3f3b8e24861da26966904f2963146"
-  integrity sha512-rAllb73hIkU8rU2LJNbzlcj91KuulpwQu804/F6xF3fhZKC/4JQMClahk+N/+VATkpmLxp1zWmvmgdlwVU4HtQ==
+pouchdb-mapreduce-utils@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-mapreduce-utils/-/pouchdb-mapreduce-utils-9.0.0.tgz#8a2edf30ca0fa24d095eabcfbe8ebb8f3f1160e3"
+  integrity sha512-Bjh8W6QXqp1j7MKmHhYYp5cYlcQsm5drD8Jd/F+ZlfNt18uiD2SQXWzGM5797+tiW/LszFGb8ttw0uHWjxufCQ==
   dependencies:
-    argsarray "0.0.1"
-    inherits "2.0.4"
-    pouchdb-collections "7.2.2"
-    pouchdb-utils "7.2.2"
+    pouchdb-utils "9.0.0"
 
 pouchdb-md5@7.2.2:
   version "7.2.2"
@@ -18578,6 +16722,14 @@ pouchdb-md5@7.2.2:
     pouchdb-binary-utils "7.2.2"
     spark-md5 "3.0.1"
 
+pouchdb-md5@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-md5/-/pouchdb-md5-9.0.0.tgz#f67a2ba627309e65f8d1ce4d4baf6a5f29164617"
+  integrity sha512-58xUYBvW3/s+aH0j4uOhhN8yCk0LQ254cxBzI/gbKA9PrfwHpe4zrr0L/ia5ml3A30oH1f8aTnuVMwWDkFcuww==
+  dependencies:
+    pouchdb-binary-utils "9.0.0"
+    spark-md5 "3.0.2"
+
 pouchdb-merge@7.2.2:
   version "7.2.2"
   resolved "https://registry.yarnpkg.com/pouchdb-merge/-/pouchdb-merge-7.2.2.tgz#940d85a2b532d6a93a6cab4b250f5648511bcc16"
@@ -18590,13 +16742,13 @@ pouchdb-promise@6.4.3, pouchdb-promise@^6.0.4:
   dependencies:
     lie "3.1.1"
 
-pouchdb-selector-core@7.2.2:
-  version "7.2.2"
-  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-7.2.2.tgz#264d7436a8c8ac3801f39960e79875ef7f3879a0"
-  integrity sha512-XYKCNv9oiNmSXV5+CgR9pkEkTFqxQGWplnVhO3W9P154H08lU0ZoNH02+uf+NjZ2kjse7Q1fxV4r401LEcGMMg==
+pouchdb-selector-core@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-selector-core/-/pouchdb-selector-core-9.0.0.tgz#6fee1df82cd5ecdbd0a034b38e6c604557d2e22a"
+  integrity sha512-ZYHYsdoedwm8j5tYofz+3+uUSK8i+7tRCBb01T0OuqDQb17+w5mzjHF8Ppi160xdPUPaWCo1Un+nLWGJzkmA3g==
   dependencies:
-    pouchdb-collate "7.2.2"
-    pouchdb-utils "7.2.2"
+    pouchdb-collate "9.0.0"
+    pouchdb-utils "9.0.0"
 
 pouchdb-utils@7.2.2:
   version "7.2.2"
@@ -18612,6 +16764,15 @@ pouchdb-utils@7.2.2:
     pouchdb-md5 "7.2.2"
     uuid "8.1.0"
 
+pouchdb-utils@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb-utils/-/pouchdb-utils-9.0.0.tgz#b68f3259add50163998201d1a6d16e6a35d5d57f"
+  integrity sha512-xWZE5c+nAslgmLC8JBZbky8AYgdz7pKtv7KTSi6CD2tuQD0WyNKib0YnhZndeE84dksTeZlqlg56RQHsHoB2LQ==
+  dependencies:
+    pouchdb-errors "9.0.0"
+    pouchdb-md5 "9.0.0"
+    uuid "8.3.2"
+
 pouchdb@7.3.0:
   version "7.3.0"
   resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-7.3.0.tgz#440fbef12dfd8f9002320802528665e883a3b7f8"
@@ -18638,10 +16799,30 @@ pouchdb@7.3.0:
     uuid "8.3.2"
     vuvuzela "1.0.3"
 
-pprof-format@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.0.7.tgz#526e4361f8b37d16b2ec4bb0696b5292de5046a4"
-  integrity sha512-1qWaGAzwMpaXJP9opRa23nPnt2Egi7RMNoNBptEE/XwHbcn4fC2b/4U4bKc5arkGkIh2ZabpF2bEb+c5GNHEKA==
+pouchdb@9.0.0:
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/pouchdb/-/pouchdb-9.0.0.tgz#569ee3941f7b03dd34b4b4e53132a9772981a35e"
+  integrity sha512-6wjFc/PzwaWz86rmMXoqdBlR/fBSkNoWO1mEJO7RZNS6n3xf+fhhXWAWtws741KpLKx84IkmmJ48tp+fhFzj4A==
+  dependencies:
+    double-ended-queue "2.1.0-0"
+    fetch-cookie "2.2.0"
+    level "6.0.1"
+    level-codec "9.0.2"
+    level-write-stream "1.0.0"
+    leveldown "6.1.1"
+    levelup "4.4.0"
+    ltgt "2.2.1"
+    node-fetch "2.6.9"
+    readable-stream "1.1.14"
+    spark-md5 "3.0.2"
+    through2 "3.0.2"
+    uuid "8.3.2"
+    vuvuzela "1.0.3"
+
+pprof-format@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/pprof-format/-/pprof-format-2.1.0.tgz#acc8d7773bcf4faf0a3d3df11bceefba7ac06664"
+  integrity sha512-0+G5bHH0RNr8E5hoZo/zJYsL92MhkZjwrHp3O2IxmY8RJL9ooKeuZ8Tm0ZNBw5sGZ9TiM71sthTjWoR2Vf5/xw==
 
 preact@^10.19.3:
   version "10.20.1"
@@ -18782,11 +16963,6 @@ proc-log@^3.0.0:
   resolved "https://registry.yarnpkg.com/proc-log/-/proc-log-3.0.0.tgz#fb05ef83ccd64fd7b20bbe9c8c1070fc08338dd8"
   integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
 
-process-es6@^0.11.2, process-es6@^0.11.6:
-  version "0.11.6"
-  resolved "https://registry.yarnpkg.com/process-es6/-/process-es6-0.11.6.tgz#c6bb389f9a951f82bd4eb169600105bd2ff9c778"
-  integrity sha512-GYBRQtL4v3wgigq10Pv58jmTbFXlIiTbSfgnNqZLY0ldUPqy1rRxDI5fCjoCpnM6TqmHQI8ydzTBXW86OYc0gA==
-
 process-nextick-args@~2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
@@ -18812,14 +16988,6 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
-promise-retry@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
-  integrity sha512-StEy2osPr28o17bIW776GtwO6+Q+M9zPiZkYfosciUUMYqjhU/ffwRAH0zN2+uvGyUsn8/YICIHRzLbPacpZGw==
-  dependencies:
-    err-code "^1.0.0"
-    retry "^0.10.0"
-
 promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
@@ -18828,12 +16996,7 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
-promise.series@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd"
-  integrity sha512-VWQJyU2bcDTgZw8kpfBpB/ejZASlCrzwz5f2hjb/zlujOEB4oeiAhHygAWq8ubsX2GVkD4kCU5V2dwOTaCY5EQ==
-
-prompts@^2.0.1, prompts@^2.4.2:
+prompts@^2.0.1:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
@@ -18914,11 +17077,6 @@ proxy-from-env@^1.1.0:
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
 
-prr@~0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a"
-  integrity sha512-LmUECmrW7RVj6mDWKjTXfKug7TFGdiz9P18HMcO4RHL+RW7MCOGNvpj5j47Rnp6ne6r4fZ2VzyUWEpKbg+tsjQ==
-
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -18939,18 +17097,6 @@ pstree.remy@^1.1.8:
   resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
   integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
 
-public-encrypt@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.3.tgz#4fcc9d77a07e48ba7527e7cbe0de33d0701331e0"
-  integrity sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==
-  dependencies:
-    bn.js "^4.1.0"
-    browserify-rsa "^4.0.0"
-    create-hash "^1.1.0"
-    parse-asn1 "^5.0.0"
-    randombytes "^2.0.1"
-    safe-buffer "^5.1.2"
-
 pump@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -19039,7 +17185,7 @@ querystringify@^2.1.1:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
-queue-microtask@^1.2.2:
+queue-microtask@^1.2.2, queue-microtask@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
@@ -19059,44 +17205,18 @@ quick-lru@^4.0.1:
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-quick-lru@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-5.1.1.tgz#366493e6b3e42a3a6885e2e99d18f80fb7a8c932"
-  integrity sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==
-
 quote-unquote@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/quote-unquote/-/quote-unquote-1.0.0.tgz#67a9a77148effeaf81a4d428404a710baaac8a0b"
   integrity sha512-twwRO/ilhlG/FIgYeKGFqyHhoEhqgnKVkcmqMKi2r524gz3ZbDTcyFt38E9xjJI2vT+KbRNHVbnJ/e0I25Azwg==
 
-railroad-diagrams@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e"
-  integrity sha512-cz93DjNeLY0idrCNOH6PviZGRN9GJhsdm9hpn1YCS879fj4W+x5IFJhhkRZcwVgMmFF7R82UA/7Oh+R8lLZg6A==
-
-randexp@0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3"
-  integrity sha512-80WNmd9DA0tmZrw9qQa62GPPWfuXJknrmVmLcxvq4uZBdYqb1wYoKTmnlGUchvVWe0XiLupYkBoXVOxz3C8DYQ==
-  dependencies:
-    discontinuous-range "1.0.0"
-    ret "~0.1.10"
-
-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5, randombytes@^2.1.0:
+randombytes@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
-randomfill@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/randomfill/-/randomfill-1.0.4.tgz#c92196fc86ab42be983f1bf31778224931d61458"
-  integrity sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==
-  dependencies:
-    randombytes "^2.0.5"
-    safe-buffer "^5.1.0"
-
 randomstring@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/randomstring/-/randomstring-1.1.5.tgz#6df0628f75cbd5932930d9fe3ab4e956a18518c3"
@@ -19129,11 +17249,6 @@ rc@1.2.8, rc@^1.2.7, rc@^1.2.8:
     minimist "^1.2.0"
     strip-json-comments "~2.0.1"
 
-reachdown@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/reachdown/-/reachdown-1.1.0.tgz#c3b85b459dbd0fe2c79782233a0a38e66a9b5454"
-  integrity sha512-6LsdRe4cZyOjw4NnvbhUd/rGG7WQ9HMopPr+kyL018Uci4kijtxcGR5kVb5Ln13k4PEE+fEFQbjfOvNw7cnXmA==
-
 react-is@^17.0.1:
   version "17.0.2"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
@@ -19210,7 +17325,7 @@ read@^2.0.0:
   dependencies:
     mute-stream "~1.0.0"
 
-readable-stream@1.1.14, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1:
+readable-stream@1.1.14, readable-stream@^1.0.27-1:
   version "1.1.14"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
   integrity sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==
@@ -19220,16 +17335,16 @@ readable-stream@1.1.14, readable-stream@^1.0.26-4, readable-stream@^1.0.27-1:
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.1.tgz#f9f9b5f536920253b3d26e7660e7da4ccff9bb62"
-  integrity sha512-+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ==
+"readable-stream@2 || 3", readable-stream@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@^2.3.8, readable-stream@~2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -19258,7 +17373,7 @@ readable-stream@~0.0.2:
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-0.0.4.tgz#f32d76e3fb863344a548d79923007173665b3b8d"
   integrity sha512-azrivNydKRYt7zwLV5wWUK7YzKTWs3q87xSmY6DlHapPrCvaT6ZrukvM5erV+yCSSPmZT8zkSdttOHQpWWm9zw==
 
-readable-stream@~1.0.26, readable-stream@~1.0.26-4, readable-stream@~1.0.31:
+readable-stream@~1.0.31:
   version "1.0.34"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
   integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
@@ -19282,13 +17397,18 @@ readdir-glob@^1.1.2:
   dependencies:
     minimatch "^5.1.0"
 
-readdirp@~3.6.0:
+readdirp@^3.6.0, readdirp@~3.6.0:
   version "3.6.0"
   resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
+readdirp@^4.0.1:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-4.0.2.tgz#388fccb8b75665da3abffe2d8f8ed59fe74c230a"
+  integrity sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==
+
 readline-sync@^1.4.9:
   version "1.4.10"
   resolved "https://registry.yarnpkg.com/readline-sync/-/readline-sync-1.4.10.tgz#41df7fbb4b6312d673011594145705bf56d8873b"
@@ -19372,11 +17492,6 @@ redlock@4.2.0:
   dependencies:
     bluebird "^3.7.2"
 
-reflect-metadata@^0.2.1:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.2.2.tgz#400c845b6cba87a21f2c65c4aeb158f4fa4d9c5b"
-  integrity sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==
-
 regenerate-unicode-properties@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz#7c3192cab6dd24e21cb4461e5ddd7dd24fa8374c"
@@ -19389,11 +17504,6 @@ regenerate@^1.4.2:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@^0.13.3:
-  version "0.13.11"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
-  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-
 regenerator-runtime@^0.14.0:
   version "0.14.0"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
@@ -19406,20 +17516,15 @@ regenerator-transform@^0.15.1:
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regexp-tree@~0.1.1:
-  version "0.1.27"
-  resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
-  integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
-
-regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz#138f644a3350f981a858c44f6bb1a61ff59be334"
-  integrity sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==
+regexp.prototype.flags@^1.5.1, regexp.prototype.flags@^1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.3.tgz#b3ae40b1d2499b8350ab2c3fe6ef3845d3a96f42"
+  integrity sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==
   dependencies:
-    call-bind "^1.0.6"
+    call-bind "^1.0.7"
     define-properties "^1.2.1"
     es-errors "^1.3.0"
-    set-function-name "^2.0.1"
+    set-function-name "^2.0.2"
 
 regexparam@2.0.2:
   version "2.0.2"
@@ -19512,6 +17617,11 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
+require-package-name@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
+  integrity sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==
+
 requirejs-config-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz#4244da5dd1f59874038cc1091d078d620abb6ebc"
@@ -19535,11 +17645,6 @@ resize-observer-polyfill@^1.5.1:
   resolved "https://registry.yarnpkg.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz#0e9020dd3d21024458d4ebd27e23e40269810464"
   integrity sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==
 
-resolve-alpn@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-alpn/-/resolve-alpn-1.2.1.tgz#b7adbdac3546aaaec20b45e7d8265927072726f9"
-  integrity sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==
-
 resolve-cwd@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
@@ -19552,6 +17657,14 @@ resolve-dependency-path@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve-dependency-path/-/resolve-dependency-path-2.0.0.tgz#11700e340717b865d216c66cabeb4a2a3c696736"
   integrity sha512-DIgu+0Dv+6v2XwRaNWnumKu7GPufBBOr5I1gRPJHkvghrfCGOooJODFvgFimX/KRxk9j0whD2MnKHzM1jYvk9w==
 
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
 resolve-from@5.0.0, resolve-from@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
@@ -19575,7 +17688,7 @@ resolve.exports@^2.0.0:
   resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-2.0.0.tgz#c1a0028c2d166ec2fbf7d0644584927e76e7400e"
   integrity sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==
 
-resolve@^1.10.0, resolve@^1.11.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.1, resolve@^1.22.4:
+resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.20.0, resolve@^1.21.0, resolve@^1.22.1, resolve@^1.22.3, resolve@^1.22.4:
   version "1.22.8"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
   integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
@@ -19591,13 +17704,6 @@ responselike@1.0.2, responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
-responselike@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.1.tgz#9a0bc8fdc252f3fb1cca68b016591059ba1422bc"
-  integrity sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==
-  dependencies:
-    lowercase-keys "^2.0.0"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
@@ -19606,19 +17712,6 @@ restore-cursor@^3.1.0:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
-retry-request@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-5.0.2.tgz#143d85f90c755af407fcc46b7166a4ba520e44da"
-  integrity sha512-wfI3pk7EE80lCIXprqh7ym48IHYdwmAAzESdbU8Q9l7pnRCk9LEhpbOTNKjz6FARLm/Bl5m+4F0ABxOkYUujSQ==
-  dependencies:
-    debug "^4.1.1"
-    extend "^3.0.2"
-
 retry-request@^7.0.0:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.2.tgz#60bf48cfb424ec01b03fca6665dee91d06dd95f3"
@@ -19633,11 +17726,6 @@ retry@0.13.1, retry@^0.13.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
   integrity "sha1-GFsVh6z2eRnWOzVzSeA1N7JIRlg= sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg=="
 
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha512-ZXUSQYTHdl3uS7IuCehYfMzKyIDBNoAuUblvy5oGO5UJSUTmStUUVPXbA9Qxd173Bgre53yCQczQuHgRWAdvJQ==
-
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
@@ -19648,10 +17736,10 @@ reusify@^1.0.4:
   resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
   integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
 
-rfdc@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
-  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+rfdc@^1.3.0, rfdc@^1.3.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.4.1.tgz#778f76c4fb731d93414e8f925fbecf64cce7f6ca"
+  integrity sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==
 
 rimraf@3.0.2, rimraf@^3.0.2:
   version "3.0.2"
@@ -19667,21 +17755,6 @@ rimraf@^4.4.1:
   dependencies:
     glob "^9.2.0"
 
-rimraf@^5.0.7:
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.10.tgz#23b9843d3dc92db71f96e1a2ce92e39fd2a8221c"
-  integrity sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==
-  dependencies:
-    glob "^10.3.7"
-
-ripemd160@^2.0.0, ripemd160@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
-  integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==
-  dependencies:
-    hash-base "^3.0.0"
-    inherits "^2.0.1"
-
 roarr@^2.15.3:
   version "2.15.4"
   resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd"
@@ -19694,53 +17767,6 @@ roarr@^2.15.3:
     semver-compare "^1.0.0"
     sprintf-js "^1.1.2"
 
-rollup-plugin-inject-process-env@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-inject-process-env/-/rollup-plugin-inject-process-env-1.3.1.tgz#2d7660fe76f2b221b976cb35597763ffcaad3db3"
-  integrity sha512-kKDoL30IZr0wxbNVJjq+OS92RJSKRbKV6B5eNW4q3mZTFqoWDh6lHy+mPDYuuGuERFNKXkG+AKxvYqC9+DRpKQ==
-  dependencies:
-    magic-string "^0.25.7"
-
-rollup-plugin-json@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-4.0.0.tgz#a18da0a4b30bf5ca1ee76ddb1422afbb84ae2b9e"
-  integrity sha512-hgb8N7Cgfw5SZAkb3jf0QXii6QX/FOkiIq2M7BAQIEydjHvTyxXHQiIzZaTFgx1GK0cRCHOCBHIyEkkLdWKxow==
-  dependencies:
-    rollup-pluginutils "^2.5.0"
-
-rollup-plugin-node-builtins@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz#24a1fed4a43257b6b64371d8abc6ce1ab14597e9"
-  integrity sha512-bxdnJw8jIivr2yEyt8IZSGqZkygIJOGAWypXvHXnwKAbUcN4Q/dGTx7K0oAJryC/m6aq6tKutltSeXtuogU6sw==
-  dependencies:
-    browserify-fs "^1.0.0"
-    buffer-es6 "^4.9.2"
-    crypto-browserify "^3.11.0"
-    process-es6 "^0.11.2"
-
-rollup-plugin-node-globals@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-globals/-/rollup-plugin-node-globals-1.4.0.tgz#5e1f24a9bb97c0ef51249f625e16c7e61b7c020b"
-  integrity sha512-xRkB+W/m1KLIzPUmG0ofvR+CPNcvuCuNdjVBVS7ALKSxr3EDhnzNceGkGi1m8MToSli13AzKFYH4ie9w3I5L3g==
-  dependencies:
-    acorn "^5.7.3"
-    buffer-es6 "^4.9.3"
-    estree-walker "^0.5.2"
-    magic-string "^0.22.5"
-    process-es6 "^0.11.6"
-    rollup-pluginutils "^2.3.1"
-
-rollup-plugin-node-resolve@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
-  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
-  dependencies:
-    "@types/resolve" "0.0.8"
-    builtin-modules "^3.1.0"
-    is-module "^1.0.0"
-    resolve "^1.11.1"
-    rollup-pluginutils "^2.8.1"
-
 rollup-plugin-polyfill-node@^0.13.0:
   version "0.13.0"
   resolved "https://registry.yarnpkg.com/rollup-plugin-polyfill-node/-/rollup-plugin-polyfill-node-0.13.0.tgz#28e5705b59438da894e55133a0fe7a86b57d9b0a"
@@ -19748,40 +17774,6 @@ rollup-plugin-polyfill-node@^0.13.0:
   dependencies:
     "@rollup/plugin-inject" "^5.0.4"
 
-rollup-plugin-postcss@^4.0.0, rollup-plugin-postcss@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-4.0.2.tgz#15e9462f39475059b368ce0e49c800fa4b1f7050"
-  integrity sha512-05EaY6zvZdmvPUDi3uCcAQoESDcYnv8ogJJQRp6V5kZ6J6P7uAVJlrTZcaaA20wTH527YTnKfkAoPxWI/jPp4w==
-  dependencies:
-    chalk "^4.1.0"
-    concat-with-sourcemaps "^1.1.0"
-    cssnano "^5.0.1"
-    import-cwd "^3.0.0"
-    p-queue "^6.6.2"
-    pify "^5.0.0"
-    postcss-load-config "^3.0.0"
-    postcss-modules "^4.0.0"
-    promise.series "^0.2.0"
-    resolve "^1.19.0"
-    rollup-pluginutils "^2.8.2"
-    safe-identifier "^0.4.2"
-    style-inject "^0.3.0"
-
-rollup-plugin-svelte@^7.1.0, rollup-plugin-svelte@^7.1.6:
-  version "7.1.6"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svelte/-/rollup-plugin-svelte-7.1.6.tgz#44a4ea6c6e8ed976824d9fd40c78d048515e5838"
-  integrity sha512-nVFRBpGWI2qUY1OcSiEEA/kjCY2+vAjO9BI8SzA7NRrh2GTunLd6w2EYmnMt/atgdg8GvcNjLsmZmbQs/u4SQA==
-  dependencies:
-    "@rollup/pluginutils" "^4.1.0"
-    resolve.exports "^2.0.0"
-
-rollup-plugin-svg@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-svg/-/rollup-plugin-svg-2.0.0.tgz#ce11b55e915d5b2190328c4e6632bd6b4fe12ee9"
-  integrity sha512-DmE7dSQHo1SC5L2uH2qul3Mjyd5oV6U1aVVkyvTLX/mUsRink7f1b1zaIm+32GEBA6EHu8H/JJi3DdWqM53ySQ==
-  dependencies:
-    rollup-pluginutils "^1.3.1"
-
 rollup-plugin-terser@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
@@ -19792,37 +17784,19 @@ rollup-plugin-terser@^7.0.2:
     serialize-javascript "^4.0.0"
     terser "^5.0.0"
 
-rollup-plugin-visualizer@^5.12.0:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.12.0.tgz#661542191ce78ee4f378995297260d0c1efb1302"
-  integrity sha512-8/NU9jXcHRs7Nnj07PF2o4gjxmm9lXIrZ8r175bT9dK8qoLlvKTwRMArRCMgpMGlq8CTLugRvEmyMeMXIU2pNQ==
-  dependencies:
-    open "^8.4.0"
-    picomatch "^2.3.1"
-    source-map "^0.7.4"
-    yargs "^17.5.1"
-
 rollup-plugin-web-worker-loader@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/rollup-plugin-web-worker-loader/-/rollup-plugin-web-worker-loader-1.6.1.tgz#9d7a27575b64b0780fe4e8b3bc87470d217e485f"
   integrity sha512-4QywQSz1NXFHKdyiou16mH3ijpcfLtLGOrAqvAqu1Gx+P8+zj+3gwC2BSL/VW1d+LW4nIHC8F7d7OXhs9UdR2A==
 
-rollup-pluginutils@^1.3.1:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408"
-  integrity sha512-SjdWWWO/CUoMpDy8RUbZ/pSpG68YHmhk5ROKNIoi2En9bJ8bTt3IhYi254RWiTclQmL7Awmrq+rZFOhZkJAHmQ==
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup-pluginutils@^2.3.1, rollup-pluginutils@^2.5.0, rollup-pluginutils@^2.8.1, rollup-pluginutils@^2.8.2:
+rollup-pluginutils@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
   integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
   dependencies:
     estree-walker "^0.6.1"
 
-rollup@^2.36.2, rollup@^2.45.2:
+rollup@^2.36.2:
   version "2.79.1"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
   integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
@@ -19836,7 +17810,7 @@ rollup@^3.27.1:
   optionalDependencies:
     fsevents "~2.3.2"
 
-rollup@^4.20.0, rollup@^4.9.4, rollup@^4.9.6:
+rollup@^4.9.4, rollup@^4.9.6:
   version "4.21.2"
   resolved "https://registry.yarnpkg.com/rollup/-/rollup-4.21.2.tgz#f41f277a448d6264e923dd1ea179f0a926aaf9b7"
   integrity sha512-e3TapAgYf9xjdLvKQCkQTnbTKd4a6jwlpQSJJFokHGaX2IVjoEqkIIhiQfqsi0cdwlOD+tQGuOd5AJkc5RngBw==
@@ -19902,6 +17876,13 @@ rxjs@^7.5.5:
   dependencies:
     tslib "^2.1.0"
 
+sade@^1.7.4:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/sade/-/sade-1.8.1.tgz#0a78e81d658d394887be57d2a409bf703a3b2701"
+  integrity sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==
+  dependencies:
+    mri "^1.1.0"
+
 safe-array-concat@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/safe-array-concat/-/safe-array-concat-1.1.2.tgz#81d77ee0c4e8b863635227c721278dd524c20edb"
@@ -19912,7 +17893,7 @@ safe-array-concat@^1.1.2:
     has-symbols "^1.0.3"
     isarray "^2.0.5"
 
-safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -19922,11 +17903,6 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-identifier@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/safe-identifier/-/safe-identifier-0.4.2.tgz#cf6bfca31c2897c588092d1750d30ef501d59fcb"
-  integrity sha512-6pNbSMW6OhAi9j+N8V+U715yBQsaWJ7eyEUaOrawX+isg5ZxhUlV1NipNtgaKHmFGiABwt+ZF04Ii+3Xjkg+8w==
-
 safe-regex-test@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/safe-regex-test/-/safe-regex-test-1.0.3.tgz#a5b4c0f06e0ab50ea2c395c14d8371232924c377"
@@ -19936,13 +17912,6 @@ safe-regex-test@^1.0.3:
     es-errors "^1.3.0"
     is-regex "^1.1.4"
 
-safe-regex@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-2.1.1.tgz#f7128f00d056e2fe5c11e81a1324dd974aadced2"
-  integrity sha512-rx+x8AMzKb5Q5lQ95Zoi6ZbJqwCLkqi3XuJXp5P3rT8OEc6sZCJG5AE5dU3lsgRr/F4Bs31jSlVN+j5KrsGu9A==
-  dependencies:
-    regexp-tree "~0.1.1"
-
 safe-stable-stringify@^2.1.0, safe-stable-stringify@^2.3.1:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz#138c84b6f6edb3db5f8ef3ef7115b8f55ccbf886"
@@ -20054,7 +18023,7 @@ semver-diff@^3.1.1:
   dependencies:
     semver "^6.3.0"
 
-"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.5.0, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3, semver@~2.3.1:
+"semver@2 || 3 || 4 || 5", semver@7.5.3, semver@^5.6.0, semver@^5.7.1, semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.2:
   version "7.5.3"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.3.tgz#161ce8c2c6b4b3bdca6caadc9fa3317a4c4fe88e"
   integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
@@ -20087,7 +18056,7 @@ serialize-javascript@^6.0.1:
   dependencies:
     randombytes "^2.1.0"
 
-server-destroy@1.0.1, server-destroy@^1.0.1:
+server-destroy@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
   integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
@@ -20097,6 +18066,11 @@ set-blocking@^2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
+set-cookie-parser@^2.4.8:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz#3016f150072202dfbe90fadee053573cc89d2943"
+  integrity sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==
+
 set-function-length@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
@@ -20109,7 +18083,7 @@ set-function-length@^1.2.1:
     gopd "^1.0.1"
     has-property-descriptors "^1.0.2"
 
-set-function-name@^2.0.1, set-function-name@^2.0.2:
+set-function-name@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/set-function-name/-/set-function-name-2.0.2.tgz#16a705c5a0dc2f5e638ca96d8a8cd4e1c2b90985"
   integrity sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==
@@ -20119,11 +18093,6 @@ set-function-name@^2.0.1, set-function-name@^2.0.2:
     functions-have-names "^1.2.3"
     has-property-descriptors "^1.0.2"
 
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==
-
 setprototypeof@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
@@ -20134,14 +18103,6 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.8:
-  version "2.4.11"
-  resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
-  integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
-  dependencies:
-    inherits "^2.0.1"
-    safe-buffer "^5.0.1"
-
 shallow-clone@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
@@ -20149,13 +18110,6 @@ shallow-clone@^3.0.0:
   dependencies:
     kind-of "^6.0.2"
 
-shebang-command@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
-  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
-  dependencies:
-    shebang-regex "^1.0.0"
-
 shebang-command@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
@@ -20163,11 +18117,6 @@ shebang-command@^2.0.0:
   dependencies:
     shebang-regex "^3.0.0"
 
-shebang-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
-  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
-
 shebang-regex@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
@@ -20178,6 +18127,11 @@ shell-exec@1.0.2:
   resolved "https://registry.yarnpkg.com/shell-exec/-/shell-exec-1.0.2.tgz#2e9361b0fde1d73f476c4b6671fa17785f696756"
   integrity sha512-jyVd+kU2X+mWKMmGhx4fpWbPsjvD53k9ivqetutVW/BQ+WIZoDoP4d8vUMGezV6saZsiNoW2f9GIhg9Dondohg==
 
+shell-quote@^1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.8.1.tgz#6dbf4db75515ad5bac63b4f1894c3a154c766680"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
 shortid@2.2.15:
   version "2.2.15"
   resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.15.tgz#2b902eaa93a69b11120373cd42a1f1fe4437c122"
@@ -20217,7 +18171,7 @@ signal-exit@3.0.7, signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, s
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-signal-exit@^4.0.1, signal-exit@^4.1.0:
+signal-exit@^4.0.1:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
   integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
@@ -20268,11 +18222,6 @@ slash@3.0.0, slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slash@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
-  integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
-
 slice-ansi@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-5.0.0.tgz#b73063c57aa96f9cd881654b15294d95d285c42a"
@@ -20291,38 +18240,30 @@ smob@^1.0.0:
   resolved "https://registry.yarnpkg.com/smob/-/smob-1.5.0.tgz#85d79a1403abf128d24d3ebc1cdc5e1a9548d3ab"
   integrity sha512-g6T+p7QO8npa+/hNx9ohv1E5pVCmWrVCUzUXJyLdMmftX6ER0oiWY/w9knEonLpnOp6b6FenKnMfR8gqwWdwig==
 
-snowflake-promise@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/snowflake-promise/-/snowflake-promise-4.5.0.tgz#ceba611d27b3792966bc752c545760e0ce168c1c"
-  integrity sha512-IFY7Y1alCTY1WRFPIEcgCbjy7wCajwLNnJsvw2L7xdePir7y5ohh+S00PnF9zFRGbfVVlRh/VYqOYHEfERK2lg==
-  dependencies:
-    snowflake-sdk "^1.6.0"
-
-snowflake-sdk@^1.6.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/snowflake-sdk/-/snowflake-sdk-1.9.0.tgz#3bd089427549efc8efa4829c2d08deeffe4aded3"
-  integrity "sha1-O9CJQnVJ78jvpIKcLQje7/5K3tM= sha512-RtFRV2KC+ebQk/kOUg8WV42LnAu9puoan2wMXykgrAj1u4sGP/GgQyQhsAfLGwXWzn+J9JAwij07h3+6HYBmFw=="
+snowflake-sdk@^1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/snowflake-sdk/-/snowflake-sdk-1.15.0.tgz#cc32fa0f2869d9e5a026e293b50d387ddbd67aca"
+  integrity sha512-u7eNIT2JWkA8USJF6gTOCcReNrdh8V9LCazJi3F0XnX5ZJkgPz2gNSn67drT4ywqNaXdXfFM0i/yNSa58fi2Rg==
   dependencies:
     "@aws-sdk/client-s3" "^3.388.0"
-    "@azure/storage-blob" "^12.11.0"
-    "@google-cloud/storage" "^6.9.3"
-    "@techteamer/ocsp" "1.0.0"
-    agent-base "^6.0.2"
+    "@aws-sdk/node-http-handler" "^3.374.0"
+    "@azure/storage-blob" "12.18.x"
+    "@google-cloud/storage" "^7.7.0"
+    "@techteamer/ocsp" "1.0.1"
     asn1.js-rfc2560 "^5.0.0"
     asn1.js-rfc5280 "^3.0.0"
-    axios "^1.5.0"
+    axios "^1.6.8"
     big-integer "^1.6.43"
-    bignumber.js "^2.4.0"
+    bignumber.js "^9.1.2"
     binascii "0.0.2"
     bn.js "^5.2.1"
     browser-request "^0.3.3"
-    debug "^3.2.6"
     expand-tilde "^2.0.2"
-    extend "^3.0.2"
     fast-xml-parser "^4.2.5"
+    fastest-levenshtein "^1.0.16"
     generic-pool "^3.8.2"
-    glob "^7.1.6"
-    https-proxy-agent "^5.0.1"
+    glob "^10.0.0"
+    https-proxy-agent "^7.0.2"
     jsonwebtoken "^9.0.0"
     mime-types "^2.1.29"
     mkdirp "^1.0.3"
@@ -20331,8 +18272,7 @@ snowflake-sdk@^1.6.0:
     open "^7.3.1"
     python-struct "^1.1.3"
     simple-lru-cache "^0.0.2"
-    string-similarity "^4.0.4"
-    tmp "^0.2.1"
+    toml "^3.0.0"
     uuid "^8.3.2"
     winston "^3.1.0"
 
@@ -20362,28 +18302,19 @@ socket.io-parser@~4.2.4:
     "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@4.7.5:
-  version "4.7.5"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.5.tgz#56eb2d976aef9d1445f373a62d781a41c7add8f8"
-  integrity sha512-DmeAkF6cwM9jSfmp6Dr/5/mfMwb5Z5qRrSXLpo3Fq5SqyU8CMF15jIN4ZhfSwu35ksM1qmHZDQ/DK5XTccSTvA==
+socket.io@4.8.1:
+  version "4.8.1"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.8.1.tgz#fa0eaff965cc97fdf4245e8d4794618459f7558a"
+  integrity sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     cors "~2.8.5"
     debug "~4.3.2"
-    engine.io "~6.5.2"
+    engine.io "~6.6.0"
     socket.io-adapter "~2.5.2"
     socket.io-parser "~4.2.4"
 
-socks-proxy-agent@^6.0.0:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce"
-  integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==
-  dependencies:
-    agent-base "^6.0.2"
-    debug "^4.3.3"
-    socks "^2.6.2"
-
 socks-proxy-agent@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz#dc069ecf34436621acb41e3efa66ca1b5fed15b6"
@@ -20436,10 +18367,10 @@ sort-keys@^2.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
-source-map-js@^1.0.1, source-map-js@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
-  integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
+source-map-js@^1.0.1, source-map-js@^1.2.0, source-map-js@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
+  integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==
 
 source-map-support@0.5.13:
   version "0.5.13"
@@ -20563,10 +18494,10 @@ split@^1.0.1:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1, sprintf-js@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
-  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
+sprintf-js@^1.1.1, sprintf-js@^1.1.2, sprintf-js@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.3.tgz#4914b903a2f8b685d17fdf78a70e917e872e444a"
+  integrity sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
@@ -20598,9 +18529,9 @@ ssh2@^1.11.0, ssh2@^1.4.0:
     nan "^2.18.0"
 
 sshpk@^1.7.0:
-  version "1.17.0"
-  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"
-  integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.18.0.tgz#1663e55cddf4d688b86a46b77f0d5fe363aba028"
+  integrity sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==
   dependencies:
     asn1 "~0.2.3"
     assert-plus "^1.0.0"
@@ -20619,13 +18550,6 @@ ssri@^10.0.0, ssri@^10.0.1:
   dependencies:
     minipass "^4.0.0"
 
-ssri@^8.0.0, ssri@^8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
-  integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
-  dependencies:
-    minipass "^3.1.1"
-
 ssri@^9.0.0, ssri@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057"
@@ -20633,12 +18557,7 @@ ssri@^9.0.0, ssri@^9.0.1:
   dependencies:
     minipass "^3.1.1"
 
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
-
-stack-trace@0.0.10, stack-trace@0.0.x:
+stack-trace@0.0.x:
   version "0.0.10"
   resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0"
   integrity sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==
@@ -20670,7 +18589,7 @@ statuses@2.0.1, statuses@^2.0.0:
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
 
-std-env@^3.3.1, std-env@^3.7.0:
+std-env@^3.3.1:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.7.0.tgz#c9f7386ced6ecf13360b6c6c55b8aaa4ef7481d2"
   integrity sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==
@@ -20699,10 +18618,10 @@ stream-events@^1.0.5:
   dependencies:
     stubs "^3.0.0"
 
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+stream-shift@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.3.tgz#85b8fab4d71010fc3ba8772e8046cc49b8a3864b"
+  integrity sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==
 
 stream-to-array@^2.3.0:
   version "2.3.0"
@@ -20731,11 +18650,6 @@ strict-uri-encode@^2.0.0:
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
   integrity sha512-QwiXZgpRcKkhTj2Scnn++4PKtWsH0kpzZ62L2R6c/LUVYv7hVnZqcg2+sMuT6R7Jusu1vviK/MFsu6kNJfWlEQ==
 
-string-hash@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b"
-  integrity sha512-kJUvRUFK49aub+a7T1nNE66EJbZBMnBgoC1UbCZ5n6bsZKBRga4KgBRTMn/pFkeCZSYtNeSyMxPDM0AXWELk2A==
-
 string-length@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a"
@@ -20744,26 +18658,7 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-string-range@~1.2, string-range@~1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd"
-  integrity sha512-tYft6IFi8SjplJpxCUxyqisD3b+R2CSkomrtJYCkvuf1KuCAWgz7YXt4O0jip7efpfCemwHEzTEAO8EuOYgh3w==
-
-string-similarity@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/string-similarity/-/string-similarity-4.0.4.tgz#42d01ab0b34660ea8a018da8f56a3309bb8b2a5b"
-  integrity sha512-/q/8Q4Bl4ZKAPjj8WerIBJWALKkaPRfrvhfF8k/B23i4nzrlRj2/go1m90In7nG/3XDSbOo0+pu6RvCTM9RGMQ==
-
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -20791,12 +18686,13 @@ string-width@^5.0.0, string-width@^5.0.1, string-width@^5.1.2:
     strip-ansi "^7.0.1"
 
 string.prototype.startswith@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-1.0.0.tgz#92a361fb1ac172033d53eb1db3d659b0cfab6280"
-  integrity sha512-VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-1.0.1.tgz#623e2d013d93d3d2bbfbc9eed9e1010ba3f50ce8"
+  integrity sha512-7FoHkxvUevSBxSBXqsJgQy+IwuSPVl1jF31FEagFxkKnNKnmRLcHY6cJgxy074qrFq9T0OE36OU5aPw+z1v0yw==
   dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
+    call-bind "^1.0.7"
+    define-properties "^1.2.1"
+    es-abstract "^1.23.3"
 
 string.prototype.trim@^1.2.9:
   version "1.2.9"
@@ -20854,7 +18750,7 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -20868,13 +18764,6 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
 strip-ansi@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
@@ -20906,21 +18795,11 @@ strip-dirs@^2.0.0:
   dependencies:
     is-natural-number "^4.0.1"
 
-strip-eof@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
-  integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==
-
 strip-final-newline@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
-strip-final-newline@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-3.0.0.tgz#52894c313fbff318835280aed60ff71ebf12b8fd"
-  integrity sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -20952,14 +18831,6 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-stripe@9.16.0:
-  version "9.16.0"
-  resolved "https://registry.yarnpkg.com/stripe/-/stripe-9.16.0.tgz#94c24549c91fced457b9e3259e8a1a1bdb6dbd0e"
-  integrity sha512-Dn8K+jSoQcXjxCobRI4HXUdHjOXsiF/KszK49fJnkbeCFjZ3EZxLG2JiM/CX+Hcq27NBDtv/Sxhvy+HhTmvyaQ==
-  dependencies:
-    "@types/node" ">=8.1.0"
-    qs "^6.10.3"
-
 striptags@^3.1.1:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/striptags/-/striptags-3.2.0.tgz#cc74a137db2de8b0b9a370006334161f7dd67052"
@@ -20992,24 +18863,11 @@ stubs@^3.0.0:
   resolved "https://registry.yarnpkg.com/stubs/-/stubs-3.0.0.tgz#e8d2ba1fa9c90570303c030b6900f7d5f89abe5b"
   integrity "sha1-6NK6H6nJBXAwPAMLaQD31fiavls= sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw=="
 
-style-inject@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3"
-  integrity sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==
-
 style-mod@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/style-mod/-/style-mod-4.0.3.tgz#136c4abc905f82a866a18b39df4dc08ec762b1ad"
   integrity sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==
 
-stylehacks@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.1.tgz#7934a34eb59d7152149fa69d6e9e56f2fc34bcc9"
-  integrity sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==
-  dependencies:
-    browserslist "^4.21.4"
-    postcss-selector-parser "^6.0.4"
-
 stylus-lookup@^3.0.1:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/stylus-lookup/-/stylus-lookup-3.0.2.tgz#c9eca3ff799691020f30b382260a67355fefdddd"
@@ -21028,17 +18886,20 @@ sublevel-pouchdb@7.2.2:
     ltgt "2.2.1"
     readable-stream "1.1.14"
 
-subleveldown@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/subleveldown/-/subleveldown-5.0.1.tgz#aa2b4e4698a48d9a86856b2c4df1b6bce2d2ce53"
-  integrity sha512-cVqd/URpp7si1HWu5YqQ3vqQkjuolAwHypY1B4itPlS71/lsf6TQPZ2Y0ijT22EYVkvH5ove9JFJf4u7VGPuZw==
+superagent@^10.1.1:
+  version "10.1.1"
+  resolved "https://registry.yarnpkg.com/superagent/-/superagent-10.1.1.tgz#2f112591a5701a1d4467048580bcfda104e5a94d"
+  integrity sha512-9pIwrHrOj3uAnqg9gDlW7EA2xv+N5au/dSM0kM22HTqmUu8jBxNT+8uA7tA3UoCnmiqzpSbu8rasIUZvbyamMQ==
   dependencies:
-    abstract-leveldown "^6.3.0"
-    encoding-down "^6.2.0"
-    inherits "^2.0.3"
-    level-option-wrap "^1.1.0"
-    levelup "^4.4.0"
-    reachdown "^1.1.0"
+    component-emitter "^1.3.0"
+    cookiejar "^2.1.4"
+    debug "^4.3.4"
+    fast-safe-stringify "^2.1.1"
+    form-data "^4.0.0"
+    formidable "^3.5.2"
+    methods "^1.1.2"
+    mime "2.6.0"
+    qs "^6.11.0"
 
 superagent@^8.0.5:
   version "8.1.2"
@@ -21090,21 +18951,32 @@ supports-preserve-symlinks-flag@^1.0.0:
   resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
+svelte-check@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/svelte-check/-/svelte-check-4.1.0.tgz#4389c1c88aa24f3d06fe0df94f9075a55017256d"
+  integrity sha512-AflEZYqI578KuDZcpcorPSf597LStxlkN7XqXi38u09zlHODVKd7c+7OuubGzbhgGRUqNTdQCZ+Ga96iRXEf2g==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.25"
+    chokidar "^4.0.1"
+    fdir "^6.2.0"
+    picocolors "^1.0.0"
+    sade "^1.7.4"
+
 svelte-dnd-action@^0.9.8:
   version "0.9.22"
   resolved "https://registry.yarnpkg.com/svelte-dnd-action/-/svelte-dnd-action-0.9.22.tgz#003eee9dddb31d8c782f6832aec8b1507fff194d"
   integrity sha512-lOQJsNLM1QWv5mdxIkCVtk6k4lHCtLgfE59y8rs7iOM6erchbLC9hMEFYSveZz7biJV0mpg7yDSs4bj/RT/YkA==
 
-"svelte-eslint-parser@>=0.33.0 <1.0.0", svelte-eslint-parser@^0.33.1:
-  version "0.33.1"
-  resolved "https://registry.yarnpkg.com/svelte-eslint-parser/-/svelte-eslint-parser-0.33.1.tgz#c64dbed2fad099577429b3c39377f6b8d36e5d97"
-  integrity sha512-vo7xPGTlKBGdLH8T5L64FipvTrqv3OQRx9d2z5X05KKZDlF4rQk8KViZO4flKERY+5BiVdOh7zZ7JGJWo5P0uA==
+svelte-eslint-parser@0.43.0, svelte-eslint-parser@^0.43.0:
+  version "0.43.0"
+  resolved "https://registry.yarnpkg.com/svelte-eslint-parser/-/svelte-eslint-parser-0.43.0.tgz#649e80f65183c4c1d1536d03dcb903e0632f4da4"
+  integrity sha512-GpU52uPKKcVnh8tKN5P4UZpJ/fUDndmq7wfsvoVXsyP+aY0anol7Yqo01fyrlaWGMFfm4av5DyrjlaXdLRJvGA==
   dependencies:
-    eslint-scope "^7.0.0"
-    eslint-visitor-keys "^3.0.0"
-    espree "^9.0.0"
-    postcss "^8.4.29"
-    postcss-scss "^4.0.8"
+    eslint-scope "^7.2.2"
+    eslint-visitor-keys "^3.4.3"
+    espree "^9.6.1"
+    postcss "^8.4.39"
+    postcss-scss "^4.0.9"
 
 svelte-hmr@^0.15.1:
   version "0.15.3"
@@ -21133,10 +19005,10 @@ svelte-spa-router@^4.0.1:
   dependencies:
     regexparam "2.0.2"
 
-svelte@^4.2.10:
-  version "4.2.12"
-  resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.12.tgz#13d98d2274d24d3ad216c8fdc801511171c70bb1"
-  integrity sha512-d8+wsh5TfPwqVzbm4/HCXC783/KPHV60NvwitJnyTA5lWn1elhXMNWhXGCJ7PwPa8qFUnyJNIyuIRt2mT0WMug==
+svelte@4.2.19:
+  version "4.2.19"
+  resolved "https://registry.yarnpkg.com/svelte/-/svelte-4.2.19.tgz#4e6e84a8818e2cd04ae0255fcf395bc211e61d4c"
+  integrity sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==
   dependencies:
     "@ampproject/remapping" "^2.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.15"
@@ -21208,19 +19080,6 @@ svg.select.js@^3.0.1:
   dependencies:
     svg.js "^2.6.5"
 
-svgo@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
-
 swagger-jsdoc@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/swagger-jsdoc/-/swagger-jsdoc-6.1.0.tgz#c2b86321f2c4dde8947b418fe8a4bc94431d5522"
@@ -21260,10 +19119,10 @@ tar-fs@2.1.1, tar-fs@^2.0.0:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
-tar-fs@^3.0.5:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.5.tgz#f954d77767e4e6edf973384e1eb95f8f81d64ed9"
-  integrity sha512-JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==
+tar-fs@^3.0.6:
+  version "3.0.6"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-3.0.6.tgz#eaccd3a67d5672f09ca8e8f9c3d2b89fa173f217"
+  integrity sha512-iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==
   dependencies:
     pump "^3.0.0"
     tar-stream "^3.1.5"
@@ -21294,7 +19153,7 @@ tar-stream@^1.5.2:
     to-buffer "^1.1.1"
     xtend "^4.0.0"
 
-tar-stream@^2.0.0, tar-stream@^2.1.4, tar-stream@^2.2.0, tar-stream@~2.2.0:
+tar-stream@^2.0.0, tar-stream@^2.1.4, tar-stream@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -21326,7 +19185,7 @@ tar@6.1.11:
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-tar@6.2.1, tar@^6.0.2, tar@^6.1.11, tar@^6.1.2:
+tar@6.2.1, tar@^6.1.11, tar@^6.1.2:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/tar/-/tar-6.2.1.tgz#717549c541bc3c2af15751bea94b1dd068d4b03a"
   integrity sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==
@@ -21343,38 +19202,21 @@ tarn@^3.0.1, tarn@^3.0.2:
   resolved "https://registry.yarnpkg.com/tarn/-/tarn-3.0.2.tgz#73b6140fbb881b71559c4f8bfde3d9a4b3d27693"
   integrity sha512-51LAVKUSZSVfI05vjPESNc5vwqqZpbXCsU+/+wxlOrUjk2SnFTt97v9ZgQrD4YmxYW1Px6w2KjaDitCfkvgxMQ==
 
-teamcity-service-messages@^0.1.14:
-  version "0.1.14"
-  resolved "https://registry.yarnpkg.com/teamcity-service-messages/-/teamcity-service-messages-0.1.14.tgz#193d420a5e4aef8e5e50b8c39e7865e08fbb5d8a"
-  integrity sha512-29aQwaHqm8RMX74u2o/h1KbMLP89FjNiMxD9wbF2BbWOnbM+q+d1sCEC+MqCc4QW3NJykn77OMpTFw/xTHIc0w==
-
-tedious@^16.4.0:
-  version "16.7.1"
-  resolved "https://registry.yarnpkg.com/tedious/-/tedious-16.7.1.tgz#1190f30fd99a413f1dc9250dee4835cf0788b650"
-  integrity sha512-NmedZS0NJiTv3CoYnf1FtjxIDUgVYzEmavrc8q2WHRb+lP4deI9BpQfmNnBZZaWusDbP5FVFZCcvzb3xOlNVlQ==
+tedious@^18.2.1:
+  version "18.6.1"
+  resolved "https://registry.yarnpkg.com/tedious/-/tedious-18.6.1.tgz#1c4a3f06c891be67a032117e2e25193286d44496"
+  integrity sha512-9AvErXXQTd6l7TDd5EmM+nxbOGyhnmdbp/8c3pw+tjaiSXW9usME90ET/CRG1LN1Y9tPMtz/p83z4Q97B4DDpw==
   dependencies:
-    "@azure/identity" "^3.4.1"
+    "@azure/core-auth" "^1.7.2"
+    "@azure/identity" "^4.2.1"
     "@azure/keyvault-keys" "^4.4.0"
-    "@js-joda/core" "^5.5.3"
-    bl "^6.0.3"
-    es-aggregate-error "^1.0.9"
+    "@js-joda/core" "^5.6.1"
+    "@types/node" ">=18"
+    bl "^6.0.11"
     iconv-lite "^0.6.3"
     js-md4 "^0.3.2"
-    jsbi "^4.3.0"
     native-duplexpair "^1.0.0"
-    node-abort-controller "^3.1.1"
-    sprintf-js "^1.1.2"
-
-teeny-request@^8.0.0:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-8.0.3.tgz#5cb9c471ef5e59f2fca8280dc3c5909595e6ca24"
-  integrity "sha1-XLnEce9eWfL8qCgNw8WQlZXmyiQ= sha512-jJZpA5He2y52yUhA7pyAGZlgQpcB+xLjcN0eUFxr9c8hP/H7uOXbBNVo/O0C/xVfJLJs680jvkFgVJEEvk9+ww=="
-  dependencies:
-    http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
-    node-fetch "^2.6.1"
-    stream-events "^1.0.5"
-    uuid "^9.0.0"
+    sprintf-js "^1.1.3"
 
 teeny-request@^9.0.0:
   version "9.0.0"
@@ -21411,26 +19253,26 @@ test-exclude@^6.0.0:
     glob "^7.1.4"
     minimatch "^3.0.4"
 
-testcontainers@10.7.2, testcontainers@^10.7.2:
-  version "10.7.2"
-  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-10.7.2.tgz#619e93200dd47f174b307b40fa830cf023b74c25"
-  integrity sha512-7d+LVd/4YKp/cutiVMLL5cnj/8p8oYELAVRRyNUM4FyUDz1OLQuwW868nDl7Vd1ZAQxzGeCR+F86FlR9Yw9fMA==
+testcontainers@10.16.0:
+  version "10.16.0"
+  resolved "https://registry.yarnpkg.com/testcontainers/-/testcontainers-10.16.0.tgz#8a7e69ada5cd2c6cce1c6db72b3a3e8e412fcaf6"
+  integrity sha512-oxPLuOtrRWS11A+Yn0+zXB7GkmNarflWqmy6CQJk8KJ75LZs2/zlUXDpizTbPpCGtk4kE2EQYwFZjrE967F8Wg==
   dependencies:
     "@balena/dockerignore" "^1.0.2"
-    "@types/dockerode" "^3.3.24"
-    archiver "^5.3.2"
+    "@types/dockerode" "^3.3.29"
+    archiver "^7.0.1"
     async-lock "^1.4.1"
     byline "^5.0.0"
-    debug "^4.3.4"
-    docker-compose "^0.24.6"
+    debug "^4.3.5"
+    docker-compose "^0.24.8"
     dockerode "^3.3.5"
     get-port "^5.1.1"
-    node-fetch "^2.7.0"
     proper-lockfile "^4.1.2"
     properties-reader "^2.3.0"
     ssh-remote-port-forward "^1.0.4"
-    tar-fs "^3.0.5"
-    tmp "^0.2.1"
+    tar-fs "^3.0.6"
+    tmp "^0.2.3"
+    undici "^5.28.4"
 
 text-extensions@^1.0.0:
   version "1.9.0"
@@ -21516,11 +19358,6 @@ timekeeper@^2.2.0:
   resolved "https://registry.yarnpkg.com/timekeeper/-/timekeeper-2.3.1.tgz#2deb6e0b95d93625fda84c18d47f84a99e4eba01"
   integrity sha512-LeQRS7/4JcC0PgdSFnfUiStQEdiuySlCj/5SJ18D+T1n9BoY7PxKFfCwLulpHXoLUFr67HxBddQdEX47lDGx1g==
 
-timm@^1.6.1:
-  version "1.7.1"
-  resolved "https://registry.yarnpkg.com/timm/-/timm-1.7.1.tgz#96bab60c7d45b5a10a8a4d0f0117c6b7e5aff76f"
-  integrity sha512-IjZc9KIotudix8bMaBW6QvMuq64BrJWFs1+4V0lXwWGQZwH+LnX87doAYhem4caOEusRP9/g6jVDQmZ8XOk1nw==
-
 tiny-glob@^0.2.9:
   version "0.2.9"
   resolved "https://registry.yarnpkg.com/tiny-glob/-/tiny-glob-0.2.9.tgz#2212d441ac17928033b110f8b3640683129d31e2"
@@ -21534,7 +19371,7 @@ tiny-queue@^0.2.0:
   resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.1.tgz#25a67f2c6e253b2ca941977b5ef7442ef97a6046"
   integrity sha512-EijGsv7kzd9I9g0ByCl6h42BWNGUZrlCSejfrb3AKeHC33SGbASu1VDf5O3rRiiUOhAC9CHdZxFPbZu0HmR70A==
 
-tinybench@^2.3.1, tinybench@^2.8.0:
+tinybench@^2.3.1:
   version "2.9.0"
   resolved "https://registry.yarnpkg.com/tinybench/-/tinybench-2.9.0.tgz#103c9f8ba6d7237a47ab6dd1dcff77251863426b"
   integrity sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==
@@ -21549,32 +19386,17 @@ tinypool@^0.4.0:
   resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-0.4.0.tgz#3cf3ebd066717f9f837e8d7d31af3c127fdb5446"
   integrity sha512-2ksntHOKf893wSAH4z/+JbPpi92esw8Gn9N2deXX+B0EO92hexAVI9GIZZPx7P5aYo5KULfeOSt3kMOmSOy6uA==
 
-tinypool@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/tinypool/-/tinypool-1.0.1.tgz#c64233c4fac4304e109a64340178760116dbe1fe"
-  integrity sha512-URZYihUbRPcGv95En+sz6MfghfIc2OJ1sv/RmhWZLouPY0/8Vo80viwPvg3dlaS9fuq7fQMEfgRRK7BBZThBEA==
-
-tinyrainbow@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tinyrainbow/-/tinyrainbow-1.2.0.tgz#5c57d2fc0fb3d1afd78465c33ca885d04f02abb5"
-  integrity sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==
-
 tinyspy@^1.0.2:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-1.1.1.tgz#0cb91d5157892af38cb2d217f5c7e8507a5bf092"
   integrity sha512-UVq5AXt/gQlti7oxoIg5oi/9r0WpF7DGEVwXgqWSMmyN16+e3tl5lIvTaOpJ3TAtu5xFzWccFRM4R5NaWHF+4g==
 
-tinyspy@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tinyspy/-/tinyspy-3.0.0.tgz#cb61644f2713cd84dee184863f4642e06ddf0585"
-  integrity sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==
-
 tlhunter-sorted-set@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/tlhunter-sorted-set/-/tlhunter-sorted-set-0.1.0.tgz#1c3eae28c0fa4dff97e9501d2e3c204b86406f4b"
   integrity sha512-eGYW4bjf1DtrHzUYxYfAcSytpOkA44zsr7G2n3PV7yOUR23vmkGe3LL4R+1jL9OsXtbsFOwe8XtbCrabeaEFnw==
 
-tmp@0.2.3, tmp@^0.2.1, tmp@~0.2.1:
+tmp@0.2.3, tmp@^0.2.3, tmp@~0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.3.tgz#eb783cc22bc1e8bebd0671476d46ea4eb32a79ae"
   integrity sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==
@@ -21596,11 +19418,6 @@ to-buffer@^1.1.1:
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
   integrity sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==
 
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
 to-gfm-code-block@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/to-gfm-code-block/-/to-gfm-code-block-0.1.1.tgz#25d045a5fae553189e9637b590900da732d8aa82"
@@ -21643,6 +19460,11 @@ token-types@^4.1.1:
     "@tokenizer/token" "^0.3.0"
     ieee754 "^1.2.1"
 
+toml@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee"
+  integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==
+
 toposort@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330"
@@ -21697,22 +19519,15 @@ trim-repeated@^1.0.0:
     escape-string-regexp "^1.0.2"
 
 triple-beam@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9"
-  integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.4.1.tgz#6fde70271dc6e5d73ca0c3b24e2d92afb7441984"
+  integrity sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==
 
-ts-api-utils@^1.0.1, ts-api-utils@^1.3.0:
+ts-api-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
   integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
-ts-declaration-location@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/ts-declaration-location/-/ts-declaration-location-1.0.4.tgz#60c64133202ec5d171fdf0395f70f786f92f14c0"
-  integrity sha512-r4JoxYhKULbZuH81Pjrp9OEG5St7XWk7zXwGkLKhmVcjiBVHTJXV5wK6dEa9JKW5QGSTW6b1lOjxAKp8R1SQhg==
-  dependencies:
-    minimatch "^10.0.0"
-
 ts-graphviz@^1.5.0:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/ts-graphviz/-/ts-graphviz-1.5.4.tgz#61a3059afeac4f6d4be3c6729a4d88546ca9e095"
@@ -21751,39 +19566,6 @@ ts-node@10.8.1:
     v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
-ts-node@^10.9.2:
-  version "10.9.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.2.tgz#70f021c9e185bccdca820e26dc413805c101c71f"
-  integrity sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==
-  dependencies:
-    "@cspotcode/source-map-support" "^0.8.0"
-    "@tsconfig/node10" "^1.0.7"
-    "@tsconfig/node12" "^1.0.7"
-    "@tsconfig/node14" "^1.0.0"
-    "@tsconfig/node16" "^1.0.2"
-    acorn "^8.4.1"
-    acorn-walk "^8.1.1"
-    arg "^4.1.0"
-    create-require "^1.1.0"
-    diff "^4.0.1"
-    make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.1"
-    yn "3.1.1"
-
-tsconfck@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/tsconfck/-/tsconfck-3.1.1.tgz#c7284913262c293b43b905b8b034f524de4a3162"
-  integrity sha512-00eoI6WY57SvZEVjm13stEVE90VkEdJAFGgpFLTsZbJyW/LwFQ7uQxJHWpZ2hzSWgCPKc9AnBnNP+0X7o3hAmQ==
-
-tsconfig-paths-webpack-plugin@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-4.1.0.tgz#3c6892c5e7319c146eee1e7302ed9e6f2be4f763"
-  integrity sha512-xWFISjviPydmtmgeUAuXp4N1fky+VCtfhOkDUFIv5ea7p4wuTomI4QTrXvFBX2S4jZsmyTSrStQl+E+4w+RzxA==
-  dependencies:
-    chalk "^4.1.0"
-    enhanced-resolve "^5.7.0"
-    tsconfig-paths "^4.1.2"
-
 tsconfig-paths@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-4.0.0.tgz#1082f5d99fd127b72397eef4809e4dd06d229b64"
@@ -21812,15 +19594,15 @@ tsconfig-paths@^4.1.2, tsconfig-paths@^4.2.0:
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0:
+tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.3.1, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
-  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
+tslib@^2.1.0, tslib@^2.2.0, tslib@^2.3.0, tslib@^2.4.0, tslib@^2.4.1, tslib@^2.5.0, tslib@^2.6.2:
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
+  integrity sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==
 
 tsscmp@1.0.6:
   version "1.0.6"
@@ -21971,11 +19753,6 @@ typed-array-length@^1.0.6:
     is-typed-array "^1.1.13"
     possible-typed-array-names "^1.0.0"
 
-typed-duration@^1.0.12:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/typed-duration/-/typed-duration-1.0.13.tgz#a40f9ba563b6e20674cac491e15ecbf6811d85a7"
-  integrity sha512-HLwA+hNq/2eXe03isJSfa7YJt6NikplBGdNKvlhyuR6WL5iZi2uXJIZv1SSOMEIukCZbeQ8QwIcQ801S0/Qulw==
-
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -21983,11 +19760,6 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typedarray-to-buffer@~1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz#9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c"
-  integrity sha512-vjMKrfSoUDN8/Vnqitw2FmstOfuJ73G6CrSEKnf11A6RmasVxHqfeBcnTb6RsL4pTMuV5Zsv9IiHRphMZyckUw==
-
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -22005,24 +19777,19 @@ typeof@^1.0.0:
   resolved "https://registry.yarnpkg.com/typeof/-/typeof-1.0.0.tgz#9c84403f2323ae5399167275497638ea1d2f2440"
   integrity sha512-Pze0mIxYXhaJdpw1ayMzOA7rtGr1OmsTY/Z+FWtRKIqXFz6aoDLjqdbWE/tcIBSC8nhnVXiRrEXujodR/xiFAA==
 
-typescript-eslint@^7.16.1, typescript-eslint@^7.3.1:
-  version "7.18.0"
-  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-7.18.0.tgz#e90d57649b2ad37a7475875fa3e834a6d9f61eb2"
-  integrity sha512-PonBkP603E3tt05lDkbOMyaxJjvKqQrXsnow72sVeOFINDE/qNmnnd+f9b4N+U7W6MXnnYyrhtmF2t08QWwUbA==
+typescript-eslint@8.17.0:
+  version "8.17.0"
+  resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.17.0.tgz#fa4033c26b3b40f778287bc12918d985481b220b"
+  integrity sha512-409VXvFd/f1br1DCbuKNFqQpXICoTB+V51afcwG1pn1a3Cp92MqAUges3YjwEdQ0cMUoCIodjVDAYzyD8h3SYA==
   dependencies:
-    "@typescript-eslint/eslint-plugin" "7.18.0"
-    "@typescript-eslint/parser" "7.18.0"
-    "@typescript-eslint/utils" "7.18.0"
+    "@typescript-eslint/eslint-plugin" "8.17.0"
+    "@typescript-eslint/parser" "8.17.0"
+    "@typescript-eslint/utils" "8.17.0"
 
-typescript@5.5.2:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.2.tgz#c26f023cb0054e657ce04f72583ea2d85f8d0507"
-  integrity sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==
-
-"typescript@>=3 < 6", typescript@^5.5.3:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba"
-  integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==
+typescript@5.7.2, "typescript@>=3 < 6":
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.7.2.tgz#3169cf8c4c8a828cde53ba9ecb3d2b1d5dd67be6"
+  integrity sha512-i5t66RHxDvVN40HfDd1PsEThGNnlMCMT3jMUuoh9/0TaqWevNontacunWyN02LA9/fIbEWlcHZcgTKb9QoaLfg==
 
 typescript@^3.9.10, typescript@^3.9.5, typescript@^3.9.7:
   version "3.9.10"
@@ -22087,7 +19854,7 @@ undici-types@~5.26.4:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
   integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
 
-undici-types@~6.19.2:
+undici-types@~6.19.2, undici-types@~6.19.8:
   version "6.19.8"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.19.8.tgz#35111c9d1437ab83a7cdc0abae2f26d88eda0a02"
   integrity sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==
@@ -22097,6 +19864,13 @@ undici@^4.14.1:
   resolved "https://registry.yarnpkg.com/undici/-/undici-4.16.0.tgz#469bb87b3b918818d3d7843d91a1d08da357d5ff"
   integrity sha512-tkZSECUYi+/T1i4u+4+lwZmQgLXd4BLGlrc7KZPcLIW7Jpq99+Xpc30ONv7nS6F5UNOxp/HBZSSL9MafUrvJbw==
 
+undici@^5.28.4:
+  version "5.28.4"
+  resolved "https://registry.yarnpkg.com/undici/-/undici-5.28.4.tgz#6b280408edb6a1a604a9b20340f45b422e373068"
+  integrity sha512-72RFADWFqKmUb2hmmvNODKL3p9hcB6Gt2DOQMis1SEBaV6a4MH8soBvzg+95CYhCKPFedut2JY9bMfrDl9D23g==
+  dependencies:
+    "@fastify/busboy" "^2.0.0"
+
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
@@ -22125,13 +19899,6 @@ uniq@^1.0.1:
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
   integrity sha512-Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==
 
-unique-filename@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
-  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
-  dependencies:
-    unique-slug "^2.0.0"
-
 unique-filename@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-2.0.1.tgz#e785f8675a9a7589e0ac77e0b5c34d2eaeac6da2"
@@ -22146,13 +19913,6 @@ unique-filename@^3.0.0:
   dependencies:
     unique-slug "^4.0.0"
 
-unique-slug@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
-  integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
-  dependencies:
-    imurmurhash "^0.1.4"
-
 unique-slug@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-3.0.0.tgz#6d347cf57c8a7a7a6044aabd0e2d74e4d76dc7c9"
@@ -22220,7 +19980,7 @@ update-browserslist-db@^1.0.10:
     escalade "^3.1.1"
     picocolors "^1.0.0"
 
-update-dotenv@1.1.1, update-dotenv@^1.1.1:
+update-dotenv@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/update-dotenv/-/update-dotenv-1.1.1.tgz#17146f302f216c3c92419d5a327a45be910050ca"
   integrity sha512-3cIC18In/t0X/yH793c00qqxcKD8jVCgNOPif/fGQkFpYMGecM9YAc+kaAKXuZsM2dE9I9wFI7KvAuNX22SGMQ==
@@ -22252,11 +20012,6 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
-urijs@^1.19.2:
-  version "1.19.11"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.11.tgz#204b0d6b605ae80bea54bea39280cdb7c9f923cc"
-  integrity sha512-HXgFDgDommxn5/bIv0cnQZsPhHDA90NPHD6+c/v21U5+Sx5hoP8+dP9IZXBU1gIfvdRfhG8cel9QNPeionfcCQ==
-
 url-parse-lax@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
@@ -22264,7 +20019,7 @@ url-parse-lax@^3.0.0:
   dependencies:
     prepend-http "^2.0.0"
 
-url-parse@^1.4.3, url-parse@^1.5.3:
+url-parse@^1.5.3:
   version "1.5.10"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
@@ -22292,7 +20047,7 @@ utf-8-validate@^5.0.2:
   dependencies:
     node-gyp-build "^4.3.0"
 
-utif2@^4.0.1:
+utif2@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/utif2/-/utif2-4.1.0.tgz#e768d37bd619b995d56d9780b5d2b4611a3d932b"
   integrity sha512-+oknB9FHrJ7oW7A2WZYajOcv4FcDR4CfoGB0dPNfxbi4GO05RRnFmt5oa23+9w32EanrYcSJWspUiJkLMs+37w==
@@ -22304,6 +20059,17 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
+util@^0.12.4:
+  version "0.12.5"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
+  integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    which-typed-array "^1.1.2"
+
 utils-merge@1.x.x, utils-merge@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
@@ -22314,10 +20080,10 @@ uuid-random@^1.3.2:
   resolved "https://registry.yarnpkg.com/uuid-random/-/uuid-random-1.3.2.tgz#96715edbaef4e84b1dcf5024b00d16f30220e2d0"
   integrity sha512-UOzej0Le/UgkbWEO8flm+0y+G+ljUon1QWTEZOq1rnMAsxo2+SckbiZdKzAHHlVh6gJqI1TjC/xwgR50MuCrBQ==
 
-uuid@3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+uuid@8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c"
+  integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==
 
 uuid@8.1.0:
   version "8.1.0"
@@ -22329,21 +20095,11 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.1, uuid@^8.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
   integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
-uuid@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
-  integrity sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==
-
 uuid@^3.3.2:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
-
 uuid@^9.0.0, uuid@^9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.1.tgz#e188d4c8853cc722220392c424cd637f32293f30"
@@ -22426,16 +20182,10 @@ vite-node@0.29.8:
     picocolors "^1.0.0"
     vite "^3.0.0 || ^4.0.0"
 
-vite-node@2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-2.0.5.tgz#36d909188fc6e3aba3da5fc095b3637d0d18e27b"
-  integrity sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==
-  dependencies:
-    cac "^6.7.14"
-    debug "^4.3.5"
-    pathe "^1.1.2"
-    tinyrainbow "^1.2.0"
-    vite "^5.0.0"
+vite-plugin-css-injected-by-js@3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/vite-plugin-css-injected-by-js/-/vite-plugin-css-injected-by-js-3.5.2.tgz#1f75d16ad5c05b6b49bf18018099a189ec2e46ad"
+  integrity sha512-2MpU/Y+SCZyWUB6ua3HbJCrgnF0KACAsmzOQt1UvRVJCGF6S8xdA3ZUhWcWdM9ivG4I5az8PnQmwwrkC2CAQrQ==
 
 vite-plugin-static-copy@^0.17.0:
   version "0.17.0"
@@ -22447,15 +20197,6 @@ vite-plugin-static-copy@^0.17.0:
     fs-extra "^11.1.0"
     picocolors "^1.0.0"
 
-vite-tsconfig-paths@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/vite-tsconfig-paths/-/vite-tsconfig-paths-4.3.2.tgz#321f02e4b736a90ff62f9086467faf4e2da857a9"
-  integrity sha512-0Vd/a6po6Q+86rPlntHye7F31zA2URZMbH8M3saAZ/xR9QoGN/L21bxEGfXdWmFdNkqPpRdxFT7nmNe12e9/uA==
-  dependencies:
-    debug "^4.1.1"
-    globrex "^0.1.2"
-    tsconfck "^3.0.3"
-
 "vite@^3.0.0 || ^4.0.0", vite@^4.5.0:
   version "4.5.3"
   resolved "https://registry.yarnpkg.com/vite/-/vite-4.5.3.tgz#d88a4529ea58bae97294c7e2e6f0eab39a50fb1a"
@@ -22467,17 +20208,6 @@ vite-tsconfig-paths@^4.3.2:
   optionalDependencies:
     fsevents "~2.3.2"
 
-vite@^5.0.0:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/vite/-/vite-5.4.2.tgz#8acb6ec4bfab823cdfc1cb2d6c53ed311bc4e47e"
-  integrity sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==
-  dependencies:
-    esbuild "^0.21.3"
-    postcss "^8.4.41"
-    rollup "^4.20.0"
-  optionalDependencies:
-    fsevents "~2.3.3"
-
 vitefu@^0.2.2:
   version "0.2.5"
   resolved "https://registry.yarnpkg.com/vitefu/-/vitefu-0.2.5.tgz#c1b93c377fbdd3e5ddd69840ea3aa70b40d90969"
@@ -22513,36 +20243,6 @@ vitest@^0.29.2:
     vite-node "0.29.8"
     why-is-node-running "^2.2.2"
 
-vitest@^2.0.4:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/vitest/-/vitest-2.0.5.tgz#2f15a532704a7181528e399cc5b754c7f335fd62"
-  integrity sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==
-  dependencies:
-    "@ampproject/remapping" "^2.3.0"
-    "@vitest/expect" "2.0.5"
-    "@vitest/pretty-format" "^2.0.5"
-    "@vitest/runner" "2.0.5"
-    "@vitest/snapshot" "2.0.5"
-    "@vitest/spy" "2.0.5"
-    "@vitest/utils" "2.0.5"
-    chai "^5.1.1"
-    debug "^4.3.5"
-    execa "^8.0.1"
-    magic-string "^0.30.10"
-    pathe "^1.1.2"
-    std-env "^3.7.0"
-    tinybench "^2.8.0"
-    tinypool "^1.0.0"
-    tinyrainbow "^1.2.0"
-    vite "^5.0.0"
-    vite-node "2.0.5"
-    why-is-node-running "^2.3.0"
-
-vlq@^0.2.2:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"
-  integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==
-
 vuvuzela@1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/vuvuzela/-/vuvuzela-1.0.3.tgz#3be145e58271c73ca55279dd851f12a682114b0b"
@@ -22586,11 +20286,6 @@ walker@^1.0.8:
   dependencies:
     makeerror "1.0.12"
 
-watskeburt@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/watskeburt/-/watskeburt-4.1.0.tgz#3c0227669be646a97424b631164b1afe3d4d5344"
-  integrity sha512-KkY5H51ajqy9HYYI+u9SIURcWnqeVVhdH0I+ab6aXPGHfZYxgRCwnR6Lm3+TYB6jJVt5jFqw4GAKmwf1zHmGQw==
-
 wcwidth@^1.0.0, wcwidth@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
@@ -22650,11 +20345,6 @@ whatwg-encoding@^2.0.0:
   dependencies:
     iconv-lite "0.6.3"
 
-whatwg-fetch@^3.4.1:
-  version "3.6.20"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz#580ce6d791facec91d37c72890995a0b48d31c70"
-  integrity sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==
-
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
@@ -22724,7 +20414,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==
 
-which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15:
+which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15, which-typed-array@^1.1.2:
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.15.tgz#264859e9b11a649b388bfaaf4f767df1f779b38d"
   integrity sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==
@@ -22735,7 +20425,7 @@ which-typed-array@^1.1.13, which-typed-array@^1.1.14, which-typed-array@^1.1.15:
     gopd "^1.0.1"
     has-tostringtag "^1.0.2"
 
-which@^1.2.9:
+which@^1.2.14:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -22756,7 +20446,7 @@ which@^3.0.0:
   dependencies:
     isexe "^2.0.0"
 
-why-is-node-running@^2.2.2, why-is-node-running@^2.3.0:
+why-is-node-running@^2.2.2:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/why-is-node-running/-/why-is-node-running-2.3.0.tgz#a3f69a97107f494b3cdc3bdddd883a7d65cebf04"
   integrity sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==
@@ -22778,41 +20468,31 @@ widest-line@^3.1.0:
   dependencies:
     string-width "^4.0.0"
 
-win-ca@3.5.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/win-ca/-/win-ca-3.5.1.tgz#2ef37ac24b0a1daa2714b4c5ef258c5242429e00"
-  integrity sha512-RNy9gpBS6cxWHjfbqwBA7odaHyT+YQNhtdpJZwYCFoxB/Dq22oeOZ9YCXMwjhLytKpo7JJMnKdJ/ve7N12zzfQ==
+winston-transport@^4.9.0:
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.9.0.tgz#3bba345de10297654ea6f33519424560003b3bf9"
+  integrity sha512-8drMJ4rkgaPo1Me4zD/3WLfI/zPdA9o2IipKODunnGDcuqbHwjsbB79ylv04LCGGzU0xQ6vTznOMpQGaLhhm6A==
   dependencies:
-    is-electron "^2.2.0"
-    make-dir "^1.3.0"
-    node-forge "^1.2.1"
-    split "^1.0.1"
-
-winston-transport@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/winston-transport/-/winston-transport-4.5.0.tgz#6e7b0dd04d393171ed5e4e4905db265f7ab384fa"
-  integrity sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q==
-  dependencies:
-    logform "^2.3.2"
-    readable-stream "^3.6.0"
+    logform "^2.7.0"
+    readable-stream "^3.6.2"
     triple-beam "^1.3.0"
 
 winston@^3.1.0:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.8.2.tgz#56e16b34022eb4cff2638196d9646d7430fdad50"
-  integrity sha512-MsE1gRx1m5jdTTO9Ld/vND4krP2To+lgDoMEHGGa4HIlAUyXJtfc7CxQcGXVyz2IBpw5hbFkj2b/AtUdQwyRew==
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.17.0.tgz#74b8665ce9b4ea7b29d0922cfccf852a08a11423"
+  integrity sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==
   dependencies:
-    "@colors/colors" "1.5.0"
+    "@colors/colors" "^1.6.0"
     "@dabh/diagnostics" "^2.0.2"
     async "^3.2.3"
     is-stream "^2.0.0"
-    logform "^2.4.0"
+    logform "^2.7.0"
     one-time "^1.0.0"
     readable-stream "^3.4.0"
     safe-stable-stringify "^2.3.1"
     stack-trace "0.0.x"
     triple-beam "^1.3.0"
-    winston-transport "^4.5.0"
+    winston-transport "^4.9.0"
 
 word-wrap@~1.2.3:
   version "1.2.5"
@@ -22831,7 +20511,7 @@ worker-farm@1.7.0:
   dependencies:
     errno "~0.1.7"
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -22849,15 +20529,6 @@ wrap-ansi@^5.1.0:
     string-width "^3.0.0"
     strip-ansi "^5.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"
@@ -22960,7 +20631,7 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
-xhr@^2.0.1, xhr@^2.4.1:
+xhr@^2.4.1:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.6.0.tgz#b69d4395e792b4173d6b7df077f0fc5e4e2b249d"
   integrity sha512-/eCGLb5rxjx5e3mF1A7s+pLlR6CGyqWN91fv1JgER5mVWg1MZmlhBvy9kjcsOdRk8RrIujotWyJamfyrp+WIcA==
@@ -22985,7 +20656,7 @@ xml-parse-from-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/xml-parse-from-string/-/xml-parse-from-string-1.0.1.tgz#a9029e929d3dbcded169f3c6e28238d95a5d5a28"
   integrity sha512-ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==
 
-xml2js@0.1.x, xml2js@0.4.19, xml2js@0.5.0, xml2js@0.6.2, xml2js@^0.4.19, xml2js@^0.4.5:
+xml2js@0.1.x, xml2js@0.6.2, xml2js@^0.5.0:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499"
   integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==
@@ -23008,36 +20679,11 @@ xmlhttprequest-ssl@~2.0.0:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz#91360c86b914e67f44dce769180027c0da618c67"
   integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
 
-xtend@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9"
-  integrity sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==
-
 xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xtend@~2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.0.6.tgz#5ea657a6dba447069c2e59c58a1138cb0c5e6cee"
-  integrity sha512-fOZg4ECOlrMl+A6Msr7EIFcON1L26mb4NY5rurSkOex/TWhazOrg6eXD/B0XkuiYcYhQDWLXzQxLMVJ7LXwokg==
-  dependencies:
-    is-object "~0.1.2"
-    object-keys "~0.2.0"
-
-xtend@~2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
-  integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==
-  dependencies:
-    object-keys "~0.4.0"
-
-xtend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a"
-  integrity sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==
-
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -23068,7 +20714,7 @@ yaml@2.0.0-1:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.0.0-1.tgz#8c3029b3ee2028306d5bcf396980623115ff8d18"
   integrity sha512-W7h5dEhywMKenDJh2iX/LABkbFnBxasD27oyXWDS/feDsxiw0dD5ncXdYXgkvAsXIY2MpW/ZKkr9IU30DBdMNQ==
 
-yaml@^1.10.2:
+yaml@^1.10.0, yaml@^1.10.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
@@ -23096,7 +20742,7 @@ yargs-parser@21.1.1, yargs-parser@>=21.1.1, yargs-parser@^21.0.0, yargs-parser@^
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.1.1.tgz#9096bceebf990d21bb31fa9516e0ede294a77d35"
   integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
-yargs-parser@^13.1.0:
+yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -23109,23 +20755,6 @@ yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@13.2.4:
-  version "13.2.4"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
-  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
-  dependencies:
-    cliui "^5.0.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
-    os-locale "^3.1.0"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.0"
-
 yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
@@ -23139,7 +20768,23 @@ yargs@16.2.0, yargs@^16.1.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.3.1, yargs@^17.5.1, yargs@^17.6.2, yargs@^17.7.2:
+yargs@^13.2.4:
+  version "13.3.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd"
+  integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.2"
+
+yargs@^17.3.1, yargs@^17.6.2, yargs@^17.7.2:
   version "17.7.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
   integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
@@ -23228,15 +20873,6 @@ z-schema@^5.0.1:
   optionalDependencies:
     commander "^9.4.1"
 
-zip-stream@^4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.1.tgz#1337fe974dbaffd2fa9a1ba09662a66932bd7135"
-  integrity sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==
-  dependencies:
-    archiver-utils "^3.0.4"
-    compress-commons "^4.1.2"
-    readable-stream "^3.6.0"
-
 zip-stream@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-6.0.1.tgz#e141b930ed60ccaf5d7fa9c8260e0d1748a2bbfb"
@@ -23244,4 +20880,14 @@ zip-stream@^6.0.1:
   dependencies:
     archiver-utils "^5.0.0"
     compress-commons "^6.0.2"
-    readable-stream "^4.0.0"
\ No newline at end of file
+    readable-stream "^4.0.0"
+
+zod-validation-error@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/zod-validation-error/-/zod-validation-error-3.4.0.tgz#3a8a1f55c65579822d7faa190b51336c61bee2a6"
+  integrity sha512-ZOPR9SVY6Pb2qqO5XHt+MkkTRxGXb4EVtnjc9JpXUOtUB1T9Ru7mZOT361AN3MsetVe7R0a1KZshJDZdgp9miQ==
+
+zod@^3.23.8:
+  version "3.23.8"
+  resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
+  integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==