[K/JS] Make all the exported top-level declarations enumerable

^KT-19016 Fixed


Merge-request: KT-MR-21552
Merged-by: Artem Kobzar <[email protected]>

Author: JSMonk

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelToJsStatements.kt

@@ -110,7 +110,8 @@ class ExportModelToJsStatements(
                                 declaration.name,
                                 getter?.makeRef(),
                                 setter?.makeRef(),
-                                staticContext
+                                staticContext,
+                                enumerable = true
                             ).makeStmt()
                         )
                     }
@@ -150,7 +151,8 @@ class ExportModelToJsStatements(
                                     }
                             ).makeRef(),
                             null,
-                            staticContext
+                            staticContext,
+                            enumerable = true
                         ).makeStmt()
                     )
                 }

compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/transformers/irToJs/jsAstUtils.kt

@@ -93,12 +93,25 @@ fun objectCreate(prototype: JsExpression, context: JsStaticContext) =
         prototype
     )
 
-fun defineProperty(obj: JsExpression, name: String, getter: JsExpression?, setter: JsExpression?, context: JsStaticContext): JsExpression {
+fun defineProperty(
+    obj: JsExpression,
+    name: String,
+    getter: JsExpression?,
+    setter: JsExpression?,
+    context: JsStaticContext,
+    enumerable: Boolean = false,
+): JsExpression {
     return JsInvocation(
         context
             .getNameForStaticFunction(context.backendContext.intrinsics.jsDefinePropertySymbol.owner)
             .makeRef(),
-        listOfNotNull(obj, JsStringLiteral(name), getter ?: runIf(setter != null) { jsUndefined(context) }, setter)
+        listOfNotNull(
+            obj,
+            JsStringLiteral(name),
+            getter ?: runIf(setter != null) { jsUndefined(context) },
+            setter ?: runIf(enumerable) { jsUndefined(context) },
+            runIf(enumerable) { JsBooleanLiteral(enumerable) }
+        )
     )
 }
 

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirJsES6BoxTestGenerated.java

@@ -0,0 +1,41 @@
+// ES_MODULES
+
+// MODULE: lib
+// FILE: lib.kt
+@file:JsExport
+package foo
+
+val valueSimpleProperty = "foo"
+var variableSimpleProperty = "foo"
+
+val valueGetterProperty: String
+    get() = "foo"
+
+var variableGetterSetterProperty: String
+    get() = variableSimpleProperty
+    set(value) { variableSimpleProperty = value }
+
+fun simpleFunction() {}
+
+class SimpleClass {}
+
+object SimpleObject
+
+// FILE: test.mjs
+// ENTRY_ES_MODULE
+import * as lib from "./allTheExportedEntitiesAreEnumerable-lib_v5.mjs";
+
+export function box() {
+    var allTheExportedEntities = Object.keys(lib);
+
+    if (allTheExportedEntities[0] !== 'SimpleClass') return "Error: 'SimpleClass' is not enumerable"
+    if (allTheExportedEntities[1] !== 'SimpleObject') return "Error: 'SimpleObject' is not enumerable"
+    if (allTheExportedEntities[2] !== 'simpleFunction') return "Error: 'simpleFunction' is not enumerable"
+    if (allTheExportedEntities[3] !== 'valueGetterProperty') return "Error: 'valueGetterProperty' is not enumerable"
+    if (allTheExportedEntities[4] !== 'valueSimpleProperty') return "Error: 'valueSimpleProperty' is not enumerable"
+    if (allTheExportedEntities[5] !== 'variableGetterSetterProperty') return "Error: 'variableGetterSetterProperty' is not enumerable"
+    if (allTheExportedEntities[6] !== 'variableSimpleProperty') return "Error: 'variableSimpleProperty' is not enumerable"
+    if (allTheExportedEntities.length !== 7) return "Error: some extra entities are visible"
+
+    return "OK"
+}

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirLightTreeJsBoxTestGenerated.java

@@ -0,0 +1,40 @@
+// TARGET_BACKEND: JS_IR, JS_IR_ES6
+// RUN_PLAIN_BOX_FUNCTION
+// INFER_MAIN_MODULE
+
+// MODULE: lib
+// FILE: lib.kt
+@file:JsExport
+package foo
+
+val valueSimpleProperty = "foo"
+var variableSimpleProperty = "foo"
+
+val valueGetterProperty: String
+    get() = "foo"
+
+var variableGetterSetterProperty: String
+    get() = variableSimpleProperty
+    set(value) { variableSimpleProperty = value }
+
+fun simpleFunction() {}
+
+class SimpleClass {}
+
+object SimpleObject
+
+// FILE: test.js
+function box() {
+    var allTheExportedEntities = Object.keys(this.lib.foo);
+
+    if (allTheExportedEntities[0] !== 'valueSimpleProperty') return "Error: 'valueSimpleProperty' is not enumerable"
+    if (allTheExportedEntities[1] !== 'variableSimpleProperty') return "Error: 'variableSimpleProperty' is not enumerable"
+    if (allTheExportedEntities[2] !== 'valueGetterProperty') return "Error: 'valueGetterProperty' is not enumerable"
+    if (allTheExportedEntities[3] !== 'variableGetterSetterProperty') return "Error: 'variableGetterSetterProperty' is not enumerable"
+    if (allTheExportedEntities[4] !== 'simpleFunction') return "Error: 'simpleFunction' is not enumerable"
+    if (allTheExportedEntities[5] !== 'SimpleClass') return "Error: 'SimpleClass' is not enumerable"
+    if (allTheExportedEntities[6] !== 'SimpleObject') return "Error: 'SimpleObject' is not enumerable"
+    if (allTheExportedEntities.length !== 7) return "Error: some extra entities are visible"
+
+    return "OK"
+}

js/js.tests/tests-gen/org/jetbrains/kotlin/js/test/fir/FirPsiJsBoxTestGenerated.java

@@ -139,7 +139,7 @@ private fun <E> createJsSetViewWith(
 ): dynamic {
     val setView = objectCreate<JsSetView<E>>().also {
         js("it[Symbol.iterator] = valuesIterator")
-        defineProp(it, "size", setSize, VOID)
+        defineProp(it, "size", setSize, VOID, true)
     }
 
     return js("""
@@ -202,7 +202,7 @@ private fun <K, V> createJsMapViewWith(
 ): dynamic {
     val mapView = objectCreate<JsMapView<K, V>>().also {
         js("it[Symbol.iterator] = entriesIterator")
-        defineProp(it, "size", mapSize, VOID)
+        defineProp(it, "size", mapSize, VOID, true)
     }
 
     return js("""