Skip to content

chore(codegen): allow schema-serde toggle by protocol #1733

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
Oct 6, 2025
Merged

chore(codegen): allow schema-serde toggle by protocol #1733

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
25 changes: 17 additions & 8 deletions ...main/java/software/amazon/smithy/typescript/codegen/schema/SchemaGenerationAllowlist.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import java.util.HashSet;
import java.util.Set;
import software.amazon.smithy.model.shapes.ShapeId;
import software.amazon.smithy.protocol.traits.Rpcv2CborTrait;
import software.amazon.smithy.typescript.codegen.TypeScriptSettings;
import software.amazon.smithy.utils.SmithyInternalApi;

Expand All @@ -19,22 +20,30 @@
*/
@SmithyInternalApi
public abstract class SchemaGenerationAllowlist {
private static final Set<String> ALLOWED = new HashSet<>();
private static final Set<ShapeId> ALLOWED = new HashSet<>();
private static final Set<ShapeId> PROTOCOLS = new HashSet<>();

static {
ALLOWED.add("smithy.protocoltests.rpcv2Cbor#RpcV2Protocol");
}

@Deprecated
public static boolean allows(String serviceShapeId, TypeScriptSettings settings) {
return ALLOWED.contains(serviceShapeId) && settings.generateSchemas();
ALLOWED.add(ShapeId.from("smithy.protocoltests.rpcv2Cbor#RpcV2Protocol"));
PROTOCOLS.add(Rpcv2CborTrait.ID);
}

public static boolean allows(ShapeId serviceShapeId, TypeScriptSettings settings) {
return ALLOWED.contains(serviceShapeId.toString()) && settings.generateSchemas();
boolean allowedByProtocol = PROTOCOLS.contains(settings.getProtocol());
boolean allowedByName = ALLOWED.contains(serviceShapeId);
return settings.generateSchemas() && (allowedByProtocol || allowedByName);
}

@Deprecated
public static void allow(String serviceShapeId) {
ALLOWED.add(ShapeId.from(serviceShapeId));
}

public static void allow(ShapeId serviceShapeId) {
ALLOWED.add(serviceShapeId);
}

public static void allowProtocol(ShapeId protocolShapeId) {
PROTOCOLS.add(protocolShapeId);
}
}