pagination: omit aggregated client in paginators (#712)

* pagination: omit aggregated client in paginators

* pagination: exclude aggregated client from pagination interface

Author: kuhe

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/PaginationGenerator.java

@@ -95,9 +95,6 @@ public void run() {
         writer.addImport(outputSymbol.getName(),
                 outputSymbol.getName(),
                 outputSymbol.getNamespace());
-        String aggregatedClientLocation = serviceSymbol.getNamespace()
-                .replace(serviceSymbol.getName(), aggregatedClientName);
-        writer.addImport(aggregatedClientName, aggregatedClientName, aggregatedClientLocation);
         writer.addImport(serviceSymbol.getName(), serviceSymbol.getName(), serviceSymbol.getNamespace());
 
         // Import Pagination types
@@ -106,7 +103,6 @@ public void run() {
             Paths.get(".", PAGINATION_INTERFACE_FILE.replace(".ts", "")).toString());
 
         writeCommandRequest();
-        writeMethodRequest();
         writePager();
     }
 
@@ -121,13 +117,11 @@ static void generateServicePaginationInterfaces(
             TypeScriptWriter writer
     ) {
         writer.addImport("PaginationConfiguration", "PaginationConfiguration", "@aws-sdk/types");
-        String aggregatedClientLocation = service.getNamespace().replace(service.getName(), aggregatedClientName);
-        writer.addImport(aggregatedClientName, aggregatedClientName, aggregatedClientLocation);
         writer.addImport(service.getName(), service.getName(), service.getNamespace());
 
         writer.openBlock("export interface $LPaginationConfiguration extends PaginationConfiguration {",
                 "}", aggregatedClientName, () -> {
-            writer.write("client: $L | $L;", aggregatedClientName, service.getName());
+            writer.write("client: $L;", service.getName());
         });
     }
 
@@ -190,10 +184,7 @@ private void writePager() {
                     writer.write("input[$S] = config.pageSize;", pageSize);
                 }
 
-                writer.openBlock("if (config.client instanceof $L) {", "}", aggregatedClientName, () -> {
-                    writer.write("page = await makePagedRequest(config.client, input, ...additionalArguments);");
-                });
-                writer.openBlock("else if (config.client instanceof $L) {", "}", serviceTypeName, () -> {
+                writer.openBlock("if (config.client instanceof $L) {", "}", serviceTypeName, () -> {
                     writer.write("page = await makePagedClientRequest(config.client, input, ...additionalArguments);");
                 });
                 writer.openBlock("else {", "}", () -> {
@@ -213,21 +204,6 @@ private void writePager() {
     }
 
 
-    /**
-     * Paginated command that calls client.method({...}) under the hood. This is meant for server side environments and
-     * exposes the entire service.
-     */
-    private void writeMethodRequest() {
-        writer.writeDocs("@private");
-        writer.openBlock(
-                "const makePagedRequest = async (client: $L, input: $L, ...args: any): Promise<$L> => {",
-                "}", aggregatedClientName, inputSymbol.getName(),
-                outputSymbol.getName(), () -> {
-            writer.write("// @ts-ignore");
-            writer.write("return await client.$L(input, ...args);", methodName);
-        });
-    }
-
     /**
      * Paginated command that calls CommandClient().send({...}) under the hood. This is meant for client side (browser)
      * environments and does not generally expose the entire service.