Skip to content
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

Process Map in function parameter list #1472

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Process Map in function parameter list #1472

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b6e181
Process Map in function parameter list
trivikr Dec 16, 2024
11f9e70
chore: put both key and value in quotes
trivikr Dec 16, 2024
7d2b5a0
fix: use single quotes instead of double in function param list
trivikr Dec 16, 2024
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
23 changes: 18 additions & 5 deletions ...escript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/CodegenUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,26 @@ static List<String> getFunctionParametersList(Map<String, Object> paramsMap) {
} else if (value instanceof Boolean) {
functionParametersList.add(String.format("%s: %s", key, value));
} else if (value instanceof List) {
if (!((List) value).isEmpty() && !(((List) value).get(0) instanceof String)) {
throw new CodegenException("Plugin function parameters not supported for type List<"
+ ((List) value).get(0).getClass() + ">");
List<?> valueList = (List<?>) value;
if (!valueList.isEmpty() && !(valueList.get(0) instanceof String)) {
throw new CodegenException("Plugin function parameters list must be List<String>");
}
List<String> valueStringList = valueList.stream()
.map(item -> String.format("\"%s\"", item))
.collect(Collectors.toList());
functionParametersList.add(String.format("%s: [%s]",
key, ((List<String>) value).stream()
.collect(Collectors.joining("\", \"", "\"", "\""))));
key, valueStringList.stream().collect(Collectors.joining(", "))));
} else if (value instanceof Map) {
Map<?, ?> valueMap = (Map<?, ?>) value;
if (!valueMap.isEmpty() && valueMap.keySet().stream().anyMatch(k -> !(k instanceof String))
&& valueMap.values().stream().anyMatch(v -> !(v instanceof String))) {
throw new CodegenException("Plugin function parameters map must be Map<String, String>");
}
List<String> valueStringList = valueMap.entrySet().stream()
.map(entry -> String.format("%s: \"%s\"", entry.getKey(), entry.getValue()))
trivikr marked this conversation as resolved.
Show resolved Hide resolved
trivikr marked this conversation as resolved.
Show resolved Hide resolved
.collect(Collectors.toList());
functionParametersList.add(String.format("%s: {%s}",
key, valueStringList.stream().collect(Collectors.joining(", "))));
} else {
// Future support for param type should be added in else if.
throw new CodegenException("Plugin function parameters not supported for type "
Expand Down
Loading