From d8abff1a7569e31204e173a8e02d66f14a0c892a Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 13 Jan 2025 11:26:32 +0100
Subject: [PATCH 1/4] js to ts

---
 packages/client/src/api/{index.js => index.ts}                  | 0
 packages/client/src/api/{patches.js => patches.ts}              | 0
 packages/client/src/components/Block.svelte                     | 2 +-
 packages/client/src/components/app/blocks/CardsBlock.svelte     | 2 +-
 packages/client/src/components/app/deprecated/TableBlock.svelte | 2 +-
 packages/client/src/utils/blocks.js                             | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename packages/client/src/api/{index.js => index.ts} (100%)
 rename packages/client/src/api/{patches.js => patches.ts} (100%)

diff --git a/packages/client/src/api/index.js b/packages/client/src/api/index.ts
similarity index 100%
rename from packages/client/src/api/index.js
rename to packages/client/src/api/index.ts
diff --git a/packages/client/src/api/patches.js b/packages/client/src/api/patches.ts
similarity index 100%
rename from packages/client/src/api/patches.js
rename to packages/client/src/api/patches.ts
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/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/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/utils/blocks.js b/packages/client/src/utils/blocks.js
index 88cf4b095b..2522f3442c 100644
--- a/packages/client/src/utils/blocks.js
+++ b/packages/client/src/utils/blocks.js
@@ -1,5 +1,5 @@
 import { makePropSafe as safe } from "@budibase/string-templates"
-import { API } from "../api/index.js"
+import { API } from "../api"
 import { UILogicalOperator } from "@budibase/types"
 import { Constants } from "@budibase/frontend-core"
 

From 20a226a0a5b0c174d3e7734de374d4880d1560b0 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 13 Jan 2025 11:30:04 +0100
Subject: [PATCH 2/4] Initial typings

---
 packages/client/src/api/patches.ts      | 9 +++++----
 packages/frontend-core/src/api/index.ts | 2 ++
 packages/frontend-core/src/index.ts     | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/api/patches.ts b/packages/client/src/api/patches.ts
index 722167e16d..77061968d7 100644
--- a/packages/client/src/api/patches.ts
+++ 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
diff --git a/packages/frontend-core/src/api/index.ts b/packages/frontend-core/src/api/index.ts
index 6efc90023a..485e4d8b5a 100644
--- a/packages/frontend-core/src/api/index.ts
+++ b/packages/frontend-core/src/api/index.ts
@@ -46,6 +46,8 @@ 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
diff --git a/packages/frontend-core/src/index.ts b/packages/frontend-core/src/index.ts
index c0baa63ab6..fd5595e04d 100644
--- a/packages/frontend-core/src/index.ts
+++ b/packages/frontend-core/src/index.ts
@@ -1,4 +1,5 @@
 export { createAPIClient } from "./api"
+export type { APIClient } from "./api"
 export { fetchData, DataFetchMap } from "./fetch"
 export type { DataFetchType } from "./fetch"
 export * as Constants from "./constants"

From 6b780e686505e57b0276cde4a36c11932dca0bc3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 13 Jan 2025 11:52:15 +0100
Subject: [PATCH 3/4] Add comment

---
 packages/client/src/api/patches.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/api/patches.ts b/packages/client/src/api/patches.ts
index 77061968d7..8f09eb5442 100644
--- a/packages/client/src/api/patches.ts
+++ b/packages/client/src/api/patches.ts
@@ -91,13 +91,14 @@ export const patchAPI = (API: APIClient) => {
     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
       }
     })

From 432f80f1a6876026e1bf27b98141e9e148e35aca Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Mon, 13 Jan 2025 11:59:30 +0100
Subject: [PATCH 4/4] Fix types

---
 packages/client/src/api/patches.ts     | 2 +-
 packages/frontend-core/src/api/self.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/api/patches.ts b/packages/client/src/api/patches.ts
index 8f09eb5442..9482644fa7 100644
--- a/packages/client/src/api/patches.ts
+++ b/packages/client/src/api/patches.ts
@@ -55,7 +55,7 @@ export const patchAPI = (API: APIClient) => {
   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
diff --git a/packages/frontend-core/src/api/self.ts b/packages/frontend-core/src/api/self.ts
index db5b1226eb..0f4ff1f985 100644
--- a/packages/frontend-core/src/api/self.ts
+++ b/packages/frontend-core/src/api/self.ts
@@ -13,7 +13,7 @@ export interface SelfEndpoints {
   generateAPIKey: () => Promise<string | undefined>
   fetchDeveloperInfo: () => Promise<FetchAPIKeyResponse>
   fetchBuilderSelf: () => Promise<GetGlobalSelfResponse>
-  fetchSelf: () => Promise<AppSelfResponse>
+  fetchSelf: () => Promise<AppSelfResponse | null>
 }
 
 export const buildSelfEndpoints = (API: BaseAPIClient): SelfEndpoints => ({