11import { AthenaIcon } from '@/components/icons'
22import type { BlockConfig , BlockMeta } from '@/blocks/types'
33import { AuthMode , IntegrationType } from '@/blocks/types'
4- import { withSavedCredential } from '@/blocks/utils'
4+ import { mapperOperation , toolCallArg , withSavedCredential } from '@/blocks/utils'
55
66/**
77 * Normalizes a switch value that may arrive as a boolean or as the strings 'true' / 'false'.
@@ -681,8 +681,9 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
681681 throw new Error ( `Invalid Athena operation: ${ params . operation } ` )
682682 }
683683 } ,
684- params : ( params ) => {
685- const { operation, maxResults, ...rest } = params
684+ params : ( params , context ) => {
685+ const { maxResults, ...rest } = params
686+ const operation = mapperOperation ( params , context )
686687
687688 const awsRegion = rest . awsRegion
688689 const awsAccessKeyId = rest . awsAccessKeyId
@@ -696,6 +697,9 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
696697 rest . resultReuseMaxAgeInMinutes !== ''
697698 ? Number . parseInt ( String ( rest . resultReuseMaxAgeInMinutes ) , 10 )
698699 : undefined
700+ const queryName = rest . queryName || toolCallArg ( context , rest . name )
701+ const queryDescription = rest . queryDescription || toolCallArg ( context , rest . description )
702+ const workGroupName = rest . workGroupName || toolCallArg ( context , rest . workGroup )
699703
700704 switch ( operation ) {
701705 case 'start_query' :
@@ -766,7 +770,7 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
766770 }
767771
768772 case 'create_named_query' : {
769- if ( ! rest . queryName ) {
773+ if ( ! queryName ) {
770774 throw new Error ( 'Query name is required' )
771775 }
772776 if ( ! rest . database ) {
@@ -779,10 +783,10 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
779783 awsRegion,
780784 awsAccessKeyId,
781785 awsSecretAccessKey,
782- name : rest . queryName ,
786+ name : queryName ,
783787 database : rest . database ,
784788 queryString : rest . queryString ,
785- ...( rest . queryDescription && { description : rest . queryDescription } ) ,
789+ ...( queryDescription && { description : queryDescription } ) ,
786790 ...( rest . workGroup && { workGroup : rest . workGroup } ) ,
787791 }
788792 }
@@ -879,7 +883,7 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
879883 if ( ! rest . namedQueryId ) {
880884 throw new Error ( 'Named query ID is required' )
881885 }
882- if ( ! rest . queryName ) {
886+ if ( ! queryName ) {
883887 throw new Error ( 'Query name is required' )
884888 }
885889 if ( ! rest . queryString ) {
@@ -888,64 +892,66 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
888892 return {
889893 ...connection ,
890894 namedQueryId : rest . namedQueryId ,
891- name : rest . queryName ,
895+ name : queryName ,
892896 queryString : rest . queryString ,
893- ...( rest . queryDescription && { description : rest . queryDescription } ) ,
897+ ...( queryDescription && { description : queryDescription } ) ,
894898 }
895899
896900 case 'create_prepared_statement' :
897- case 'update_prepared_statement' :
901+ case 'update_prepared_statement' : {
902+ const queryStatement = rest . queryString || toolCallArg ( context , rest . queryStatement )
898903 if ( ! rest . statementName ) {
899904 throw new Error ( 'Statement name is required' )
900905 }
901- if ( ! rest . workGroupName ) {
906+ if ( ! workGroupName ) {
902907 throw new Error ( 'Workgroup is required' )
903908 }
904- if ( ! rest . queryString ) {
909+ if ( ! queryStatement ) {
905910 throw new Error ( 'SQL query statement is required' )
906911 }
907912 return {
908913 ...connection ,
909914 statementName : rest . statementName ,
910- workGroup : rest . workGroupName ,
911- queryStatement : rest . queryString ,
912- ...( rest . queryDescription && { description : rest . queryDescription } ) ,
915+ workGroup : workGroupName ,
916+ queryStatement,
917+ ...( queryDescription && { description : queryDescription } ) ,
913918 }
919+ }
914920
915921 case 'get_prepared_statement' :
916922 case 'delete_prepared_statement' :
917923 if ( ! rest . statementName ) {
918924 throw new Error ( 'Statement name is required' )
919925 }
920- if ( ! rest . workGroupName ) {
926+ if ( ! workGroupName ) {
921927 throw new Error ( 'Workgroup is required' )
922928 }
923929 return {
924930 ...connection ,
925931 statementName : rest . statementName ,
926- workGroup : rest . workGroupName ,
932+ workGroup : workGroupName ,
927933 }
928934
929935 case 'batch_get_prepared_statement' :
930936 if ( ! rest . preparedStatementNames ) {
931937 throw new Error ( 'Statement names are required' )
932938 }
933- if ( ! rest . workGroupName ) {
939+ if ( ! workGroupName ) {
934940 throw new Error ( 'Workgroup is required' )
935941 }
936942 return {
937943 ...connection ,
938944 preparedStatementNames : rest . preparedStatementNames ,
939- workGroup : rest . workGroupName ,
945+ workGroup : workGroupName ,
940946 }
941947
942948 case 'list_prepared_statements' :
943- if ( ! rest . workGroupName ) {
949+ if ( ! workGroupName ) {
944950 throw new Error ( 'Workgroup is required' )
945951 }
946952 return {
947953 ...connection ,
948- workGroup : rest . workGroupName ,
954+ workGroup : workGroupName ,
949955 ...( parsedMaxResults !== undefined && { maxResults : parsedMaxResults } ) ,
950956 ...( rest . nextToken && { nextToken : rest . nextToken } ) ,
951957 }
@@ -958,15 +964,17 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
958964 ...( rest . nextToken && { nextToken : rest . nextToken } ) ,
959965 }
960966
961- case 'get_data_catalog' :
962- if ( ! rest . catalogName ) {
967+ case 'get_data_catalog' : {
968+ const catalogName = rest . catalogName || toolCallArg ( context , rest . name )
969+ if ( ! catalogName ) {
963970 throw new Error ( 'Data catalog name is required' )
964971 }
965972 return {
966973 ...connection ,
967- name : rest . catalogName ,
974+ name : catalogName ,
968975 ...( rest . workGroup && { workGroup : rest . workGroup } ) ,
969976 }
977+ }
970978
971979 case 'get_database' :
972980 if ( ! rest . catalogName ) {
@@ -1008,10 +1016,10 @@ Return ONLY a JSON array of strings — no explanations, no markdown code blocks
10081016 }
10091017
10101018 case 'get_work_group' :
1011- if ( ! rest . workGroupName ) {
1019+ if ( ! workGroupName ) {
10121020 throw new Error ( 'Workgroup is required' )
10131021 }
1014- return { ...connection , workGroup : rest . workGroupName }
1022+ return { ...connection , workGroup : workGroupName }
10151023
10161024 default :
10171025 throw new Error ( `Invalid Athena operation: ${ operation } ` )
0 commit comments