[K/JS] Change strategy for implicitly exported declarations if there is a cycled reference

JSMonk · Space Team · commit 153d7b9d6fe5 · 2023-04-19T12:38:29.000Z
^KT-57356 Fixed
diff --git a/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt b/compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/export/ExportModelGenerator.kt
@@ -549,13 +549,17 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac
         )
     }
 
+    private val currentlyProcessedTypes = hashSetOf<IrType>()
+
     private fun exportType(type: IrType, shouldCalculateExportedSupertypeForImplicit: Boolean = true): ExportedType {
-        if (type is IrDynamicType)
+        if (type is IrDynamicType || type in currentlyProcessedTypes)
             return ExportedType.Primitive.Any
 
         if (type !is IrSimpleType)
             return ExportedType.ErrorType("NonSimpleType ${type.render()}")
 
+        currentlyProcessedTypes.add(type)
+
         val classifier = type.classifier
         val isMarkedNullable = type.isMarkedNullable()
         val nonNullType = type.makeNotNull() as IrSimpleType
@@ -625,6 +629,7 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac
         }
 
         return exportedType.withNullability(isMarkedNullable)
+            .also { currentlyProcessedTypes.remove(type) }
     }
 
     private fun IrDeclarationWithName.getExportedIdentifier(): String =
diff --git a/js/js.translator/testData/typescript-export/implicit-export/implicit-export.d.ts b/js/js.translator/testData/typescript-export/implicit-export/implicit-export.d.ts
@@ -45,5 +45,19 @@ declare namespace JS_TESTS {
         class TheNewException extends Error {
             constructor();
         }
+        interface Service<Self extends foo.Service<Self, TEvent>, TEvent extends foo.Event<Self>> {
+            readonly __doNotUseOrImplementIt: {
+                readonly "foo.Service": unique symbol;
+            };
+        }
+        interface Event<TService extends foo.Service<TService, any /*UnknownType **/>> {
+            readonly __doNotUseOrImplementIt: {
+                readonly "foo.Event": unique symbol;
+            };
+        }
+        class SomeServiceRequest implements foo.Service<any/* foo.SomeService */, foo.Event<any/* foo.SomeService */>/* foo.SomeEvent */> {
+            constructor();
+            readonly __doNotUseOrImplementIt: foo.Service<any/* foo.SomeService */, foo.Event<any/* foo.SomeService */>/* foo.SomeEvent */>["__doNotUseOrImplementIt"];
+        }
     }
 }
diff --git a/js/js.translator/testData/typescript-export/implicit-export/implicit-export.kt b/js/js.translator/testData/typescript-export/implicit-export/implicit-export.kt
@@ -95,4 +95,17 @@ fun functionWithTypeAliasInside(x: NotExportedTypeAlias): NotExportedTypeAlias {
 }
 
 @JsExport
-class TheNewException: Throwable()
+class TheNewException: Throwable()
+
+// Recursive definition KT-57356
+@JsExport
+interface Service<Self : Service<Self, TEvent>, in TEvent : Event<Self>>
+
+@JsExport
+interface Event<out TService : Service<out TService, *>>
+
+class SomeService : Service<SomeService, SomeEvent>
+class SomeEvent : Event<SomeService>
+
+@JsExport
+class SomeServiceRequest : Service<SomeService, SomeEvent>
diff --git a/js/js.translator/testData/typescript-export/strict-implicit-export/strict-implicit-export.d.ts b/js/js.translator/testData/typescript-export/strict-implicit-export/strict-implicit-export.d.ts
@@ -79,6 +79,20 @@ declare namespace JS_TESTS {
         }
         function acceptForthLike<T extends foo.Forth>(forth: T): void;
         function acceptMoreGenericForthLike<T extends foo.IB & foo.IC & foo.Third>(forth: T): void;
+        interface Service<Self extends foo.Service<Self, TEvent>, TEvent extends foo.Event<Self>> {
+            readonly __doNotUseOrImplementIt: {
+                readonly "foo.Service": unique symbol;
+            };
+        }
+        interface Event<TService extends foo.Service<TService, any /*UnknownType **/>> {
+            readonly __doNotUseOrImplementIt: {
+                readonly "foo.Event": unique symbol;
+            };
+        }
+        class SomeServiceRequest implements foo.Service<any/* foo.SomeService */, foo.Event<any/* foo.SomeService */>/* foo.SomeEvent */> {
+            constructor();
+            readonly __doNotUseOrImplementIt: foo.Service<any/* foo.SomeService */, foo.Event<any/* foo.SomeService */>/* foo.SomeEvent */>["__doNotUseOrImplementIt"];
+        }
         interface NonExportedParent {
             readonly __doNotUseOrImplementIt: {
                 readonly "foo.NonExportedParent": unique symbol;
diff --git a/js/js.translator/testData/typescript-export/strict-implicit-export/strict-implicit-export.kt b/js/js.translator/testData/typescript-export/strict-implicit-export/strict-implicit-export.kt
@@ -167,3 +167,16 @@ fun <T> acceptMoreGenericForthLike(forth: T) where T: IB, T: IC, T: Third {}
 
 @JsExport
 val forth = Forth()
+
+// Recursive definition KT-57356
+@JsExport
+interface Service<Self : Service<Self, TEvent>, in TEvent : Event<Self>>
+
+@JsExport
+interface Event<out TService : Service<out TService, *>>
+
+class SomeService : Service<SomeService, SomeEvent>
+class SomeEvent : Event<SomeService>
+
+@JsExport
+class SomeServiceRequest : Service<SomeService, SomeEvent>

Original file line number	Diff line number	Diff line change
`@@ -549,13 +549,17 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac`
`549`	`549`	`)`
`550`	`550`	`}`
`551`	`551`
	`552`	`+ private val currentlyProcessedTypes = hashSetOf<IrType>()`
	`553`	`+`
`552`	`554`	`private fun exportType(type: IrType, shouldCalculateExportedSupertypeForImplicit: Boolean = true): ExportedType {`
`553`		`- if (type is IrDynamicType)`
	`555`	`+ if (type is IrDynamicType \|\| type in currentlyProcessedTypes)`
`554`	`556`	`return ExportedType.Primitive.Any`
`555`	`557`
`556`	`558`	`if (type !is IrSimpleType)`
`557`	`559`	`return ExportedType.ErrorType("NonSimpleType ${type.render()}")`
`558`	`560`
	`561`	`+ currentlyProcessedTypes.add(type)`
	`562`	`+`
`559`	`563`	`val classifier = type.classifier`
`560`	`564`	`val isMarkedNullable = type.isMarkedNullable()`
`561`	`565`	`val nonNullType = type.makeNotNull() as IrSimpleType`
`@@ -625,6 +629,7 @@ class ExportModelGenerator(val context: JsIrBackendContext, val generateNamespac`
`625`	`629`	`}`
`626`	`630`
`627`	`631`	`return exportedType.withNullability(isMarkedNullable)`
	`632`	`+ .also { currentlyProcessedTypes.remove(type) }`
`628`	`633`	`}`
`629`	`634`
`630`	`635`	`private fun IrDeclarationWithName.getExportedIdentifier(): String =`