Skip to content
This repository was archived by the owner on Nov 6, 2019. It is now read-only.

Commit bfa042e

Browse files
epabstepabst
committed
Support protected methods and properties
1 parent df92c43 commit bfa042e

11 files changed

+78
-21
lines changed

‎src/main/kotlin/ts2kt/TsClassifierToKt.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,15 @@ abstract class TsClassifierToKt(
9595
isOverride = isOverride,
9696
isVar = !isReadonly(node),
9797
isAbstract = isAbstract(node),
98-
needsNoImpl = needsNoImpl(node)
98+
needsNoImpl = needsNoImpl(node),
99+
accessModifier = getAccessModifier(node)
99100
)
100101
}
101102

102103
open fun TsClassifierToKt.addFunction(name: String, isOverride: Boolean, needsNoImpl: Boolean, node: MethodDeclaration) {
103104
val symbol = typeMapper.typeChecker.getSymbolResolvingAliases(node)
104105
node.toKotlinCallSignatureOverloads(typeMapper).forEach { callSignature ->
105-
addFunction(symbol, name, callSignature, isOverride = isOverride, needsNoImpl = needsNoImpl(node), isAbstract = isAbstract(node))
106+
addFunction(symbol, name, callSignature, isOverride = isOverride, needsNoImpl = needsNoImpl(node), isAbstract = isAbstract(node), accessModifier = getAccessModifier(node))
106107
}
107108

108109
assert(node.body == null, "An function in declarations file should not have body, function '${this.name}.$name'")
@@ -119,7 +120,7 @@ abstract class TsClassifierToKt(
119120

120121
override fun visitSignatureDeclaration(node: SignatureDeclaration) {
121122
node.toKotlinCallSignatureOverloads(typeMapper).forEach { callSignature ->
122-
addFunction(null, INVOKE, callSignature, needsNoImpl = false, additionalAnnotations = listOf(NATIVE_INVOKE_ANNOTATION), isOperator = true)
123+
addFunction(null, INVOKE, callSignature, needsNoImpl = false, additionalAnnotations = listOf(NATIVE_INVOKE_ANNOTATION), isOperator = true, accessModifier = getAccessModifier(node))
123124
}
124125
}
125126

‎src/main/kotlin/ts2kt/TsInterfaceToKt.kt‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,13 @@ open class TsInterfaceToKt(
3030
override fun TsClassifierToKt.addFunction(name: String, isOverride: Boolean, needsNoImpl: Boolean, node: MethodDeclaration) {
3131
val isOptional = node.questionToken != null
3232
val symbol = typeMapper.typeChecker.getSymbolResolvingAliases(node)
33+
val accessModifier = getAccessModifier(node)
3334
if (isOptional) {
3435
val call = node.toKotlinCallSignature(typeMapper)
35-
addVariable(symbol, name, type = createFunctionType(call.params, call.returnType.type).copy(isNullable = true), typeParams = call.typeParams, isVar = false, needsNoImpl = true, isOverride = isOverride)
36+
addVariable(symbol, name, type = createFunctionType(call.params, call.returnType.type).copy(isNullable = true), typeParams = call.typeParams, isVar = false, needsNoImpl = true, isOverride = isOverride, accessModifier = accessModifier)
3637
} else {
3738
node.toKotlinCallSignatureOverloads(typeMapper).forEach { call ->
38-
addFunction(symbol, name, call, needsNoImpl = false, isOverride = isOverride)
39+
addFunction(symbol, name, call, needsNoImpl = false, isOverride = isOverride, accessModifier = accessModifier)
3940
}
4041
}
4142

‎src/main/kotlin/ts2kt/TsInterfaceToKtExtensions.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,21 +52,22 @@ class TsInterfaceToKtExtensions(
5252
}
5353
}
5454

55-
override fun addVariable(symbol: Symbol?, name: String, type: KtType, extendsType: KtType?, typeParams: List<KtTypeParam>?, isVar: Boolean, isAbstract: Boolean, needsNoImpl: Boolean, additionalAnnotations: List<KtAnnotation>, isOverride: Boolean) {
55+
override fun addVariable(symbol: Symbol?, name: String, type: KtType, extendsType: KtType?, typeParams: List<KtTypeParam>?, isVar: Boolean, isAbstract: Boolean, needsNoImpl: Boolean, additionalAnnotations: List<KtAnnotation>, isOverride: Boolean, accessModifier: AccessModifier) {
5656
val typeParamsWithoutClashes = this.typeParams.fixIfClashWith(typeParams)
5757
val actualExtendsType = if (typeParamsWithoutClashes === this.typeParams) cachedExtendsType else getExtendsType(typeParamsWithoutClashes)
5858
val annotations = additionalAnnotations.withNativeAnnotation()
5959

6060
super.addVariable(symbol, name, type, actualExtendsType, typeParamsWithoutClashes merge typeParams, isVar,
61-
needsNoImpl = !isAbstract, additionalAnnotations = annotations, isOverride = isOverride, isAbstract = isAbstract)
61+
needsNoImpl = !isAbstract, additionalAnnotations = annotations, isOverride = isOverride, isAbstract = isAbstract,
62+
accessModifier = accessModifier)
6263
}
6364

64-
override fun addFunction(symbol: Symbol?, name: String, callSignature: KtCallSignature, extendsType: KtType?, needsNoImpl: Boolean, additionalAnnotations: List<KtAnnotation>, isOverride: Boolean, isOperator: Boolean, isAbstract: Boolean) {
65+
override fun addFunction(symbol: Symbol?, name: String, callSignature: KtCallSignature, extendsType: KtType?, needsNoImpl: Boolean, additionalAnnotations: List<KtAnnotation>, isOverride: Boolean, isOperator: Boolean, isAbstract: Boolean, accessModifier: AccessModifier) {
6566
val typeParamsWithoutClashes = this.typeParams.fixIfClashWith(callSignature.typeParams)
6667
val actualExtendsType = if (typeParamsWithoutClashes === this.typeParams) cachedExtendsType else getExtendsType(typeParamsWithoutClashes)
6768
val annotations = additionalAnnotations.withNativeAnnotation()
6869

69-
super.addFunction(symbol, name, KtCallSignature(callSignature.params, typeParamsWithoutClashes merge callSignature.typeParams, callSignature.returnType), actualExtendsType, true, annotations, isOverride, isOperator, isAbstract)
70+
super.addFunction(symbol, name, KtCallSignature(callSignature.params, typeParamsWithoutClashes merge callSignature.typeParams, callSignature.returnType), actualExtendsType, true, annotations, isOverride, isOperator, isAbstract, accessModifier)
7071
}
7172

7273
}

‎src/main/kotlin/ts2kt/TypeScriptToKotlin.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class TypeScriptToKotlin(
9696
}
9797
}
9898
val varType = d.type?.let { typeMapper.mapType(it) } ?: KtType(ANY)
99-
addVariable(symbol, name, varType, additionalAnnotations = additionalAnnotations)
99+
addVariable(symbol, name, varType, additionalAnnotations = additionalAnnotations, accessModifier = getAccessModifier(node))
100100
}
101101
}
102102

‎src/main/kotlin/ts2kt/TypeScriptToKotlinBase.kt‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,23 @@ abstract class TypeScriptToKotlinBase(
1616

1717
open val defaultAnnotations: List<KtAnnotation> = listOf()
1818

19-
open fun addVariable(symbol: Symbol?, name: String, type: KtType, extendsType: KtType? = null, typeParams: List<KtTypeParam>? = null, isVar: Boolean = true, isAbstract: Boolean = false, needsNoImpl: Boolean = !isAbstract, additionalAnnotations: List<KtAnnotation> = listOf(), isOverride: Boolean = false) {
19+
open fun addVariable(symbol: Symbol?, name: String, type: KtType, extendsType: KtType? = null, typeParams: List<KtTypeParam>? = null, isVar: Boolean = true, isAbstract: Boolean = false, needsNoImpl: Boolean = !isAbstract, additionalAnnotations: List<KtAnnotation> = listOf(), isOverride: Boolean = false, accessModifier: AccessModifier = AccessModifier.PUBLIC) {
2020
val annotations = defaultAnnotations + additionalAnnotations
21-
addDeclaration(symbol, KtVariable(KtName(name), KtTypeAnnotation(type), extendsType?.let { KtHeritageType(it) }, annotations, typeParams, isVar = isVar, needsNoImpl = needsNoImpl, isInInterface = isInterface, isOverride = isOverride, hasOpenModifier = hasMembersOpenModifier && !isAbstract, isAbstract = isAbstract))
21+
addDeclaration(symbol, KtVariable(KtName(name), KtTypeAnnotation(type), extendsType?.let { KtHeritageType(it) }, annotations, typeParams, isVar = isVar, needsNoImpl = needsNoImpl, isInInterface = isInterface, isOverride = isOverride, hasOpenModifier = hasMembersOpenModifier && !isAbstract, isAbstract = isAbstract, accessModifier = accessModifier))
2222
}
2323

24-
open fun addFunction(symbol: Symbol?, name: String, callSignature: KtCallSignature, extendsType: KtType? = null, needsNoImpl: Boolean = true, additionalAnnotations: List<KtAnnotation> = listOf(), isOverride: Boolean = false, isOperator: Boolean = false, isAbstract: Boolean = false) {
24+
open fun addFunction(symbol: Symbol?, name: String, callSignature: KtCallSignature, extendsType: KtType? = null, needsNoImpl: Boolean = true, additionalAnnotations: List<KtAnnotation> = listOf(), isOverride: Boolean = false, isOperator: Boolean = false, isAbstract: Boolean = false, accessModifier: AccessModifier = AccessModifier.PUBLIC) {
2525
val annotations = defaultAnnotations + additionalAnnotations
26-
addDeclaration(symbol, KtFunction(KtName(name), callSignature, extendsType?.let { KtHeritageType(it) }, annotations, needsNoImpl = needsNoImpl, isOverride = isOverride, hasOpenModifier = hasMembersOpenModifier && !isAbstract, isOperator = isOperator, isAbstract = isAbstract))
26+
addDeclaration(symbol, KtFunction(KtName(name), callSignature, extendsType?.let { KtHeritageType(it) }, annotations, needsNoImpl = needsNoImpl, isOverride = isOverride, hasOpenModifier = hasMembersOpenModifier && !isAbstract, isOperator = isOperator, isAbstract = isAbstract, accessModifier = accessModifier))
2727
}
2828

2929
protected fun addDeclaration(symbol: Symbol?, declaration: KtMember) {
30-
declarations += declaration
31-
if (symbol != null) {
32-
val values = declarationsBySymbol.getOrPut(symbol) { mutableListOf() }
33-
values += declaration
30+
if (declaration.accessModifier.usable) {
31+
declarations += declaration
32+
if (symbol != null) {
33+
val values = declarationsBySymbol.getOrPut(symbol) { mutableListOf() }
34+
values += declaration
35+
}
3436
}
3537
}
3638

@@ -42,6 +44,14 @@ abstract class TypeScriptToKotlinBase(
4244
return node.modifiers?.arr?.any { it.kind == SyntaxKind.ReadonlyKeyword } == true
4345
}
4446

47+
fun getAccessModifier(node: Node): AccessModifier {
48+
return when {
49+
node.modifiers?.arr?.any { it.kind == SyntaxKind.ProtectedKeyword } == true -> AccessModifier.PROTECTED
50+
node.modifiers?.arr?.any { it.kind == SyntaxKind.PrivateKeyword } == true -> AccessModifier.PRIVATE
51+
else -> AccessModifier.PUBLIC
52+
}
53+
}
54+
4555
// TODO
4656
open fun visitList(node: typescriptServices.ts.Node) {
4757
forEachChild(this, node)

‎src/main/kotlin/ts2kt/kotlin/ast/Stringify.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ private val EQ_NO_IMPL = " = $NO_IMPL"
1111
private val NO_IMPL_PROPERTY_GETTER = " get()" + EQ_NO_IMPL
1212
private val NO_IMPL_PROPERTY_SETTER = " set(value)" + EQ_NO_IMPL
1313
private val EXTERNAL = "external"
14+
private val PROTECTED = "protected"
1415
private val ABSTRACT = "abstract"
1516
private val OPEN = "open"
1617
private val OVERRIDE = "override"
@@ -139,6 +140,10 @@ class Stringify(
139140

140141
out.printIndent()
141142

143+
if (accessModifier == AccessModifier.PROTECTED) {
144+
out.print("$PROTECTED ")
145+
}
146+
142147
if (isAbstract) {
143148
out.print("$ABSTRACT ")
144149
}
@@ -183,6 +188,10 @@ class Stringify(
183188

184189
out.printIndent()
185190

191+
if (accessModifier == AccessModifier.PROTECTED) {
192+
out.print("$PROTECTED ")
193+
}
194+
186195
if (isAbstract) {
187196
out.print("$ABSTRACT ")
188197
}

‎src/main/kotlin/ts2kt/kotlin/ast/ast.kt‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ interface KtAnnotated {
8888
var annotations: List<KtAnnotation>
8989
}
9090

91-
interface KtMember : KtNode, KtNamed, KtAnnotated
91+
interface KtMember : KtNode, KtNamed, KtAnnotated {
92+
val accessModifier: AccessModifier
93+
}
9294

9395
// TODO should be Named?
9496
data class KtArgument(val value: Any/* TODO Any ??? */, val name: KtName? = null) : AbstractKtNode() {
@@ -122,6 +124,9 @@ data class KtClassifier(
122124
val hasOpenModifier: Boolean,
123125
val isAbstract: Boolean
124126
) : KtMember, AbstractKtNode(), KtWithMembers {
127+
128+
override val accessModifier: AccessModifier = AccessModifier.PUBLIC
129+
125130
override fun accept(visitor: KtVisitor) {
126131
visitor.visitClassifier(this)
127132
}
@@ -157,7 +162,8 @@ data class KtFunction(
157162
val isOverride: Boolean = false,
158163
val hasOpenModifier: Boolean = false,
159164
val isOperator: Boolean = false,
160-
val isAbstract: Boolean = false
165+
val isAbstract: Boolean = false,
166+
override val accessModifier: AccessModifier = AccessModifier.PUBLIC
161167
) : KtMember, AbstractKtNode() {
162168
override fun accept(visitor: KtVisitor) {
163169
visitor.visitFunction(this)
@@ -175,14 +181,17 @@ data class KtVariable(
175181
val needsNoImpl: Boolean = !isAbstract,
176182
val isInInterface: Boolean,
177183
val isOverride: Boolean = false,
178-
val hasOpenModifier: Boolean
184+
val hasOpenModifier: Boolean,
185+
override val accessModifier: AccessModifier = AccessModifier.PUBLIC
179186
) : KtMember, AbstractKtNode() {
180187
override fun accept(visitor: KtVisitor) {
181188
visitor.visitVariable(this)
182189
}
183190
}
184191

185192
data class KtEnumEntry(override var name: KtName, val value: String? = null) : KtMember, AbstractKtNode() {
193+
override val accessModifier: AccessModifier = AccessModifier.PUBLIC
194+
186195
override var annotations = listOf<KtAnnotation>()
187196

188197
override fun accept(visitor: KtVisitor) {
@@ -247,3 +256,7 @@ data class KtTypeAnnotation(var type: KtType, val isVararg: Boolean = false) : A
247256
visitor.visitTypeAnnotation(this)
248257
}
249258
}
259+
260+
enum class AccessModifier(val usable: Boolean) {
261+
PUBLIC(true), PROTECTED(true), INTERNAL(false), PRIVATE(false)
262+
}

‎testData/class/methods/accessModifierMethods.d.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package accessModifierMethods
2+
3+
external open class FooWithAccessModifierMethods {
4+
open fun publicMethod(s: String): String = definedExternally
5+
protected open fun protectedMethod(s: String): String = definedExternally
6+
}

‎testData/class/methods/accessModifierMethods.d.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
declare class FooWithAccessModifierMethods {
2+
public publicMethod(s: string): string;
3+
protected protectedMethod(s: string): string;
4+
private privateMethod(s: string): string;
5+
}

‎testData/class/variables/accessModifierVariables.d.kt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
package accessModifierVariables
2+
3+
external open class FooWithAccessModifierVariables {
4+
open var publicVar: Number = definedExternally
5+
protected open var protectedVar: Number = definedExternally
6+
}

0 commit comments

Comments
 (0)