fix onedrive

Author: icecrasher321

apps/sim/app/api/tools/onedrive/upload/route.ts

@@ -6,21 +6,30 @@ import { createLogger } from '@/lib/logs/console/logger'
 import { processSingleFileToUserFile } from '@/lib/uploads/utils/file-utils'
 import { downloadFileFromStorage } from '@/lib/uploads/utils/file-utils.server'
 import { generateRequestId } from '@/lib/utils'
+import { normalizeExcelValues } from '@/tools/onedrive/utils'
 
 export const dynamic = 'force-dynamic'
 
 const logger = createLogger('OneDriveUploadAPI')
 
 const MICROSOFT_GRAPH_BASE = 'https://graph.microsoft.com/v1.0'
 
+const ExcelCellSchema = z.union([z.string(), z.number(), z.boolean(), z.null()])
+const ExcelRowSchema = z.array(ExcelCellSchema)
+const ExcelValuesSchema = z.union([
+  z.string(),
+  z.array(ExcelRowSchema),
+  z.array(z.record(ExcelCellSchema)),
+])
+
 const OneDriveUploadSchema = z.object({
   accessToken: z.string().min(1, 'Access token is required'),
   fileName: z.string().min(1, 'File name is required'),
   file: z.any().optional(), // UserFile object (optional for blank Excel creation)
   folderId: z.string().optional().nullable(),
   mimeType: z.string().optional(),
   // Optional Excel write-after-create inputs
-  values: z.array(z.array(z.union([z.string(), z.number(), z.boolean(), z.null()]))).optional(),
+  values: ExcelValuesSchema.optional(),
 })
 
 export async function POST(request: NextRequest) {
@@ -46,6 +55,7 @@ export async function POST(request: NextRequest) {
 
     const body = await request.json()
     const validatedData = OneDriveUploadSchema.parse(body)
+    const excelValues = normalizeExcelValues(validatedData.values)
 
     let fileBuffer: Buffer
     let mimeType: string
@@ -180,7 +190,7 @@ export async function POST(request: NextRequest) {
     // If this is an Excel creation and values were provided, write them using the Excel API
     let excelWriteResult: any | undefined
     const shouldWriteExcelContent =
-      isExcelCreation && Array.isArray(validatedData.values) && validatedData.values.length > 0
+      isExcelCreation && Array.isArray(excelValues) && excelValues.length > 0
 
     if (shouldWriteExcelContent) {
       try {
@@ -232,7 +242,7 @@ export async function POST(request: NextRequest) {
           logger.warn(`[${requestId}] Error listing worksheets, using default Sheet1`, listError)
         }
 
-        let processedValues: any = validatedData.values || []
+        let processedValues: any = excelValues || []
 
         if (
           Array.isArray(processedValues) &&

apps/sim/blocks/blocks/onedrive.ts

@@ -2,46 +2,11 @@ import { MicrosoftOneDriveIcon } from '@/components/icons'
 import { createLogger } from '@/lib/logs/console/logger'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
-import type { OneDriveResponse, OneDriveToolParams } from '@/tools/onedrive/types'
+import type { OneDriveResponse } from '@/tools/onedrive/types'
+import { normalizeExcelValuesForToolParams } from '@/tools/onedrive/utils'
 
 const logger = createLogger('OneDriveBlock')
 
-type ExcelValues = OneDriveToolParams['values']
-
-/**
- * Normalizes Excel values so that downstream tooling always receives an array.
- */
-function normalizeExcelValues(values: unknown): ExcelValues | undefined {
-  if (values === null || values === undefined || values === '') {
-    return undefined
-  }
-
-  if (Array.isArray(values)) {
-    return values as ExcelValues
-  }
-
-  if (typeof values === 'string') {
-    const trimmed = values.trim()
-    if (!trimmed) {
-      return undefined
-    }
-
-    try {
-      const parsed = JSON.parse(trimmed)
-
-      if (!Array.isArray(parsed)) {
-        throw new Error('Excel values must be an array of rows or array of objects')
-      }
-
-      return parsed as ExcelValues
-    } catch (_error) {
-      throw new Error('Invalid JSON format for values')
-    }
-  }
-
-  throw new Error('Excel values must be an array of rows or array of objects')
-}
-
 export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
   type: 'onedrive',
   name: 'OneDrive',
@@ -387,9 +352,9 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
       params: (params) => {
         const { credential, folderId, fileId, mimeType, values, downloadFileName, ...rest } = params
 
-        let normalizedValues: ExcelValues | undefined
+        let normalizedValues: ReturnType<typeof normalizeExcelValuesForToolParams>
         if (values !== undefined) {
-          normalizedValues = normalizeExcelValues(values)
+          normalizedValues = normalizeExcelValuesForToolParams(values)
         }
 
         return {

apps/sim/tools/onedrive/utils.ts

@@ -0,0 +1,49 @@
+import type { OneDriveToolParams } from '@/tools/onedrive/types'
+
+export type ExcelCell = string | number | boolean | null
+export type ExcelArrayValues = ExcelCell[][]
+export type ExcelObjectValues = Array<Record<string, ExcelCell>>
+export type NormalizedExcelValues = ExcelArrayValues | ExcelObjectValues
+
+/**
+ * Ensures Excel values are always represented as arrays before hitting downstream tooling.
+ * Accepts JSON strings, array-of-arrays, or array-of-objects and normalizes them.
+ */
+export function normalizeExcelValues(values: unknown): NormalizedExcelValues | undefined {
+  if (values === null || values === undefined) {
+    return undefined
+  }
+
+  if (typeof values === 'string') {
+    const trimmed = values.trim()
+    if (!trimmed) {
+      return undefined
+    }
+
+    try {
+      const parsed = JSON.parse(trimmed)
+      if (!Array.isArray(parsed)) {
+        throw new Error('Excel values must be an array of rows or array of objects')
+      }
+      return parsed as NormalizedExcelValues
+    } catch (_error) {
+      throw new Error('Invalid JSON format for values')
+    }
+  }
+
+  if (Array.isArray(values)) {
+    return values as NormalizedExcelValues
+  }
+
+  throw new Error('Excel values must be an array of rows or array of objects')
+}
+
+/**
+ * Convenience helper for contexts that expect the narrower ToolParams typing.
+ */
+export function normalizeExcelValuesForToolParams(
+  values: unknown
+): OneDriveToolParams['values'] | undefined {
+  const normalized = normalizeExcelValues(values)
+  return normalized as OneDriveToolParams['values'] | undefined
+}