Skip to content

fix: model bucketing edge case with resource shape #1123

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 1 commit into from
Jan 9, 2024
Merged

fix: model bucketing edge case with resource shape #1123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...script-codegen/src/main/java/software/amazon/smithy/typescript/codegen/SymbolVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,9 +463,9 @@ public String formatModuleName(Shape shape, String name) {
}
// Add models into buckets no bigger than chunk size.
String path;
if (shape.getId().equals(UnitTypeTrait.UNIT)) {
// Unit should only be put in the zero bucket, since it does not
// generate anything. It also does not contribute to bucket size.
if (shape.getId().equals(UnitTypeTrait.UNIT) || shape.isResourceShape()) {
// Unit or Resource shapes should only be put in the zero bucket, since they do not
// generate anything. They also do not contribute to bucket size.
path = String.join("/", ".", SHAPE_NAMESPACE_PREFIX, "models_0");
} else {
path = String.join("/", ".", SHAPE_NAMESPACE_PREFIX, "models_" + bucketCount);
Expand Down
27 changes: 27 additions & 0 deletions ...t-codegen/src/test/java/software/amazon/smithy/typescript/codegen/SymbolProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import software.amazon.smithy.model.shapes.IntEnumShape;
import software.amazon.smithy.model.shapes.ListShape;
import software.amazon.smithy.model.shapes.MemberShape;
import software.amazon.smithy.model.shapes.ResourceShape;
import software.amazon.smithy.model.shapes.Shape;
import software.amazon.smithy.model.shapes.ShapeId;
import software.amazon.smithy.model.shapes.StringShape;
Expand Down Expand Up @@ -249,4 +250,30 @@ public void omitsUnknownNumberIntEnumVariant() {
assertThat(memberSymbol.getName(), equalTo("Foo"));
}

@Test
public void placesResourceShapeIntoInitialBucket() {
Shape shape1 = StructureShape.builder().id("com.foo#Hello").build();
Shape shape2 = ResourceShape.builder().id("com.foo.baz#Hello").build();
Model model = Model.assembler()
.addImport(getClass().getResource("simple-service.smithy"))
.addShapes(shape1, shape2)
.assemble()
.unwrap();
TypeScriptSettings settings = TypeScriptSettings.from(model, Node.objectNodeBuilder()
.withMember("package", Node.from("example"))
.withMember("packageVersion", Node.from("1.0.0"))
.build());
SymbolProvider provider = new SymbolVisitor(model, settings, 1);
Symbol symbol1 = provider.toSymbol(shape1);
Symbol symbol2 = provider.toSymbol(shape2);
MockManifest manifest = new MockManifest();
SymbolVisitor.writeModelIndex(Arrays.asList(shape1, shape2), provider, manifest);

assertThat(symbol1.getNamespace(), equalTo("./" + CodegenUtils.SOURCE_FOLDER + "/models/models_0"));
assertThat(symbol1.getDefinitionFile(), equalTo("./" + CodegenUtils.SOURCE_FOLDER + "/models/models_0.ts"));
assertThat(symbol2.getNamespace(), equalTo("./" + CodegenUtils.SOURCE_FOLDER + "/models/models_0"));
assertThat(symbol2.getDefinitionFile(), equalTo("./" + CodegenUtils.SOURCE_FOLDER + "/models/models_0.ts"));
assertThat(manifest.getFileString(CodegenUtils.SOURCE_FOLDER + "/models/index.ts").get(),
containsString("export * from \"./models_0\";"));
}
}