Draft: Implemented the initialization API and 'querRef' function; refactored and renamed the 'executeGraphqlHelper' function to support the 'executeQuery' and 'executeMutation' functions.

Author: FOLUSO ONATEMOWO

.gitignore

@@ -20,3 +20,4 @@ test/resources/appid.txt
 firebase-admin-*.tgz
 
 docgen/markdown/
+service_account.json

dataconnect_test.ts

@@ -4,15 +4,19 @@ const { initializeApp } = require('./lib/app');
 const app = initializeApp();
 
 const config = {
-    serviceId: "your-service-id",
-    location: "us-central1",
-    connector:"movie-connector"
+    serviceId: "<your-service-id>",
+    location: "<us-central>",
+    // connector:"<connector?"
 };
 
-const dataConnect = getDataConnect({
-    connectorConfig: config
-});
+// const dataConnect = getDataConnect(config);
 
-const listOfMovies = dataConnect.queryRef('ListMovies').execute();
+// async function queryref_test (){
+//     // const listOfMovies_res = await dataConnect.queryRef('ListMovies', {orderByRating: "DESC",orderByReleaseYear: "DESC", limit: 3}).execute();
+//     // const getActorsDetails = await dataConnect.queryRef('GetActorById', {id: "11111111222233334444555555555555"}).execute()
+//     const graphqlRead_listOfMovies_res = await dataConnect.executeGraphqlRead(" query { movies {id, title}}");
 
-console.log(listOfMovies)
+//     console.log(graphqlRead_listOfMovies_res.data)
+// }
+
+// queryref_test()

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

@@ -41,7 +41,7 @@ const FIREBASE_DATA_CONNECT_EMULATOR_BASE_URL_FORMAT =
 
 /** Firebase Data Connect base URl format when using the Data Connect emulator including a connector. */
 const FIREBASE_DATA_CONNECT_EMULATOR_BASE_URL_FORMAT_WITH_CONNECTOR =
-  'http://{host}/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}/connectors/${connector}:{endpointId}';
+  'http://{host}/{version}/projects/{projectId}/locations/{locationId}/services/{serviceId}/connectors/{connector}:{endpointId}';
 
 const EXECUTE_GRAPH_QL_ENDPOINT = 'executeGraphql';
 const EXECUTE_GRAPH_QL_READ_ENDPOINT = 'executeGraphqlRead';
@@ -96,7 +96,8 @@ export class DataConnectApiClient {
     query: string,
     options?: GraphqlOptions<Variables>,
   ): Promise<ExecuteGraphqlResponse<GraphqlResponse>> {
-    return this.executeGraphqlHelper(query, EXECUTE_GRAPH_QL_READ_ENDPOINT, options);
+    // return this.executeGraphqlHelper(query, EXECUTE_GRAPH_QL_READ_ENDPOINT, options);
+    return this.executeHelper(EXECUTE_GRAPH_QL_READ_ENDPOINT,options, query);
   }
 
     /**
@@ -114,17 +115,22 @@ export class DataConnectApiClient {
     options?: GraphqlOptions<Variables>,
     gql?: string
   ): Promise<ExecuteGraphqlResponse<GraphqlResponse>> {
-    if (!validator.isNonEmptyString(gql)) {
+    if (!validator.isNonEmptyString(gql) && typeof options == 'undefined') {
       throw new FirebaseDataConnectError(
         DATA_CONNECT_ERROR_CODE_MAPPING.INVALID_ARGUMENT,
-        '`query` must be a non-empty string.');
-    }
-    if (typeof options !== 'undefined') {
+        '`gql` must be a non-empty string or GraphqlOptions should be a non-null object');
+    } //How would we steer them in the right direction or let them know which area makes the most sense to follow for what they are trying to accomplish? they might want gql to be empty and the message should say
+    if (typeof options !== 'undefined' && !validator.isNonEmptyString(gql)) {
       if (!validator.isNonNullObject(options)) {
         throw new FirebaseDataConnectError(
           DATA_CONNECT_ERROR_CODE_MAPPING.INVALID_ARGUMENT,
           'GraphqlOptions must be a non-null object');
       }
+      if (!("operationName" in options)) {
+        throw new FirebaseDataConnectError(
+          DATA_CONNECT_ERROR_CODE_MAPPING.INVALID_ARGUMENT,
+          '`gql` missing thus GraphqlOptions must contain `operationName`.');//Is this too descriptive?
+      }
     }
     const data = {
       query: gql,
@@ -157,6 +163,7 @@ export class DataConnectApiClient {
         return resp;
       })
       .catch((err) => {
+        console.log(err)
         throw this.toFirebaseError(err);
       });
   }

src/data-connect/data-connect.ts

@@ -180,7 +180,7 @@ export class DataConnect {
    * @returns QueryRef
    */
   public queryRef<Data, Variables>(name: string, variables?: Variables): QueryRef<Data, Variables> {
-    console.log(this)
+    // console.log(this)
     if (!("connector" in this.connectorConfig)){
       throw new FirebaseDataConnectError(DATA_CONNECT_ERROR_CODE_MAPPING.INVALID_ARGUMENT,'executeQuery requires a connector');
     }
@@ -242,7 +242,7 @@ class QueryRef<Data, Variables> extends OperationRef<Data, Variables> {
       operationName: this.name
     };
     const {data} = await this.client.executeQuery<Data, Variables>(option_params)
-
+    
     return {
       ref: this,
       data: data,

src/data-connect/index.ts

@@ -71,6 +71,15 @@ export {
  * @returns The default `DataConnect` service with the provided connector configuration
  *  if no app is provided, or the `DataConnect` service associated with the provided app.
  */
+// export function getDataConnect(connectorConfig: ConnectorConfig, app?: App): DataConnect {
+//   if (typeof app === 'undefined') {
+//     app = getApp();
+//   }
+
+//   const firebaseApp: FirebaseApp = app as FirebaseApp;
+//   const dataConnectService = firebaseApp.getOrInitService('dataConnect', (app) => new DataConnectService(app));
+//   return dataConnectService.getDataConnect(connectorConfig);
+// }
 export function getDataConnect(connectorConfig: ConnectorConfig, app?: App): DataConnect {
   if (typeof app === 'undefined') {
     app = getApp();