From 214072646dbad29fe474bf134108bcf1a431976e Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 11:44:38 +0100
Subject: [PATCH 01/22] Support svg imports in svelte.ts

---
 packages/builder/src/types/svg.d.ts | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packages/builder/src/types/svg.d.ts

diff --git a/packages/builder/src/types/svg.d.ts b/packages/builder/src/types/svg.d.ts
new file mode 100644
index 0000000000..aa39b45040
--- /dev/null
+++ b/packages/builder/src/types/svg.d.ts
@@ -0,0 +1,4 @@
+declare module "*.svg" {
+  const content: string
+  export default content
+}

From 04179e41ba7d3a9cd30ac1807b76f0b5a9a153b8 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:04:06 +0100
Subject: [PATCH 02/22] Initial conversion

---
 .../integration/RestQueryViewer.svelte        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 7bb5022f3c..9bc23a2df4 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { goto, params } from "@roxi/routify"
   import { datasources, flags, integrations, queries } from "@/stores/builder"
   import { environment } from "@/stores/portal"
@@ -50,15 +50,16 @@
     toBindingsArray,
   } from "@/dataBinding"
   import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
+  import { Datasource, Query, TableSchema } from "@budibase/types"
 
-  export let queryId
+  export let queryId: string
 
-  let query, datasource
+  let query: Query, datasource: Datasource
   let breakQs = {},
     requestBindings = {}
-  let saveId, url
-  let response, schema, enabledHeaders
-  let authConfigId
+  let saveId: string | undefined, url: string
+  let response, schema: TableSchema, enabledHeaders: boolean
+  let authConfigId: string
   let dynamicVariables, addVariableModal, varBinding, globalDynamicBindings
   let restBindings = getRestBindings()
   let nestedSchemaFields = {}
@@ -103,7 +104,7 @@
 
   $: runtimeUrlQueries = readableToRuntimeMap(mergedBindings, breakQs)
 
-  function getSelectedQuery() {
+  function getSelectedQuery(): Query {
     return cloneDeep(
       $queries.list.find(q => q._id === queryId) || {
         datasourceId: $params.datasourceId,
@@ -114,18 +115,21 @@
           headers: {},
         },
         queryVerb: "read",
+        transformer: null,
+        schema: {},
+        name: "aaa",
       }
     )
   }
 
-  const cleanUrl = inputUrl =>
+  const cleanUrl = (inputUrl: string) =>
     url
       ?.replace(/(https)|(http)|[{}:]/g, "")
       ?.replaceAll(".", "_")
       ?.replaceAll("/", " ")
       ?.trim() || inputUrl
 
-  function checkQueryName(inputUrl = null) {
+  function checkQueryName(inputUrl = "") {
     if (query && (!query.name || query.flags.urlName)) {
       query.flags.urlName = true
       query.name = cleanUrl(inputUrl)

From 64423dd6bf76ccc0d2d4e40508e0fd324f17e4c0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:09:18 +0100
Subject: [PATCH 03/22] More types

---
 .../integration/RestQueryViewer.svelte        | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 9bc23a2df4..d9286c9b9c 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -50,17 +50,27 @@
     toBindingsArray,
   } from "@/dataBinding"
   import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
-  import { Datasource, Query, TableSchema } from "@budibase/types"
+  import {
+    Datasource,
+    PreviewQueryResponse,
+    Query,
+    QuerySchema,
+  } from "@budibase/types"
 
   export let queryId: string
 
   let query: Query, datasource: Datasource
-  let breakQs = {},
-    requestBindings = {}
+  let breakQs: Record<string, string> = {},
+    requestBindings: Record<string, string> = {}
   let saveId: string | undefined, url: string
-  let response, schema: TableSchema, enabledHeaders: boolean
+  let response: PreviewQueryResponse,
+    schema: Record<string, string | QuerySchema>,
+    enabledHeaders: boolean
   let authConfigId: string
-  let dynamicVariables, addVariableModal, varBinding, globalDynamicBindings
+  let dynamicVariables: any,
+    addVariableModal: any,
+    varBinding: any,
+    globalDynamicBindings: any
   let restBindings = getRestBindings()
   let nestedSchemaFields = {}
 
@@ -221,7 +231,7 @@
       }
     })
 
-    Object.values(query.fields.headers).forEach(headerValue => {
+    Object.values(query.fields.headers ?? {}).forEach(headerValue => {
       if (forbiddenBindings.test(headerValue)) {
         throw bindingError
       }
@@ -248,7 +258,7 @@
         nestedSchemaFields = response.nestedSchemaFields
         notifications.success("Request sent successfully")
       }
-    } catch (error) {
+    } catch (error: any) {
       notifications.error(`Query Error: ${error.message}`)
     }
   }
@@ -269,7 +279,7 @@
     return id
   }
 
-  const buildAuthConfigs = datasource => {
+  const buildAuthConfigs = (datasource: Datasource) => {
     if (datasource?.config?.authConfigs) {
       return datasource.config.authConfigs.map(c => ({
         label: c.name,
@@ -282,7 +292,7 @@
   const schemaMenuItems = [
     {
       text: "Create dynamic variable",
-      onClick: input => {
+      onClick: (input: { name: string }) => {
         varBinding = `{{ data.0.[${input.name}] }}`
         addVariableModal.show()
       },
@@ -291,7 +301,7 @@
   const responseHeadersMenuItems = [
     {
       text: "Create dynamic variable",
-      onClick: input => {
+      onClick: (input: { name: string }) => {
         varBinding = `{{ info.headers.[${input.name}] }}`
         addVariableModal.show()
       },

From 61376820797e0d6fe9b6c9fee1e4f1523600a61f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:13:04 +0100
Subject: [PATCH 04/22] More types

---
 .../integration/RestQueryViewer.svelte        | 62 ++++++++++++-------
 packages/types/src/documents/app/query.ts     |  2 +-
 2 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index d9286c9b9c..cf41c9cd91 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -146,7 +146,7 @@
     }
   }
 
-  function buildUrl(base, qsObj) {
+  function buildUrl(base: string | undefined, qsObj: Record<string, string>) {
     if (!base) {
       return base
     }
@@ -268,7 +268,7 @@
     if (id) {
       // find the matching config on the datasource
       const matchedConfig = datasource?.config?.authConfigs?.filter(
-        c => c._id === id
+        (c: { _id?: string }) => c._id === id
       )[0]
       // clear the id if the config is not found (deleted)
       // i.e. just show 'None' in the dropdown
@@ -281,10 +281,12 @@
 
   const buildAuthConfigs = (datasource: Datasource) => {
     if (datasource?.config?.authConfigs) {
-      return datasource.config.authConfigs.map(c => ({
-        label: c.name,
-        value: c._id,
-      }))
+      return datasource.config.authConfigs.map(
+        (c: { name: string; _id: string }) => ({
+          label: c.name,
+          value: c._id,
+        })
+      )
     }
     return []
   }
@@ -309,14 +311,21 @@
   ]
 
   // convert dynamic variables list to simple key/val object
-  const getDynamicVariables = (datasource, queryId, matchFn) => {
+  const getDynamicVariables = (
+    datasource: Datasource,
+    queryId: string | undefined,
+    matchFn: (variable: any, queryId: any) => boolean
+  ) => {
     const variablesList = datasource?.config?.dynamicVariables
     if (variablesList && variablesList.length > 0) {
       const filtered = queryId
-        ? variablesList.filter(variable => matchFn(variable, queryId))
+        ? variablesList.filter((variable: any) => matchFn(variable, queryId))
         : variablesList
       return filtered.reduce(
-        (acc, next) => ({ ...acc, [next.name]: next.value }),
+        (acc: any, next: { name: string; value: string }) => ({
+          ...acc,
+          [next.name]: next.value,
+        }),
         {}
       )
     }
@@ -324,8 +333,8 @@
   }
 
   // convert dynamic variables object back to a list, enrich with query id
-  const rebuildVariables = queryId => {
-    let variables = []
+  const rebuildVariables = (queryId: string | undefined) => {
+    let variables: { name: string; value: string; queryId: string }[] = []
     if (dynamicVariables) {
       variables = Object.entries(dynamicVariables).map(entry => {
         return {
@@ -338,12 +347,17 @@
 
     let existing = datasource?.config?.dynamicVariables || []
     // remove existing query variables (for changes and deletions)
-    existing = existing.filter(variable => variable.queryId !== queryId)
+    existing = existing.filter(
+      (variable: { queryId: string }) => variable.queryId !== queryId
+    )
     // re-add the new query variables
     return [...existing, ...variables]
   }
 
-  const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {
+  const shouldShowVariables = (
+    dynamicVariables: {},
+    variablesReadOnly: boolean
+  ) => {
     return !!(
       dynamicVariables &&
       // show when editable or when read only and not empty
@@ -351,7 +365,7 @@
     )
   }
 
-  const updateFlag = async (flag, value) => {
+  const updateFlag = async (flag: string, value: boolean) => {
     try {
       await flags.updateFlag(flag, value)
     } catch (error) {
@@ -360,11 +374,11 @@
   }
 
   const prettifyQueryRequestBody = (
-    query,
-    requestBindings,
-    dynamicVariables,
-    staticVariables,
-    restBindings
+    query: Query,
+    requestBindings: any,
+    dynamicVariables: any,
+    staticVariables: any,
+    restBindings: any[]
   ) => {
     let customRequestBindings = toBindingsArray(requestBindings, "Binding")
     let dynamicRequestBindings = toBindingsArray(dynamicVariables, "Dynamic")
@@ -389,14 +403,14 @@
     }
   }
 
-  const paramsChanged = evt => {
+  const paramsChanged = (evt: { detail: any }) => {
     breakQs = {}
     for (let param of evt.detail) {
       breakQs[param.name] = param.value
     }
   }
 
-  const urlChanged = evt => {
+  const urlChanged = (evt: { target: { value: string } }) => {
     breakQs = {}
     const qs = evt.target.value.split("?")[1]
     if (qs && qs.length > 0) {
@@ -479,12 +493,14 @@
       dynamicVariables = getDynamicVariables(
         datasource,
         query._id,
-        (variable, queryId) => variable.queryId === queryId
+        (variable: { queryId: string }, queryId: string) =>
+          variable.queryId === queryId
       )
       globalDynamicBindings = getDynamicVariables(
         datasource,
         query._id,
-        (variable, queryId) => variable.queryId !== queryId
+        (variable: { queryId: string }, queryId: string) =>
+          variable.queryId !== queryId
       )
     }
 
diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts
index d287a5b2c3..63656cc752 100644
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@@ -11,7 +11,7 @@ export interface Query extends Document {
   datasourceId: string
   name: string
   parameters: QueryParameter[]
-  fields: RestQueryFields | any
+  fields: RestQueryFields
   transformer: string | null
   schema: Record<string, QuerySchema | string>
   nestedSchemaFields?: Record<string, Record<string, QuerySchema | string>>

From 3a8b91072c564fd088504055e063754951e4d729 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:17:39 +0100
Subject: [PATCH 05/22] Fix import type

---
 .../builder/src/components/integration/RestQueryViewer.svelte   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index cf41c9cd91..c5dff313f8 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -50,7 +50,7 @@
     toBindingsArray,
   } from "@/dataBinding"
   import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
-  import {
+  import type {
     Datasource,
     PreviewQueryResponse,
     Query,

From 1c6c2eb47489f6f02f531b5be62ad2828f3e4408 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:22:45 +0100
Subject: [PATCH 06/22] KeyValueBuilder to ts

---
 .../integration/KeyValueBuilder.svelte        | 44 +++++++++----------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 7ea7a935c8..26fcd11f23 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import {
     Icon,
     ActionButton,
@@ -18,27 +18,26 @@
   export let defaults
   export let object = defaults || {}
   export let activity = {}
-  export let readOnly
-  export let noAddButton
-  export let name
-  export let headings = false
+  export let readOnly: boolean
+  export let noAddButton: boolean
+  export let name: string
+  export let headings: boolean = false
   export let options
   export let toggle
-  export let keyPlaceholder = "Key"
-  export let valuePlaceholder = "Value"
+  export let keyPlaceholder: string = "Key"
+  export let valuePlaceholder: string = "Value"
   export let valueHeading
   export let keyHeading
   export let tooltip
   export let menuItems
   export let showMenu = false
-  export let bindings = []
-  export let bindingDrawerLeft
-  export let allowHelpers = true
+  export let bindings: any[] = []
+  export let allowHelpers: boolean = true
   export let customButtonText = null
-  export let keyBindings = false
-  export let allowJS = false
-  export let actionButtonDisabled = false
-  export let compare = (option, value) => option === value
+  export let keyBindings: boolean = false
+  export let allowJS: boolean = false
+  export let actionButtonDisabled: boolean = false
+  export let compare = (option: string, value: string) => option === value
   export let context = null
 
   let fields = Object.entries(object || {}).map(([name, value]) => ({
@@ -52,15 +51,17 @@
     {}
   )
 
-  function buildFieldActivity(obj) {
+  function buildFieldActivity(obj: any) {
     if (!obj || typeof obj !== "object") {
       return []
     }
     const array = Array(fields.length)
     for (let [key, value] of Object.entries(obj)) {
       const field = fields.find(el => el.name === key)
-      const idx = fields.indexOf(field)
-      array[idx] = idx !== -1 ? value : true
+      if (field) {
+        const idx = fields.indexOf(field)
+        array[idx] = idx !== -1 ? value : true
+      }
     }
     return array
   }
@@ -71,7 +72,7 @@
     changed()
   }
 
-  function deleteEntry(idx) {
+  function deleteEntry(idx: number) {
     fields.splice(idx, 1)
     fieldActivity.splice(idx, 1)
     changed()
@@ -90,7 +91,7 @@
     dispatch("change", fields)
   }
 
-  function isJsonArray(value) {
+  function isJsonArray(value: any) {
     if (!value || typeof value === "string") {
       return false
     }
@@ -132,7 +133,6 @@
           value={field.name}
           {allowJS}
           {allowHelpers}
-          drawerLeft={bindingDrawerLeft}
           {context}
         />
       {:else}
@@ -159,7 +159,6 @@
           value={field.value}
           {allowJS}
           {allowHelpers}
-          drawerLeft={bindingDrawerLeft}
           {context}
         />
       {:else}
@@ -196,9 +195,6 @@
     <ActionButton
       disabled={actionButtonDisabled}
       icon="Add"
-      secondary
-      thin
-      outline
       on:click={addEntry}
     >
       {#if customButtonText}

From 3275a06b2027c750ef338881bfa3279e5e968e9d Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:26:27 +0100
Subject: [PATCH 07/22] More types

---
 .../integration/KeyValueBuilder.svelte        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 26fcd11f23..3da5f36c63 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -15,22 +15,22 @@
 
   let dispatch = createEventDispatcher()
 
-  export let defaults
-  export let object = defaults || {}
-  export let activity = {}
+  export let defaults: Record<string, string>
+  export let object: Record<string, string> = defaults || {}
+  export let activity: Record<string, boolean> = {}
   export let readOnly: boolean
   export let noAddButton: boolean
   export let name: string
   export let headings: boolean = false
-  export let options
-  export let toggle
+  export let options: any[]
+  export let toggle: boolean
   export let keyPlaceholder: string = "Key"
   export let valuePlaceholder: string = "Value"
-  export let valueHeading
-  export let keyHeading
-  export let tooltip
-  export let menuItems
-  export let showMenu = false
+  export let valueHeading: string | undefined = undefined
+  export let keyHeading: string | undefined = undefined
+  export let tooltip: string
+  export let menuItems: any[] | undefined
+  export let showMenu: boolean = false
   export let bindings: any[] = []
   export let allowHelpers: boolean = true
   export let customButtonText = null
@@ -38,7 +38,7 @@
   export let allowJS: boolean = false
   export let actionButtonDisabled: boolean = false
   export let compare = (option: string, value: string) => option === value
-  export let context = null
+  export let context: any = null
 
   let fields = Object.entries(object || {}).map(([name, value]) => ({
     name,

From 47a6446de0dc1d12ffe901962c118f2fba823545 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:34:35 +0100
Subject: [PATCH 08/22] Type switch

---
 packages/bbui/src/Form/Core/Switch.svelte | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Switch.svelte b/packages/bbui/src/Form/Core/Switch.svelte
index d7110a6e67..1683678fe6 100644
--- a/packages/bbui/src/Form/Core/Switch.svelte
+++ b/packages/bbui/src/Form/Core/Switch.svelte
@@ -1,15 +1,16 @@
-<script>
+<script lang="ts">
   import "@spectrum-css/switch/dist/index-vars.css"
   import { createEventDispatcher } from "svelte"
 
-  export let value = false
-  export let id = null
-  export let text = null
-  export let disabled = false
+  export let value: boolean = false
+  export let id: string | null = null
+  export let text: string | null = null
+  export let disabled: boolean = false
 
   const dispatch = createEventDispatcher()
-  const onChange = event => {
-    dispatch("change", event.target.checked)
+  const onChange = (event: Event) => {
+    const target = event.target as HTMLInputElement
+    dispatch("change", target.checked)
   }
 </script>
 

From fdf4e9afb801c24dace7adc293373005e956f3b6 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:36:07 +0100
Subject: [PATCH 09/22] Type toggle

---
 packages/bbui/src/Form/Toggle.svelte | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index 1fbad949ca..c50e57d456 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -1,23 +1,23 @@
-<script>
+<script lang="ts">
   import Field from "./Field.svelte"
   import Switch from "./Core/Switch.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let value = null
-  export let label = null
+  export let value: boolean | undefined = undefined
+  export let label: string | undefined = undefined
   export let labelPosition = "above"
   export let text = null
   export let disabled = false
-  export let error = null
-  export let helpText = null
+  export let error: string | undefined = undefined
+  export let helpText: string | undefined = undefined
 
   const dispatch = createEventDispatcher()
-  const onChange = e => {
+  const onChange = (e: CustomEvent<boolean>) => {
     value = e.detail
     dispatch("change", e.detail)
   }
 </script>
 
 <Field {helpText} {label} {labelPosition} {error}>
-  <Switch {error} {disabled} {text} {value} on:change={onChange} on:click />
+  <Switch {disabled} {text} {value} on:change={onChange} on:click />
 </Field>

From c0629b3195594c0c63fe192ec3e444e7120488c2 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:45:24 +0100
Subject: [PATCH 10/22] Type action menu

---
 .../bbui/src/ActionMenu/ActionMenu.svelte     | 27 ++++++++++---------
 packages/bbui/src/context.d.ts                |  5 ++++
 packages/bbui/src/types/actionMenu.ts         |  3 +++
 3 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 packages/bbui/src/context.d.ts
 create mode 100644 packages/bbui/src/types/actionMenu.ts

diff --git a/packages/bbui/src/ActionMenu/ActionMenu.svelte b/packages/bbui/src/ActionMenu/ActionMenu.svelte
index f27854bc04..06daf276e5 100644
--- a/packages/bbui/src/ActionMenu/ActionMenu.svelte
+++ b/packages/bbui/src/ActionMenu/ActionMenu.svelte
@@ -1,25 +1,26 @@
-<script>
+<script lang="ts">
   import { setContext, getContext } from "svelte"
   import Popover from "../Popover/Popover.svelte"
   import Menu from "../Menu/Menu.svelte"
+  import { PopoverAlignment } from "../constants"
 
-  export let disabled = false
-  export let align = "left"
-  export let portalTarget
-  export let openOnHover = false
-  export let animate
-  export let offset
+  export let disabled: boolean = false
+  export let align: `${PopoverAlignment}` = "left"
+  export let portalTarget: string | undefined = undefined
+  export let openOnHover: boolean = false
+  export let animate: boolean | undefined = undefined
+  export let offset: number | undefined = undefined
 
   const actionMenuContext = getContext("actionMenu")
 
-  let anchor
-  let dropdown
-  let timeout
+  let anchor: HTMLElement | undefined
+  let dropdown: Popover
+  let timeout: ReturnType<typeof setTimeout>
 
   // This is needed because display: contents is considered "invisible".
   // It should only ever be an action button, so should be fine.
-  function getAnchor(node) {
-    anchor = node.firstChild
+  function getAnchor(node: HTMLDivElement) {
+    anchor = (node.firstChild as HTMLElement) ?? undefined
   }
 
   export const show = () => {
@@ -37,7 +38,7 @@
     actionMenuContext?.hide()
   }
 
-  const openMenu = event => {
+  const openMenu = (event: Event) => {
     if (!disabled) {
       event.stopPropagation()
       show()
diff --git a/packages/bbui/src/context.d.ts b/packages/bbui/src/context.d.ts
new file mode 100644
index 0000000000..6df0457616
--- /dev/null
+++ b/packages/bbui/src/context.d.ts
@@ -0,0 +1,5 @@
+import { ActionMenu } from "./types"
+
+declare module "svelte" {
+  export function getContext(key: "actionMenu"): ActionMenu | undefined
+}
diff --git a/packages/bbui/src/types/actionMenu.ts b/packages/bbui/src/types/actionMenu.ts
new file mode 100644
index 0000000000..872a9f7c75
--- /dev/null
+++ b/packages/bbui/src/types/actionMenu.ts
@@ -0,0 +1,3 @@
+export interface ActionMenu {
+  hide: () => void
+}

From ae2cb27f39dc7f8af9f56bba05db983f84f5f514 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:45:52 +0100
Subject: [PATCH 11/22] Type some anys

---
 .../src/components/integration/KeyValueBuilder.svelte     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 3da5f36c63..df03d76cac 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -51,11 +51,11 @@
     {}
   )
 
-  function buildFieldActivity(obj: any) {
+  function buildFieldActivity(obj: Record<string, boolean>) {
     if (!obj || typeof obj !== "object") {
       return []
     }
-    const array = Array(fields.length)
+    const array: boolean[] = Array(fields.length)
     for (let [key, value] of Object.entries(obj)) {
       const field = fields.find(el => el.name === key)
       if (field) {
@@ -80,7 +80,7 @@
 
   function changed() {
     fields = fields
-    const newActivity = {}
+    const newActivity: Record<string, boolean> = {}
     for (let idx = 0; idx < fields.length; idx++) {
       const fieldName = fields[idx].name
       if (fieldName) {
@@ -175,7 +175,7 @@
       {#if !readOnly}
         <Icon hoverable name="Close" on:click={() => deleteEntry(idx)} />
       {/if}
-      {#if menuItems?.length > 0 && showMenu}
+      {#if menuItems?.length && showMenu}
         <ActionMenu>
           <div slot="control" class="control icon">
             <Icon size="S" hoverable name="MoreSmallList" />

From e6976ed62295283c6ac1f0dfdfac7be4fcf2d199 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:51:45 +0100
Subject: [PATCH 12/22] Default types

---
 .../integration/KeyValueBuilder.svelte         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index df03d76cac..4ecc2441ba 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -1,4 +1,4 @@
-<script lang="ts">
+<script lang="ts" generics="O">
   import {
     Icon,
     ActionButton,
@@ -15,21 +15,21 @@
 
   let dispatch = createEventDispatcher()
 
-  export let defaults: Record<string, string>
+  export let defaults: Record<string, string> | undefined = undefined
   export let object: Record<string, string> = defaults || {}
   export let activity: Record<string, boolean> = {}
   export let readOnly: boolean
-  export let noAddButton: boolean
-  export let name: string
+  export let noAddButton: boolean = false
+  export let name: string = ""
   export let headings: boolean = false
-  export let options: any[]
-  export let toggle: boolean
+  export let options: O[] | undefined = undefined
+  export let toggle: boolean = false
   export let keyPlaceholder: string = "Key"
   export let valuePlaceholder: string = "Value"
   export let valueHeading: string | undefined = undefined
   export let keyHeading: string | undefined = undefined
-  export let tooltip: string
-  export let menuItems: any[] | undefined
+  export let tooltip: string = ""
+  export let menuItems: any[] | undefined = undefined
   export let showMenu: boolean = false
   export let bindings: any[] = []
   export let allowHelpers: boolean = true
@@ -37,7 +37,7 @@
   export let keyBindings: boolean = false
   export let allowJS: boolean = false
   export let actionButtonDisabled: boolean = false
-  export let compare = (option: string, value: string) => option === value
+  export let compare = (option: O, value: O) => option === value
   export let context: any = null
 
   let fields = Object.entries(object || {}).map(([name, value]) => ({

From 691954aa1c078e571f7aaf6730e5267f4196a75f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:58:09 +0100
Subject: [PATCH 13/22] More types

---
 .../design/settings/controls/RoleSelect.svelte         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index b0b968c403..857a463c50 100644
--- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
@@ -1,11 +1,11 @@
-<script>
+<script lang="ts">
   import { Select } from "@budibase/bbui"
   import { roles } from "@/stores/builder"
 
-  export let value
-  export let error
-  export let placeholder = null
-  export let autoWidth = false
+  export let value: string
+  export let error: string | undefined = undefined
+  export let placeholder: string | undefined = undefined
+  export let autoWidth: boolean = false
 </script>
 
 <Select

From 0473069518730812dfcb4db0cf1ba747468e3027 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 12 Mar 2025 12:58:12 +0100
Subject: [PATCH 14/22] More types

---
 .../src/components/integration/AccessLevelSelect.svelte  | 9 +++++----
 .../src/components/integration/RestQueryViewer.svelte    | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index fc84369c11..47541735f9 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -1,15 +1,16 @@
-<script>
+<script lang="ts">
   import { Label, notifications } from "@budibase/bbui"
   import { permissions } from "@/stores/builder"
   import { Constants } from "@budibase/frontend-core"
   import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
+  import { Query } from "@budibase/types"
 
-  export let query
+  export let query: Query
   export let label
 
   $: getPermissions(query)
 
-  let roleId, loaded, fetched
+  let roleId: string, loaded: boolean, fetched: Query | undefined
 
   async function updateRole(role, id) {
     try {
@@ -29,7 +30,7 @@
     }
   }
 
-  async function getPermissions(queryToFetch) {
+  async function getPermissions(queryToFetch: Query) {
     if (fetched?._id === queryToFetch?._id) {
       loaded = true
       return
diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index c5dff313f8..b67b56a208 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -67,7 +67,7 @@
     schema: Record<string, string | QuerySchema>,
     enabledHeaders: boolean
   let authConfigId: string
-  let dynamicVariables: any,
+  let dynamicVariables: Record<string, string>,
     addVariableModal: any,
     varBinding: any,
     globalDynamicBindings: any
@@ -534,10 +534,10 @@
             on:save={saveQuery}
           />
           <div class="controls">
-            <ConnectedQueryScreens sourceId={query._id} />
+            <ConnectedQueryScreens sourceId={query._id || ""} />
             <div class="access">
               <Label>Access</Label>
-              <AccessLevelSelect {query} {saveId} />
+              <AccessLevelSelect {query} />
             </div>
           </div>
         </div>

From 4f88748c6518442b32827952e4303cd9502fe411 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:26:13 +0100
Subject: [PATCH 15/22] Undo RestQueryViewer changes

---
 .../integration/RestQueryViewer.svelte        | 73 +++++++------------
 1 file changed, 27 insertions(+), 46 deletions(-)

diff --git a/packages/builder/src/components/integration/RestQueryViewer.svelte b/packages/builder/src/components/integration/RestQueryViewer.svelte
index 9bfea74808..86cbee1732 100644
--- a/packages/builder/src/components/integration/RestQueryViewer.svelte
+++ b/packages/builder/src/components/integration/RestQueryViewer.svelte
@@ -52,7 +52,7 @@
   import ConnectedQueryScreens from "./ConnectedQueryScreens.svelte"
   import AuthPicker from "./rest/AuthPicker.svelte"
 
-  export let queryId: string
+  export let queryId
 
   let query, datasource
   let breakQs = {},
@@ -123,14 +123,11 @@
           headers: {},
         },
         queryVerb: "read",
-        transformer: null,
-        schema: {},
-        name: "aaa",
       }
     )
   }
 
-  const cleanUrl = (inputUrl: string) =>
+  const cleanUrl = inputUrl =>
     url
       ?.replace(/(https)|(http)|[{}:]/g, "")
       ?.replaceAll(".", "_")
@@ -145,7 +142,7 @@
     }
   }
 
-  function buildUrl(base: string | undefined, qsObj: Record<string, string>) {
+  function buildUrl(base, qsObj) {
     if (!base) {
       return base
     }
@@ -245,7 +242,7 @@
       }
     })
 
-    Object.values(query.fields.headers ?? {}).forEach(headerValue => {
+    Object.values(query.fields.headers).forEach(headerValue => {
       if (forbiddenBindings.test(headerValue)) {
         throw bindingError
       }
@@ -272,19 +269,17 @@
         nestedSchemaFields = response.nestedSchemaFields
         notifications.success("Request sent successfully")
       }
-    } catch (error: any) {
+    } catch (error) {
       notifications.error(`Query Error: ${error.message}`)
     }
   }
 
   const buildAuthConfigs = datasource => {
     if (datasource?.config?.authConfigs) {
-      return datasource.config.authConfigs.map(
-        (c: { name: string; _id: string }) => ({
-          label: c.name,
-          value: c._id,
-        })
-      )
+      return datasource.config.authConfigs.map(c => ({
+        label: c.name,
+        value: c._id,
+      }))
     }
     return []
   }
@@ -292,7 +287,7 @@
   const schemaMenuItems = [
     {
       text: "Create dynamic variable",
-      onClick: (input: { name: string }) => {
+      onClick: input => {
         varBinding = `{{ data.0.[${input.name}] }}`
         addVariableModal.show()
       },
@@ -301,7 +296,7 @@
   const responseHeadersMenuItems = [
     {
       text: "Create dynamic variable",
-      onClick: (input: { name: string }) => {
+      onClick: input => {
         varBinding = `{{ info.headers.[${input.name}] }}`
         addVariableModal.show()
       },
@@ -309,21 +304,14 @@
   ]
 
   // convert dynamic variables list to simple key/val object
-  const getDynamicVariables = (
-    datasource: Datasource,
-    queryId: string | undefined,
-    matchFn: (variable: any, queryId: any) => boolean
-  ) => {
+  const getDynamicVariables = (datasource, queryId, matchFn) => {
     const variablesList = datasource?.config?.dynamicVariables
     if (variablesList && variablesList.length > 0) {
       const filtered = queryId
-        ? variablesList.filter((variable: any) => matchFn(variable, queryId))
+        ? variablesList.filter(variable => matchFn(variable, queryId))
         : variablesList
       return filtered.reduce(
-        (acc: any, next: { name: string; value: string }) => ({
-          ...acc,
-          [next.name]: next.value,
-        }),
+        (acc, next) => ({ ...acc, [next.name]: next.value }),
         {}
       )
     }
@@ -331,8 +319,8 @@
   }
 
   // convert dynamic variables object back to a list, enrich with query id
-  const rebuildVariables = (queryId: string | undefined) => {
-    let variables: { name: string; value: string; queryId: string }[] = []
+  const rebuildVariables = queryId => {
+    let variables = []
     if (dynamicVariables) {
       variables = Object.entries(dynamicVariables).map(entry => {
         return {
@@ -345,17 +333,12 @@
 
     let existing = datasource?.config?.dynamicVariables || []
     // remove existing query variables (for changes and deletions)
-    existing = existing.filter(
-      (variable: { queryId: string }) => variable.queryId !== queryId
-    )
+    existing = existing.filter(variable => variable.queryId !== queryId)
     // re-add the new query variables
     return [...existing, ...variables]
   }
 
-  const shouldShowVariables = (
-    dynamicVariables: {},
-    variablesReadOnly: boolean
-  ) => {
+  const shouldShowVariables = (dynamicVariables, variablesReadOnly) => {
     return !!(
       dynamicVariables &&
       // show when editable or when read only and not empty
@@ -363,7 +346,7 @@
     )
   }
 
-  const updateFlag = async (flag: string, value: boolean) => {
+  const updateFlag = async (flag, value) => {
     try {
       await flags.updateFlag(flag, value)
     } catch (error) {
@@ -372,11 +355,11 @@
   }
 
   const prettifyQueryRequestBody = (
-    query: Query,
-    requestBindings: any,
-    dynamicVariables: any,
-    staticVariables: any,
-    restBindings: any[]
+    query,
+    requestBindings,
+    dynamicVariables,
+    staticVariables,
+    restBindings
   ) => {
     let customRequestBindings = toBindingsArray(requestBindings, "Binding")
     let dynamicRequestBindings = toBindingsArray(dynamicVariables, "Dynamic")
@@ -475,14 +458,12 @@
       dynamicVariables = getDynamicVariables(
         datasource,
         query._id,
-        (variable: { queryId: string }, queryId: string) =>
-          variable.queryId === queryId
+        (variable, queryId) => variable.queryId === queryId
       )
       globalDynamicBindings = getDynamicVariables(
         datasource,
         query._id,
-        (variable: { queryId: string }, queryId: string) =>
-          variable.queryId !== queryId
+        (variable, queryId) => variable.queryId !== queryId
       )
     }
 
@@ -554,7 +535,7 @@
             {/if}
             <div class="access">
               <Label>Access</Label>
-              <AccessLevelSelect {query} />
+              <AccessLevelSelect {query} {saveId} />
             </div>
           </div>
         </div>

From f839ee6e8e0333d25939b8a6a032695f9d6d56be Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:31:14 +0100
Subject: [PATCH 16/22] Fix toggle types

---
 packages/bbui/src/Form/Toggle.svelte | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index ceca884ae4..ad476a5dfe 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -3,11 +3,11 @@
   import Switch from "./Core/Switch.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let value = undefined
-  export let label = null
-  export let labelPosition = "above"
-  export let text = undefined
-  export let disabled = false
+  export let value: boolean | undefined = undefined
+  export let label: string | undefined = undefined
+  export let labelPosition: "above" = "above"
+  export let text: string | undefined = undefined
+  export let disabled: boolean | undefined = false
   export let error: string | undefined = undefined
   export let helpText: string | undefined = undefined
 

From 7d8476b7b03c3fb78bfb88259e3333a641c8f0e0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:40:58 +0100
Subject: [PATCH 17/22] Fix types

---
 packages/bbui/src/Form/Toggle.svelte            | 10 ++++++++--
 .../design/settings/controls/RoleSelect.svelte  |  4 ++--
 .../integration/AccessLevelSelect.svelte        |  2 +-
 .../integration/KeyValueBuilder.svelte          | 17 ++++++++++-------
 packages/types/src/documents/app/query.ts       |  1 +
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/packages/bbui/src/Form/Toggle.svelte b/packages/bbui/src/Form/Toggle.svelte
index ad476a5dfe..7523de9729 100644
--- a/packages/bbui/src/Form/Toggle.svelte
+++ b/packages/bbui/src/Form/Toggle.svelte
@@ -3,7 +3,7 @@
   import Switch from "./Core/Switch.svelte"
   import { createEventDispatcher } from "svelte"
 
-  export let value: boolean | undefined = undefined
+  export let value: boolean | null | undefined = undefined
   export let label: string | undefined = undefined
   export let labelPosition: "above" = "above"
   export let text: string | undefined = undefined
@@ -19,5 +19,11 @@
 </script>
 
 <Field {helpText} {label} {labelPosition} {error}>
-  <Switch {disabled} {text} {value} on:change={onChange} on:click />
+  <Switch
+    {disabled}
+    {text}
+    value={value ?? undefined}
+    on:change={onChange}
+    on:click
+  />
 </Field>
diff --git a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
index 857a463c50..e0d0eea6c4 100644
--- a/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
+++ b/packages/builder/src/components/design/settings/controls/RoleSelect.svelte
@@ -12,9 +12,9 @@
   bind:value
   on:change
   options={$roles}
-  getOptionLabel={role => role.uiMetadata.displayName}
+  getOptionLabel={role => role.uiMetadata?.displayName}
   getOptionValue={role => role._id}
-  getOptionColour={role => role.uiMetadata.color}
+  getOptionColour={role => role.uiMetadata?.color}
   {placeholder}
   {error}
   {autoWidth}
diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index 47541735f9..b5d30ff542 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -3,7 +3,7 @@
   import { permissions } from "@/stores/builder"
   import { Constants } from "@budibase/frontend-core"
   import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
-  import { Query } from "@budibase/types"
+  import type { Query } from "@budibase/types"
 
   export let query: Query
   export let label
diff --git a/packages/builder/src/components/integration/KeyValueBuilder.svelte b/packages/builder/src/components/integration/KeyValueBuilder.svelte
index 89039e7d15..6823ccc286 100644
--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@@ -46,17 +46,20 @@
   }))
   let fieldActivity = buildFieldActivity(activity)
 
-  $: fullObject = fields.reduce((acc, next) => {
+  $: fullObject = fields.reduce<Record<string, string>>((acc, next) => {
     acc[next.name] = next.value
     return acc
   }, {})
 
-  $: object = Object.entries(fullObject).reduce((acc, [key, next]) => {
-    if (key) {
-      acc[key] = next
-    }
-    return acc
-  }, {})
+  $: object = Object.entries(fullObject).reduce<Record<string, string>>(
+    (acc, [key, next]) => {
+      if (key) {
+        acc[key] = next
+      }
+      return acc
+    },
+    {}
+  )
 
   function buildFieldActivity(obj: Record<string, boolean>) {
     if (!obj || typeof obj !== "object") {
diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts
index 0ef70c8f86..50c7e7529e 100644
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@@ -60,6 +60,7 @@ export interface RestQueryFields {
   authConfigType?: RestAuthType
   pagination?: PaginationConfig
   paginationValues?: PaginationValues
+  sql?: string
 }
 
 export interface PaginationConfig {

From 561add01c25b64e4ae18ba8e47a197e21ff97f6f Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:48:46 +0100
Subject: [PATCH 18/22] Type query fields

---
 .../api/routes/tests/queries/mongodb.spec.ts  |  2 +-
 packages/types/src/documents/app/query.ts     | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

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 37af4e74e1..457c3b6d7e 100644
--- a/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
@@ -764,7 +764,7 @@ if (descriptions.length) {
         const verbs = ["read", "create", "update", "delete"]
         for (const verb of verbs) {
           const query = await createQuery({
-            fields: { json: {}, extra: { actionType: "invalid" } },
+            fields: { json: {}, extra: { actionType: "invalid" as any } },
             queryVerb: verb,
           })
           await config.api.query.execute(query._id!, undefined, { status: 400 })
diff --git a/packages/types/src/documents/app/query.ts b/packages/types/src/documents/app/query.ts
index 50c7e7529e..c81334289b 100644
--- a/packages/types/src/documents/app/query.ts
+++ b/packages/types/src/documents/app/query.ts
@@ -12,7 +12,7 @@ export interface Query extends Document {
   datasourceId: string
   name: string
   parameters: QueryParameter[]
-  fields: RestQueryFields
+  fields: RestQueryFields & SQLQueryFields & MongoQueryFields
   transformer: string | null
   schema: Record<string, QuerySchema | string>
   nestedSchemaFields?: Record<string, Record<string, QuerySchema | string>>
@@ -60,9 +60,29 @@ export interface RestQueryFields {
   authConfigType?: RestAuthType
   pagination?: PaginationConfig
   paginationValues?: PaginationValues
+}
+export interface SQLQueryFields {
   sql?: string
 }
 
+export interface MongoQueryFields {
+  extra?: {
+    collection?: string
+    actionType:
+      | "findOne"
+      | "find"
+      | "updateOne"
+      | "updateMany"
+      | "findOneAndUpdate"
+      | "count"
+      | "distinct"
+      | "insertOne"
+      | "deleteOne"
+      | "deleteMany"
+  }
+  json?: object | string
+}
+
 export interface PaginationConfig {
   type: string
   location: string

From 7def5b799042925a09666fd3f53b0f6284bd2187 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:50:46 +0100
Subject: [PATCH 19/22] Fix test types

---
 .../server/src/api/routes/tests/queries/rest.spec.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/api/routes/tests/queries/rest.spec.ts b/packages/server/src/api/routes/tests/queries/rest.spec.ts
index 6f489bc723..36057b47b6 100644
--- a/packages/server/src/api/routes/tests/queries/rest.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/rest.spec.ts
@@ -1,6 +1,6 @@
 import * as setup from "../utilities"
 import TestConfiguration from "../../../../tests/utilities/TestConfiguration"
-import { Datasource, SourceName } from "@budibase/types"
+import { BodyType, Datasource, SourceName } from "@budibase/types"
 import { getCachedVariable } from "../../../../threads/utils"
 import nock from "nock"
 import { generator } from "@budibase/backend-core/tests"
@@ -259,7 +259,7 @@ describe("rest", () => {
       readable: true,
       fields: {
         path: "www.example.com",
-        bodyType: "text",
+        bodyType: BodyType.TEXT,
         queryString: "&testParam={{testParam}}",
         requestBody:
           "This is plain text and this is my email: {{[user].[email]}}. This is a test param: {{testParam}}",
@@ -305,7 +305,7 @@ describe("rest", () => {
       readable: true,
       fields: {
         path: "www.example.com",
-        bodyType: "json",
+        bodyType: BodyType.JSON,
         queryString: "&testParam={{testParam}}",
         requestBody:
           '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',
@@ -350,7 +350,7 @@ describe("rest", () => {
       readable: true,
       fields: {
         path: "www.example.com",
-        bodyType: "xml",
+        bodyType: BodyType.XML,
         queryString: "&testParam={{testParam}}",
         requestBody:
           "<note> <email>{{[user].[email]}}</email> <code>{{testParam}}</code> " +
@@ -399,7 +399,7 @@ describe("rest", () => {
       readable: true,
       fields: {
         path: "www.example.com",
-        bodyType: "form",
+        bodyType: BodyType.FORM_DATA,
         queryString: "&testParam={{testParam}}",
         requestBody:
           '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',
@@ -445,7 +445,7 @@ describe("rest", () => {
       readable: true,
       fields: {
         path: "www.example.com",
-        bodyType: "encoded",
+        bodyType: BodyType.ENCODED,
         queryString: "&testParam={{testParam}}",
         requestBody:
           '{"email":"{{[user].[email]}}","queryCode":{{testParam}},"userRef":"{{userRef}}"}',

From e532034ca09255aa074e802e68641f05635491a4 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 09:54:48 +0100
Subject: [PATCH 20/22] Fix AccessLevelSelect types

---
 .../src/components/integration/AccessLevelSelect.svelte   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/components/integration/AccessLevelSelect.svelte b/packages/builder/src/components/integration/AccessLevelSelect.svelte
index b5d30ff542..1510faf40f 100644
--- a/packages/builder/src/components/integration/AccessLevelSelect.svelte
+++ b/packages/builder/src/components/integration/AccessLevelSelect.svelte
@@ -3,7 +3,7 @@
   import { permissions } from "@/stores/builder"
   import { Constants } from "@budibase/frontend-core"
   import RoleSelect from "@/components/design/settings/controls/RoleSelect.svelte"
-  import type { Query } from "@budibase/types"
+  import { PermissionLevel, type Query } from "@budibase/types"
 
   export let query: Query
   export let label
@@ -12,12 +12,12 @@
 
   let roleId: string, loaded: boolean, fetched: Query | undefined
 
-  async function updateRole(role, id) {
+  async function updateRole(role: string) {
     try {
       roleId = role
-      const queryId = query?._id || id
+      const queryId = query._id
       if (roleId && queryId) {
-        for (let level of ["read", "write"]) {
+        for (let level of [PermissionLevel.READ, PermissionLevel.WRITE]) {
           await permissions.save({
             level,
             role,

From d2b1845ffddb9b47b038d96df467e5e0fafa3ebf Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 26 Mar 2025 10:03:49 +0100
Subject: [PATCH 21/22] Remove unnecessary

---
 packages/builder/src/types/svg.d.ts | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 packages/builder/src/types/svg.d.ts

diff --git a/packages/builder/src/types/svg.d.ts b/packages/builder/src/types/svg.d.ts
deleted file mode 100644
index aa39b45040..0000000000
--- a/packages/builder/src/types/svg.d.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-declare module "*.svg" {
-  const content: string
-  export default content
-}

From 5b4e1d905437ec861c1e39b9fbfd8c8f8ee5e7ff Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Thu, 3 Apr 2025 10:50:27 +0200
Subject: [PATCH 22/22] PR comments

---
 packages/server/src/api/routes/tests/queries/mongodb.spec.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 457c3b6d7e..ad48d8563f 100644
--- a/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
+++ b/packages/server/src/api/routes/tests/queries/mongodb.spec.ts
@@ -764,7 +764,8 @@ if (descriptions.length) {
         const verbs = ["read", "create", "update", "delete"]
         for (const verb of verbs) {
           const query = await createQuery({
-            fields: { json: {}, extra: { actionType: "invalid" as any } },
+            // @ts-expect-error
+            fields: { json: {}, extra: { actionType: "invalid" } },
             queryVerb: verb,
           })
           await config.api.query.execute(query._id!, undefined, { status: 400 })