From af0312e5fe501e1b0f739b1c391877023f388186 Mon Sep 17 00:00:00 2001
From: Adria Navarro <adria@budibase.com>
Date: Wed, 8 Jan 2025 13:48:45 +0100
Subject: [PATCH] Proper type QueryArrayFetch

---
 packages/frontend-core/src/fetch/QueryArrayFetch.ts | 10 +++++-----
 packages/frontend-core/src/utils/json.d.ts          | 13 +++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 packages/frontend-core/src/utils/json.d.ts

diff --git a/packages/frontend-core/src/fetch/QueryArrayFetch.ts b/packages/frontend-core/src/fetch/QueryArrayFetch.ts
index 15f86ae7fc..ce9177e554 100644
--- a/packages/frontend-core/src/fetch/QueryArrayFetch.ts
+++ b/packages/frontend-core/src/fetch/QueryArrayFetch.ts
@@ -14,12 +14,12 @@ 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
       )
-      const result: {
-        schema: Record<string, any> | null
-      } = { schema: getJSONArrayDatasourceSchema(schema, datasource) }
+      const result = {
+        schema: getJSONArrayDatasourceSchema(schema, datasource),
+      }
 
       return result
     } catch (error) {
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..ebda694c15
--- /dev/null
+++ b/packages/frontend-core/src/utils/json.d.ts
@@ -0,0 +1,13 @@
+import { QuerySchema } from "@budibase/types"
+
+type Schema = Record<string, QuerySchema | string>
+
+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