Skip to content

refactor: streamline JoinConfiguration setup and improve component joining logic #86

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
twisti-dev merged 2 commits into from
Apr 18, 2025
Merged

refactor: streamline JoinConfiguration setup and improve component joining logic #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9691e61
refactor: streamline JoinConfiguration setup and improve component jo…
twisti-dev Apr 18, 2025
f5c1dc1
Update surf-api-core/surf-api-core-api/src/main/kotlin/dev/slne/surf/…
twisti-dev Apr 18, 2025
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ javaVersion=21
mcVersion=1.21.4

group=dev.slne.surf
version=1.21.4-2.13.1-SNAPSHOT
version=1.21.4-2.13.2-SNAPSHOT
relocationPrefix=dev.slne.surf.surfapi.libs
59 changes: 34 additions & 25 deletions ...-api-core-api/src/main/kotlin/dev/slne/surf/surfapi/core/api/messages/CommonComponents.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,9 +349,7 @@ object CommonComponents {
collection: Iterable<E>,
formatter: (E) -> Component,
): Component {
val joinConfig = JoinConfiguration.builder()
.separator(Component.text(", ", SPACER))
.build()
val joinConfig = JoinConfiguration.builder().separator(Component.text(", ", SPACER)).build()

return Component.join(joinConfig, collection.mapTo(mutableObjectListOf(), formatter))
}
Expand Down Expand Up @@ -382,15 +380,20 @@ object CommonComponents {
linePrefix: Component = PREFIX,
formatter: (E) -> Component,
): Component {
val joinConfig = JoinConfiguration.builder()
.separator(buildText0 {
appendNewline()
append(linePrefix)
appendText("- ", SPACER)
})
.build()
val separator = buildText0 {
appendNewline()
append(linePrefix)
appendText("- ", SPACER)
}
val joinConfig = JoinConfiguration.builder().separator(separator).build()

return Component.join(joinConfig, collection.mapTo(mutableObjectListOf(), formatter))
val firstPrefix = if (collection.iterator().hasNext()) separator else Component.empty()

return firstPrefix.append(
Component.join(
joinConfig, collection.mapTo(mutableObjectListOf(), formatter)
)
)
}

/**
Expand Down Expand Up @@ -422,20 +425,26 @@ object CommonComponents {
linePrefix: Component = PREFIX,
keyValueSeparator: Component = MAP_SEPERATOR,
): Component {
val joinConfig = JoinConfiguration.builder()
.separator(buildText0 {
appendNewline()
append(linePrefix)
appendText("- ", SPACER)
})

return Component.join(joinConfig, map.mapTo(mutableObjectListOf()) { (key, value) ->
buildText0 {
append(keyFormatter(key).colorIfAbsent(VARIABLE_KEY))
append(keyValueSeparator)
append(valueFormatter(value).colorIfAbsent(VARIABLE_VALUE))
}
})
val separator = buildText0 {
appendNewline()
append(linePrefix)
appendText("- ", SPACER)
}
val joinConfig = JoinConfiguration.builder().separator(separator).build()
val firstPrefix = if (map.isNotEmpty()) separator else Component.empty()

return firstPrefix.append(
Component.join(
joinConfig,
map.mapTo(mutableObjectListOf()) { (key, value) ->
buildText0 {
append(keyFormatter(key).colorIfAbsent(VARIABLE_KEY))
append(keyValueSeparator)
append(valueFormatter(value).colorIfAbsent(VARIABLE_VALUE))
}
}
)
)
}

/**
Expand Down