From 543660dc2e9448730eb89e71402d5f753acf16b3 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Fri, 3 Jan 2025 12:34:36 +0100
Subject: [PATCH] Convert fieldFetch

---
 .../fetch/{FieldFetch.js => FieldFetch.ts}    | 30 +++++++++++++++----
 .../frontend-core/src/fetch/JSONArrayFetch.js |  2 +-
 .../src/fetch/QueryArrayFetch.js              |  2 +-
 packages/frontend-core/src/fetch/index.ts     |  2 +-
 4 files changed, 28 insertions(+), 8 deletions(-)
 rename packages/frontend-core/src/fetch/{FieldFetch.js => FieldFetch.ts} (52%)

diff --git a/packages/frontend-core/src/fetch/FieldFetch.js b/packages/frontend-core/src/fetch/FieldFetch.ts
similarity index 52%
rename from packages/frontend-core/src/fetch/FieldFetch.js
rename to packages/frontend-core/src/fetch/FieldFetch.ts
index 7c9d715761..7f0dfdf331 100644
--- a/packages/frontend-core/src/fetch/FieldFetch.js
+++ b/packages/frontend-core/src/fetch/FieldFetch.ts
@@ -1,9 +1,29 @@
+import { Row, TableSchema } from "@budibase/types"
 import DataFetch from "./DataFetch"
 
-export default class FieldFetch extends DataFetch {
-  async getDefinition(datasource) {
+interface FieldDatasource {
+  fieldType: "attachment" | "array"
+  value: string[] | Row[]
+}
+
+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 }> }
+> {
+  getSchema(
+    _datasource: FieldDatasource,
+    definition: { schema?: TableSchema }
+  ) {
+    return definition?.schema
+  }
+
+  async getDefinition(datasource: FieldDatasource) {
     // Field sources have their schema statically defined
-    let schema
+    let schema: Record<string, { type: string }> | undefined
     if (datasource.fieldType === "attachment") {
       schema = {
         url: {
@@ -28,8 +48,8 @@ export default class FieldFetch extends DataFetch {
 
     // These sources will be available directly from context
     const data = datasource?.value || []
-    let rows
-    if (Array.isArray(data) && data[0] && typeof data[0] !== "object") {
+    let rows: Row[]
+    if (isArrayOfStrings(data)) {
       rows = data.map(value => ({ value }))
     } else {
       rows = data
diff --git a/packages/frontend-core/src/fetch/JSONArrayFetch.js b/packages/frontend-core/src/fetch/JSONArrayFetch.js
index ab2af3e2c7..f7de74a4b8 100644
--- a/packages/frontend-core/src/fetch/JSONArrayFetch.js
+++ b/packages/frontend-core/src/fetch/JSONArrayFetch.js
@@ -1,4 +1,4 @@
-import FieldFetch from "./FieldFetch.js"
+import FieldFetch from "./FieldFetch"
 import { getJSONArrayDatasourceSchema } from "../utils/json"
 
 export default class JSONArrayFetch extends FieldFetch {
diff --git a/packages/frontend-core/src/fetch/QueryArrayFetch.js b/packages/frontend-core/src/fetch/QueryArrayFetch.js
index 0b36b640a6..222697b78f 100644
--- a/packages/frontend-core/src/fetch/QueryArrayFetch.js
+++ b/packages/frontend-core/src/fetch/QueryArrayFetch.js
@@ -1,4 +1,4 @@
-import FieldFetch from "./FieldFetch.js"
+import FieldFetch from "./FieldFetch"
 import {
   getJSONArrayDatasourceSchema,
   generateQueryArraySchemas,
diff --git a/packages/frontend-core/src/fetch/index.ts b/packages/frontend-core/src/fetch/index.ts
index a08748a77e..502b2d3162 100644
--- a/packages/frontend-core/src/fetch/index.ts
+++ b/packages/frontend-core/src/fetch/index.ts
@@ -4,7 +4,7 @@ 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 FieldFetch from "./FieldFetch"
 import JSONArrayFetch from "./JSONArrayFetch.js"
 import UserFetch from "./UserFetch.js"
 import GroupUserFetch from "./GroupUserFetch.js"