reuse versioned tool selector

Author: icecrasher321

apps/sim/blocks/blocks/github.ts

@@ -1,6 +1,7 @@
 import { GithubIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { GitHubResponse } from '@/tools/github/types'
 import { getTrigger } from '@/triggers'
 
@@ -1347,10 +1348,11 @@ export const GitHubV2Block: BlockConfig<GitHubResponse> = {
     access: (GitHubBlock.tools?.access || []).map((toolId) => `${toolId}_v2`),
     config: {
       ...GitHubBlock.tools?.config,
-      tool: (params) => {
-        const baseToolId = (GitHubBlock.tools?.config as any)?.tool(params)
-        return `${baseToolId}_v2`
-      },
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => (GitHubBlock.tools?.config as any)?.tool(params),
+        suffix: '_v2',
+        fallbackToolId: 'github_create_issue_v2',
+      }),
       params: (GitHubBlock.tools?.config as any)?.params,
     },
   },

apps/sim/blocks/blocks/google_calendar.ts

@@ -1,6 +1,7 @@
 import { GoogleCalendarIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { GoogleCalendarResponse } from '@/tools/google_calendar/types'
 
 export const GoogleCalendarBlock: BlockConfig<GoogleCalendarResponse> = {
@@ -403,19 +404,11 @@ export const GoogleCalendarV2Block: BlockConfig<GoogleCalendarResponse> = {
     ],
     config: {
       ...GoogleCalendarBlock.tools?.config,
-      tool: (params) => {
-        const operation = params.operation || 'create'
-        if (
-          operation !== 'create' &&
-          operation !== 'list' &&
-          operation !== 'get' &&
-          operation !== 'quick_add' &&
-          operation !== 'invite'
-        ) {
-          throw new Error(`Invalid Google Calendar operation: ${operation}`)
-        }
-        return `google_calendar_${operation}_v2`
-      },
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => `google_calendar_${params.operation || 'create'}`,
+        suffix: '_v2',
+        fallbackToolId: 'google_calendar_create_v2',
+      }),
       params: GoogleCalendarBlock.tools?.config?.params,
     },
   },

apps/sim/blocks/blocks/notion.ts

@@ -1,6 +1,7 @@
 import { NotionIcon } from '@/components/icons'
 import type { BlockConfig } from '@/blocks/types'
 import { AuthMode } from '@/blocks/types'
+import { createVersionedToolSelector } from '@/blocks/utils'
 import type { NotionResponse } from '@/tools/notion/types'
 
 // Legacy block - hidden from toolbar
@@ -385,26 +386,11 @@ export const NotionV2Block: BlockConfig<any> = {
       'notion_create_database_v2',
     ],
     config: {
-      tool: (params) => {
-        switch (params.operation) {
-          case 'notion_read':
-            return 'notion_read_v2'
-          case 'notion_read_database':
-            return 'notion_read_database_v2'
-          case 'notion_write':
-            return 'notion_write_v2'
-          case 'notion_create_page':
-            return 'notion_create_page_v2'
-          case 'notion_query_database':
-            return 'notion_query_database_v2'
-          case 'notion_search':
-            return 'notion_search_v2'
-          case 'notion_create_database':
-            return 'notion_create_database_v2'
-          default:
-            return 'notion_read_v2'
-        }
-      },
+      tool: createVersionedToolSelector({
+        baseToolSelector: (params) => params.operation || 'notion_read',
+        suffix: '_v2',
+        fallbackToolId: 'notion_read_v2',
+      }),
       params: NotionBlock.tools?.config?.params,
     },
   },