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

[K/JS] Prepare JS Plain Objects plugin to publication

Browse Source
This commit is contained in:
Artem Kobzar
2024-01-17 10:52:58 +00:00
committed by Space Team
parent 561be747c1
commit dfe2d8651e
53 changed files with 479 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.space/CODEOWNERS
+2 -2
View File
@@ -376,8 +376,8 @@
/plugins/kapt3/kapt3-compiler/tests-gen/ "Kotlin Compiler Core" "Kotlin JVM"
/plugins/kapt4/ "Kotlin JVM"
/plugins/kotlinx-serialization/ Sergey.Shanshin Leonid.Startsev
/plugins/jso/ "Kotlin JS"
/libraries/tools/jso "Kotlin JS"
/plugins/js-plain-objects/ "Kotlin JS"
/libraries/tools/js-plain-objects "Kotlin JS"
/plugins/lombok/ "Kotlin Compiler Core"
/plugins/noarg/ "Kotlin Compiler Core"
/plugins/parcelize/ "Kotlin Compiler Core"
build.gradle.kts
+1 -1
View File
@@ -874,7 +874,7 @@ tasks {
dependsOn(":plugins:fir-plugin-prototype:fir-plugin-ic-test:test")
dependsOn(":kotlin-imports-dumper-compiler-plugin:test")
dependsOn(":plugins:jvm-abi-gen:test")
dependsOn(":plugins:jso:compiler-plugin:test")
dependsOn(":plugins:js-plain-objects:compiler-plugin:test")
dependsOn(":kotlinx-serialization-compiler-plugin:test")
dependsOn(":kotlin-lombok-compiler-plugin:test")
dependsOn(":kotlin-noarg-compiler-plugin:test")
libraries/tools/js-plain-objects/build.gradle.kts
+18
View File
@@ -0,0 +1,18 @@
plugins {
id("gradle-plugin-common-configuration")
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
}
gradlePlugin {
plugins {
create("js-plain-objects") {
id = "org.jetbrains.kotlin.plugin.js-plain-objects"
displayName = "Kotlin compiler plugin for typed JS-objects library"
description = displayName
implementationClass = "org.jetbrains.kotlinx.jspo.gradle.JsPlainObjectsKotlinGradleSubplugin"
}
}
}
libraries/tools/jso/src/common/kotlin/org/jetbrains/kotlinx/jso/gradle/JsoKotlinGradleSubplugin.kt → libraries/tools/js-plain-objects/src/common/kotlin/org/jetbrains/kotlinx/jso/gradle/JsPlainObjectsKotlinGradleSubplugin.kt
+5 -5
View File
@@ -14,14 +14,14 @@
* limitations under the License.
*/
package org.jetbrains.kotlinx.jso.gradle
package org.jetbrains.kotlinx.jspo.gradle
import org.gradle.api.provider.Provider
import org.jetbrains.kotlin.gradle.plugin.*
class JsoKotlinGradleSubplugin : KotlinCompilerPluginSupportPlugin {
class JsPlainObjectsKotlinGradleSubplugin : KotlinCompilerPluginSupportPlugin {
companion object {
const val JSO_ARTIFACT_NAME = "kotlinx-jso-compiler-plugin-embeddable"
const val JS_PLAIN_OBJECTS_ARTIFACT_NAME = "kotlinx-js-plain-objects-compiler-plugin-embeddable"
}
override fun isApplicable(kotlinCompilation: KotlinCompilation<*>): Boolean =
@@ -33,9 +33,9 @@ class JsoKotlinGradleSubplugin : KotlinCompilerPluginSupportPlugin {
kotlinCompilation.target.project.provider { emptyList() }
override fun getPluginArtifact(): SubpluginArtifact =
JetBrainsSubpluginArtifact(JSO_ARTIFACT_NAME)
JetBrainsSubpluginArtifact(JS_PLAIN_OBJECTS_ARTIFACT_NAME)
override fun getCompilerPluginId() = "org.jetbrains.kotlinx.jso"
override fun getCompilerPluginId() = "org.jetbrains.kotlinx.js-plain-objects"
private fun KotlinTarget.isJs() = platformType == KotlinPlatformType.js
libraries/tools/js-plain-objects/src/common/resources/META-INF/gradle-plugins/kotlinx-js-plain-objects.properties
+1
View File
@@ -0,0 +1 @@
implementation-class=org.jetbrains.kotlinx.jspo.gradle.JsPlainObjectsKotlinGradleSubplugin
libraries/tools/jso/build.gradle.kts
-18
View File
@@ -1,18 +0,0 @@
plugins {
id("gradle-plugin-common-configuration")
}
dependencies {
commonApi(platform(project(":kotlin-gradle-plugins-bom")))
}
gradlePlugin {
plugins {
create("jso") {
id = "org.jetbrains.kotlin.plugin.jso"
displayName = "Kotlin compiler plugin for kotlinx.jso library"
description = displayName
implementationClass = "org.jetbrains.kotlinx.jso.gradle.JsoKotlinGradleSubplugin"
}
}
}
libraries/tools/jso/src/common/resources/META-INF/gradle-plugins/kotlinx-jso.properties
-1
View File
@@ -1 +0,0 @@
implementation-class=org.jetbrains.kotlinx.jso.gradle.JsoKotlinGradleSubplugin
plugins/js-plain-objects/compiler-plugin-embeddable/build.gradle.kts
+19
View File
@@ -0,0 +1,19 @@
plugins {
id("org.jetbrains.kotlin.jvm")
}
dependencies {
embedded(project(":plugins:js-plain-objects:compiler-plugin")) { isTransitive = false }
}
publish {
artifactId = "kotlinx-js-plain-objects-compiler-plugin-embeddable"
}
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJarWithSourcesFromEmbedded(
project(":plugins:js-plain-objects:compiler-plugin").tasks.named<Jar>("sourcesJar")
)
javadocJarWithJavadocFromEmbedded(
project(":plugins:js-plain-objects:compiler-plugin").tasks.named<Jar>("javadocJar")
)
plugins/jso/compiler-plugin/build.gradle.kts → plugins/js-plain-objects/compiler-plugin/build.gradle.kts
+14 -12
View File
@@ -2,7 +2,7 @@ import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformType
import org.jetbrains.kotlin.gradle.plugin.mpp.KotlinUsages
import org.jetbrains.kotlin.gradle.targets.js.KotlinJsCompilerAttribute
description = "JavaScript Object Compiler Plugin"
description = "JavaScript Plain Objects Compiler Plugin"
plugins {
kotlin("jvm")
@@ -18,14 +18,14 @@ val jsoIrRuntimeForTests by configurations.creating {
}
dependencies {
embedded(project(":plugins:jso:compiler-plugin:jso.common")) { isTransitive = false }
embedded(project(":plugins:jso:compiler-plugin:jso.k2")) { isTransitive = false }
embedded(project(":plugins:jso:compiler-plugin:jso.backend")) { isTransitive = false }
embedded(project(":plugins:jso:compiler-plugin:jso.cli")) { isTransitive = false }
embedded(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.common")) { isTransitive = false }
embedded(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.k2")) { isTransitive = false }
embedded(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.backend")) { isTransitive = false }
embedded(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.cli")) { isTransitive = false }
testApi(project(":compiler:backend"))
testApi(project(":compiler:cli"))
testApi(project(":plugins:jso:compiler-plugin:jso.cli"))
testApi(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.cli"))
testApi(projectTests(":compiler:test-infrastructure"))
testApi(projectTests(":compiler:test-infrastructure-utils"))
@@ -40,9 +40,9 @@ dependencies {
testRuntimeOnly(libs.junit.jupiter.engine)
if (!project.kotlinBuildProperties.isInJpsBuildIdeaSync) {
jsoIrRuntimeForTests(project(":plugins:jso:runtime")) { isTransitive = false }
jsoIrRuntimeForTests(project(":plugins:js-plain-objects:runtime")) { isTransitive = false }
embedded(project(":plugins:jso:runtime")) {
embedded(project(":plugins:js-plain-objects:runtime")) {
attributes {
attribute(KotlinPlatformType.attribute, KotlinPlatformType.js)
attribute(KotlinJsCompilerAttribute.jsCompilerAttribute, KotlinJsCompilerAttribute.ir)
@@ -65,7 +65,9 @@ sourceSets {
}
}
publish()
publish {
artifactId = "kotlinx-js-plain-objects-compiler-plugin"
}
runtimeJar()
sourcesJar()
@@ -80,11 +82,11 @@ projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
dependsOn(jsoIrRuntimeForTests)
val localJsoIrRuntimePath: FileCollection = jsoIrRuntimeForTests
val localJsPlainObjectsIrRuntimePath: FileCollection = jsoIrRuntimeForTests
doFirst {
systemProperty("jso.runtime.path", localJsoIrRuntimePath.asPath)
systemProperty("jso.runtime.path", localJsPlainObjectsIrRuntimePath.asPath)
}
}
val generateTests by generator("org.jetbrains.kotlinx.jso.TestGeneratorKt")
val generateTests by generator("org.jetbrains.kotlinx.jspo.TestGeneratorKt")
plugins/jso/compiler-plugin/jso.backend/build.gradle.kts → plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/build.gradle.kts
+2 -2
View File
@@ -1,4 +1,4 @@
description = "Kotlin JavaScript Object Compiler Plugin (Backend)"
description = "Kotlin JavaScript Plain Objects Compiler Plugin (Backend)"
plugins {
kotlin("jvm")
@@ -10,7 +10,7 @@ dependencies {
compileOnly(project(":compiler:ir.backend.common"))
compileOnly(project(":compiler:ir.tree"))
implementation(project(":plugins:jso:compiler-plugin:jso.common"))
implementation(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.common"))
compileOnly(intellijCore())
}
plugins/jso/compiler-plugin/jso.backend/src/org/jetbrains/kotlinx/jso/compiler/backend/JsObjectLoweringExtension.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.backend/src/org/jetbrains/kotlinx/jso/compiler/backend/JsObjectLoweringExtension.kt
+5 -5
View File
@@ -2,7 +2,7 @@
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.backend
package org.jetbrains.kotlinx.jspo.compiler.backend
import org.jetbrains.kotlin.backend.common.DeclarationTransformer
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
@@ -15,12 +15,12 @@ import org.jetbrains.kotlin.ir.expressions.impl.*
import org.jetbrains.kotlin.ir.symbols.UnsafeDuringIrConstructionAPI
import org.jetbrains.kotlin.ir.util.*
import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlinx.jso.compiler.resolve.JsSimpleObjectPluginKey
import org.jetbrains.kotlinx.jso.compiler.resolve.StandardIds
import org.jetbrains.kotlinx.jspo.compiler.resolve.JsPlainObjectsPluginKey
import org.jetbrains.kotlinx.jspo.compiler.resolve.StandardIds
private class MoveExternalInlineFunctionsWithBodiesOutsideLowering(private val context: IrPluginContext) : DeclarationTransformer {
private val jsFunction = context.referenceFunctions(StandardIds.JS_FUNCTION_ID).single()
private val EXPECTED_ORIGIN = IrDeclarationOrigin.GeneratedByPlugin(JsSimpleObjectPluginKey)
private val EXPECTED_ORIGIN = IrDeclarationOrigin.GeneratedByPlugin(JsPlainObjectsPluginKey)
@OptIn(UnsafeDuringIrConstructionAPI::class)
override fun transformFlat(declaration: IrDeclaration): List<IrDeclaration>? {
@@ -66,7 +66,7 @@ private class MoveExternalInlineFunctionsWithBodiesOutsideLowering(private val c
}
}
open class JsObjectLoweringExtension : IrGenerationExtension {
open class JsPlainObjectsLoweringExtension : IrGenerationExtension {
override fun generate(moduleFragment: IrModuleFragment, pluginContext: IrPluginContext) {
MoveExternalInlineFunctionsWithBodiesOutsideLowering(pluginContext).lower(moduleFragment)
}
plugins/jso/compiler-plugin/jso.cli/build.gradle.kts → plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/build.gradle.kts
+4 -4
View File
@@ -1,4 +1,4 @@
description = "Kotlin JavaScript Object Compiler Plugin (CLI)"
description = "Kotlin JavaScript Plain Objects Compiler Plugin (CLI)"
plugins {
kotlin("jvm")
@@ -12,9 +12,9 @@ dependencies {
compileOnly(project(":compiler:fir:entrypoint"))
compileOnly(project(":compiler:ir.backend.common"))
implementation(project(":plugins:jso:compiler-plugin:jso.common"))
implementation(project(":plugins:jso:compiler-plugin:jso.backend"))
implementation(project(":plugins:jso:compiler-plugin:jso.k2"))
implementation(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.common"))
implementation(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.backend"))
implementation(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.k2"))
compileOnly(intellijCore())
}
plugins/jso/compiler-plugin/jso.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar → plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/resources/META-INF/services/org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
+1 -1
View File
@@ -14,4 +14,4 @@
# limitations under the License.
#
org.jetbrains.kotlinx.jso.compiler.cli.JsObjectComponentRegistrar
org.jetbrains.kotlinx.jspo.compiler.cli.JsPlainObjectsComponentRegistrar
plugins/jso/compiler-plugin/jso.cli/src/org/jetbrains/kotlinx/jso/compiler/cli/JsObjectComponentRegistrar.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.cli/src/org/jetbrains/kotlinx/jso/compiler/cli/JsPlainObjectsComponentRegistrar.kt
+6 -6
View File
@@ -3,16 +3,16 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.cli
package org.jetbrains.kotlinx.jspo.compiler.cli
import org.jetbrains.kotlin.backend.common.extensions.IrGenerationExtension
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
import org.jetbrains.kotlin.config.CompilerConfiguration
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrarAdapter
import org.jetbrains.kotlinx.jso.compiler.backend.JsObjectLoweringExtension
import org.jetbrains.kotlinx.jso.compiler.fir.JsObjectExtensionRegistrar
import org.jetbrains.kotlinx.jspo.compiler.backend.JsPlainObjectsLoweringExtension
import org.jetbrains.kotlinx.jspo.compiler.fir.JsPlainObjectsExtensionRegistrar
class JsObjectComponentRegistrar : CompilerPluginRegistrar() {
class JsPlainObjectsComponentRegistrar : CompilerPluginRegistrar() {
override val supportsK2: Boolean get() = true
override fun ExtensionStorage.registerExtensions(configuration: CompilerConfiguration) {
@@ -21,8 +21,8 @@ class JsObjectComponentRegistrar : CompilerPluginRegistrar() {
companion object {
fun registerExtensions(extensionStorage: ExtensionStorage) = with(extensionStorage) {
FirExtensionRegistrarAdapter.registerExtension(JsObjectExtensionRegistrar())
IrGenerationExtension.registerExtension(JsObjectLoweringExtension())
FirExtensionRegistrarAdapter.registerExtension(JsPlainObjectsExtensionRegistrar())
IrGenerationExtension.registerExtension(JsPlainObjectsLoweringExtension())
}
}
}
plugins/jso/compiler-plugin/jso.common/build.gradle.kts → plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/build.gradle.kts
+1 -1
View File
@@ -1,4 +1,4 @@
description = "Kotlin JavaScript Object Compiler Plugin (Common)"
description = "Kotlin JavaScript Plain Objects Compiler Plugin (Common)"
plugins {
kotlin("jvm")
plugins/jso/compiler-plugin/jso.common/src/org/jetbrains/kotlinx/jso/compiler/resolve/JsSimpleObjectPluginKey.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/src/org/jetbrains/kotlinx/jso/compiler/resolve/JsPlainObjectsPluginKey.kt
+3 -3
View File
@@ -3,12 +3,12 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.resolve
package org.jetbrains.kotlinx.jspo.compiler.resolve
import org.jetbrains.kotlin.GeneratedDeclarationKey
object JsSimpleObjectPluginKey : GeneratedDeclarationKey() {
object JsPlainObjectsPluginKey : GeneratedDeclarationKey() {
override fun toString(): String {
return "KotlinxJsSimpleObjectPlugin"
return "KotlinxJsPlainObjectsPlugin"
}
}
plugins/jso/compiler-plugin/jso.common/src/org/jetbrains/kotlinx/jso/compiler/resolve/NamingConventions.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.common/src/org/jetbrains/kotlinx/jso/compiler/resolve/NamingConventions.kt
+4 -4
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.resolve;
package org.jetbrains.kotlinx.jspo.compiler.resolve;
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.ClassId
@@ -15,7 +15,7 @@ object StandardIds {
val JS_FUNCTION_ID = CallableId(KOTLIN_JS_FQN, Name.identifier("js"))
}
object JsObjectAnnotations {
val jsSimpleObjectAnnotationClassId = ClassId(FqName("kotlinx.jso"), Name.identifier("JsSimpleObject"))
val jsSimpleObjectAnnotationFqName = jsSimpleObjectAnnotationClassId.asSingleFqName()
object JsPlainObjectsAnnotations {
val jsPlainObjectAnnotationClassId = ClassId(FqName("kotlinx.js"), Name.identifier("JsPlainObject"))
val jsPlainObjectAnnotationFqName = jsPlainObjectAnnotationClassId.asSingleFqName()
}
plugins/jso/compiler-plugin/jso.k2/build.gradle.kts → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/build.gradle.kts
+2 -2
View File
@@ -1,4 +1,4 @@
description = "Kotlin JavaScript Object Compiler Plugin (K2)"
description = "Kotlin JavaScript Plain Objects Compiler Plugin (K2)"
plugins {
kotlin("jvm")
@@ -13,7 +13,7 @@ dependencies {
compileOnly(project(":compiler:fir:entrypoint"))
compileOnly(project(":compiler:cli-common"))
implementation(project(":plugins:jso:compiler-plugin:jso.common"))
implementation(project(":plugins:js-plain-objects:compiler-plugin:js-plain-objects.common"))
compileOnly(intellijCore())
plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsPlainObjectsExtensionRegistrar.kt
+19
View File
@@ -0,0 +1,19 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jspo.compiler.fir
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
import org.jetbrains.kotlinx.jspo.compiler.fir.checkers.FirJsPlainObjectsCheckersComponent
import org.jetbrains.kotlinx.jspo.compiler.fir.services.JsPlainObjectsPropertiesProvider
class JsPlainObjectsExtensionRegistrar : FirExtensionRegistrar() {
override fun ExtensionRegistrarContext.configurePlugin() {
+::FirJsPlainObjectsCheckersComponent
+::JsPlainObjectsFunctionsGenerator
// services
+::JsPlainObjectsPropertiesProvider
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsObjectFunctionsGenerator.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsPlainObjectsFunctionsGenerator.kt
+40 -44
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir
package org.jetbrains.kotlinx.jspo.compiler.fir
import org.jetbrains.kotlin.builtins.StandardNames
import org.jetbrains.kotlin.descriptors.ClassKind
@@ -12,10 +12,8 @@ import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.fir.FirFunctionTarget
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.analysis.checkers.getContainingClassSymbol
import org.jetbrains.kotlin.fir.builder.createDataClassCopyFunction
import org.jetbrains.kotlin.fir.declarations.FirResolvePhase
import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction
import org.jetbrains.kotlin.fir.declarations.builder.FirSimpleFunctionBuilder
import org.jetbrains.kotlin.fir.declarations.builder.buildRegularClass
import org.jetbrains.kotlin.fir.declarations.builder.buildSimpleFunction
import org.jetbrains.kotlin.fir.declarations.builder.buildValueParameter
@@ -37,27 +35,25 @@ import org.jetbrains.kotlin.fir.scopes.kotlinScopeProvider
import org.jetbrains.kotlin.fir.symbols.SymbolInternals
import org.jetbrains.kotlin.fir.symbols.impl.*
import org.jetbrains.kotlin.fir.toEffectiveVisibility
import org.jetbrains.kotlin.fir.types.coneTypeOrNull
import org.jetbrains.kotlin.fir.types.isNullable
import org.jetbrains.kotlin.fir.types.toFirResolvedTypeRef
import org.jetbrains.kotlin.name.CallableId
import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.name.SpecialNames
import org.jetbrains.kotlin.name.StandardClassIds
import org.jetbrains.kotlin.types.ConstantValueKind
import org.jetbrains.kotlin.util.OperatorNameConventions
import org.jetbrains.kotlin.utils.addToStdlib.runIf
import org.jetbrains.kotlinx.jso.compiler.fir.services.jsObjectPropertiesProvider
import org.jetbrains.kotlinx.jso.compiler.resolve.JsSimpleObjectPluginKey
import org.jetbrains.kotlinx.jspo.compiler.fir.services.jsPlainObjectPropertiesProvider
import org.jetbrains.kotlinx.jspo.compiler.resolve.JsPlainObjectsPluginKey
/**
* The extension generate a synthetic factory and copy-method for an `external interface` annotated with @JsSimpleObject
* The extension generate a synthetic factory and copy-method for an `external interface` annotated with @JsPlainObjects
* Imagine the next interfaces:
* ```
* external interface User {
* val name: String
* }
* @JsSimpleObject
* @JsPlainObjects
* external interface Admin {
* val chat: Chat
* }
@@ -78,24 +74,24 @@ import org.jetbrains.kotlinx.jso.compiler.resolve.JsSimpleObjectPluginKey
* }
* ```
*/
class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) {
class JsPlainObjectsFunctionsGenerator(session: FirSession) : FirDeclarationGenerationExtension(session) {
private val predicateBasedProvider = session.predicateBasedProvider
private val matchedInterfaces by lazy {
predicateBasedProvider.getSymbolsByPredicate(JsObjectPredicates.AnnotatedWithJsSimpleObject.LOOKUP)
predicateBasedProvider.getSymbolsByPredicate(JsPlainObjectsPredicates.AnnotatedWithJsPlainObject.LOOKUP)
.filterIsInstance<FirRegularClassSymbol>()
.toSet()
}
private val factoryFqNamesToJsObjectInterface by lazy {
private val factoryFqNamesToJsPlainObjectsInterface by lazy {
matchedInterfaces.associateBy { it.classId.asSingleFqName() }
}
private val FirClassLikeSymbol<*>.isJsObject: Boolean
private val FirClassLikeSymbol<*>.isJsPlainObject: Boolean
get() = this is FirRegularClassSymbol && this in matchedInterfaces
override fun getNestedClassifiersNames(classSymbol: FirClassSymbol<*>, context: NestedClassGenerationContext): Set<Name> {
return if (classSymbol.isJsObject) setOf(SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT) else emptySet()
return if (classSymbol.isJsPlainObject) setOf(SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT) else emptySet()
}
override fun generateNestedClassLikeDeclaration(
@@ -105,7 +101,7 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
): FirClassLikeSymbol<*>? {
return if (
owner is FirRegularClassSymbol &&
owner.isJsObject &&
owner.isJsPlainObject &&
name == org.jetbrains.kotlin.name.SpecialNames.DEFAULT_NAME_FOR_COMPANION_OBJECT
) generateCompanionDeclaration(owner)
else null
@@ -117,7 +113,7 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
return buildRegularClass {
resolvePhase = FirResolvePhase.BODY_RESOLVE
moduleData = session.moduleData
origin = JsSimpleObjectPluginKey.origin
origin = JsPlainObjectsPluginKey.origin
classKind = ClassKind.OBJECT
scopeProvider = session.kotlinScopeProvider
status = FirResolvedDeclarationStatusImpl(
@@ -136,8 +132,8 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
override fun getCallableNamesForClass(classSymbol: FirClassSymbol<*>, context: MemberGenerationContext): Set<Name> {
val outerClass = classSymbol.getContainingClassSymbol(session)
return when {
classSymbol.isCompanion && outerClass?.isJsObject == true -> setOf(OperatorNameConventions.INVOKE)
classSymbol.isJsObject -> setOf(StandardNames.DATA_CLASS_COPY)
classSymbol.isCompanion && outerClass?.isJsPlainObject == true -> setOf(OperatorNameConventions.INVOKE)
classSymbol.isJsPlainObject -> setOf(StandardNames.DATA_CLASS_COPY)
else -> emptySet()
}
}
@@ -151,25 +147,25 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
return when (callableId.callableName) {
StandardNames.DATA_CLASS_COPY -> {
containingClass
?.let { factoryFqNamesToJsObjectInterface[it.asSingleFqName()] }
?.let { listOf(createJsObjectCopyFunction(callableId, context.owner, it).symbol) } ?: emptyList()
?.let { factoryFqNamesToJsPlainObjectsInterface[it.asSingleFqName()] }
?.let { listOf(createJsPlainObjectCopyFunction(callableId, context.owner, it).symbol) } ?: emptyList()
}
OperatorNameConventions.INVOKE -> {
possibleInterface
?.takeIf { context.owner.isCompanion }
?.let { factoryFqNamesToJsObjectInterface[it.asSingleFqName()] }
?.let { listOf(createJsObjectFactoryFunction(callableId, context.owner, it).symbol) } ?: emptyList()
?.let { factoryFqNamesToJsPlainObjectsInterface[it.asSingleFqName()] }
?.let { listOf(createJsPlainObjectFactoryFunction(callableId, context.owner, it).symbol) } ?: emptyList()
}
else -> emptyList()
}
}
private fun createJsObjectFactoryFunction(
private fun createJsPlainObjectFactoryFunction(
callableId: CallableId,
parent: FirClassSymbol<*>,
jsSimpleObjectInterface: FirRegularClassSymbol,
jsPlainObjectInterface: FirRegularClassSymbol,
): FirSimpleFunction {
return createJsObjectFunction(callableId, parent, jsSimpleObjectInterface) {
return createJsPlainObjectsFunction(callableId, parent, jsPlainObjectInterface) {
runIf(resolvedReturnTypeRef.type.isNullable) {
buildConstExpression(
source = null,
@@ -181,21 +177,21 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
}
}
private fun createJsObjectCopyFunction(
private fun createJsPlainObjectCopyFunction(
callableId: CallableId,
parent: FirClassSymbol<*>,
jsSimpleObjectInterface: FirRegularClassSymbol,
jsPlainObjectInterface: FirRegularClassSymbol,
): FirSimpleFunction {
val interfaceType = jsSimpleObjectInterface.defaultType()
return createJsObjectFunction(callableId, parent, jsSimpleObjectInterface) {
val interfaceType = jsPlainObjectInterface.defaultType()
return createJsPlainObjectsFunction(callableId, parent, jsPlainObjectInterface) {
buildPropertyAccessExpression {
dispatchReceiver = buildThisReceiverExpression {
calleeReference = buildImplicitThisReference { boundSymbol = jsSimpleObjectInterface }
calleeReference = buildImplicitThisReference { boundSymbol = jsPlainObjectInterface }
coneTypeOrNull = interfaceType
}
calleeReference = buildResolvedNamedReference {
name = this@createJsObjectFunction.name
resolvedSymbol = this@createJsObjectFunction
name = this@createJsPlainObjectsFunction.name
resolvedSymbol = this@createJsPlainObjectsFunction
}
coneTypeOrNull = resolvedReturnType
}
@@ -203,40 +199,40 @@ class JsObjectFunctionsGenerator(session: FirSession) : FirDeclarationGeneration
}
@OptIn(SymbolInternals::class)
private fun createJsObjectFunction(
private fun createJsPlainObjectsFunction(
callableId: CallableId,
parent: FirClassSymbol<*>,
jsSimpleObjectInterface: FirRegularClassSymbol,
jsPlainObjectInterface: FirRegularClassSymbol,
getParameterDefaultValueFromProperty: FirPropertySymbol.() -> FirExpression?
): FirSimpleFunction {
val jsSimpleObjectProperties = session.jsObjectPropertiesProvider.getJsObjectPropertiesForClass(jsSimpleObjectInterface)
val jsPlainObjectProperties = session.jsPlainObjectPropertiesProvider.getJsPlainObjectsPropertiesForClass(jsPlainObjectInterface)
val functionTarget = FirFunctionTarget(null, isLambda = false)
val jsSimpleObjectInterfaceDefaultType = jsSimpleObjectInterface.defaultType()
val jsPlainObjectInterfaceDefaultType = jsPlainObjectInterface.defaultType()
return buildSimpleFunction {
moduleData = jsSimpleObjectInterface.moduleData
moduleData = jsPlainObjectInterface.moduleData
resolvePhase = FirResolvePhase.BODY_RESOLVE
origin = JsSimpleObjectPluginKey.origin
origin = JsPlainObjectsPluginKey.origin
symbol = FirNamedFunctionSymbol(callableId)
name = callableId.callableName
returnTypeRef = jsSimpleObjectInterfaceDefaultType.toFirResolvedTypeRef()
returnTypeRef = jsPlainObjectInterfaceDefaultType.toFirResolvedTypeRef()
status = FirResolvedDeclarationStatusImpl(
jsSimpleObjectInterface.visibility,
jsPlainObjectInterface.visibility,
Modality.FINAL,
jsSimpleObjectInterface.visibility.toEffectiveVisibility(parent, forClass = true)
jsPlainObjectInterface.visibility.toEffectiveVisibility(parent, forClass = true)
).apply {
isInline = true
isOperator = true
}
dispatchReceiverType = parent.defaultType()
jsSimpleObjectInterface.typeParameterSymbols.mapTo(typeParameters) { it.fir }
jsSimpleObjectProperties.mapTo(valueParameters) {
jsPlainObjectInterface.typeParameterSymbols.mapTo(typeParameters) { it.fir }
jsPlainObjectProperties.mapTo(valueParameters) {
val typeRef = it.resolvedReturnTypeRef
buildValueParameter {
moduleData = session.moduleData
origin = JsSimpleObjectPluginKey.origin
origin = JsPlainObjectsPluginKey.origin
returnTypeRef = typeRef
name = it.name
symbol = FirValueParameterSymbol(it.name)
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsObjectPredicates.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsPlainObjectsPredicates.kt
+7 -7
View File
@@ -2,16 +2,16 @@
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir
package org.jetbrains.kotlinx.jspo.compiler.fir
import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate
import org.jetbrains.kotlin.fir.extensions.predicate.LookupPredicate
import org.jetbrains.kotlinx.jso.compiler.resolve.JsObjectAnnotations
import org.jetbrains.kotlinx.jspo.compiler.resolve.JsPlainObjectsAnnotations
object JsObjectPredicates {
internal object AnnotatedWithJsSimpleObject {
private val jsSimpleObjectAnnotation = setOf(JsObjectAnnotations.jsSimpleObjectAnnotationFqName)
internal val LOOKUP = LookupPredicate.create { annotated(jsSimpleObjectAnnotation) }
internal val DECLARATION = DeclarationPredicate.create { annotated(jsSimpleObjectAnnotation) }
object JsPlainObjectsPredicates {
internal object AnnotatedWithJsPlainObject {
private val jsPlainObjectAnnotation = setOf(JsPlainObjectsAnnotations.jsPlainObjectAnnotationFqName)
internal val LOOKUP = LookupPredicate.create { annotated(jsPlainObjectAnnotation) }
internal val DECLARATION = DeclarationPredicate.create { annotated(jsPlainObjectAnnotation) }
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsoCheckersComponent.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsPlainObjectsCheckersComponent.kt
+3 -3
View File
@@ -3,15 +3,15 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir.checkers
package org.jetbrains.kotlinx.jspo.compiler.fir.checkers
import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.DeclarationCheckers
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirClassChecker
import org.jetbrains.kotlin.fir.analysis.extensions.FirAdditionalCheckersExtension
class FirJsoCheckersComponent(session: FirSession) : FirAdditionalCheckersExtension(session) {
class FirJsPlainObjectsCheckersComponent(session: FirSession) : FirAdditionalCheckersExtension(session) {
override val declarationCheckers: DeclarationCheckers = object : DeclarationCheckers() {
override val classCheckers: Set<FirClassChecker> = setOf(FirJsoPluginClassChecker)
override val classCheckers: Set<FirClassChecker> = setOf(FirJsPlainObjectsPluginClassChecker)
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsoErrors.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsPlainObjectsErrors.kt
+6 -8
View File
@@ -3,22 +3,20 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir.checkers
package org.jetbrains.kotlinx.jspo.compiler.fir.checkers
import com.intellij.psi.PsiElement
import org.jetbrains.kotlin.diagnostics.*
import org.jetbrains.kotlin.diagnostics.rendering.RootDiagnosticRendererFactory
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.ConeKotlinType
import org.jetbrains.kotlin.psi.KtAnnotationEntry
object FirJsoErrors {
object FirJsPlainObjectsErrors {
val NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED by error1<PsiElement, String>()
val ONLY_INTERFACES_ARE_SUPPORTED by error1<PsiElement, String>()
val IMPLEMENTING_OF_JSO_IS_NOT_SUPPORTED by error1<PsiElement, String>()
val IMPLEMENTING_OF_JS_PLAIN_OBJECT_IS_NOT_SUPPORTED by error1<PsiElement, String>()
val METHODS_ARE_NOT_ALLOWED_INSIDE_JS_PLAIN_OBJECT by error0<PsiElement>()
val JS_PLAIN_OBJECT_CAN_EXTEND_ONLY_OTHER_JS_PLAIN_OBJECTS by error1<PsiElement, String>()
init {
RootDiagnosticRendererFactory.registerFactory(KtDefaultErrorMessagesJso)
RootDiagnosticRendererFactory.registerFactory(KtDefaultErrorMessagesJsPlainObjects)
}
}
plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsPlainObjectsPluginClassChecker.kt
+105
View File
@@ -0,0 +1,105 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jspo.compiler.fir.checkers
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirClassChecker
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
import org.jetbrains.kotlin.fir.declarations.utils.isEffectivelyExternal
import org.jetbrains.kotlin.fir.declarations.utils.isInline
import org.jetbrains.kotlin.fir.declarations.utils.isInterface
import org.jetbrains.kotlin.fir.declarations.utils.isMethodOfAny
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.scopes.impl.declaredMemberScope
import org.jetbrains.kotlin.fir.scopes.processAllFunctions
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.isAny
import org.jetbrains.kotlin.fir.types.toRegularClassSymbol
import org.jetbrains.kotlinx.jspo.compiler.resolve.JsPlainObjectsAnnotations
object FirJsPlainObjectsPluginClassChecker : FirClassChecker() {
override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) {
with(context) {
val classSymbol = declaration.symbol as? FirRegularClassSymbol ?: return
if (classSymbol.hasAnnotation(JsPlainObjectsAnnotations.jsPlainObjectAnnotationClassId, session)) {
checkJsPlainObjectAnnotationTargets(classSymbol, reporter)
checkJsPlainObjectSuperTypes(classSymbol, reporter)
checkJsPlainObjectMembers(classSymbol, reporter)
} else {
checkJsPlainObjectAsSuperInterface(classSymbol, reporter)
}
}
}
context(CheckerContext)
private fun checkJsPlainObjectAnnotationTargets(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
val classKind = classSymbol.classKind.codeRepresentation ?: error("Unexpected enum entry")
if (!classSymbol.isEffectivelyExternal(session)) {
reporter.reportOn(classSymbol.source, FirJsPlainObjectsErrors.NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED, classKind)
return
}
if (!classSymbol.isInterface) {
reporter.reportOn(classSymbol.source, FirJsPlainObjectsErrors.ONLY_INTERFACES_ARE_SUPPORTED, classKind)
return
}
}
context(CheckerContext)
private fun checkJsPlainObjectMembers(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
if (!classSymbol.isEffectivelyExternal(session) || !classSymbol.isInterface) return
classSymbol
.declaredMemberScope(session, null)
.processAllFunctions {
if (!it.isMethodOfAny && !it.isInline) {
reporter.reportOn(it.source, FirJsPlainObjectsErrors.METHODS_ARE_NOT_ALLOWED_INSIDE_JS_PLAIN_OBJECT)
}
}
}
context(CheckerContext)
private fun checkJsPlainObjectSuperTypes(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
if (!classSymbol.isEffectivelyExternal(session) || !classSymbol.isInterface) return
classSymbol.resolvedSuperTypeRefs.forEach { superType ->
val superInterface = superType.coneType
.takeIf { !it.isAny }
?.fullyExpandedType(session)
?.toRegularClassSymbol(session) ?: return@forEach
if (!superInterface.hasAnnotation(JsPlainObjectsAnnotations.jsPlainObjectAnnotationClassId, session)) {
reporter.reportOn(
superType.source,
FirJsPlainObjectsErrors.JS_PLAIN_OBJECT_CAN_EXTEND_ONLY_OTHER_JS_PLAIN_OBJECTS,
classSymbol.classId.asFqNameString()
)
}
}
}
context(CheckerContext)
private fun checkJsPlainObjectAsSuperInterface(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
classSymbol.resolvedSuperTypeRefs.forEach {
val superInterface = it.coneType.fullyExpandedType(session)
.toRegularClassSymbol(session)
?.takeIf { it.classKind == ClassKind.INTERFACE } ?: return@forEach
if (superInterface.hasAnnotation(JsPlainObjectsAnnotations.jsPlainObjectAnnotationClassId, session)) {
reporter.reportOn(
it.source,
FirJsPlainObjectsErrors.IMPLEMENTING_OF_JS_PLAIN_OBJECT_IS_NOT_SUPPORTED,
classSymbol.classId.asFqNameString()
)
}
}
}
}
plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/KtDefaultErrorMessagesJso.kt
+30
View File
@@ -0,0 +1,30 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jspo.compiler.fir.checkers
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap
import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers
object KtDefaultErrorMessagesJsPlainObjects : BaseDiagnosticRendererFactory() {
override val MAP = KtDiagnosticFactoryToRendererMap("JsPlainObjects").apply {
put(
FirJsPlainObjectsErrors.NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED,
"Non-external {0} can not be annotated with JsPlainObjects. Only external interfaces are supported.",
CommonRenderers.STRING
)
put(
FirJsPlainObjectsErrors.ONLY_INTERFACES_ARE_SUPPORTED,
"External {0} can not be annotated with JsPlainObjects. Only external interfaces are supported.",
CommonRenderers.STRING
)
put(
FirJsPlainObjectsErrors.IMPLEMENTING_OF_JS_PLAIN_OBJECT_IS_NOT_SUPPORTED,
"[{0}] is marked as JsPlainObjects, so, it can not be used as a super-type for non-JsPlainObjects declarations",
CommonRenderers.STRING
)
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/services/JsSimpleObjectPropertiesProvider.kt → plugins/js-plain-objects/compiler-plugin/js-plain-objects.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/services/JsPlainObjectsPropertiesProvider.kt
+11 -11
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir.services
package org.jetbrains.kotlinx.jspo.compiler.fir.services
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -23,23 +23,23 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol
import org.jetbrains.kotlin.fir.types.toRegularClassSymbol
import org.jetbrains.kotlin.utils.addIfNotNull
import org.jetbrains.kotlinx.jso.compiler.fir.JsObjectPredicates
import org.jetbrains.kotlinx.jso.compiler.resolve.JsObjectAnnotations
import org.jetbrains.kotlinx.jspo.compiler.fir.JsPlainObjectsPredicates
import org.jetbrains.kotlinx.jspo.compiler.resolve.JsPlainObjectsAnnotations
class JsSimpleObjectPropertiesProvider(session: FirSession) : FirExtensionSessionComponent(session) {
class JsPlainObjectsPropertiesProvider(session: FirSession) : FirExtensionSessionComponent(session) {
private val cache: FirCache<FirClassSymbol<*>, List<FirPropertySymbol>, Nothing?> =
session.firCachesFactory.createCache(this::createJsSimpleObjectProperties)
session.firCachesFactory.createCache(this::createJsPlainObjectProperties)
override fun FirDeclarationPredicateRegistrar.registerPredicates() {
register(JsObjectPredicates.AnnotatedWithJsSimpleObject.DECLARATION)
register(JsPlainObjectsPredicates.AnnotatedWithJsPlainObject.DECLARATION)
}
fun getJsObjectPropertiesForClass(classSymbol: FirClassSymbol<*>): List<FirPropertySymbol> {
fun getJsPlainObjectsPropertiesForClass(classSymbol: FirClassSymbol<*>): List<FirPropertySymbol> {
return cache.getValue(classSymbol)
}
private fun createJsSimpleObjectProperties(classSymbol: FirClassSymbol<*>): List<FirPropertySymbol> =
if (!classSymbol.hasAnnotation(JsObjectAnnotations.jsSimpleObjectAnnotationClassId, session)) {
private fun createJsPlainObjectProperties(classSymbol: FirClassSymbol<*>): List<FirPropertySymbol> =
if (!classSymbol.hasAnnotation(JsPlainObjectsAnnotations.jsPlainObjectAnnotationClassId, session)) {
emptyList()
} else {
buildList {
@@ -48,7 +48,7 @@ class JsSimpleObjectPropertiesProvider(session: FirSession) : FirExtensionSessio
.toRegularClassSymbol(session)
?.takeIf { it.classKind == ClassKind.INTERFACE } ?: return@forEach
val superInterfaceSimpleObjectProperties = createJsSimpleObjectProperties(superInterface)
val superInterfaceSimpleObjectProperties = createJsPlainObjectProperties(superInterface)
superInterfaceSimpleObjectProperties.forEach(::addIfNotNull)
}
@@ -61,4 +61,4 @@ class JsSimpleObjectPropertiesProvider(session: FirSession) : FirExtensionSessio
}
}
val FirSession.jsObjectPropertiesProvider: JsSimpleObjectPropertiesProvider by FirSession.sessionComponentAccessor()
val FirSession.jsPlainObjectPropertiesProvider: JsPlainObjectsPropertiesProvider by FirSession.sessionComponentAccessor()
plugins/jso/compiler-plugin/testData/box/copy.kt → plugins/js-plain-objects/compiler-plugin/testData/box/copy.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package foo
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
@JsSimpleObject
@JsPlainObject
external interface User {
var name: String
val age: Int
plugins/jso/compiler-plugin/testData/box/optional.kt → plugins/js-plain-objects/compiler-plugin/testData/box/optional.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package foo
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
@JsSimpleObject
@JsPlainObject
external interface User {
var name: String
val age: Int
plugins/jso/compiler-plugin/testData/box/simple.kt → plugins/js-plain-objects/compiler-plugin/testData/box/simple.kt
Vendored
+2 -2
View File
@@ -1,8 +1,8 @@
package foo
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
@JsSimpleObject
@JsPlainObject
external interface User {
var name: String
val age: Int
plugins/jso/compiler-plugin/testData/box/with-inheritance.kt → plugins/js-plain-objects/compiler-plugin/testData/box/with-inheritance.kt
Vendored
+3 -3
View File
@@ -1,14 +1,14 @@
package foo
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
@JsSimpleObject
@JsPlainObject
external interface User {
var name: String
val age: Int
}
@JsSimpleObject
@JsPlainObject
external interface ExtendedUser : User {
val email: String
}
plugins/jso/compiler-plugin/testData/box/with-multiple-inheritance.kt → plugins/js-plain-objects/compiler-plugin/testData/box/with-multiple-inheritance.kt
Vendored
+4 -4
View File
@@ -1,19 +1,19 @@
package foo
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
@JsSimpleObject
@JsPlainObject
external interface User {
var name: String
val age: Int
}
@JsSimpleObject
@JsPlainObject
external interface Role {
val role: String
}
@JsSimpleObject
@JsPlainObject
external interface ExtendedUser : User, Role {
val email: String
}
plugins/js-plain-objects/compiler-plugin/testData/diagnostics/inheritance.kt
Vendored
+27
View File
@@ -0,0 +1,27 @@
// FIR_IDENTICAL
// SKIP_TXT
// FILE: test.kt
import kotlinx.js.JsPlainObject
external interface A
external interface B
external interface C
@JsPlainObject
external interface D : <!JS_PLAIN_OBJECT_CAN_EXTEND_ONLY_OTHER_JS_PLAIN_OBJECTS!>A<!>, <!JS_PLAIN_OBJECT_CAN_EXTEND_ONLY_OTHER_JS_PLAIN_OBJECTS!>B<!>, <!JS_PLAIN_OBJECT_CAN_EXTEND_ONLY_OTHER_JS_PLAIN_OBJECTS!>C<!>
@JsPlainObject
external interface E
@JsPlainObject
external interface F
@JsPlainObject
external interface DEF: D, E, F
external interface G: A, C, <!IMPLEMENTING_OF_JS_PLAIN_OBJECT_IS_NOT_SUPPORTED!>E<!>
class Foo : A, <!IMPLEMENTING_OF_JS_PLAIN_OBJECT_IS_NOT_SUPPORTED!>D<!>, B
plugins/js-plain-objects/compiler-plugin/testData/diagnostics/only-properties.kt
Vendored
+15
View File
@@ -0,0 +1,15 @@
// FIR_IDENTICAL
// SKIP_TXT
// FILE: test.kt
import kotlinx.js.JsPlainObject
@JsPlainObject
external interface Foo {
val foo: String
val bar: Int?
val fn: () -> String
val fnOptional: (() -> String)?
<!METHODS_ARE_NOT_ALLOWED_INSIDE_JS_PLAIN_OBJECT!>fun test(): String<!>
}
plugins/jso/compiler-plugin/testData/diagnostics/wrongAnnotationTarget.kt → plugins/js-plain-objects/compiler-plugin/testData/diagnostics/wrongAnnotationTarget.kt
Vendored
+8 -8
View File
@@ -2,27 +2,27 @@
// SKIP_TXT
// FILE: test.kt
import kotlinx.jso.JsSimpleObject
import kotlinx.js.JsPlainObject
<!NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED("class")!>@JsSimpleObject
<!NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED("class")!>@JsPlainObject
class Regular1<!>
@JsSimpleObject
@JsPlainObject
<!NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED("object")!>object Regular2<!>
<!NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED("enum class")!>@JsSimpleObject
<!NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED("enum class")!>@JsPlainObject
enum class Regular3<!>
<!ONLY_INTERFACES_ARE_SUPPORTED("class")!>@JsSimpleObject
<!ONLY_INTERFACES_ARE_SUPPORTED("class")!>@JsPlainObject
external class External1<!>
@JsSimpleObject
@JsPlainObject
external <!ONLY_INTERFACES_ARE_SUPPORTED("object")!>object External2<!>
@JsSimpleObject
@JsPlainObject
external interface External3
external class Nested {
@JsSimpleObject
@JsPlainObject
interface Inner
}
plugins/jso/compiler-plugin/tests-gen/org/jetbrains/kotlinx/jso/runners/FirJsObjectIrJsBoxTestGenerated.java → plugins/js-plain-objects/compiler-plugin/tests-gen/org/jetbrains/kotlinx/jspo/runners/FirJsPlainObjectsIrJsBoxTestGenerated.java
Generated
+10 -10
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.runners;
package org.jetbrains.kotlinx.jspo.runners;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
@@ -15,43 +15,43 @@ import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlinx.jso.TestGeneratorKt}. DO NOT MODIFY MANUALLY */
/** This class is generated by {@link org.jetbrains.kotlinx.jspo.TestGeneratorKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/jso/compiler-plugin/testData/box")
@TestMetadata("plugins/js-plain-objects/compiler-plugin/testData/box")
@TestDataPath("$PROJECT_ROOT")
public class FirJsObjectIrJsBoxTestGenerated extends AbstractFirJsObjectIrJsBoxTest {
public class FirJsPlainObjectsIrJsBoxTestGenerated extends AbstractFirJsPlainObjectsIrJsBoxTest {
@Test
public void testAllFilesPresentInBox() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jso/compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/js-plain-objects/compiler-plugin/testData/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JS_IR, true);
}
@Test
@TestMetadata("copy.kt")
public void testCopy() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/box/copy.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/box/copy.kt");
}
@Test
@TestMetadata("optional.kt")
public void testOptional() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/box/optional.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/box/optional.kt");
}
@Test
@TestMetadata("simple.kt")
public void testSimple() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/box/simple.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/box/simple.kt");
}
@Test
@TestMetadata("with-inheritance.kt")
public void testWith_inheritance() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/box/with-inheritance.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/box/with-inheritance.kt");
}
@Test
@TestMetadata("with-multiple-inheritance.kt")
public void testWith_multiple_inheritance() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/box/with-multiple-inheritance.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/box/with-multiple-inheritance.kt");
}
}
plugins/jso/compiler-plugin/tests-gen/org/jetbrains/kotlinx/jso/runners/JsObjectPluginDiagnosticTestGenerated.java → plugins/js-plain-objects/compiler-plugin/tests-gen/org/jetbrains/kotlinx/jspo/runners/FirJsPlainObjectsPluginDiagnosticTestGenerated.java
Generated
+13 -7
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.runners;
package org.jetbrains.kotlinx.jspo.runners;
import com.intellij.testFramework.TestDataPath;
import org.jetbrains.kotlin.test.util.KtTestUtil;
@@ -14,25 +14,31 @@ import org.junit.jupiter.api.Test;
import java.io.File;
import java.util.regex.Pattern;
/** This class is generated by {@link org.jetbrains.kotlinx.jso.TestGeneratorKt}. DO NOT MODIFY MANUALLY */
/** This class is generated by {@link org.jetbrains.kotlinx.jspo.TestGeneratorKt}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("plugins/jso/compiler-plugin/testData/diagnostics")
@TestMetadata("plugins/js-plain-objects/compiler-plugin/testData/diagnostics")
@TestDataPath("$PROJECT_ROOT")
public class JsObjectPluginDiagnosticTestGenerated extends AbstractJsObjectPluginDiagnosticTest {
public class FirJsPlainObjectsPluginDiagnosticTestGenerated extends AbstractFirJsPlainObjectsPluginDiagnosticTest {
@Test
public void testAllFilesPresentInDiagnostics() throws Exception {
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/jso/compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/js-plain-objects/compiler-plugin/testData/diagnostics"), Pattern.compile("^(.+)\\.kt$"), null, true);
}
@Test
@TestMetadata("inheritance.kt")
public void testInheritance() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/diagnostics/inheritance.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/diagnostics/inheritance.kt");
}
@Test
@TestMetadata("only-properties.kt")
public void testOnly_properties() throws Exception {
runTest("plugins/js-plain-objects/compiler-plugin/testData/diagnostics/only-properties.kt");
}
@Test
@TestMetadata("wrongAnnotationTarget.kt")
public void testWrongAnnotationTarget() throws Exception {
runTest("plugins/jso/compiler-plugin/testData/diagnostics/wrongAnnotationTarget.kt");
runTest("plugins/js-plain-objects/compiler-plugin/testData/diagnostics/wrongAnnotationTarget.kt");
}
}
plugins/jso/compiler-plugin/tests/org/jetbrains/kotlinx/jso/TestGenerator.kt → plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/TestGenerator.kt
+7 -7
View File
@@ -3,26 +3,26 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso
package org.jetbrains.kotlinx.jspo
import org.jetbrains.kotlin.generators.generateTestGroupSuiteWithJUnit5
import org.jetbrains.kotlinx.jso.runners.AbstractFirJsObjectIrJsBoxTest
import org.jetbrains.kotlinx.jso.runners.AbstractJsObjectPluginDiagnosticTest
import org.jetbrains.kotlinx.jspo.runners.AbstractFirJsPlainObjectsIrJsBoxTest
import org.jetbrains.kotlinx.jspo.runners.AbstractFirJsPlainObjectsPluginDiagnosticTest
fun main(args: Array<String>) {
generateTestGroupSuiteWithJUnit5(args) {
testGroup(
"plugins/jso/compiler-plugin/tests-gen",
"plugins/jso/compiler-plugin/testData"
"plugins/js-plain-objects/compiler-plugin/tests-gen",
"plugins/js-plain-objects/compiler-plugin/testData"
) {
// ------------------------------- diagnostics -------------------------------
testClass<AbstractJsObjectPluginDiagnosticTest>() {
testClass<AbstractFirJsPlainObjectsPluginDiagnosticTest>() {
model("diagnostics")
}
// ------------------------------- box -------------------------------
testClass<AbstractFirJsObjectIrJsBoxTest> {
testClass<AbstractFirJsPlainObjectsIrJsBoxTest> {
model("box")
}
}
plugins/jso/compiler-plugin/tests/org/jetbrains/kotlinx/jso/jsObjectConfiguration.kt → plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/jsObjectConfiguration.kt
+8 -8
View File
@@ -3,7 +3,7 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.runners
package org.jetbrains.kotlinx.jspo.runners
import org.jetbrains.kotlin.compiler.plugin.CompilerPluginRegistrar
import org.jetbrains.kotlin.config.CompilerConfiguration
@@ -12,25 +12,25 @@ import org.jetbrains.kotlin.test.model.TestModule
import org.jetbrains.kotlin.test.services.EnvironmentConfigurator
import org.jetbrains.kotlin.test.services.RuntimeClasspathProvider
import org.jetbrains.kotlin.test.services.TestServices
import org.jetbrains.kotlinx.jso.compiler.cli.JsObjectComponentRegistrar
import org.jetbrains.kotlinx.jspo.compiler.cli.JsPlainObjectsComponentRegistrar
import java.io.File
class JsObjectEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
class JsPlainObjectsEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
override fun CompilerPluginRegistrar.ExtensionStorage.registerCompilerExtensions(
module: TestModule,
configuration: CompilerConfiguration
) {
JsObjectComponentRegistrar.registerExtensions(this)
JsPlainObjectsComponentRegistrar.registerExtensions(this)
}
}
class JsObjectRuntimeClasspathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
class JsPlainObjectsRuntimeClasspathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
override fun runtimeClassPaths(module: TestModule): List<File> {
return listOf(File(System.getProperty("jso.runtime.path")))
}
}
fun TestConfigurationBuilder.configureForKotlinxJsObject() {
useConfigurators(::JsObjectEnvironmentConfigurator)
useCustomRuntimeClasspathProviders(::JsObjectRuntimeClasspathProvider)
fun TestConfigurationBuilder.configureForKotlinxJsPlainObjects() {
useConfigurators(::JsPlainObjectsEnvironmentConfigurator)
useCustomRuntimeClasspathProviders(::JsPlainObjectsRuntimeClasspathProvider)
}
plugins/jso/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/BoxTests.kt → plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/BoxTests.kt
+3 -4
View File
@@ -3,18 +3,17 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.runners
package org.jetbrains.kotlinx.jspo.runners
import org.jetbrains.kotlin.js.test.fir.AbstractFirJsTest
import org.jetbrains.kotlin.js.test.ir.AbstractJsIrTest
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
open class AbstractFirJsObjectIrJsBoxTest : AbstractFirJsTest(
open class AbstractFirJsPlainObjectsIrJsBoxTest : AbstractFirJsTest(
pathToTestDir = "plugins/kotlinx-serialization/testData/boxIr/",
testGroupOutputDirPrefix = "codegen/serializationBoxIr/"
) {
override fun configure(builder: TestConfigurationBuilder) {
super.configure(builder)
builder.configureForKotlinxJsObject()
builder.configureForKotlinxJsPlainObjects()
}
}
plugins/jso/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt → plugins/js-plain-objects/compiler-plugin/tests/org/jetbrains/kotlinx/jso/runners/DiagnosticTests.kt
+3 -5
View File
@@ -3,18 +3,16 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.runners
package org.jetbrains.kotlinx.jspo.runners
import org.jetbrains.kotlin.platform.TargetPlatform
import org.jetbrains.kotlin.platform.js.JsPlatforms
import org.jetbrains.kotlin.test.TargetBackend
import org.jetbrains.kotlin.test.builders.TestConfigurationBuilder
import org.jetbrains.kotlin.test.directives.DiagnosticsDirectives.DIAGNOSTICS
import org.jetbrains.kotlin.test.model.DependencyKind
import org.jetbrains.kotlin.test.runners.AbstractFirPsiDiagnosticTest
import org.jetbrains.kotlin.test.runners.configurationForClassicAndFirTestsAlongside
abstract class AbstractJsObjectPluginDiagnosticTest : AbstractFirPsiDiagnosticTest() {
abstract class AbstractFirJsPlainObjectsPluginDiagnosticTest : AbstractFirPsiDiagnosticTest() {
override fun configure(builder: TestConfigurationBuilder) {
super.configure(builder)
with(builder) {
@@ -24,7 +22,7 @@ abstract class AbstractJsObjectPluginDiagnosticTest : AbstractFirPsiDiagnosticTe
dependencyKind = DependencyKind.Source
}
configureForKotlinxJsObject()
configureForKotlinxJsPlainObjects()
disableOptInErrors()
}
}
plugins/jso/runtime/build.gradle.kts → plugins/js-plain-objects/runtime/build.gradle.kts
+7 -7
View File
@@ -1,14 +1,14 @@
import plugins.configureDefaultPublishing
import plugins.configureKotlinPomAttributes
description = "Runtime library for the JSO compiler plugin"
description = "Runtime library for the JS Plain Objects compiler plugin"
plugins {
kotlin("js")
`maven-publish`
}
group = "org.jetbrains.kotlinx"
group = "org.jetbrains.kotlin"
kotlin {
js {
@@ -26,17 +26,17 @@ val emptyJavadocJar by tasks.registering(Jar::class) {
archiveClassifier.set("javadoc")
}
configureDefaultPublishing()
publishing {
publications {
create<MavenPublication>("maven") {
artifactId = "jso"
artifactId = "kotlin-js-plain-objects"
from(components["kotlin"])
configureKotlinPomAttributes(project, "Runtime library for the JSO compiler plugin", packaging = "klib")
configureKotlinPomAttributes(project, "Annotations library for the JS Plain Objects compiler plugin", packaging = "klib")
}
withType<MavenPublication> {
artifact(emptyJavadocJar)
}
}
}
configureDefaultPublishing()
}
plugins/jso/runtime/src/main/kotlin/jso.kt → plugins/js-plain-objects/runtime/src/main/kotlin/JsPlainObject.kt
+2 -2
View File
@@ -3,9 +3,9 @@
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package kotlinx.jso
package kotlinx.js
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.BINARY)
public annotation class JsSimpleObject
public annotation class JsPlainObject
plugins/jso/compiler-plugin-embeddable/build.gradle.kts
-19
View File
@@ -1,19 +0,0 @@
plugins {
id("org.jetbrains.kotlin.jvm")
}
dependencies {
embedded(project(":plugins:jso:compiler-plugin")) { isTransitive = false }
}
publish {
artifactId = "kotlinx-jso-compiler-plugin-embeddable"
}
runtimeJar(rewriteDefaultJarDepsToShadedCompiler())
sourcesJarWithSourcesFromEmbedded(
project(":plugins:jso:compiler-plugin").tasks.named<Jar>("sourcesJar")
)
javadocJarWithJavadocFromEmbedded(
project(":plugins:jso:compiler-plugin").tasks.named<Jar>("javadocJar")
)
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/JsObjectExtensionRegistrar.kt
-19
View File
@@ -1,19 +0,0 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir
import org.jetbrains.kotlin.fir.extensions.FirExtensionRegistrar
import org.jetbrains.kotlinx.jso.compiler.fir.checkers.FirJsoCheckersComponent
import org.jetbrains.kotlinx.jso.compiler.fir.services.JsSimpleObjectPropertiesProvider
class JsObjectExtensionRegistrar : FirExtensionRegistrar() {
override fun ExtensionRegistrarContext.configurePlugin() {
+::FirJsoCheckersComponent
+::JsObjectFunctionsGenerator
// services
+::JsSimpleObjectPropertiesProvider
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/FirJsoPluginClassChecker.kt
-68
View File
@@ -1,68 +0,0 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir.checkers
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.diagnostics.DiagnosticReporter
import org.jetbrains.kotlin.diagnostics.reportOn
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
import org.jetbrains.kotlin.fir.analysis.checkers.declaration.FirClassChecker
import org.jetbrains.kotlin.fir.declarations.FirClass
import org.jetbrains.kotlin.fir.declarations.hasAnnotation
import org.jetbrains.kotlin.fir.declarations.utils.isEffectivelyExternal
import org.jetbrains.kotlin.fir.declarations.utils.isExternal
import org.jetbrains.kotlin.fir.declarations.utils.isInterface
import org.jetbrains.kotlin.fir.resolve.fullyExpandedType
import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
import org.jetbrains.kotlin.fir.types.coneType
import org.jetbrains.kotlin.fir.types.toRegularClassSymbol
import org.jetbrains.kotlinx.jso.compiler.resolve.JsObjectAnnotations
object FirJsoPluginClassChecker : FirClassChecker() {
override fun check(declaration: FirClass, context: CheckerContext, reporter: DiagnosticReporter) {
with(context) {
val classSymbol = declaration.symbol as? FirRegularClassSymbol ?: return
if (classSymbol.hasAnnotation(JsObjectAnnotations.jsSimpleObjectAnnotationClassId, session)) {
checkJsoAnnotationTargets(classSymbol, reporter)
} else {
checkJsoSuperInterfaces(classSymbol, reporter)
}
}
}
context(CheckerContext)
private fun checkJsoAnnotationTargets(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
val classKind = classSymbol.classKind.codeRepresentation ?: error("Unexpected enum entry")
if (!classSymbol.isEffectivelyExternal(session)) {
reporter.reportOn(classSymbol.source, FirJsoErrors.NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED, classKind)
return
}
if (!classSymbol.isInterface) {
reporter.reportOn(classSymbol.source, FirJsoErrors.ONLY_INTERFACES_ARE_SUPPORTED, classKind)
return
}
}
context(CheckerContext)
private fun checkJsoSuperInterfaces(classSymbol: FirClassSymbol<out FirClass>, reporter: DiagnosticReporter) {
classSymbol.resolvedSuperTypeRefs.forEach {
val superInterface = it.coneType.fullyExpandedType(session)
.toRegularClassSymbol(session)
?.takeIf { it.classKind == ClassKind.INTERFACE } ?: return@forEach
if (superInterface.hasAnnotation(JsObjectAnnotations.jsSimpleObjectAnnotationClassId, session)) {
reporter.reportOn(
it.source,
FirJsoErrors.IMPLEMENTING_OF_JSO_IS_NOT_SUPPORTED,
classSymbol.classId.asFqNameString()
)
}
}
}
}
plugins/jso/compiler-plugin/jso.k2/src/org/jetbrains/kotlinx/jso/compiler/fir/checkers/KtDefaultErrorMessagesJso.kt
-30
View File
@@ -1,30 +0,0 @@
/*
* Copyright 2010-2023 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlinx.jso.compiler.fir.checkers
import org.jetbrains.kotlin.diagnostics.KtDiagnosticFactoryToRendererMap
import org.jetbrains.kotlin.diagnostics.rendering.BaseDiagnosticRendererFactory
import org.jetbrains.kotlin.diagnostics.rendering.CommonRenderers
object KtDefaultErrorMessagesJso : BaseDiagnosticRendererFactory() {
override val MAP = KtDiagnosticFactoryToRendererMap("JsSimpleObject").apply {
put(
FirJsoErrors.NON_EXTERNAL_DECLARATIONS_NOT_SUPPORTED,
"Non-external {0} can not be annotated with JsSimpleObject. Only external interfaces are supported.",
CommonRenderers.STRING
)
put(
FirJsoErrors.ONLY_INTERFACES_ARE_SUPPORTED,
"External {0} can not be annotated with JsSimpleObject. Only external interfaces are supported.",
CommonRenderers.STRING
)
put(
FirJsoErrors.IMPLEMENTING_OF_JSO_IS_NOT_SUPPORTED,
"[{0}] is marked as JsSimpleObject, so, it can not be used as a super-type for non-JsSimpleObject declarations",
CommonRenderers.STRING
)
}
}
plugins/jso/compiler-plugin/testData/diagnostics/inheritance.kt
Vendored
-27
View File
@@ -1,27 +0,0 @@
// FIR_IDENTICAL
// SKIP_TXT
// FILE: test.kt
import kotlinx.jso.JsSimpleObject
external interface A
external interface B
external interface C
@JsSimpleObject
external interface D : A, B, C
@JsSimpleObject
external interface E
@JsSimpleObject
external interface F
@JsSimpleObject
external interface DEF: D, E, F
external interface G: A, C, <!IMPLEMENTING_OF_JSO_IS_NOT_SUPPORTED!>E<!>
class Foo : A, <!IMPLEMENTING_OF_JSO_IS_NOT_SUPPORTED!>D<!>, B
repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/jso/jso.pom → repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/js-plain-objects/js-plain-objects.pom
+3 -3
View File
@@ -7,10 +7,10 @@
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>jso</artifactId>
<artifactId>js-plain-objects</artifactId>
<version>ArtifactsTest.version</version>
<name>Jso</name>
<description>Jso</description>
<name>Js Plain Objects</name>
<description>Js Plain Objects</description>
<url>https://kotlinlang.org/</url>
<licenses>
<license>
repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-js-plain-objects/kotlin-js-plain-objects.pom
+35
View File
@@ -0,0 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!-- This module was also published with a richer model, Gradle metadata, -->
<!-- which should be used instead. Do not delete the following line which -->
<!-- is to indicate to Gradle or any Gradle module metadata file consumer -->
<!-- that they should prefer consuming it instead. -->
<!-- do_not_remove: published-with-gradle-metadata -->
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-js-plain-objects</artifactId>
<version>ArtifactsTest.version</version>
<packaging>klib</packaging>
<name>Kotlin Js Plain Objects</name>
<description>Annotations library for the JS Plain Objects compiler plugin</description>
<url>https://kotlinlang.org/</url>
<licenses>
<license>
<name>The Apache License, Version 2.0</name>
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
</license>
</licenses>
<developers>
<developer>
<name>Kotlin Team</name>
<organization>JetBrains</organization>
<organizationUrl>https://www.jetbrains.com</organizationUrl>
</developer>
</developers>
<scm>
<connection>scm:git:https://github.com/JetBrains/kotlin.git</connection>
<developerConnection>scm:git:https://github.com/JetBrains/kotlin.git</developerConnection>
<url>https://github.com/JetBrains/kotlin</url>
</scm>
</project>
repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlinx-jso-compiler-plugin-embeddable/kotlinx-jso-compiler-plugin-embeddable.pom → repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlinx-js-plain-objects-compiler-plugin-embeddable/kotlinx-js-plain-objects-compiler-plugin-embeddable.pom
+1 -1
View File
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlinx-jso-compiler-plugin-embeddable</artifactId>
<artifactId>kotlinx-js-plain-objects-compiler-plugin-embeddable</artifactId>
<version>ArtifactsTest.version</version>
<name>Compiler Plugin Embeddable</name>
<description>Compiler Plugin Embeddable</description>
repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/compiler-plugin/compiler-plugin.pom → repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlinx-js-plain-objects-compiler-plugin/kotlinx-js-plain-objects-compiler-plugin.pom
+2 -2
View File
@@ -2,10 +2,10 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>compiler-plugin</artifactId>
<artifactId>kotlinx-js-plain-objects-compiler-plugin</artifactId>
<version>ArtifactsTest.version</version>
<name>Compiler Plugin</name>
<description>JavaScript Object Compiler Plugin</description>
<description>JavaScript Plain Objects Compiler Plugin</description>
<url>https://kotlinlang.org/</url>
<licenses>
<license>
repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/plugin/jso/org.jetbrains.kotlin.plugin.jso.gradle.plugin/org.jetbrains.kotlin.plugin.jso.gradle.plugin.pom → repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/plugin/js-plain-objects/org.jetbrains.kotlin.plugin.js-plain-objects.gradle.plugin/org.jetbrains.kotlin.plugin.js-plain-objects.gradle.plugin.pom
+5 -5
View File
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.jetbrains.kotlin.plugin.jso</groupId>
<artifactId>org.jetbrains.kotlin.plugin.jso.gradle.plugin</artifactId>
<groupId>org.jetbrains.kotlin.plugin.js-plain-objects</groupId>
<artifactId>org.jetbrains.kotlin.plugin.js-plain-objects.gradle.plugin</artifactId>
<version>ArtifactsTest.version</version>
<packaging>pom</packaging>
<name>Kotlin compiler plugin for kotlinx.jso library</name>
<description>Kotlin compiler plugin for kotlinx.jso library</description>
<name>Kotlin compiler plugin for typed JS-objects library</name>
<description>Kotlin compiler plugin for typed JS-objects library</description>
<url>https://kotlinlang.org/</url>
<licenses>
<license>
@@ -29,7 +29,7 @@
<dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>jso</artifactId>
<artifactId>js-plain-objects</artifactId>
<version>ArtifactsTest.version</version>
</dependency>
</dependencies>
settings.gradle
+8 -8
View File
@@ -283,16 +283,16 @@ include ":kotlin-atomicfu-compiler-plugin",
":kotlinx-atomicfu-runtime",
":atomicfu"
include ":plugins:jso:compiler-plugin",
":plugins:jso:compiler-plugin-embeddable",
":plugins:jso:compiler-plugin:jso.common",
":plugins:jso:compiler-plugin:jso.k2",
":plugins:jso:compiler-plugin:jso.backend",
":plugins:jso:compiler-plugin:jso.cli"
include ":plugins:js-plain-objects:compiler-plugin",
":plugins:js-plain-objects:compiler-plugin-embeddable",
":plugins:js-plain-objects:compiler-plugin:js-plain-objects.common",
":plugins:js-plain-objects:compiler-plugin:js-plain-objects.k2",
":plugins:js-plain-objects:compiler-plugin:js-plain-objects.backend",
":plugins:js-plain-objects:compiler-plugin:js-plain-objects.cli"
if (!buildProperties.inJpsBuildIdeaSync) {
include ":plugins:jso:runtime",
":libraries:tools:jso"
include ":plugins:js-plain-objects:runtime",
":libraries:tools:js-plain-objects"
}
include ":compiler:fir",