Skip to content

Commit e14875c

Browse files
Merge pull request #1 from adamthom-amzn/server-serde
A couple of minor fixes/tweaks
2 parents c68ccc1 + bc1f871 commit e14875c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ private void generateOperationResponseSerializer(
248248

249249
writer.openBlock("export const $L = async(\n"
250250
+ " input: $T,\n"
251-
+ " context: $L\n"
251+
+ " context: Omit<$L, 'endpoint'>\n"
252252
+ "): Promise<$T> => {", "}", methodName, outputType, contextType, responseType, () -> {
253253
writeOperationStatusCode(context, operation, bindingIndex, trait);
254254
writeResponseHeaders(context, operation, bindingIndex, () -> writeDefaultHeaders(context, operation));
@@ -287,7 +287,7 @@ private void generateErrorSerializer(GenerationContext context, StructureShape e
287287

288288
writer.openBlock("export const $L = async(\n"
289289
+ " input: $T,\n"
290-
+ " context: __SerdeContext\n"
290+
+ " context: Omit<__SerdeContext, 'endpoint'>\n"
291291
+ "): Promise<$T> => {", "}", methodName, symbol, responseType, () -> {
292292
writeErrorStatusCode(context, error);
293293
writeResponseHeaders(context, error, bindingIndex, () -> writeDefaultErrorHeaders(context, error));
@@ -1178,8 +1178,8 @@ private void readPath(
11781178
pathRegexBuilder.append("/");
11791179
}
11801180
writer.write("const pathRegex = new RegExp($S);", pathRegexBuilder.toString());
1181-
writer.write("const parsedPath: RegExpMatchArray = output.endpoint.path.match(pathRegex);");
1182-
writer.openBlock("if (parsedPath.groups !== undefined) {", "}", () -> {
1181+
writer.write("const parsedPath = output.path.match(pathRegex);");
1182+
writer.openBlock("if (parsedPath?.groups !== undefined) {", "}", () -> {
11831183
for (HttpBinding binding : pathBindings) {
11841184
Shape target = context.getModel().expectShape(binding.getMember().getTarget());
11851185
String memberName = context.getSymbolProvider().toMemberName(binding.getMember());
@@ -1210,9 +1210,9 @@ private void readHost(GenerationContext context, OperationShape operation) {
12101210
}
12111211
}
12121212
writer.write("const hostRegex = new RegExp($S);", endpointRegexBuilder.toString());
1213-
writer.write("const parsedHost: RegExpMatchArray = output.endpoint.path.match(pathRegex);");
1213+
writer.write("const parsedHost = output.path.match(pathRegex);");
12141214
Shape input = context.getModel().expectShape(operation.getInput().get());
1215-
writer.openBlock("if (parsedHost.groups !== undefined) {", "}", () -> {
1215+
writer.openBlock("if (parsedHost?.groups !== undefined) {", "}", () -> {
12161216
for (MemberShape member : input.members()) {
12171217
if (member.hasTrait(HostLabelTrait.class)) {
12181218
Shape target = context.getModel().expectShape(member.getTarget());

0 commit comments

Comments
 (0)