Skip to content

fix: set context in schema codegen #1678

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
Sep 3, 2025
+21 −21
Merged

fix: set context in schema codegen #1678

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
42 changes: 21 additions & 21 deletions ...degen/src/main/java/software/amazon/smithy/typescript/codegen/schema/SchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
public class SchemaGenerator implements Runnable {
public static final String SCHEMAS_FOLDER = "schemas";
private final SchemaReferenceIndex elision;
private final ShapeGroupingIndex treeOrganizer;
private final ShapeGroupingIndex groupingIndex;
private final TypeScriptSettings settings;
private final SymbolProvider symbolProvider;
private final Model model;
Expand Down Expand Up @@ -90,7 +90,7 @@ public SchemaGenerator(Model model,
elision = SchemaReferenceIndex.of(model);
this.settings = settings;
this.symbolProvider = symbolProvider;
treeOrganizer = ShapeGroupingIndex.of(model);
groupingIndex = ShapeGroupingIndex.of(model);
}

/**
Expand Down Expand Up @@ -154,7 +154,7 @@ public void run() {
* @return writer corresponding to the file that will hold the shape's schema.
*/
private TypeScriptWriter getWriter(ShapeId shape) {
return writers.computeIfAbsent(treeOrganizer.getGroup(shape), k -> {
return writers.computeIfAbsent(groupingIndex.getGroup(shape), k -> {
TypeScriptWriter typeScriptWriter = new TypeScriptWriter("");
typeScriptWriter.write("""
/* eslint no-var: 0 */
Expand Down Expand Up @@ -277,7 +277,7 @@ private void writeSimpleSchema(Shape shape) {
getShapeVariableName(shape),
checkImportString(shape, shape.getId().getNamespace(), "n"),
checkImportString(shape, shape.getId().getName()),
resolveSimpleSchema(shape)
resolveSimpleSchema(shape, shape)
);
writeTraits(shape);
writer.write(");");
Expand Down Expand Up @@ -515,7 +515,7 @@ private void writeTraits(Shape shape) {
*/
private void writeTraitsInContext(Shape context, Shape shape) {
TypeScriptWriter writer = getWriter(context.getId());
boolean useImportedStrings = !treeOrganizer.isBaseGroup(context);
boolean useImportedStrings = !groupingIndex.isBaseGroup(context);

writer.write(
new SchemaTraitWriter(
Expand Down Expand Up @@ -567,7 +567,7 @@ private String resolveSchema(Shape context, Shape shape) {

if (!hasTraits) {
try {
return resolveSimpleSchema(memberShape != null ? memberShape : shape);
return resolveSimpleSchema(context, memberShape != null ? memberShape : shape);
} catch (IllegalArgumentException ignored) {
//
}
Expand All @@ -584,7 +584,7 @@ private String resolveSchema(Shape context, Shape shape) {
* @return a sentinel value representing a preconfigured schema type.
* @throws IllegalArgumentException when no sentinel value exists, e.g. a non-simple schema was passed in.
*/
private String resolveSimpleSchema(Shape shape) {
private String resolveSimpleSchema(Shape context, Shape shape) {
MemberShape memberShape = null;
if (shape instanceof MemberShape ms) {
memberShape = ms;
Expand Down Expand Up @@ -631,8 +631,8 @@ private String resolveSimpleSchema(Shape shape) {
return "19";
}
case LIST, SET, MAP -> {
TypeScriptWriter writer = getWriter(shape.getId());
return resolveSimpleSchemaNestedContainer(shape, writer);
TypeScriptWriter writer = getWriter(context.getId());
return resolveSimpleSchemaNestedContainer(context, shape, writer);
}
default -> {
//
Expand All @@ -649,7 +649,7 @@ private String resolveSimpleSchema(Shape shape) {
*
* @return the container bit modifier attached to the schema numeric value.
*/
private String resolveSimpleSchemaNestedContainer(Shape shape, TypeScriptWriter writer) {
private String resolveSimpleSchemaNestedContainer(Shape context, Shape shape, TypeScriptWriter writer) {
Shape contained;
String factory;
String sentinel;
Expand All @@ -664,7 +664,7 @@ private String resolveSimpleSchemaNestedContainer(Shape shape, TypeScriptWriter
case MAP -> {
contained = shape.asMapShape().get().getValue();
factory = "map";
keyMemberSchema = this.resolveSimpleSchema(shape.asMapShape().get().getKey()) + ", ";
keyMemberSchema = this.resolveSimpleSchema(context, shape.asMapShape().get().getKey()) + ", ";
sentinel = "128";
}
default -> {
Expand All @@ -679,29 +679,29 @@ private String resolveSimpleSchemaNestedContainer(Shape shape, TypeScriptWriter

if (contained.isListShape()) {
writer.addImportSubmodule(factory, factory, TypeScriptDependency.SMITHY_CORE, "/schema");
String schemaVarName = checkImportString(shape, shape.getId().getName());
String schemaVarName = checkImportString(context, shape.getId().getName());
return factory + "("
+ checkImportString(shape, shape.getId().getNamespace(), "n") + ", " + schemaVarName + ", 0, "
+ checkImportString(context, shape.getId().getNamespace(), "n") + ", " + schemaVarName + ", 0, "
+ keyMemberSchema
+ this.resolveSimpleSchema(contained) + ")";
+ this.resolveSimpleSchema(context, contained) + ")";
} else if (contained.isMapShape()) {
writer.addImportSubmodule(factory, factory, TypeScriptDependency.SMITHY_CORE, "/schema");
String schemaVarName = checkImportString(shape, shape.getId().getName());
String schemaVarName = checkImportString(context, shape.getId().getName());
return factory + "("
+ checkImportString(shape, shape.getId().getNamespace(), "n") + ", " + schemaVarName + ", 0, "
+ checkImportString(context, shape.getId().getNamespace(), "n") + ", " + schemaVarName + ", 0, "
+ keyMemberSchema
+ this.resolveSimpleSchema(contained) + ")";
+ this.resolveSimpleSchema(context, contained) + ")";
} else {
return sentinel + "|" + this.resolveSimpleSchema(contained);
return sentinel + "|" + this.resolveSimpleSchema(context, contained);
}
}

/**
* Imports the shape's schema from another file if the context group differs from the shape group.
*/
private void checkImportSchema(Shape context, Shape shape) {
String shapeGroup = treeOrganizer.getGroup(shape.getId());
if (treeOrganizer.different(context, shape)) {
String shapeGroup = groupingIndex.getGroup(shape.getId());
if (groupingIndex.different(context, shape)) {
getWriter(context.getId()).addRelativeImport(
getShapeVariableName(shape), null, Path.of("./", shapeGroup)
);
Expand All @@ -717,7 +717,7 @@ private String checkImportString(Shape context, String fullString) {
*/
private String checkImportString(Shape context, String fullString, String prefix) {
String var = prefix != null ? store.var(fullString, prefix) : store.var(fullString);
if (!treeOrganizer.isBaseGroup(context)) {
if (!groupingIndex.isBaseGroup(context)) {
getWriter(context.getId()).addRelativeImport(
var,
null,
Expand Down
Loading