Skip to content

Commit 42d43bb

Browse files
committed
apply writeAdditionalExports() of TypeScriptIntegration interface to the ssdk generation
1 parent e3eb0e1 commit 42d43bb

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ static void writeIndex(
6060

6161
// write export statement for models
6262
writer.write("export * from \"./models\";");
63+
64+
// Write each custom export.
65+
for (TypeScriptIntegration integration : integrations) {
66+
integration.writeAdditionalExports(settings, model, symbolProvider, writer);
67+
}
68+
6369
fileManifest.writeFile(Paths.get(CodegenUtils.SOURCE_FOLDER, "index.ts").toString(), writer.toString());
6470
}
6571

@@ -83,8 +89,6 @@ static void writeServerIndex(
8389

8490
writer.write("export * from \"./$L\"", symbol.getName());
8591

86-
writer.write("export { SmithyException } from $S", TypeScriptDependency.SERVER_COMMON.packageName);
87-
8892
fileManifest.writeFile(
8993
Paths.get(CodegenUtils.SOURCE_FOLDER, ServerSymbolVisitor.SERVER_FOLDER, "index.ts").toString(),
9094
writer.toString());
@@ -124,11 +128,5 @@ private static void writeClientExports(
124128
if (operations.stream().anyMatch(operation -> operation.hasTrait(WaitableTrait.ID))) {
125129
writer.write("export * from \"./waiters\";");
126130
}
127-
128-
// Write each custom export.
129-
for (TypeScriptIntegration integration : integrations) {
130-
integration.writeAdditionalExports(settings, model, symbolProvider, writer);
131-
}
132-
fileManifest.writeFile(Paths.get(CodegenUtils.SOURCE_FOLDER, "index.ts").toString(), writer.toString());
133131
}
134132
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ public void writeAdditionalExports(
3535
SymbolProvider symbolProvider,
3636
TypeScriptWriter writer
3737
) {
38-
writer.write("export { ServiceException } from $S;", TypeScriptDependency.AWS_SMITHY_CLIENT.packageName);
38+
boolean isServerSdk = settings.generateServerSdk();
39+
if (isServerSdk) {
40+
writer.write("export {SmithyException} from $S;", TypeScriptDependency.SERVER_COMMON.packageName);
41+
} else {
42+
writer.write("export { ServiceException } from $S;", TypeScriptDependency.AWS_SMITHY_CLIENT.packageName);
43+
}
3944
}
4045
}

0 commit comments

Comments
 (0)