Skip to content

feat: adds enum support #191

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
jimmarino merged 1 commit into from
Jun 18, 2025
Merged

feat: adds enum support #191

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: 6 additions & 0 deletions artifacts/buildSrc/src/main/java/org/eclipse/dsp/generation/jsom/JsomParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.CONST;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.CONTAINS;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.DEFINITIONS;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.ENUM;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.ITEMS;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.ONE_OF;
import static org.eclipse.dsp.generation.jsom.JsonSchemaKeywords.PROPERTIES;
Expand Down Expand Up @@ -227,6 +228,7 @@ private void parseRequired(Map<String, Object> definition, SchemaType schemaType
}
}

@SuppressWarnings("unchecked")
private SchemaProperty parseProperty(String name, Map<String, Object> value) {
var type = value.get(TYPE);
var comment = value.containsKey(COMMENT) ? value.get(COMMENT).toString() : "";
Expand Down Expand Up @@ -260,6 +262,10 @@ private SchemaProperty parseProperty(String name, Map<String, Object> value) {
if (constantValue != null) {
builder.constantValue(constantValue.toString());
}
var enumValues = (List<Object>) value.get(ENUM);
if (enumValues != null) {
builder.enumValues(enumValues);
}
return builder.build();
}
}
Expand Down
1 change: 1 addition & 0 deletions artifacts/buildSrc/src/main/java/org/eclipse/dsp/generation/jsom/JsonSchemaKeywords.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,5 @@ public interface JsonSchemaKeywords {
String PROPERTIES = "properties";
String REQUIRED = "required";
String TYPE = "type";
String ENUM = "enum";
}
10 changes: 10 additions & 0 deletions artifacts/buildSrc/src/main/java/org/eclipse/dsp/generation/jsom/SchemaProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ public class SchemaProperty implements Comparable<SchemaProperty> {
private Set<String> types = new TreeSet<>();
private final Set<SchemaType> resolvedTypes = new TreeSet<>();
private final Set<ElementDefinition> itemTypes = new TreeSet<>();
private final Set<Object> enumValues = new TreeSet<>();

public String getName() {
return name;
Expand All @@ -50,6 +51,10 @@ public String getDescription() {
return description;
}

public Set<Object> getEnumValues() {
return enumValues;
}

public Set<SchemaType> getResolvedTypes() {
return resolvedTypes;
}
Expand Down Expand Up @@ -113,6 +118,11 @@ public Builder constantValue(String value) {
return this;
}

public Builder enumValues(Collection<Object> enumValues) {
property.enumValues.addAll(enumValues);
return this;
}

public SchemaProperty build() {
requireNonNull(property.name);
requireNonNull(property.description);
Expand Down
5 changes: 5 additions & 0 deletions ...s/buildSrc/src/main/java/org/eclipse/dsp/generation/transformer/HtmlTableTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@ private void transformProperty(SchemaPropertyReference propertyReference, boolea
builder.append(format("<td>%s</td>", resolvedTypes));
if (resolvedProperty.getConstantValue() != null) {
builder.append(format("<td>Value must be <span class=\"code\">%s</span></td>", resolvedProperty.getConstantValue()));
} else if (!resolvedProperty.getEnumValues().isEmpty()){
var values = resolvedProperty.getEnumValues().stream()
.map(Object::toString)
.collect(Collectors.joining(","));
builder.append(format("<td>Must be of the following:<br><span class=\"code\">%s</span></td>",values));
} else {
var constants = resolvedProperty.getResolvedTypes().stream()
.flatMap(t -> concat(Stream.of(t), t.getResolvedAllOf().stream())) // search the contains of the current type and any references 'allOf' types
Expand Down
Loading