Treat names starting with dot as non-supportable

Kotlin · Dec 1, 2019 · 7457cd6 · 7457cd6
1 parent 9a880f3
commit 7457cd6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/compiler/test/data/typescript/escaping/escaping.d.ts b/compiler/test/data/typescript/escaping/escaping.d.ts
@@ -8,6 +8,7 @@ interface This {
     'another-string-literal': string;
     "this_one_shouldnt_be_escaped": boolean;
     ":authority"?: string;
+    ".xxx": any;
     '3х': string;
     200: string;
     300?: number;

diff --git a/model-lowerings-common/src/org/jetbrains/dukat/model/commonLowerings/escapeIdentificators.kt b/model-lowerings-common/src/org/jetbrains/dukat/model/commonLowerings/escapeIdentificators.kt
@@ -86,8 +86,10 @@ private fun String.shouldEscape(): Boolean {
     val startsWithNumber = this.contains(STARTS_WITH_NUMBER)
     val isEscapedAlready = this.startsWith("`")
     val isStartingWithColon = this.startsWith(":")
+    val isStartingWithDot = this.startsWith(".")
 
-    return !isEscapedAlready && (isReservedWord || containsDollarSign || containsOnlyUnderscores || containsMinusSign || startsWithNumber || isStartingWithColon)
+    return !isEscapedAlready &&
+            (isReservedWord || containsDollarSign || containsOnlyUnderscores || containsMinusSign || startsWithNumber || isStartingWithColon || isStartingWithDot)
 }
 
 private fun String.escape(): String {

diff --git a/model-lowerings/src/org/jetbrains/dukat/commonLowerings/removeUnsupportedJsNames.kt b/model-lowerings/src/org/jetbrains/dukat/commonLowerings/removeUnsupportedJsNames.kt
@@ -41,7 +41,7 @@ private fun NameEntity.contains(str: String): Boolean {
 private val STARTS_WITH_NUMBER = "^`\\d+".toRegex()
 
 private fun NameEntity.isInvalidJsName(): Boolean {
-    return contains(STARTS_WITH_NUMBER) || contains("-") || startsWith("`:")
+    return contains(STARTS_WITH_NUMBER) || contains("-") || startsWith("`:") || startsWith("`.")
 }
 
 private fun MemberModel.getType(): TypeModel? {