Skip to content

Commit 4231a7e

Browse files
committed
move types from smithy-client package to types package
1 parent 1de654f commit 4231a7e

File tree

6 files changed

+16
-7
lines changed

6 files changed

+16
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ private void writeServerResponseTest(OperationShape operation, HttpResponseTestC
607607
writer.write("const request = new HttpRequest({method: 'POST', hostname: 'example.com'});");
608608

609609
// Create a new serializer factory that always returns our test serializer.
610-
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
610+
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
611611
writer.addImport("OperationSerializer", "__OperationSerializer", "@aws-smithy/server-common");
612612
writer.openBlock("const serFn: (op: $1T) => __OperationSerializer<$2T<{}>, $1T, __SmithyException> = (op) =>"
613613
+ " { return new TestSerializer(); };", serviceOperationsSymbol, serviceSymbol);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ private static void addCommonHandlerImports(TypeScriptWriter writer) {
209209
writer.addImport("SmithyFrameworkException", "__SmithyFrameworkException", "@aws-smithy/server-common");
210210
writer.addImport("HttpRequest", "__HttpRequest", "@aws-sdk/protocol-http");
211211
writer.addImport("HttpResponse", "__HttpResponse", "@aws-sdk/protocol-http");
212-
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
212+
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
213213
writer.addImport("ValidationCustomizer", "__ValidationCustomizer", "@aws-smithy/server-common");
214214
}
215215

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ private void renderErrorStructure() {
180180
writer.writeShapeDocs(shape);
181181

182182
// Find symbol references with the "extends" property, and add SmithyException.
183-
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
183+
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
184184
String extendsFrom = Stream.concat(
185185
Stream.of("__SmithyException"),
186186
symbol.getReferences().stream()

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,17 @@ private Symbol createBigJsSymbol(Shape shape) {
237237

238238
@Override
239239
public Symbol documentShape(DocumentShape shape) {
240-
Symbol.Builder builder = createSymbolBuilder(shape, "__DocumentType.Value");
241-
return addSmithyUseImport(builder, "DocumentType", "__DocumentType").build();
240+
Symbol.Builder builder = createSymbolBuilder(shape, "__DocumentType");
241+
Symbol importSymbol = Symbol.builder()
242+
.name("DocumentType")
243+
.namespace(TypeScriptDependency.AWS_SDK_TYPES.packageName, "/")
244+
.build();
245+
SymbolReference reference = SymbolReference.builder()
246+
.symbol(importSymbol)
247+
.alias("__DocumentType")
248+
.options(SymbolReference.ContextOption.USE)
249+
.build();
250+
return builder.addReference(reference).build();
242251
}
243252

244253
@Override

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ public void generateServiceHandlerFactory(GenerationContext context) {
358358
writer.indent();
359359

360360
generateServiceMux(context);
361-
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/smithy-client");
361+
writer.addImport("SmithyException", "__SmithyException", "@aws-sdk/types");
362362
writer.openBlock("const serFn: (op: $1T) => __OperationSerializer<$2T<Context>, $1T, __SmithyException> = "
363363
+ "(op) => {", "};", operationsSymbol, serviceSymbol, () -> {
364364
writer.openBlock("switch (op) {", "}", () -> {

smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/integration/HttpProtocolGeneratorUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static Set<StructureShape> generateErrorDispatcher(
311311

312312
// Error responses must be at least SmithyException and MetadataBearer implementations.
313313
writer.addImport("SmithyException", "__SmithyException",
314-
TypeScriptDependency.AWS_SMITHY_CLIENT.packageName);
314+
TypeScriptDependency.AWS_SDK_TYPES.packageName);
315315
writer.addImport("MetadataBearer", "__MetadataBearer",
316316
TypeScriptDependency.AWS_SDK_TYPES.packageName);
317317
// These responses will also have additional properties, so enable that on the interface.

0 commit comments

Comments
 (0)