Skip to content

Commit 89e691a

Browse files
committed
update executeOperation API to return executeOperationResponse
1 parent 786c75f commit 89e691a

File tree

4 files changed

+28
-11
lines changed

4 files changed

+28
-11
lines changed

etc/firebase-admin.data-connect.api.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ export class DataConnect {
2828
readonly connectorConfig: ConnectorConfig;
2929
executeGraphql<GraphqlResponse, Variables>(query: string, options?: GraphqlOptions<Variables>): Promise<ExecuteGraphqlResponse<GraphqlResponse>>;
3030
executeGraphqlRead<GraphqlResponse, Variables>(query: string, options?: GraphqlOptions<Variables>): Promise<ExecuteGraphqlResponse<GraphqlResponse>>;
31-
executeMutation<Data>(name: string, options?: OperationOptions): Promise<ExecuteGraphqlResponse<Data>>;
32-
executeMutation<Data, Variables>(name: string, variables: Variables, options?: OperationOptions): Promise<ExecuteGraphqlResponse<Data>>;
33-
executeQuery<Data>(name: string, options?: OperationOptions): Promise<ExecuteGraphqlResponse<Data>>;
34-
executeQuery<Data, Variables>(name: string, variables: Variables, options?: OperationOptions): Promise<ExecuteGraphqlResponse<Data>>;
31+
executeMutation<Data>(name: string, options?: OperationOptions): Promise<ExecuteOperationResponse<Data>>;
32+
executeMutation<Data, Variables>(name: string, variables: Variables, options?: OperationOptions): Promise<ExecuteOperationResponse<Data>>;
33+
executeQuery<Data>(name: string, options?: OperationOptions): Promise<ExecuteOperationResponse<Data>>;
34+
executeQuery<Data, Variables>(name: string, variables: Variables, options?: OperationOptions): Promise<ExecuteOperationResponse<Data>>;
3535
insert<GraphQlResponse, Variables extends object>(tableName: string, variables: Variables): Promise<ExecuteGraphqlResponse<GraphQlResponse>>;
3636
insertMany<GraphQlResponse, Variables extends Array<unknown>>(tableName: string, variables: Variables): Promise<ExecuteGraphqlResponse<GraphQlResponse>>;
3737
upsert<GraphQlResponse, Variables extends object>(tableName: string, variables: Variables): Promise<ExecuteGraphqlResponse<GraphQlResponse>>;
@@ -43,6 +43,11 @@ export interface ExecuteGraphqlResponse<GraphqlResponse> {
4343
data: GraphqlResponse;
4444
}
4545

46+
// @public
47+
export interface ExecuteOperationResponse<GraphqlResponse> {
48+
data: GraphqlResponse;
49+
}
50+
4651
// @public
4752
export function getDataConnect(connectorConfig: ConnectorConfig, app?: App): DataConnect;
4853

src/data-connect/data-connect-api.ts

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ export interface ConnectorConfig {
3838
}
3939

4040
/**
41-
* Interface representing GraphQL response.
41+
* Interface representing ExecuteGraphQL response.
4242
*/
4343
export interface ExecuteGraphqlResponse<GraphqlResponse> {
4444
/**
@@ -47,6 +47,16 @@ export interface ExecuteGraphqlResponse<GraphqlResponse> {
4747
data: GraphqlResponse;
4848
}
4949

50+
/**
51+
* Interface representing ExecuteOperation response.
52+
*/
53+
export interface ExecuteOperationResponse<GraphqlResponse> {
54+
/**
55+
* Data payload of the GraphQL response.
56+
*/
57+
data: GraphqlResponse;
58+
}
59+
5060
/**
5161
* Interface representing GraphQL options for executing arbitrary GraphQL operations.
5262
*/

src/data-connect/data-connect.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import { DataConnectApiClient } from './data-connect-api-client-internal';
2121
import {
2222
ConnectorConfig,
2323
ExecuteGraphqlResponse,
24+
ExecuteOperationResponse,
2425
GraphqlOptions,
2526
OperationOptions,
2627
} from './data-connect-api';
@@ -178,7 +179,7 @@ export class DataConnect {
178179
public executeQuery<Data>(
179180
name: string,
180181
options?: OperationOptions
181-
): Promise<ExecuteGraphqlResponse<Data>>;
182+
): Promise<ExecuteOperationResponse<Data>>;
182183

183184
/**
184185
* Executes a pre-defined GraphQL query, optionally with auth impersonation.
@@ -193,13 +194,13 @@ export class DataConnect {
193194
name: string,
194195
variables: Variables,
195196
options?: OperationOptions
196-
): Promise<ExecuteGraphqlResponse<Data>>;
197+
): Promise<ExecuteOperationResponse<Data>>;
197198

198199
public executeQuery<Data, Variables>(
199200
name: string,
200201
variables: Variables,
201202
options?: OperationOptions
202-
): Promise<ExecuteGraphqlResponse<Data>> {
203+
): Promise<ExecuteOperationResponse<Data>> {
203204
return this.client.executeQuery<Data, Variables>(name, variables, options);
204205
}
205206

@@ -214,7 +215,7 @@ export class DataConnect {
214215
public executeMutation<Data>(
215216
name: string,
216217
options?: OperationOptions
217-
): Promise<ExecuteGraphqlResponse<Data>>;
218+
): Promise<ExecuteOperationResponse<Data>>;
218219

219220
/**
220221
* Executes a pre-defined GraphQL mutation, optionally with auth impersonation.
@@ -229,13 +230,13 @@ export class DataConnect {
229230
name: string,
230231
variables: Variables,
231232
options?: OperationOptions
232-
): Promise<ExecuteGraphqlResponse<Data>>;
233+
): Promise<ExecuteOperationResponse<Data>>;
233234

234235
public executeMutation<Data, Variables>(
235236
name: string,
236237
variables: Variables,
237238
options?: OperationOptions
238-
): Promise<ExecuteGraphqlResponse<Data>> {
239+
): Promise<ExecuteOperationResponse<Data>> {
239240
return this.client.executeMutation<Data, Variables>(name, variables, options);
240241
}
241242
}

src/data-connect/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import { ConnectorConfig } from './data-connect-api';
2929
export {
3030
GraphqlOptions,
3131
ExecuteGraphqlResponse,
32+
ExecuteOperationResponse,
3233
ConnectorConfig,
3334
ImpersonateAuthenticated,
3435
ImpersonateUnauthenticated,

0 commit comments

Comments
 (0)