Skip to content

Commit 6ad4624

Browse files
committed
chore: a bit more modern
1 parent e40467a commit 6ad4624

File tree

4 files changed

+17
-16
lines changed

4 files changed

+17
-16
lines changed

src/main/kotlin/me/ntrrgc/tsGenerator/FilteredClassTransformer.kt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,26 +24,26 @@ class FilteredClassTransformer(val wrappedTransformer: ClassTransformer,
2424
val filter: (klass: KClass<*>) -> Boolean): ClassTransformer {
2525

2626
override fun transformPropertyList(properties: List<KProperty<*>>, klass: KClass<*>): List<KProperty<*>> {
27-
if (filter(klass)) {
28-
return wrappedTransformer.transformPropertyList(properties, klass)
27+
return if (filter(klass)) {
28+
wrappedTransformer.transformPropertyList(properties, klass)
2929
} else {
30-
return properties
30+
properties
3131
}
3232
}
3333

3434
override fun transformPropertyName(propertyName: String, property: KProperty<*>, klass: KClass<*>): String {
35-
if (filter(klass)) {
36-
return wrappedTransformer.transformPropertyName(propertyName, property, klass)
35+
return if (filter(klass)) {
36+
wrappedTransformer.transformPropertyName(propertyName, property, klass)
3737
} else {
38-
return propertyName
38+
propertyName
3939
}
4040
}
4141

4242
override fun transformPropertyType(type: KType, property: KProperty<*>, klass: KClass<*>): KType {
43-
if (filter(klass)) {
44-
return wrappedTransformer.transformPropertyType(type, property, klass)
43+
return if (filter(klass)) {
44+
wrappedTransformer.transformPropertyType(type, property, klass)
4545
} else {
46-
return type
46+
type
4747
}
4848
}
4949
}

src/main/kotlin/me/ntrrgc/tsGenerator/TypeScriptGenerator.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ import kotlin.reflect.jvm.javaType
8686
* possibility to use set<T> in typeScript and not arrays.
8787
* The second value represents the possibility to use enum as classes
8888
*/
89+
@Suppress("unused")
8990
class TypeScriptGenerator(
9091
rootClasses: Iterable<KClass<*>>,
9192
private val mappings: Map<KClass<*>, String> = mapOf(),
@@ -250,9 +251,9 @@ class TypeScriptGenerator(
250251
//add '' to an enum with a -
251252
private fun transformPropertyEnum(toString: String): String {
252253
if (toString.contains('-') || toString.matches(Regex("^[0-9].*"))) {
253-
return "'${toString.toUpperCase()}'"
254+
return "'${toString.uppercase()}'"
254255
}
255-
return toString.toUpperCase()
256+
return toString.uppercase()
256257
}
257258

258259
private fun generateInterface(klass: KClass<*>): String {

src/main/kotlin/me/ntrrgc/tsGenerator/TypeScriptType.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ internal class TypeScriptType private constructor(val types: List<String>) {
4444
}
4545

4646
fun formatWithParenthesis(): String {
47-
if (types.size == 1) {
48-
return types.single()
47+
return if (types.size == 1) {
48+
types.single()
4949
} else {
50-
return "(" + this.formatWithoutParenthesis() + ")"
50+
"(" + this.formatWithoutParenthesis() + ")"
5151
}
5252
}
5353

src/main/kotlin/me/ntrrgc/tsGenerator/capitalization.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ fun camelCaseToSnakeCase(name: String): String {
2828
return name
2929
.replace(Regex("(.)([A-Z][a-z]+)"), { "${it.groupValues[1]}_${it.groupValues[2]}" })
3030
.replace(Regex("([a-z0-9])([A-Z])"), { "${it.groupValues[1]}_${it.groupValues[2]}"})
31-
.toLowerCase()
31+
.lowercase()
3232
}
3333

3434
fun snakeCaseToCamelCase(name: String): String {
@@ -37,7 +37,7 @@ fun snakeCaseToCamelCase(name: String): String {
3737
if (i == 0) {
3838
s
3939
} else {
40-
s[0].toUpperCase() + s.substring(1)
40+
s[0].uppercase() + s.substring(1)
4141
}
4242
}
4343
.joinToString("")

0 commit comments

Comments
 (0)