azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[JS] Prevent default class constructors in d.ts files.

Browse Source 
Generate private TypeScript constructor for classes without public
primary Kotlin constructor.
This commit is contained in:
Svyatoslav Kuzmich
2020-05-21 17:50:41 +03:00
parent 695d383ed1
commit 2ca751a9fc
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToTsDeclarations.kt
+10 -1
View File
@@ -66,6 +66,13 @@ fun ExportedDeclaration.toTypeScript(indent: String): String = indent + when (th
val membersString = members.joinToString("") { it.toTypeScript("$indent ") + "\n" }
// If there are no exported constructors, add a private constructor to disable default one
val privateCtorString =
if (!isInterface && !isAbstract && members.none { it is ExportedConstructor })
"$indent private constructor();\n"
else
""
val renderedTypeParameters =
if (typeParameters.isNotEmpty())
"<" + typeParameters.joinToString(", ") + ">"
@@ -74,7 +81,9 @@ fun ExportedDeclaration.toTypeScript(indent: String): String = indent + when (th
val modifiers = if (isAbstract && !isInterface) "abstract " else ""
val klassExport = "$modifiers$keyword $name$renderedTypeParameters$superClassClause$superInterfacesClause {\n$membersString$indent}"
val bodyString = privateCtorString + membersString + indent
val klassExport = "$modifiers$keyword $name$renderedTypeParameters$superClassClause$superInterfacesClause {\n$bodyString}"
val staticsExport = if (nestedClasses.isNotEmpty()) "\n" + ExportedNamespace(name, nestedClasses).toTypeScript(indent) else ""
klassExport + staticsExport
}
js/js.translator/testData/typescript-export/constructors/constructors.d.ts
Vendored
+3
View File
@@ -9,10 +9,12 @@ declare namespace JS_TESTS {
readonly x: string;
}
class ClassWithSecondaryCtor {
private constructor();
readonly x: string;
static create(y: string): ClassWithSecondaryCtor
}
class ClassWithMultipleSecondaryCtors {
private constructor();
readonly x: string;
static createFromString(y: string): ClassWithMultipleSecondaryCtors
static createFromInts(y: number, z: number): ClassWithMultipleSecondaryCtors
@@ -24,6 +26,7 @@ declare namespace JS_TESTS {
static createFromInts(y: number, z: number): OpenClassWithMixedConstructors
}
class DerivedClassWithSecondaryCtor extends OpenClassWithMixedConstructors {
private constructor();
static delegateToPrimary(y: string): DerivedClassWithSecondaryCtor
static delegateToCreateFromInts(y: number, z: number): DerivedClassWithSecondaryCtor
}