clean up the new api

Author: lahirumaramba

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

@@ -25,36 +25,6 @@ import * as utils from '../utils/index';
 import * as validator from '../utils/validator';
 import { ConnectorConfig, ExecuteGraphqlResponse, GraphqlOptions } from './data-connect-api';
 
-/**
- * Converts a JavaScript value into a GraphQL literal string.
- * Handles nested objects, arrays, strings, numbers, and booleans.
- * Ensures strings are properly escaped.
- */
-function objectToString(data: any): string {
-  if (typeof data !== 'object' || data === null) {
-    if (typeof data === 'string') {
-      // Properly escape double quotes and backslashes within strings
-      const escapedString = data.replace(/\//g, '\\').replace(/,"/g, '"');
-      return `"${escapedString}"`;
-    }
-    // Handle numbers, booleans, null directly
-    return String(data);
-  }
-
-  if (Array.isArray(data)) {
-    const elements = data.map(item => objectToString(item)).join(', ');
-    return `[${elements}]`;
-  }
-
-  // Handle plain objects
-  const entries = Object.entries(data).map(([key, value]) => {
-    // GraphQL object keys are typically unquoted identifiers
-    return `${key}: ${objectToString(value)}`;
-  });
-
-  return `{ ${entries.join(', ')} }`;
-}
-
 const API_VERSION = 'v1alpha';
 
 /** The Firebase Data Connect backend base URL format. */
@@ -229,9 +199,38 @@ export class DataConnectApiClient {
     return new FirebaseDataConnectError(code, message);
   }
 
+    /**
+     * Converts JSON data into a GraphQL literal string.
+     * Handles nested objects, arrays, strings, numbers, and booleans.
+     * Ensures strings are properly escaped.
+     */
+    private objectToString(data: any): string {
+    if (typeof data !== 'object' || data === null) {
+      if (typeof data === 'string') {
+        // Properly escape double quotes and backslashes within strings
+        const escapedString = data.replace(/\//g, '\\').replace(/,"/g, '"');
+        return `"${escapedString}"`;
+      }
+      // Handle numbers, booleans, null directly
+      return String(data);
+    }
+
+    if (validator.isArray(data)) {
+      const elements = data.map(item => this.objectToString(item)).join(', ');
+      return `[${elements}]`;
+    }
+
+    // Handle plain objects
+    const entries = Object.entries(data).map(([key, value]) => {
+      // GraphQL object keys are typically unquoted identifiers
+      return `${key}: ${this.objectToString(value)}`;
+    });
+
+    return `{ ${entries.join(', ')} }`;
+  }
+
   /**
    * Insert a single row into the specified table.
-   * (Implementation moved from DataConnect class)
    */
   public async insert<GraphQlResponse, Variables extends object>(
     tableName: string,
@@ -243,13 +242,13 @@ export class DataConnectApiClient {
     if (!validator.isNonNullObject(data)) {
       throw new FirebaseDataConnectError('invalid-argument', '`data` must be a non-null object.');
     }
-    if (Array.isArray(data)) {
+    if (validator.isArray(data)) {
       throw new FirebaseDataConnectError(
         'invalid-argument', '`data` must be an object, not an array, for single insert.');
     }
 
     try {
-      const gqlDataString = objectToString(data);
+      const gqlDataString = this.objectToString(data);
       const mutation = `mutation { ${tableName}_insert(data: ${gqlDataString}) }`;
       // Use internal executeGraphql
       return this.executeGraphql<GraphQlResponse, Variables>(mutation);
@@ -260,7 +259,6 @@ export class DataConnectApiClient {
 
   /**
    * Insert multiple rows into the specified table.
-   * (Implementation moved from DataConnect class)
    */
   public async insertMany<GraphQlResponse, Variables extends Array<unknown>>(
     tableName: string,
@@ -274,7 +272,7 @@ export class DataConnectApiClient {
     }
 
     try {
-      const gqlDataString = objectToString(data);
+      const gqlDataString = this.objectToString(data);
       const mutation = `mutation { ${tableName}_insertMany(data: ${gqlDataString}) }`;
       // Use internal executeGraphql
       return this.executeGraphql<GraphQlResponse, Variables>(mutation);
@@ -285,7 +283,6 @@ export class DataConnectApiClient {
 
   /**
    * Insert a single row into the specified table, or update it if it already exists.
-   * (Implementation moved from DataConnect class)
    */
   public async upsert<GraphQlResponse, Variables extends object>(
     tableName: string,
@@ -297,13 +294,13 @@ export class DataConnectApiClient {
     if (!validator.isNonNullObject(data)) {
       throw new FirebaseDataConnectError('invalid-argument', '`data` must be a non-null object.');
     }
-    if (Array.isArray(data)) {
+    if (validator.isArray(data)) {
       throw new FirebaseDataConnectError(
         'invalid-argument', '`data` must be an object, not an array, for single upsert.');
     }
 
     try {
-      const gqlDataString = objectToString(data);
+      const gqlDataString = this.objectToString(data);
       const mutation = `mutation { ${tableName}_upsert(data: ${gqlDataString}) }`;
       // Use internal executeGraphql
       return this.executeGraphql<GraphQlResponse, Variables>(mutation);
@@ -314,7 +311,6 @@ export class DataConnectApiClient {
 
   /**
    * Insert multiple rows into the specified table, or update them if they already exist.
-   * (Implementation moved from DataConnect class)
    */
   public async upsertMany<GraphQlResponse, Variables extends Array<unknown>>(
     tableName: string,
@@ -328,7 +324,7 @@ export class DataConnectApiClient {
     }
 
     try {
-      const gqlDataString = objectToString(data);
+      const gqlDataString = this.objectToString(data);
       const mutation = `mutation { ${tableName}_upsertMany(data: ${gqlDataString}) }`;
       // Use internal executeGraphql
       return this.executeGraphql<GraphQlResponse, Variables>(mutation);

src/data-connect/data-connect.ts

@@ -17,7 +17,6 @@
 
 import { App } from '../app';
 import { DataConnectApiClient } from './data-connect-api-client-internal';
-// FirebaseDataConnectError, objectToString, and validator are no longer needed here
 
 import {
   ConnectorConfig,
@@ -47,10 +46,10 @@ export class DataConnectService {
   }
 
   /**
- * Returns the app associated with this `DataConnectService` instance.
- *
- * @returns The app associated with this `DataConnectService` instance.
- */
+   * Returns the app associated with this `DataConnectService` instance.
+   *
+   * @returns The app associated with this `DataConnectService` instance.
+   */
   get app(): App {
     return this.appInternal;
   }
@@ -64,24 +63,24 @@ export class DataConnect {
   private readonly client: DataConnectApiClient;
 
   /**
- * @param connectorConfig - The connector configuration.
- * @param app - The app for this `DataConnect` service.
- * @constructor
- * @internal
- */
+   * @param connectorConfig - The connector configuration.
+   * @param app - The app for this `DataConnect` service.
+   * @constructor
+   * @internal
+   */
   constructor(readonly connectorConfig: ConnectorConfig, readonly app: App) {
     this.client = new DataConnectApiClient(connectorConfig, app);
   }
 
   /**
- * Execute an arbitrary GraphQL query or mutation
- *
- * @param query - The GraphQL query or mutation.
- * @param options - Optional {@link GraphqlOptions} when executing a GraphQL query or mutation.
- *
- * @returns A promise that fulfills with a `ExecuteGraphqlResponse`.
- * @beta
- */
+   * Execute an arbitrary GraphQL query or mutation
+   *
+   * @param query - The GraphQL query or mutation.
+   * @param options - Optional {@link GraphqlOptions} when executing a GraphQL query or mutation.
+   *
+   * @returns A promise that fulfills with a `ExecuteGraphqlResponse`.
+   * @beta
+   */
   public executeGraphql<GraphqlResponse, Variables>(
     query: string,
     options?: GraphqlOptions<Variables>,
@@ -137,7 +136,6 @@ export class DataConnect {
 
   /**
    * Insert a single row into the specified table, or update it if it already exists.
-   * The specific behavior (insert or update) depends on the underlying database and schema configuration.
    *
    * @param tableName - The name of the table to upsert data into.
    * @param variables - The data object to upsert. The keys should correspond to the column names.
@@ -153,7 +151,6 @@ export class DataConnect {
 
   /**
    * Insert multiple rows into the specified table, or update them if they already exist.
-   * The specific behavior (insert or update) depends on the underlying database and schema configuration.
    *
    * @param tableName - The name of the table to upsert data into.
    * @param variables - An array of data objects to upsert. Each object's keys should correspond to the column names.