From 85ee2d71d28514d64cb1bfaccd5baa798a420f93 Mon Sep 17 00:00:00 2001
From: Artem Kobzar <artem.kobzar@jetbrains.com>
Date: Thu, 27 Jul 2023 09:44:28 +0000
Subject: [PATCH] [K/JS] Remove FILE target from JsName annotation and use the
 new experimental JsFileName annotation instead

---
 .../js/transformers/irToJs/IrModuleToJsTransformer.kt    | 2 +-
 .../transformers/irToJs/ModuleFragmentToExternalName.kt  | 3 ++-
 .../kotlin/ir/backend/js/utils/AnnotationUtils.kt        | 9 +++++----
 libraries/stdlib/api/js/kotlin.js.kt                     | 4 ++--
 libraries/stdlib/common/src/kotlin/JsAnnotationsH.kt     | 3 ++-
 libraries/stdlib/js-v1/runtime/hacks.kt                  | 2 +-
 libraries/stdlib/js/src/kotlin/Comparator.kt             | 2 +-
 libraries/stdlib/js/src/kotlin/annotationsJs.kt          | 4 ++--
 .../src/kotlin/collections/AbstractMutableCollection.kt  | 2 +-
 .../js/src/kotlin/collections/AbstractMutableList.kt     | 2 +-
 libraries/stdlib/js/src/kotlin/collections/ArrayList.kt  | 2 +-
 libraries/stdlib/js/src/kotlin/reflect/KCallable.kt      | 2 +-
 libraries/stdlib/js/src/kotlin/reflect/KClass.kt         | 2 +-
 libraries/stdlib/js/src/kotlin/reflect/KProperty.kt      | 2 +-
 libraries/stdlib/src/kotlin/collections/Collections.kt   | 6 ++----
 libraries/stdlib/wasm/src/kotlin/js/annotations.kt       | 1 -
 16 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
index d3063aaee28..658df813f46 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/IrModuleToJsTransformer.kt
@@ -338,7 +338,7 @@ class IrModuleToJsTransformer(
         val staticContext = JsStaticContext(backendContext, nameGenerator, globalNameScope, mode)
 
         val result = JsIrProgramFragment(
-            fileExports.file.getJsName() ?: fileExports.file.nameWithoutExtension,
+            fileExports.file.getJsFileName() ?: fileExports.file.nameWithoutExtension,
             fileExports.file.packageFqName.asString()
         ).apply {
             if (shouldGeneratePolyfills) {
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/ModuleFragmentToExternalName.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/ModuleFragmentToExternalName.kt
index fa00297ea5c..49fa25eac3f 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/ModuleFragmentToExternalName.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/ModuleFragmentToExternalName.kt
@@ -5,6 +5,7 @@
 
 package org.jetbrains.kotlin.ir.backend.js.transformers.irToJs
 
+import org.jetbrains.kotlin.ir.backend.js.utils.getJsFileName
 import org.jetbrains.kotlin.ir.backend.js.utils.getJsName
 import org.jetbrains.kotlin.ir.backend.js.utils.nameWithoutExtension
 import org.jetbrains.kotlin.ir.backend.js.utils.sanitizeName
@@ -67,6 +68,6 @@ class ModuleFragmentToExternalName(private val jsOutputNamesMapping: Map<IrModul
         return "$prefix${if (prefix.isNotEmpty()) "/" else ""}$fileName"
     }
 
-    private val IrFile.outputName: String get() = getJsName() ?: nameWithoutExtension
+    private val IrFile.outputName: String get() = getJsFileName() ?: nameWithoutExtension
     private val IrFile.stableFileName: String get() = getFileStableName(outputName, packageFqName.asString())
 }
\ No newline at end of file
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/AnnotationUtils.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/AnnotationUtils.kt
index 5ffda68623f..394b5448a82 100644
--- a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/AnnotationUtils.kt
+++ b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/utils/AnnotationUtils.kt
@@ -6,10 +6,7 @@
 package org.jetbrains.kotlin.ir.backend.js.utils
 
 import org.jetbrains.kotlin.builtins.StandardNames
-import org.jetbrains.kotlin.ir.declarations.IrAnnotationContainer
-import org.jetbrains.kotlin.ir.declarations.IrClass
-import org.jetbrains.kotlin.ir.declarations.IrDeclarationWithName
-import org.jetbrains.kotlin.ir.declarations.IrOverridableDeclaration
+import org.jetbrains.kotlin.ir.declarations.*
 import org.jetbrains.kotlin.ir.expressions.IrClassReference
 import org.jetbrains.kotlin.ir.expressions.IrConst
 import org.jetbrains.kotlin.ir.expressions.IrConstructorCall
@@ -22,6 +19,7 @@ object JsAnnotations {
     val jsModuleFqn = FqName("kotlin.js.JsModule")
     val jsNonModuleFqn = FqName("kotlin.js.JsNonModule")
     val jsNameFqn = FqName("kotlin.js.JsName")
+    val jsFileNameFqn = FqName("kotlin.js.JsFileName")
     val jsQualifierFqn = FqName("kotlin.js.JsQualifier")
     val jsExportFqn = FqName("kotlin.js.JsExport")
     val jsImplicitExportFqn = FqName("kotlin.js.JsImplicitExport")
@@ -46,6 +44,9 @@ fun IrAnnotationContainer.isJsNonModule(): Boolean =
 fun IrAnnotationContainer.getJsQualifier(): String? =
     getAnnotation(JsAnnotations.jsQualifierFqn)?.getSingleConstStringArgument()
 
+fun IrFile.getJsFileName(): String? =
+    getAnnotation(JsAnnotations.jsFileNameFqn)?.getSingleConstStringArgument()
+
 fun IrAnnotationContainer.getJsName(): String? =
     getAnnotation(JsAnnotations.jsNameFqn)?.getSingleConstStringArgument()
 
diff --git a/libraries/stdlib/api/js/kotlin.js.kt b/libraries/stdlib/api/js/kotlin.js.kt
index 3d69458c9c8..5be0ab05aa4 100644
--- a/libraries/stdlib/api/js/kotlin.js.kt
+++ b/libraries/stdlib/api/js/kotlin.js.kt
@@ -281,7 +281,7 @@ public final annotation class JsExternalInheritorsOnly : kotlin.Annotation {
     public constructor JsExternalInheritorsOnly()
 }
 
-@kotlin.annotation.Retention(value = AnnotationRetention.BINARY)
+@kotlin.annotation.Retention(value = AnnotationRetention.SOURCE)
 @kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE})
 public final annotation class JsFileName : kotlin.Annotation {
     public constructor JsFileName(name: kotlin.String)
@@ -298,7 +298,7 @@ public final annotation class JsModule : kotlin.Annotation {
 }
 
 @kotlin.annotation.Retention(value = AnnotationRetention.BINARY)
-@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER})
+@kotlin.annotation.Target(allowedTargets = {AnnotationTarget.CLASS, AnnotationTarget.FUNCTION, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.PROPERTY_GETTER, AnnotationTarget.PROPERTY_SETTER})
 public final annotation class JsName : kotlin.Annotation {
     public constructor JsName(name: kotlin.String)
 
diff --git a/libraries/stdlib/common/src/kotlin/JsAnnotationsH.kt b/libraries/stdlib/common/src/kotlin/JsAnnotationsH.kt
index 34ea4c28613..0b9c73d8fd9 100644
--- a/libraries/stdlib/common/src/kotlin/JsAnnotationsH.kt
+++ b/libraries/stdlib/common/src/kotlin/JsAnnotationsH.kt
@@ -11,7 +11,7 @@ import kotlin.reflect.KClass
 /**
  * Gives a declaration (a function, a property or a class) specific name in JavaScript.
  */
-@Target(FILE, CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
+@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
 @OptionalExpectation
 public expect annotation class JsName(val name: String)
 
@@ -37,6 +37,7 @@ public annotation class ExperimentalJsFileName
 @Target(FILE)
 @OptionalExpectation
 @ExperimentalJsFileName
+@Retention(AnnotationRetention.SOURCE)
 public expect annotation class JsFileName(val name: String)
 
 /**
diff --git a/libraries/stdlib/js-v1/runtime/hacks.kt b/libraries/stdlib/js-v1/runtime/hacks.kt
index 121b8619414..7d5d391ca65 100644
--- a/libraries/stdlib/js-v1/runtime/hacks.kt
+++ b/libraries/stdlib/js-v1/runtime/hacks.kt
@@ -8,7 +8,7 @@ package kotlin.js
 import kotlin.annotation.AnnotationTarget.*
 
 @Retention(AnnotationRetention.BINARY)
-@Target(FILE, CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
+@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
 internal external annotation class JsName(val name: String)
 
 internal external annotation class native
diff --git a/libraries/stdlib/js/src/kotlin/Comparator.kt b/libraries/stdlib/js/src/kotlin/Comparator.kt
index f6c7e5d2cc2..cd65aaae547 100644
--- a/libraries/stdlib/js/src/kotlin/Comparator.kt
+++ b/libraries/stdlib/js/src/kotlin/Comparator.kt
@@ -2,7 +2,7 @@
  * Copyright 2010-2020 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.
  */
-@file:JsName("ComparatorJs")
+@file:JsFileName("ComparatorJs")
 package kotlin
 
 
diff --git a/libraries/stdlib/js/src/kotlin/annotationsJs.kt b/libraries/stdlib/js/src/kotlin/annotationsJs.kt
index eb744371dc2..162add7df0c 100644
--- a/libraries/stdlib/js/src/kotlin/annotationsJs.kt
+++ b/libraries/stdlib/js/src/kotlin/annotationsJs.kt
@@ -58,7 +58,7 @@ internal annotation class marker
  *
  */
 @Retention(AnnotationRetention.BINARY)
-@Target(FILE, CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
+@Target(CLASS, FUNCTION, PROPERTY, CONSTRUCTOR, PROPERTY_GETTER, PROPERTY_SETTER)
 public actual annotation class JsName(actual val name: String)
 
 /**
@@ -66,7 +66,7 @@ public actual annotation class JsName(actual val name: String)
  *
  * This annotation can be applied only to files and only when the compilation granularity is `PER_FILE`.
  */
-@Retention(AnnotationRetention.BINARY)
+@Retention(AnnotationRetention.SOURCE)
 @Target(FILE)
 public actual annotation class JsFileName(actual val name: String)
 
diff --git a/libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt
index 3578aea0e98..5d52027b687 100644
--- a/libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt
+++ b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableCollection.kt
@@ -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.
  */
 
-@file:JsName("AbstractMutableCollectionJs")
+@file:JsFileName("AbstractMutableCollectionJs")
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt
index 8edf411dd0e..bb8c65944d9 100644
--- a/libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt
+++ b/libraries/stdlib/js/src/kotlin/collections/AbstractMutableList.kt
@@ -8,7 +8,7 @@
  * Copyright 2007 Google Inc.
 */
 
-@file:JsName("AbstractMutableListJs")
+@file:JsFileName("AbstractMutableListJs")
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/js/src/kotlin/collections/ArrayList.kt b/libraries/stdlib/js/src/kotlin/collections/ArrayList.kt
index 3a4e0979208..ac30de18500 100644
--- a/libraries/stdlib/js/src/kotlin/collections/ArrayList.kt
+++ b/libraries/stdlib/js/src/kotlin/collections/ArrayList.kt
@@ -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.
  */
 
-@file:JsName("ArrayListJs")
+@file:JsFileName("ArrayListJs")
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/js/src/kotlin/reflect/KCallable.kt b/libraries/stdlib/js/src/kotlin/reflect/KCallable.kt
index ab46412fc9c..ff7c50d2695 100644
--- a/libraries/stdlib/js/src/kotlin/reflect/KCallable.kt
+++ b/libraries/stdlib/js/src/kotlin/reflect/KCallable.kt
@@ -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.
  */
 
-@file:JsName("KCallableJs")
+@file:JsFileName("KCallableJs")
 
 package kotlin.reflect
 
diff --git a/libraries/stdlib/js/src/kotlin/reflect/KClass.kt b/libraries/stdlib/js/src/kotlin/reflect/KClass.kt
index 4b3902826a2..9a0f78fc21a 100644
--- a/libraries/stdlib/js/src/kotlin/reflect/KClass.kt
+++ b/libraries/stdlib/js/src/kotlin/reflect/KClass.kt
@@ -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.
  */
 
-@file:kotlin.js.JsName("KClassJs")
+@file:kotlin.js.JsFileName("KClassJs")
 
 package kotlin.reflect
 
diff --git a/libraries/stdlib/js/src/kotlin/reflect/KProperty.kt b/libraries/stdlib/js/src/kotlin/reflect/KProperty.kt
index 644877b002f..eb8caefdff5 100644
--- a/libraries/stdlib/js/src/kotlin/reflect/KProperty.kt
+++ b/libraries/stdlib/js/src/kotlin/reflect/KProperty.kt
@@ -4,7 +4,7 @@
  */
 
 @file:Suppress("IMPLEMENTING_FUNCTION_INTERFACE")
-@file:JsName("KPropertyJs")
+@file:JsFileName("KPropertyJs")
 
 package kotlin.reflect
 
diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt
index feba9cd7b50..0600dc61a58 100644
--- a/libraries/stdlib/src/kotlin/collections/Collections.kt
+++ b/libraries/stdlib/src/kotlin/collections/Collections.kt
@@ -3,12 +3,10 @@
  * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
  */
 
-// TODO: Suppress will be until the next bootstrapping, after the bootstrapping the annotation should be replaced with [kotlin.js.JsFileName]
-@file:Suppress("ANNOTATION_IS_NOT_APPLICABLE_TO_MULTIFILE_CLASSES")
-@file:kotlin.js.JsName("CollectionsKt")
+@file:kotlin.js.JsFileName("CollectionsKt")
 @file:kotlin.jvm.JvmMultifileClass
 @file:kotlin.jvm.JvmName("CollectionsKt")
-@file:OptIn(kotlin.experimental.ExperimentalTypeInference::class)
+@file:OptIn(kotlin.experimental.ExperimentalTypeInference::class, kotlin.js.ExperimentalJsFileName::class)
 
 package kotlin.collections
 
diff --git a/libraries/stdlib/wasm/src/kotlin/js/annotations.kt b/libraries/stdlib/wasm/src/kotlin/js/annotations.kt
index 8f03d1d4d85..32c425c7bd7 100644
--- a/libraries/stdlib/wasm/src/kotlin/js/annotations.kt
+++ b/libraries/stdlib/wasm/src/kotlin/js/annotations.kt
@@ -32,7 +32,6 @@ public actual annotation class JsExport {
  */
 @Retention(AnnotationRetention.BINARY)
 @Target(
-    AnnotationTarget.FILE,
     AnnotationTarget.CLASS,
     AnnotationTarget.FUNCTION,
     AnnotationTarget.PROPERTY,