From 364e997fc2f338d051cfd32c36f3a066c4323375 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Tue, 7 Jan 2025 12:41:37 +0100
Subject: [PATCH] Type jsonArrayFetch

---
 packages/client/src/utils/schema.js                  |  2 +-
 packages/frontend-core/src/fetch/FieldFetch.ts       | 12 +++++++++---
 .../fetch/{JSONArrayFetch.js => JSONArrayFetch.ts}   |  9 ++++++---
 packages/frontend-core/src/fetch/index.ts            |  2 +-
 4 files changed, 17 insertions(+), 8 deletions(-)
 rename packages/frontend-core/src/fetch/{JSONArrayFetch.js => JSONArrayFetch.ts} (63%)

diff --git a/packages/client/src/utils/schema.js b/packages/client/src/utils/schema.js
index 3a1b5acaaa..f9cd7dbc60 100644
--- a/packages/client/src/utils/schema.js
+++ b/packages/client/src/utils/schema.js
@@ -5,7 +5,7 @@ import QueryFetch from "@budibase/frontend-core/src/fetch/QueryFetch"
 import RelationshipFetch from "@budibase/frontend-core/src/fetch/RelationshipFetch"
 import NestedProviderFetch from "@budibase/frontend-core/src/fetch/NestedProviderFetch.js"
 import FieldFetch from "@budibase/frontend-core/src/fetch/FieldFetch"
-import JSONArrayFetch from "@budibase/frontend-core/src/fetch/JSONArrayFetch.js"
+import JSONArrayFetch from "@budibase/frontend-core/src/fetch/JSONArrayFetch"
 import ViewV2Fetch from "@budibase/frontend-core/src/fetch/ViewV2Fetch"
 import QueryArrayFetch from "@budibase/frontend-core/src/fetch/QueryArrayFetch"
 
diff --git a/packages/frontend-core/src/fetch/FieldFetch.ts b/packages/frontend-core/src/fetch/FieldFetch.ts
index 5e89d6e881..6809dee00e 100644
--- a/packages/frontend-core/src/fetch/FieldFetch.ts
+++ b/packages/frontend-core/src/fetch/FieldFetch.ts
@@ -7,13 +7,17 @@ export interface FieldDatasource {
   value: string[] | Row[]
 }
 
+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 extends DataFetch<
   FieldDatasource,
-  { schema?: Record<string, { type: string }> }
+  FieldDefinition
 > {
   getSchema(
     _datasource: FieldDatasource,
@@ -22,9 +26,11 @@ export default class FieldFetch extends DataFetch<
     return definition?.schema
   }
 
-  async getDefinition(datasource: FieldDatasource) {
+  async getDefinition(
+    datasource: FieldDatasource
+  ): Promise<FieldDefinition | null> {
     // Field sources have their schema statically defined
-    let schema: Record<string, { type: string }> | undefined
+    let schema
     if (datasource.fieldType === "attachment") {
       schema = {
         url: {
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 f7de74a4b8..a254bc3ae4 100644
--- a/packages/frontend-core/src/fetch/JSONArrayFetch.js
+++ b/packages/frontend-core/src/fetch/JSONArrayFetch.ts
@@ -1,13 +1,16 @@
-import FieldFetch from "./FieldFetch"
+import FieldFetch, { FieldDatasource } from "./FieldFetch"
 import { getJSONArrayDatasourceSchema } from "../utils/json"
 
 export default class JSONArrayFetch extends FieldFetch {
-  async getDefinition(datasource) {
+  async getDefinition(datasource: FieldDatasource) {
     // JSON arrays need their table definitions fetched.
     // We can then extract their schema as a subset of the table schema.
     try {
       const table = await this.API.fetchTableDefinition(datasource.tableId)
-      const schema = getJSONArrayDatasourceSchema(table?.schema, datasource)
+      const schema: Record<string, any> | null = getJSONArrayDatasourceSchema(
+        table?.schema,
+        datasource
+      )
       return { schema }
     } catch (error) {
       return null
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
index fc029324ba..3976adc3d9 100644
--- a/packages/frontend-core/src/fetch/index.ts
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -5,7 +5,7 @@ import QueryFetch from "./QueryFetch"
 import RelationshipFetch from "./RelationshipFetch"
 import NestedProviderFetch from "./NestedProviderFetch.js"
 import FieldFetch from "./FieldFetch"
-import JSONArrayFetch from "./JSONArrayFetch.js"
+import JSONArrayFetch from "./JSONArrayFetch"
 import UserFetch from "./UserFetch.js"
 import GroupUserFetch from "./GroupUserFetch"
 import CustomFetch from "./CustomFetch.js"