Skip to content

fix: move SSDK source code to 'src' folder #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 30, 2021
Merged

fix: move SSDK source code to 'src' folder #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
914fc62
chore: prefix 'src' in ServerSymbolVisitor
trivikr Sep 30, 2021
09d3cf1
chore: prefix 'src' for server/index.ts
trivikr Sep 30, 2021
8158c34
chore: prefix 'src' for protocols import
trivikr Sep 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...en/src/main/java/software/amazon/smithy/typescript/codegen/HttpProtocolTestGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,8 @@ private void writeServerResponseTest(OperationShape operation, HttpResponseTestC
+ " { return new TestSerializer(); };", serviceOperationsSymbol, serviceSymbol);

writer.addImport("serializeFrameworkException", null,
"./protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
writer.addImport("ValidationFailure", "__ValidationFailure", "@aws-smithy/server-common");
writer.write("const handler = new $T(service, testMux, serFn, serializeFrameworkException, "
+ "(ctx: {}, f: __ValidationFailure[]) => { if (f) { throw f; } return undefined;});", handlerSymbol);
Expand Down
2 changes: 1 addition & 1 deletion ...cript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/IndexGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ static void writeServerIndex(
writer.write("export * from \"./operations/$L\";", symbolProvider.toSymbol(operation).getName());
}
writer.write("export * from \"./$L\"", symbol.getName());
fileManifest.writeFile("server/index.ts", writer.toString());
fileManifest.writeFile(CodegenUtils.SOURCE_FOLDER + "/server/index.ts", writer.toString());
}

private static String getModulePath(String fileLocation) {
Expand Down
9 changes: 6 additions & 3 deletions ...degen/src/main/java/software/amazon/smithy/typescript/codegen/ServerCommandGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,11 @@ private void writeOperationSerializer() {
String serializerFunction = ProtocolGenerator.getGenericSerFunctionName(operationSymbol) + "Response";
String deserializerFunction = ProtocolGenerator.getGenericDeserFunctionName(operationSymbol) + "Request";
writer.addImport(serializerFunction, null,
"./protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
writer.addImport(deserializerFunction, null,
"./protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
writer.write("serialize = $L;", serializerFunction);
writer.write("deserialize = $L;", deserializerFunction);
writer.write("");
Expand Down Expand Up @@ -222,7 +224,8 @@ private void writeErrorHandlerCase(ShapeId errorId) {
Symbol errorSymbol = symbolProvider.toSymbol(model.expectShape(errorId));
String serializerFunction = ProtocolGenerator.getGenericSerFunctionName(errorSymbol) + "Error";
writer.addImport(serializerFunction, null,
"./protocols/" + ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(protocolGenerator.getName()));
writer.openBlock("case $S: {", "}", errorId.getName(), () -> {
writer.write("return $L(error, ctx);", serializerFunction);
});
Expand Down
10 changes: 6 additions & 4 deletions ...-codegen/src/main/java/software/amazon/smithy/typescript/codegen/ServerSymbolVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,10 @@ private String flattenShapeName(ToShapeId id) {
}

private Symbol.Builder createGeneratedSymbolBuilder(Shape shape, String typeName, String namespace) {
return createSymbolBuilder(shape, typeName, namespace)
.definitionFile(toFilename(namespace));
String prefixedNamespace = "./" + CodegenUtils.SOURCE_FOLDER
+ (namespace.startsWith(".") ? namespace.substring(1) : namespace);
return createSymbolBuilder(shape, typeName, prefixedNamespace)
.definitionFile(toFilename(prefixedNamespace));
}

private Symbol.Builder createSymbolBuilder(Shape shape, String typeName, String namespace) {
Expand All @@ -137,9 +139,9 @@ static final class ModuleNameDelegator {

public String formatModuleName(Shape shape, String name) {
if (shape.getType() == ShapeType.SERVICE) {
return "./server/" + name;
return "/server/" + name;
} else if (shape.getType() == ShapeType.OPERATION) {
return "./server/operations/" + name;
return "/server/operations/" + name;
}

throw new IllegalArgumentException("Unsupported shape type: " + shape.getType());
Expand Down
6 changes: 4 additions & 2 deletions ...a/software/amazon/smithy/typescript/codegen/integration/HttpBindingProtocolGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,8 @@ public void generateServiceHandlerFactory(GenerationContext context) {
SymbolProvider symbolProvider = context.getSymbolProvider();

writer.addImport("serializeFrameworkException", null,
"./protocols/" + ProtocolGenerator.getSanitizedName(getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(getName()));
writer.addImport("ValidationCustomizer", "__ValidationCustomizer", "@aws-smithy/server-common");
writer.addImport("HttpRequest", "__HttpRequest", "@aws-sdk/protocol-http");
writer.addImport("HttpResponse", "__HttpResponse", "@aws-sdk/protocol-http");
Expand Down Expand Up @@ -390,7 +391,8 @@ public void generateOperationHandlerFactory(GenerationContext context, Operation
SymbolProvider symbolProvider = context.getSymbolProvider();

writer.addImport("serializeFrameworkException", null,
"./protocols/" + ProtocolGenerator.getSanitizedName(getName()));
"./" + CodegenUtils.SOURCE_FOLDER + "/protocols/"
+ ProtocolGenerator.getSanitizedName(getName()));
writer.addImport("HttpRequest", "__HttpRequest", "@aws-sdk/protocol-http");
writer.addImport("HttpResponse", "__HttpResponse", "@aws-sdk/protocol-http");

Expand Down