test(codegen): add waiter/paginator to index tests (#1790)

Author: kuhe

private/my-local-model-schema/test/index-types.ts

@@ -3,7 +3,11 @@ export type {
   XYZServiceClient,
   XYZService,
   GetNumbersCommand,
+  GetNumbersCommandInput,
+  GetNumbersCommandOutput,
   TradeEventStreamCommand,
+  TradeEventStreamCommandInput,
+  TradeEventStreamCommandOutput,
   Alpha,
   GetNumbersRequest,
   GetNumbersResponse,

private/smithy-rpcv2-cbor-schema/test/index-types.ts

@@ -3,18 +3,44 @@ export type {
   RpcV2ProtocolClient,
   RpcV2Protocol,
   EmptyInputOutputCommand,
+  EmptyInputOutputCommandInput,
+  EmptyInputOutputCommandOutput,
   Float16Command,
+  Float16CommandInput,
+  Float16CommandOutput,
   FractionalSecondsCommand,
+  FractionalSecondsCommandInput,
+  FractionalSecondsCommandOutput,
   GreetingWithErrorsCommand,
+  GreetingWithErrorsCommandInput,
+  GreetingWithErrorsCommandOutput,
   NoInputOutputCommand,
+  NoInputOutputCommandInput,
+  NoInputOutputCommandOutput,
   OperationWithDefaultsCommand,
+  OperationWithDefaultsCommandInput,
+  OperationWithDefaultsCommandOutput,
   OptionalInputOutputCommand,
+  OptionalInputOutputCommandInput,
+  OptionalInputOutputCommandOutput,
   RecursiveShapesCommand,
+  RecursiveShapesCommandInput,
+  RecursiveShapesCommandOutput,
   RpcV2CborDenseMapsCommand,
+  RpcV2CborDenseMapsCommandInput,
+  RpcV2CborDenseMapsCommandOutput,
   RpcV2CborListsCommand,
+  RpcV2CborListsCommandInput,
+  RpcV2CborListsCommandOutput,
   RpcV2CborSparseMapsCommand,
+  RpcV2CborSparseMapsCommandInput,
+  RpcV2CborSparseMapsCommandOutput,
   SimpleScalarPropertiesCommand,
+  SimpleScalarPropertiesCommandInput,
+  SimpleScalarPropertiesCommandOutput,
   SparseNullsOperationCommand,
+  SparseNullsOperationCommandInput,
+  SparseNullsOperationCommandOutput,
   TestEnum,
   TestIntEnum,
   FooEnum,

private/smithy-rpcv2-cbor/test/index-types.ts

@@ -3,18 +3,44 @@ export type {
   RpcV2ProtocolClient,
   RpcV2Protocol,
   EmptyInputOutputCommand,
+  EmptyInputOutputCommandInput,
+  EmptyInputOutputCommandOutput,
   Float16Command,
+  Float16CommandInput,
+  Float16CommandOutput,
   FractionalSecondsCommand,
+  FractionalSecondsCommandInput,
+  FractionalSecondsCommandOutput,
   GreetingWithErrorsCommand,
+  GreetingWithErrorsCommandInput,
+  GreetingWithErrorsCommandOutput,
   NoInputOutputCommand,
+  NoInputOutputCommandInput,
+  NoInputOutputCommandOutput,
   OperationWithDefaultsCommand,
+  OperationWithDefaultsCommandInput,
+  OperationWithDefaultsCommandOutput,
   OptionalInputOutputCommand,
+  OptionalInputOutputCommandInput,
+  OptionalInputOutputCommandOutput,
   RecursiveShapesCommand,
+  RecursiveShapesCommandInput,
+  RecursiveShapesCommandOutput,
   RpcV2CborDenseMapsCommand,
+  RpcV2CborDenseMapsCommandInput,
+  RpcV2CborDenseMapsCommandOutput,
   RpcV2CborListsCommand,
+  RpcV2CborListsCommandInput,
+  RpcV2CborListsCommandOutput,
   RpcV2CborSparseMapsCommand,
+  RpcV2CborSparseMapsCommandInput,
+  RpcV2CborSparseMapsCommandOutput,
   SimpleScalarPropertiesCommand,
+  SimpleScalarPropertiesCommandInput,
+  SimpleScalarPropertiesCommandOutput,
   SparseNullsOperationCommand,
+  SparseNullsOperationCommandInput,
+  SparseNullsOperationCommandOutput,
   TestEnum,
   TestIntEnum,
   FooEnum,

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

@@ -67,7 +67,10 @@ public void writeTypeIndexTest() {
                     settings.getService()
                 );
                 for (OperationShape operation : containedOperations) {
-                    writer.write("$L,", symbolProvider.toSymbol(operation).getName());
+                    String commandName = symbolProvider.toSymbol(operation).getName();
+                    writer.write("$L,", commandName);
+                    writer.write("$LInput,", commandName);
+                    writer.write("$LOutput,", commandName);
                 }
 
                 // enums
@@ -89,6 +92,15 @@ public void writeTypeIndexTest() {
 
                 // synthetic base exception
                 writer.write("$L,", aggregateClientName + "ServiceException");
+
+                // waiters
+                serviceClosure.getWaiterNames().forEach(waiter -> {
+                    writer.write("$L,", waiter);
+                });
+                // paginators
+                serviceClosure.getPaginatorNames().forEach(paginator -> {
+                    writer.write("$L,", paginator);
+                });
             }
         );
     }
@@ -164,6 +176,30 @@ public void writeRuntimeIndexTest() {
         writer.addRelativeImport(baseExceptionName, null, cjsIndex);
         writer.write("assert($L.prototype instanceof Error)", baseExceptionName);
 
+        // waiters & paginators
+        TreeSet<String> waiterNames = serviceClosure.getWaiterNames();
+        if (!waiterNames.isEmpty()) {
+            writer.write("// waiters");
+        }
+        waiterNames.forEach(waiter -> {
+            writer.addRelativeImport(waiter, null, cjsIndex);
+            writer.write("""
+                assert(typeof $L === "function")""",
+                waiter
+            );
+        });
+        TreeSet<String> paginatorNames = serviceClosure.getPaginatorNames();
+        if (!paginatorNames.isEmpty()) {
+            writer.write("// paginators");
+        }
+        paginatorNames.forEach(paginator -> {
+            writer.addRelativeImport(paginator, null, cjsIndex);
+            writer.write("""
+                assert(typeof $L === "function")""",
+                paginator
+            );
+        });
+
         writer.write("console.log(`$L index test passed.`);", aggregateClientName);
     }
 }

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/knowledge/ServiceClosure.java

@@ -27,7 +27,9 @@
 import software.amazon.smithy.model.shapes.UnionShape;
 import software.amazon.smithy.model.traits.EnumTrait;
 import software.amazon.smithy.model.traits.ErrorTrait;
+import software.amazon.smithy.model.traits.PaginatedTrait;
 import software.amazon.smithy.utils.SmithyInternalApi;
+import software.amazon.smithy.waiters.WaitableTrait;
 
 /**
  * Retrieves shapes in the service operation closure.
@@ -37,6 +39,7 @@ public final class ServiceClosure implements KnowledgeIndex {
     private static final Map<ShapeId, ServiceClosure> BY_SERVICE = new ConcurrentHashMap<>();
     private final Model model;
 
+    private final TreeSet<OperationShape> operations = new TreeSet<>();
     private final TreeSet<Shape> structures = new TreeSet<>();
     private final TreeSet<Shape> errors = new TreeSet<>();
     private final TreeSet<Shape> enums = new TreeSet<>();
@@ -56,6 +59,7 @@ public static ServiceClosure of(Model model, ServiceShape service) {
         TopDownIndex topDown = TopDownIndex.of(model);
         ServiceClosure instance = new ServiceClosure(model);
         Set<OperationShape> containedOperations = topDown.getContainedOperations(service);
+        instance.operations.addAll(containedOperations);
         instance.scan(containedOperations);
         instance.scanned.clear();
 
@@ -76,6 +80,29 @@ public TreeSet<Shape> getEnums() {
         return enums;
     }
 
+    public TreeSet<String> getWaiterNames() {
+        TreeSet<String> waiters = new TreeSet<>();
+        for (OperationShape operation : operations) {
+            operation.getTrait(WaitableTrait.class).ifPresent(trait -> {
+                trait.getWaiters().forEach((waiterName, waiter) -> {
+                    waiters.add("waitFor" + waiterName);
+                    waiters.add("waitUntil" + waiterName);
+                });
+            });
+        }
+        return waiters;
+    }
+
+    public TreeSet<String> getPaginatorNames() {
+        TreeSet<String> paginators = new TreeSet<>();
+        for (OperationShape operation : operations) {
+            operation.getTrait(PaginatedTrait.class).ifPresent(trait -> {
+                paginators.add("paginate" + operation.getId().getName());
+            });
+        }
+        return paginators;
+    }
+
     private void scan(Shape shape) {
         scan(Collections.singletonList(shape));
     }