Moving path encoding code from the Datastore implementation to the Connection implementation, because the encoding is Connection specific.

Author: MarkDuckworth

packages/firestore/src/platform/node/grpc_connection.ts

@@ -114,7 +114,7 @@ export class GrpcConnection implements Connection {
 
   invokeRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null
@@ -166,7 +166,7 @@ export class GrpcConnection implements Connection {
 
   invokeStreamingRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null,

packages/firestore/src/remote/connection.ts

@@ -38,14 +38,15 @@ export interface Connection {
    * representing the JSON to send.
    *
    * @param rpcName - the name of the RPC to invoke
-   * @param path - the path to invoke this RPC on
+   * @param path - the path to invoke this RPC on. An array of path segments
+   * that will be encoded and joined with path separators when required.
    * @param request - the Raw JSON object encoding of the request message
    * @param token - the Token to use for the RPC.
    * @returns a Promise containing the JSON object encoding of the response
    */
   invokeRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null
@@ -57,15 +58,16 @@ export interface Connection {
    * completion and then returned as an array.
    *
    * @param rpcName - the name of the RPC to invoke
-   * @param path - the path to invoke this RPC on
+   * @param path - the path to invoke this RPC on. An array of path segments
+   * that will be encoded and joined with path separators when required.
    * @param request - the Raw JSON object encoding of the request message
    * @param token - the Token to use for the RPC.
    * @returns a Promise containing an array with the JSON object encodings of the
    * responses
    */
   invokeStreamingRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null,

packages/firestore/src/remote/datastore.ts

@@ -106,10 +106,7 @@ class DatastoreImpl extends Datastore {
       this.appCheckCredentials.getToken()
     ])
       .then(([authToken, appCheckToken]) => {
-        const path = toResourcePath(databaseId, resourcePath)
-          .toArray()
-          .map(encodeURIComponent)
-          .join('/');
+        const path = toResourcePath(databaseId, resourcePath).toArray();
         return this.connection.invokeRPC<Req, Resp>(
           rpcName,
           path,
@@ -145,10 +142,7 @@ class DatastoreImpl extends Datastore {
       this.appCheckCredentials.getToken()
     ])
       .then(([authToken, appCheckToken]) => {
-        const path = toResourcePath(databaseId, resourcePath)
-          .toArray()
-          .map(encodeURIComponent)
-          .join('/');
+        const path = toResourcePath(databaseId, resourcePath).toArray();
         return this.connection.invokeStreamingRPC<Req, Resp>(
           rpcName,
           path,

packages/firestore/src/remote/rest_connection.ts

@@ -82,13 +82,13 @@ export abstract class RestConnection implements Connection {
 
   invokeRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     req: Req,
     authToken: Token | null,
     appCheckToken: Token | null
   ): Promise<Resp> {
     const streamId = generateUniqueDebugId();
-    const url = this.makeUrl(rpcName, path);
+    const url = this.makeUrl(rpcName, path.map(encodeURIComponent).join('/'));
     logDebug(LOG_TAG, `Sending RPC '${rpcName}' ${streamId}:`, url, req);
 
     const headers: StringMap = {
@@ -119,7 +119,7 @@ export abstract class RestConnection implements Connection {
 
   invokeStreamingRPC<Req, Resp>(
     rpcName: string,
-    path: string,
+    path: string[],
     request: Req,
     authToken: Token | null,
     appCheckToken: Token | null,