test(codegen): add test case for multiple visible services in model

Author: kuhe

Makefile

@@ -8,6 +8,7 @@ sync:
 	git fetch --all
 
 generate-protocol-tests:
+	rm -rf ./smithy-typescript-protocol-test-codegen/build/smithyprojections/smithy-typescript-protocol-test-codegen
 	./gradlew :smithy-typescript-protocol-test-codegen:build
 	rm -rf ./private/smithy-rpcv2-cbor
 	rm -rf ./private/smithy-rpcv2-cbor-schema

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

@@ -273,11 +273,11 @@ private void scan(Collection<Shape> shapes) {
                     existsAsSchema.add(operation);
                 }
                 case SERVICE -> {
-//                    ServiceShape serviceShape = (ServiceShape) shape;
-//                    serviceShape.getErrorsSet().forEach(errorShapeId -> {
-//                        Shape errorShape = model.expectShape(errorShapeId);
-//                        scan(errorShape);
-//                    });
+                    ServiceShape serviceShape = (ServiceShape) shape;
+                    serviceShape.getErrorsSet().forEach(errorShapeId -> {
+                        Shape errorShape = model.expectShape(errorShapeId);
+                        scan(errorShape);
+                    });
                 }
                 case BYTE, INT_ENUM, SHORT, INTEGER, LONG, FLOAT, DOUBLE, BIG_INTEGER, BIG_DECIMAL, BOOLEAN, STRING,
                      TIMESTAMP, DOCUMENT, ENUM, BLOB -> {

smithy-typescript-protocol-test-codegen/model/my-local-model/main.smithy

@@ -129,4 +129,4 @@ structure UnusedServiceLinkedError {}
 
 @error("client")
 @httpError(400)
-structure CompletelyUnlinkedError {}
+structure CompletelyUnlinkedError {}

smithy-typescript-protocol-test-codegen/model/my-local-model/secondary.smithy

@@ -0,0 +1,37 @@
+$version: "2.0"
+
+namespace org.xyz.secondary
+
+use smithy.protocols#rpcv2Cbor
+
+@rpcv2Cbor
+@documentation("a second service in the same model, unused.")
+service TertiaryService {
+    version: "1.0"
+    operations: [
+        TertiaryUnusedOperation
+    ]
+    errors: [
+        TertiaryUnusedServiceLinkedError
+    ]
+}
+
+operation TertiaryUnusedOperation {
+    input: Unit
+    output: Unit
+    errors: [
+        TertiaryUnusedServiceOperationLinkedError
+    ]
+}
+
+@error("client")
+@httpError(400)
+structure TertiaryUnusedServiceOperationLinkedError {}
+
+@error("client")
+@httpError(400)
+structure TertiaryUnusedServiceLinkedError {}
+
+@error("client")
+@httpError(400)
+structure TertiaryCompletelyUnlinkedError {}

smithy-typescript-protocol-test-codegen/smithy-build.json

@@ -62,7 +62,7 @@
         {
           "name": "includeServices",
           "args": {
-            "services": ["org.xyz.v1#XYZService"]
+            "services": ["org.xyz.v1#XYZService", "org.xyz.v1#UnusedService", "org.xyz.secondary#TertiaryService"]
           }
         }
       ],
@@ -83,7 +83,7 @@
         {
           "name": "includeServices",
           "args": {
-            "services": ["org.xyz.v1#XYZService"]
+            "services": ["org.xyz.v1#XYZService", "org.xyz.v1#UnusedService", "org.xyz.secondary#TertiaryService"]
           }
         }
       ],