[K/JS] Support essential Kotlin collections (List, MutableList, Set, MutableSet, Map, MutableMap) for exporting into JS
^KT-34995 Fixed ^KT-44871 Fixed
This commit is contained in:
Artem Kobzar
+11
-3
@@ -7,6 +7,7 @@ package org.jetbrains.kotlin.js.resolve.diagnostics
|
||||
|
||||
import com.intellij.psi.PsiElement
|
||||
import org.jetbrains.kotlin.builtins.KotlinBuiltIns
|
||||
import org.jetbrains.kotlin.builtins.StandardNames
|
||||
import org.jetbrains.kotlin.builtins.isFunctionType
|
||||
import org.jetbrains.kotlin.descriptors.*
|
||||
import org.jetbrains.kotlin.descriptors.ClassKind.*
|
||||
@@ -14,6 +15,7 @@ import org.jetbrains.kotlin.js.common.RESERVED_KEYWORDS
|
||||
import org.jetbrains.kotlin.js.common.SPECIAL_KEYWORDS
|
||||
import org.jetbrains.kotlin.js.naming.NameSuggestion
|
||||
import org.jetbrains.kotlin.js.translate.utils.AnnotationsUtils
|
||||
import org.jetbrains.kotlin.name.FqName
|
||||
import org.jetbrains.kotlin.psi.KtAnnotationEntry
|
||||
import org.jetbrains.kotlin.psi.KtDeclaration
|
||||
import org.jetbrains.kotlin.psi.KtNamedDeclaration
|
||||
@@ -190,9 +192,15 @@ class JsExportDeclarationChecker(private val includeUnsignedNumbers: Boolean) :
|
||||
KotlinBuiltIns.isString(nonNullable) ||
|
||||
(nonNullable.isPrimitiveNumberOrNullableType() && !nonNullable.isLong()) ||
|
||||
nonNullable.isNothingOrNullableNothing() ||
|
||||
KotlinBuiltIns.isArray(nonNullable) ||
|
||||
KotlinBuiltIns.isPrimitiveArray(nonNullable) ||
|
||||
(includeUnsignedNumbers && KotlinBuiltIns.isUnsignedNumber(nonNullable))
|
||||
(includeUnsignedNumbers && KotlinBuiltIns.isUnsignedNumber(nonNullable)) ||
|
||||
KotlinBuiltIns.isArray(this) ||
|
||||
KotlinBuiltIns.isPrimitiveArray(this) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.list) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.mutableList) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.set) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.mutableSet) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.map) ||
|
||||
KotlinBuiltIns.isConstructedFromGivenClass(this, StandardNames.FqNames.mutableMap)
|
||||
|
||||
if (isPrimitiveExportableType) return true
|
||||
|
||||
|
||||
Generated
+32
@@ -57,6 +57,38 @@ public class IrJsES6TypeScriptExportTestGenerated extends AbstractIrJsES6TypeScr
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/collections")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Collections {
|
||||
@Test
|
||||
public void testAllFilesPresentInCollections() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/typescript-export/collections"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("collections.kt")
|
||||
public void testCollections() throws Exception {
|
||||
runTest("js/js.translator/testData/typescript-export/collections/collections.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/collections-in-exported-file")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Collections_in_exported_file {
|
||||
@Test
|
||||
public void testAllFilesPresentInCollections_in_exported_file() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/typescript-export/collections-in-exported-file"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR_ES6, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("collections.kt")
|
||||
public void testCollections() throws Exception {
|
||||
runTest("js/js.translator/testData/typescript-export/collections-in-exported-file/collections.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/constructors")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
Generated
+32
@@ -57,6 +57,38 @@ public class IrJsTypeScriptExportTestGenerated extends AbstractIrJsTypeScriptExp
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/collections")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Collections {
|
||||
@Test
|
||||
public void testAllFilesPresentInCollections() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/typescript-export/collections"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("collections.kt")
|
||||
public void testCollections() throws Exception {
|
||||
runTest("js/js.translator/testData/typescript-export/collections/collections.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/collections-in-exported-file")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
public class Collections_in_exported_file {
|
||||
@Test
|
||||
public void testAllFilesPresentInCollections_in_exported_file() throws Exception {
|
||||
KtTestUtil.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("js/js.translator/testData/typescript-export/collections-in-exported-file"), Pattern.compile("^([^_](.+))\\.kt$"), null, TargetBackend.JS_IR, true);
|
||||
}
|
||||
|
||||
@Test
|
||||
@TestMetadata("collections.kt")
|
||||
public void testCollections() throws Exception {
|
||||
runTest("js/js.translator/testData/typescript-export/collections-in-exported-file/collections.kt");
|
||||
}
|
||||
}
|
||||
|
||||
@Nested
|
||||
@TestMetadata("js/js.translator/testData/typescript-export/constructors")
|
||||
@TestDataPath("$PROJECT_ROOT")
|
||||
|
||||
+53
@@ -0,0 +1,53 @@
|
||||
declare namespace JS_TESTS {
|
||||
type Nullable<T> = T | null | undefined
|
||||
namespace kotlin.collections {
|
||||
interface KtList<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlyArrayView(): ReadonlyArray<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtList": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMap<K, V> {
|
||||
asJsReadonlyMapView(): ReadonlyMap<K, V>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMap": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMutableList<E> extends kotlin.collections.KtList<E>/*, kotlin.collections.MutableCollection<E> */ {
|
||||
asJsArrayView(): Array<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableList": unique symbol;
|
||||
} & kotlin.collections.KtList<E>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
interface KtSet<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlySetView(): ReadonlySet<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtSet": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMutableSet<E> extends kotlin.collections.KtSet<E>/*, kotlin.collections.MutableCollection<E> */ {
|
||||
asJsSetView(): Set<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableSet": unique symbol;
|
||||
} & kotlin.collections.KtSet<E>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
interface KtMutableMap<K, V> extends kotlin.collections.KtMap<K, V> {
|
||||
asJsMapView(): Map<K, V>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableMap": unique symbol;
|
||||
} & kotlin.collections.KtMap<K, V>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
}
|
||||
function provideList(): kotlin.collections.KtList<number>;
|
||||
function provideMutableList(): kotlin.collections.KtMutableList<number>;
|
||||
function provideSet(): kotlin.collections.KtSet<number>;
|
||||
function provideMutableSet(): kotlin.collections.KtMutableSet<number>;
|
||||
function provideMap(): kotlin.collections.KtMap<string, number>;
|
||||
function provideMutableMap(): kotlin.collections.KtMutableMap<string, number>;
|
||||
function consumeList(list: kotlin.collections.KtList<number>): boolean;
|
||||
function consumeMutableList(list: kotlin.collections.KtMutableList<number>): boolean;
|
||||
function consumeSet(list: kotlin.collections.KtSet<number>): boolean;
|
||||
function consumeMutableSet(list: kotlin.collections.KtMutableSet<number>): boolean;
|
||||
function consumeMap(map: kotlin.collections.KtMap<string, number>): boolean;
|
||||
function consumeMutableMap(map: kotlin.collections.KtMutableMap<string, number>): boolean;
|
||||
}
|
||||
+61
@@ -0,0 +1,61 @@
|
||||
/** This file is generated by {@link :js:js.test:generateTypeScriptJsExportOnFileTests} task. DO NOT MODIFY MANUALLY */
|
||||
|
||||
// CHECK_TYPESCRIPT_DECLARATIONS
|
||||
// RUN_PLAIN_BOX_FUNCTION
|
||||
// WITH_STDLIB
|
||||
// SKIP_MINIFICATION
|
||||
// SKIP_NODE_JS
|
||||
// INFER_MAIN_MODULE
|
||||
|
||||
// TODO fix statics export in DCE-driven mode
|
||||
// SKIP_DCE_DRIVEN
|
||||
|
||||
// MODULE: JS_TESTS
|
||||
// FILE: f1.kt
|
||||
|
||||
@file:JsExport
|
||||
|
||||
|
||||
fun provideList(): List<Int> = listOf(1, 2, 3)
|
||||
|
||||
|
||||
fun provideMutableList(): MutableList<Int> = mutableListOf(4, 5, 6)
|
||||
|
||||
|
||||
fun provideSet(): Set<Int> = setOf(1, 2, 3)
|
||||
|
||||
|
||||
fun provideMutableSet(): MutableSet<Int> = mutableSetOf(4, 5, 6)
|
||||
|
||||
|
||||
fun provideMap(): Map<String, Int> = mapOf("a" to 1, "b" to 2, "c" to 3)
|
||||
|
||||
|
||||
fun provideMutableMap(): MutableMap<String, Int> = mutableMapOf("d" to 4, "e" to 5, "f" to 6)
|
||||
|
||||
|
||||
fun consumeList(list: List<Int>) = list.toString() == "[1, 2, 3]"
|
||||
|
||||
|
||||
fun consumeMutableList(list: MutableList<Int>): Boolean {
|
||||
list.add(7)
|
||||
return list.toString() == "[4, 5, 6, 7]"
|
||||
}
|
||||
|
||||
|
||||
fun consumeSet(list: Set<Int>) = list.toString() == "[1, 2, 3]"
|
||||
|
||||
|
||||
fun consumeMutableSet(list: MutableSet<Int>): Boolean {
|
||||
list.add(7)
|
||||
return list.toString() == "[4, 5, 6, 7]"
|
||||
}
|
||||
|
||||
|
||||
fun consumeMap(map: Map<String, Int>) = map.toString() == "{a=1, b=2, c=3}"
|
||||
|
||||
|
||||
fun consumeMutableMap(map: MutableMap<String, Int>): Boolean {
|
||||
map["g"] = 7
|
||||
return map.toString() == "{d=4, e=5, f=6, g=7}"
|
||||
}
|
||||
Vendored
+213
@@ -0,0 +1,213 @@
|
||||
import provideList = JS_TESTS.provideList;
|
||||
import consumeList = JS_TESTS.consumeList;
|
||||
import provideMutableList = JS_TESTS.provideMutableList;
|
||||
import consumeMutableList = JS_TESTS.consumeMutableList;
|
||||
import provideMutableSet = JS_TESTS.provideMutableSet;
|
||||
import provideSet = JS_TESTS.provideSet;
|
||||
import consumeSet = JS_TESTS.consumeSet;
|
||||
import consumeMutableSet = JS_TESTS.consumeMutableSet;
|
||||
import provideMap = JS_TESTS.provideMap;
|
||||
import consumeMap = JS_TESTS.consumeMap;
|
||||
import provideMutableMap = JS_TESTS.provideMutableMap;
|
||||
import consumeMutableMap = JS_TESTS.consumeMutableMap;
|
||||
|
||||
function assert(condition: boolean, message: string) {
|
||||
if (!condition) {
|
||||
throw message
|
||||
}
|
||||
}
|
||||
|
||||
function assertThrow(fn: () => void, message: string) {
|
||||
try {
|
||||
fn();
|
||||
throw message;
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
function box(): string {
|
||||
testImmutableList()
|
||||
testImmutableSet()
|
||||
testImmutableMap()
|
||||
|
||||
testMutableList()
|
||||
testMutableSet()
|
||||
testMutableMap()
|
||||
|
||||
return "OK"
|
||||
}
|
||||
|
||||
function testImmutableList() {
|
||||
const list = provideList()
|
||||
const listReadonlyArrayView = list.asJsReadonlyArrayView()
|
||||
|
||||
assert(listReadonlyArrayView[0] == 1, "Problem with accessing of element in immutable list readonly array view")
|
||||
assert(listReadonlyArrayView["0"] == 1, "Problem with accessing of element in immutable list readonly array view by string")
|
||||
assert(listReadonlyArrayView.map(x => x + 1).join("") == "234", "Problem with immutable list readonly array view")
|
||||
assert(consumeList(list), "Problem with consumption of a Kotlin list")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>)[1] = 4 }, "Immutable list readonly array view have ability to mutate the list by direct set")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>).push(4) }, "Immutable list readonly array view have ability to mutate the list by 'push'")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>).pop() }, "Immutable list readonly array view have ability to mutate the list by 'pop'")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { listReadonlyArrayView["foo"] }, "Immutable list getting a random index from its readonly array view")
|
||||
}
|
||||
|
||||
function testMutableList() {
|
||||
const mutableList = provideMutableList()
|
||||
const mutableListReadonlyArrayView = mutableList.asJsReadonlyArrayView()
|
||||
|
||||
assert(mutableListReadonlyArrayView[0] == 4, "Problem with accessing of element in mutable list readonly array view")
|
||||
assert(mutableListReadonlyArrayView["0"] == 4, "Problem with accessing of element in immutable list readonly array view by string")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "567", "Problem with mutable list readonly array view")
|
||||
assert(!consumeList(mutableList), "Problem with consumption of a Kotlin mutable list as a list")
|
||||
assert(consumeMutableList(mutableList), "Problem with consumption of a Kotlin mutable list as a mutable list")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "5678", "Problem with mutable list readonly array view after original list is mutated")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>)[1] = 4 }, "Mutable list readonly array view have ability to mutate the list by direct set")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>).push(4) }, "Mutable list readonly array view have ability to mutate the list by 'push'")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>).pop() }, "Mutable list readonly array view have ability to mutate the list by 'pop'")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { mutableListReadonlyArrayView["foo"] }, "Immutable list getting a random index from its readonly array view")
|
||||
|
||||
const mutableListArrayView = mutableList.asJsArrayView()
|
||||
mutableListArrayView.pop()
|
||||
|
||||
assert(mutableListArrayView[0] == 4, "Problem with accessing of element in mutable list array view")
|
||||
assert(mutableListArrayView["0"] == 4, "Problem with accessing of element in mutable list array view by string")
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "567", "Problem with mutable list array view")
|
||||
assert(consumeMutableList(mutableList), "Problem with consumption of a Kotlin mutable list as a mutable list")
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "5678", "Problem with mutable list array view after original list is mutated")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { mutableListArrayView["foo"] = 4 }, "Mutable list setting a random index in its array view")
|
||||
|
||||
mutableListArrayView.shift()
|
||||
mutableListArrayView.unshift(9)
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "10678", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.sort()
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67810", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.push(3)
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "678104", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView[3] = 4
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67854", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView["3"] = 6
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67874", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.length = 3
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "678", "Problem with mutable list array view after the view is mutated after size decreased")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "678", "Problem with mutable list readonly array view after size decreased")
|
||||
|
||||
assertThrow(() => { mutableListArrayView.length = 5 }, "Mutable list view size increasing works, but should not")
|
||||
}
|
||||
|
||||
function testImmutableSet() {
|
||||
const set = provideSet()
|
||||
const setReadonlyView = set.asJsReadonlySetView();
|
||||
|
||||
assert(setReadonlyView.has(1), "Problem with accessing element of readonly view")
|
||||
assert(joinSetOrMap(setReadonlyView) == "123", "Problem with readonly view iterator")
|
||||
assert(consumeSet(set), "Problem with consumption of a Kotlin set")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).add(4) }, "Set readonly view have ability to mutate the set by 'add'")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).delete(4) }, "Set readonly view have ability to mutate the set by 'delete'")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).clear() }, "Set readonly view have ability to mutate the set by 'clear'")
|
||||
}
|
||||
|
||||
function testMutableSet() {
|
||||
const mutableSet = provideMutableSet()
|
||||
const mutableSetReadonlyView = mutableSet.asJsReadonlySetView()
|
||||
|
||||
assert(mutableSetReadonlyView.has(4), "Problem with accessing element of mutable set readonly view")
|
||||
assert(joinSetOrMap(mutableSetReadonlyView) == "456", "Problem with mutable set readonly view iterator")
|
||||
assert(!consumeSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a set")
|
||||
assert(consumeMutableSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a mutable set")
|
||||
assert(joinSetOrMap(mutableSetReadonlyView) == "4567", "Problem with mutable set readonly view after original set is mutated")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).add(4) }, "Mutable set readonly view have ability to mutate the set by 'add'")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).delete(4) }, "Mutable set readonly view have ability to mutate the set by 'delete'")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).clear() }, "Mutable set readonly view have ability to mutate the set by 'clear'")
|
||||
|
||||
const mutableSetView = mutableSet.asJsSetView()
|
||||
|
||||
mutableSetView.delete(7)
|
||||
|
||||
assert(mutableSetView.has(4), "Problem with accessing element of mutable set view")
|
||||
assert(joinSetOrMap(mutableSetView) == "456", "Problem with mutable set view")
|
||||
assert(consumeMutableSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a mutable set")
|
||||
assert(joinSetOrMap(mutableSetView) == "4567", "Problem with mutable set view after original set is mutated")
|
||||
|
||||
mutableSetView.add(8)
|
||||
|
||||
assert(joinSetOrMap(mutableSetView) == "45678", "Problem with mutable set view after the view is mutated")
|
||||
|
||||
mutableSetView.clear()
|
||||
|
||||
assert(joinSetOrMap(mutableSetView) == "", "Problem with mutable set view after the view is mutated")
|
||||
}
|
||||
|
||||
function testImmutableMap() {
|
||||
const map = provideMap()
|
||||
const mapReadonlyView = map.asJsReadonlyMapView()
|
||||
|
||||
assert(mapReadonlyView.has("a"), "Problem with accessing element in map readonly view")
|
||||
assert(mapReadonlyView.get("a") == 1, "Problem with accessing element in map readonly view")
|
||||
assert(joinSetOrMap(mapReadonlyView) == "[a:1][b:2][c:3]", "Problem with map readonly view iterator")
|
||||
assert(consumeMap(map), "Problem with consumption of a Kotlin map")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).set("d", 4) }, "Map readonly view have ability to mutate the map by 'set'")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).delete("a") }, "Map readonly view have ability to mutate the map by 'delete'")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).clear() }, "Map readonly view have ability to mutate the map by 'clear'")
|
||||
}
|
||||
|
||||
function testMutableMap() {
|
||||
const mutableMap = provideMutableMap()
|
||||
const mutableMapReadonlyView = mutableMap.asJsReadonlyMapView()
|
||||
|
||||
assert(mutableMapReadonlyView.has("d"), "Problem with accessing element in mutable map readonly view")
|
||||
assert(mutableMapReadonlyView.get("d") == 4, "Problem with accessing element in mutable map readonly view")
|
||||
assert(joinSetOrMap(mutableMapReadonlyView) == "[d:4][e:5][f:6]", "Problem with mutable map readonly view")
|
||||
assert(!consumeMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a map")
|
||||
assert(consumeMutableMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a mutable map")
|
||||
assert(joinSetOrMap(mutableMapReadonlyView) == "[d:4][e:5][f:6][g:7]", "Problem with mutable map readonly view after original map is mutated")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).set("d", 4) }, "Mutable map readonly view have ability to mutate the map by 'set'")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).delete("a") }, "Mutable map readonly view have ability to mutate the map by 'delete'")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).clear() }, "Mutable map readonly view have ability to mutate the map by 'clear'")
|
||||
|
||||
const mutableMapView = mutableMap.asJsMapView()
|
||||
|
||||
mutableMapView.delete("g")
|
||||
|
||||
assert(mutableMapView.has("d"), "Problem with accessing element in mutable map view")
|
||||
assert(mutableMapView.get("d") == 4, "Problem with accessing element in mutable map view")
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6]", "Problem with mutable map view")
|
||||
assert(consumeMutableMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a mutable map")
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6][g:7]", "Problem with mutable map view after original map is mutated")
|
||||
|
||||
mutableMapView.set("h", 8)
|
||||
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6][g:7][h:8]", "Problem with mutable map view after the view is mutated")
|
||||
|
||||
mutableMapView.clear()
|
||||
|
||||
assert(joinSetOrMap(mutableMapView) == "", "Problem with mutable map view after the view is mutated")
|
||||
}
|
||||
|
||||
function joinSetOrMap(setOrMap: ReadonlySet<number> | ReadonlyMap<string, number>): string {
|
||||
let result = ""
|
||||
|
||||
if (setOrMap instanceof Set) {
|
||||
setOrMap.forEach((a: any) => {
|
||||
result += a
|
||||
});
|
||||
} else {
|
||||
setOrMap.forEach((key: any, value: any) => {
|
||||
result += `[${key}:${value}]`
|
||||
});
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
+4
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"include": [ "./*" ],
|
||||
"extends": "../common.tsconfig.json"
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
declare namespace JS_TESTS {
|
||||
type Nullable<T> = T | null | undefined
|
||||
namespace kotlin.collections {
|
||||
interface KtList<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlyArrayView(): ReadonlyArray<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtList": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMap<K, V> {
|
||||
asJsReadonlyMapView(): ReadonlyMap<K, V>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMap": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMutableList<E> extends kotlin.collections.KtList<E>/*, kotlin.collections.MutableCollection<E> */ {
|
||||
asJsArrayView(): Array<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableList": unique symbol;
|
||||
} & kotlin.collections.KtList<E>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
interface KtSet<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlySetView(): ReadonlySet<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtSet": unique symbol;
|
||||
};
|
||||
}
|
||||
interface KtMutableSet<E> extends kotlin.collections.KtSet<E>/*, kotlin.collections.MutableCollection<E> */ {
|
||||
asJsSetView(): Set<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableSet": unique symbol;
|
||||
} & kotlin.collections.KtSet<E>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
interface KtMutableMap<K, V> extends kotlin.collections.KtMap<K, V> {
|
||||
asJsMapView(): Map<K, V>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtMutableMap": unique symbol;
|
||||
} & kotlin.collections.KtMap<K, V>["__doNotUseOrImplementIt"];
|
||||
}
|
||||
}
|
||||
function provideList(): kotlin.collections.KtList<number>;
|
||||
function provideMutableList(): kotlin.collections.KtMutableList<number>;
|
||||
function provideSet(): kotlin.collections.KtSet<number>;
|
||||
function provideMutableSet(): kotlin.collections.KtMutableSet<number>;
|
||||
function provideMap(): kotlin.collections.KtMap<string, number>;
|
||||
function provideMutableMap(): kotlin.collections.KtMutableMap<string, number>;
|
||||
function consumeList(list: kotlin.collections.KtList<number>): boolean;
|
||||
function consumeMutableList(list: kotlin.collections.KtMutableList<number>): boolean;
|
||||
function consumeSet(list: kotlin.collections.KtSet<number>): boolean;
|
||||
function consumeMutableSet(list: kotlin.collections.KtMutableSet<number>): boolean;
|
||||
function consumeMap(map: kotlin.collections.KtMap<string, number>): boolean;
|
||||
function consumeMutableMap(map: kotlin.collections.KtMutableMap<string, number>): boolean;
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
// CHECK_TYPESCRIPT_DECLARATIONS
|
||||
// RUN_PLAIN_BOX_FUNCTION
|
||||
// WITH_STDLIB
|
||||
// SKIP_MINIFICATION
|
||||
// SKIP_NODE_JS
|
||||
// INFER_MAIN_MODULE
|
||||
|
||||
// TODO fix statics export in DCE-driven mode
|
||||
// SKIP_DCE_DRIVEN
|
||||
|
||||
// MODULE: JS_TESTS
|
||||
// FILE: f1.kt
|
||||
|
||||
@JsExport
|
||||
fun provideList(): List<Int> = listOf(1, 2, 3)
|
||||
|
||||
@JsExport
|
||||
fun provideMutableList(): MutableList<Int> = mutableListOf(4, 5, 6)
|
||||
|
||||
@JsExport
|
||||
fun provideSet(): Set<Int> = setOf(1, 2, 3)
|
||||
|
||||
@JsExport
|
||||
fun provideMutableSet(): MutableSet<Int> = mutableSetOf(4, 5, 6)
|
||||
|
||||
@JsExport
|
||||
fun provideMap(): Map<String, Int> = mapOf("a" to 1, "b" to 2, "c" to 3)
|
||||
|
||||
@JsExport
|
||||
fun provideMutableMap(): MutableMap<String, Int> = mutableMapOf("d" to 4, "e" to 5, "f" to 6)
|
||||
|
||||
@JsExport
|
||||
fun consumeList(list: List<Int>) = list.toString() == "[1, 2, 3]"
|
||||
|
||||
@JsExport
|
||||
fun consumeMutableList(list: MutableList<Int>): Boolean {
|
||||
list.add(7)
|
||||
return list.toString() == "[4, 5, 6, 7]"
|
||||
}
|
||||
|
||||
@JsExport
|
||||
fun consumeSet(list: Set<Int>) = list.toString() == "[1, 2, 3]"
|
||||
|
||||
@JsExport
|
||||
fun consumeMutableSet(list: MutableSet<Int>): Boolean {
|
||||
list.add(7)
|
||||
return list.toString() == "[4, 5, 6, 7]"
|
||||
}
|
||||
|
||||
@JsExport
|
||||
fun consumeMap(map: Map<String, Int>) = map.toString() == "{a=1, b=2, c=3}"
|
||||
|
||||
@JsExport
|
||||
fun consumeMutableMap(map: MutableMap<String, Int>): Boolean {
|
||||
map["g"] = 7
|
||||
return map.toString() == "{d=4, e=5, f=6, g=7}"
|
||||
}
|
||||
+213
@@ -0,0 +1,213 @@
|
||||
import provideList = JS_TESTS.provideList;
|
||||
import consumeList = JS_TESTS.consumeList;
|
||||
import provideMutableList = JS_TESTS.provideMutableList;
|
||||
import consumeMutableList = JS_TESTS.consumeMutableList;
|
||||
import provideMutableSet = JS_TESTS.provideMutableSet;
|
||||
import provideSet = JS_TESTS.provideSet;
|
||||
import consumeSet = JS_TESTS.consumeSet;
|
||||
import consumeMutableSet = JS_TESTS.consumeMutableSet;
|
||||
import provideMap = JS_TESTS.provideMap;
|
||||
import consumeMap = JS_TESTS.consumeMap;
|
||||
import provideMutableMap = JS_TESTS.provideMutableMap;
|
||||
import consumeMutableMap = JS_TESTS.consumeMutableMap;
|
||||
|
||||
function assert(condition: boolean, message: string) {
|
||||
if (!condition) {
|
||||
throw message
|
||||
}
|
||||
}
|
||||
|
||||
function assertThrow(fn: () => void, message: string) {
|
||||
try {
|
||||
fn();
|
||||
throw message;
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
function box(): string {
|
||||
testImmutableList()
|
||||
testImmutableSet()
|
||||
testImmutableMap()
|
||||
|
||||
testMutableList()
|
||||
testMutableSet()
|
||||
testMutableMap()
|
||||
|
||||
return "OK"
|
||||
}
|
||||
|
||||
function testImmutableList() {
|
||||
const list = provideList()
|
||||
const listReadonlyArrayView = list.asJsReadonlyArrayView()
|
||||
|
||||
assert(listReadonlyArrayView[0] == 1, "Problem with accessing of element in immutable list readonly array view")
|
||||
assert(listReadonlyArrayView["0"] == 1, "Problem with accessing of element in immutable list readonly array view by string")
|
||||
assert(listReadonlyArrayView.map(x => x + 1).join("") == "234", "Problem with immutable list readonly array view")
|
||||
assert(consumeList(list), "Problem with consumption of a Kotlin list")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>)[1] = 4 }, "Immutable list readonly array view have ability to mutate the list by direct set")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>).push(4) }, "Immutable list readonly array view have ability to mutate the list by 'push'")
|
||||
assertThrow(() => { (listReadonlyArrayView as Array<number>).pop() }, "Immutable list readonly array view have ability to mutate the list by 'pop'")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { listReadonlyArrayView["foo"] }, "Immutable list getting a random index from its readonly array view")
|
||||
}
|
||||
|
||||
function testMutableList() {
|
||||
const mutableList = provideMutableList()
|
||||
const mutableListReadonlyArrayView = mutableList.asJsReadonlyArrayView()
|
||||
|
||||
assert(mutableListReadonlyArrayView[0] == 4, "Problem with accessing of element in mutable list readonly array view")
|
||||
assert(mutableListReadonlyArrayView["0"] == 4, "Problem with accessing of element in immutable list readonly array view by string")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "567", "Problem with mutable list readonly array view")
|
||||
assert(!consumeList(mutableList), "Problem with consumption of a Kotlin mutable list as a list")
|
||||
assert(consumeMutableList(mutableList), "Problem with consumption of a Kotlin mutable list as a mutable list")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "5678", "Problem with mutable list readonly array view after original list is mutated")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>)[1] = 4 }, "Mutable list readonly array view have ability to mutate the list by direct set")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>).push(4) }, "Mutable list readonly array view have ability to mutate the list by 'push'")
|
||||
assertThrow(() => { (mutableListReadonlyArrayView as Array<number>).pop() }, "Mutable list readonly array view have ability to mutate the list by 'pop'")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { mutableListReadonlyArrayView["foo"] }, "Immutable list getting a random index from its readonly array view")
|
||||
|
||||
const mutableListArrayView = mutableList.asJsArrayView()
|
||||
mutableListArrayView.pop()
|
||||
|
||||
assert(mutableListArrayView[0] == 4, "Problem with accessing of element in mutable list array view")
|
||||
assert(mutableListArrayView["0"] == 4, "Problem with accessing of element in mutable list array view by string")
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "567", "Problem with mutable list array view")
|
||||
assert(consumeMutableList(mutableList), "Problem with consumption of a Kotlin mutable list as a mutable list")
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "5678", "Problem with mutable list array view after original list is mutated")
|
||||
// @ts-expect-error
|
||||
assertThrow(() => { mutableListArrayView["foo"] = 4 }, "Mutable list setting a random index in its array view")
|
||||
|
||||
mutableListArrayView.shift()
|
||||
mutableListArrayView.unshift(9)
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "10678", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.sort()
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67810", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.push(3)
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "678104", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView[3] = 4
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67854", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView["3"] = 6
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "67874", "Problem with mutable list array view after the view is mutated")
|
||||
|
||||
mutableListArrayView.length = 3
|
||||
|
||||
assert(mutableListArrayView.map(x => x + 1).join("") == "678", "Problem with mutable list array view after the view is mutated after size decreased")
|
||||
assert(mutableListReadonlyArrayView.map(x => x + 1).join("") == "678", "Problem with mutable list readonly array view after size decreased")
|
||||
|
||||
assertThrow(() => { mutableListArrayView.length = 5 }, "Mutable list view size increasing works, but should not")
|
||||
}
|
||||
|
||||
function testImmutableSet() {
|
||||
const set = provideSet()
|
||||
const setReadonlyView = set.asJsReadonlySetView();
|
||||
|
||||
assert(setReadonlyView.has(1), "Problem with accessing element of readonly view")
|
||||
assert(joinSetOrMap(setReadonlyView) == "123", "Problem with readonly view iterator")
|
||||
assert(consumeSet(set), "Problem with consumption of a Kotlin set")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).add(4) }, "Set readonly view have ability to mutate the set by 'add'")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).delete(4) }, "Set readonly view have ability to mutate the set by 'delete'")
|
||||
assertThrow(() => { (setReadonlyView as Set<number>).clear() }, "Set readonly view have ability to mutate the set by 'clear'")
|
||||
}
|
||||
|
||||
function testMutableSet() {
|
||||
const mutableSet = provideMutableSet()
|
||||
const mutableSetReadonlyView = mutableSet.asJsReadonlySetView()
|
||||
|
||||
assert(mutableSetReadonlyView.has(4), "Problem with accessing element of mutable set readonly view")
|
||||
assert(joinSetOrMap(mutableSetReadonlyView) == "456", "Problem with mutable set readonly view iterator")
|
||||
assert(!consumeSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a set")
|
||||
assert(consumeMutableSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a mutable set")
|
||||
assert(joinSetOrMap(mutableSetReadonlyView) == "4567", "Problem with mutable set readonly view after original set is mutated")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).add(4) }, "Mutable set readonly view have ability to mutate the set by 'add'")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).delete(4) }, "Mutable set readonly view have ability to mutate the set by 'delete'")
|
||||
assertThrow(() => { (mutableSetReadonlyView as Set<number>).clear() }, "Mutable set readonly view have ability to mutate the set by 'clear'")
|
||||
|
||||
const mutableSetView = mutableSet.asJsSetView()
|
||||
|
||||
mutableSetView.delete(7)
|
||||
|
||||
assert(mutableSetView.has(4), "Problem with accessing element of mutable set view")
|
||||
assert(joinSetOrMap(mutableSetView) == "456", "Problem with mutable set view")
|
||||
assert(consumeMutableSet(mutableSet), "Problem with consumption of a Kotlin mutable set as a mutable set")
|
||||
assert(joinSetOrMap(mutableSetView) == "4567", "Problem with mutable set view after original set is mutated")
|
||||
|
||||
mutableSetView.add(8)
|
||||
|
||||
assert(joinSetOrMap(mutableSetView) == "45678", "Problem with mutable set view after the view is mutated")
|
||||
|
||||
mutableSetView.clear()
|
||||
|
||||
assert(joinSetOrMap(mutableSetView) == "", "Problem with mutable set view after the view is mutated")
|
||||
}
|
||||
|
||||
function testImmutableMap() {
|
||||
const map = provideMap()
|
||||
const mapReadonlyView = map.asJsReadonlyMapView()
|
||||
|
||||
assert(mapReadonlyView.has("a"), "Problem with accessing element in map readonly view")
|
||||
assert(mapReadonlyView.get("a") == 1, "Problem with accessing element in map readonly view")
|
||||
assert(joinSetOrMap(mapReadonlyView) == "[a:1][b:2][c:3]", "Problem with map readonly view iterator")
|
||||
assert(consumeMap(map), "Problem with consumption of a Kotlin map")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).set("d", 4) }, "Map readonly view have ability to mutate the map by 'set'")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).delete("a") }, "Map readonly view have ability to mutate the map by 'delete'")
|
||||
assertThrow(() => { (mapReadonlyView as Map<string, number>).clear() }, "Map readonly view have ability to mutate the map by 'clear'")
|
||||
}
|
||||
|
||||
function testMutableMap() {
|
||||
const mutableMap = provideMutableMap()
|
||||
const mutableMapReadonlyView = mutableMap.asJsReadonlyMapView()
|
||||
|
||||
assert(mutableMapReadonlyView.has("d"), "Problem with accessing element in mutable map readonly view")
|
||||
assert(mutableMapReadonlyView.get("d") == 4, "Problem with accessing element in mutable map readonly view")
|
||||
assert(joinSetOrMap(mutableMapReadonlyView) == "[d:4][e:5][f:6]", "Problem with mutable map readonly view")
|
||||
assert(!consumeMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a map")
|
||||
assert(consumeMutableMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a mutable map")
|
||||
assert(joinSetOrMap(mutableMapReadonlyView) == "[d:4][e:5][f:6][g:7]", "Problem with mutable map readonly view after original map is mutated")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).set("d", 4) }, "Mutable map readonly view have ability to mutate the map by 'set'")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).delete("a") }, "Mutable map readonly view have ability to mutate the map by 'delete'")
|
||||
assertThrow(() => { (mutableMapReadonlyView as Map<string, number>).clear() }, "Mutable map readonly view have ability to mutate the map by 'clear'")
|
||||
|
||||
const mutableMapView = mutableMap.asJsMapView()
|
||||
|
||||
mutableMapView.delete("g")
|
||||
|
||||
assert(mutableMapView.has("d"), "Problem with accessing element in mutable map view")
|
||||
assert(mutableMapView.get("d") == 4, "Problem with accessing element in mutable map view")
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6]", "Problem with mutable map view")
|
||||
assert(consumeMutableMap(mutableMap), "Problem with consumption of a Kotlin mutable map as a mutable map")
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6][g:7]", "Problem with mutable map view after original map is mutated")
|
||||
|
||||
mutableMapView.set("h", 8)
|
||||
|
||||
assert(joinSetOrMap(mutableMapView) == "[d:4][e:5][f:6][g:7][h:8]", "Problem with mutable map view after the view is mutated")
|
||||
|
||||
mutableMapView.clear()
|
||||
|
||||
assert(joinSetOrMap(mutableMapView) == "", "Problem with mutable map view after the view is mutated")
|
||||
}
|
||||
|
||||
function joinSetOrMap(setOrMap: ReadonlySet<number> | ReadonlyMap<string, number>): string {
|
||||
let result = ""
|
||||
|
||||
if (setOrMap instanceof Set) {
|
||||
setOrMap.forEach((a: any) => {
|
||||
result += a
|
||||
});
|
||||
} else {
|
||||
setOrMap.forEach((key: any, value: any) => {
|
||||
result += `[${key}:${value}]`
|
||||
});
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"include": [ "./*" ],
|
||||
"extends": "../common.tsconfig.json"
|
||||
}
|
||||
@@ -2,6 +2,7 @@
|
||||
"compilerOptions": {
|
||||
"target": "es5",
|
||||
"strict": true,
|
||||
"newLine": "lf"
|
||||
"newLine": "lf",
|
||||
"lib": ["es2015", "dom"]
|
||||
}
|
||||
}
|
||||
+10
-2
@@ -1,5 +1,13 @@
|
||||
declare namespace JS_TESTS {
|
||||
type Nullable<T> = T | null | undefined
|
||||
namespace kotlin.collections {
|
||||
interface KtList<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlyArrayView(): ReadonlyArray<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtList": unique symbol;
|
||||
};
|
||||
}
|
||||
}
|
||||
namespace foo {
|
||||
interface SomeExternalInterface {
|
||||
}
|
||||
@@ -18,8 +26,8 @@ declare namespace JS_TESTS {
|
||||
function genericWithMultipleConstraints<T extends unknown/* kotlin.Comparable<T> */ & foo.SomeExternalInterface & Error>(x: T): T;
|
||||
function generic3<A, B, C, D, E>(a: A, b: B, c: C, d: D): Nullable<E>;
|
||||
function inlineFun(x: number, callback: (p0: number) => void): void;
|
||||
function formatList(value: any/* kotlin.collections.List<UnknownType *> */): string;
|
||||
function createList(): any/* kotlin.collections.List<UnknownType *> */;
|
||||
function formatList(value: kotlin.collections.KtList<any /*UnknownType **/>): string;
|
||||
function createList(): kotlin.collections.KtList<any /*UnknownType **/>;
|
||||
function defaultParametersAtTheBegining(a: string | undefined, b: string): string;
|
||||
function nonDefaultParameterInBetween(a: string | undefined, b: string, c?: string): string;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
declare namespace JS_TESTS {
|
||||
type Nullable<T> = T | null | undefined
|
||||
namespace kotlin.collections {
|
||||
interface KtList<E> /* extends kotlin.collections.Collection<E> */ {
|
||||
asJsReadonlyArrayView(): ReadonlyArray<E>;
|
||||
readonly __doNotUseOrImplementIt: {
|
||||
readonly "kotlin.collections.KtList": unique symbol;
|
||||
};
|
||||
}
|
||||
}
|
||||
namespace foo {
|
||||
interface SomeExternalInterface {
|
||||
}
|
||||
@@ -18,8 +26,8 @@ declare namespace JS_TESTS {
|
||||
function genericWithMultipleConstraints<T extends unknown/* kotlin.Comparable<T> */ & foo.SomeExternalInterface & Error>(x: T): T;
|
||||
function generic3<A, B, C, D, E>(a: A, b: B, c: C, d: D): Nullable<E>;
|
||||
function inlineFun(x: number, callback: (p0: number) => void): void;
|
||||
function formatList(value: any/* kotlin.collections.List<UnknownType *> */): string;
|
||||
function createList(): any/* kotlin.collections.List<UnknownType *> */;
|
||||
function formatList(value: kotlin.collections.KtList<any /*UnknownType **/>): string;
|
||||
function createList(): kotlin.collections.KtList<any /*UnknownType **/>;
|
||||
function defaultParametersAtTheBegining(a: string | undefined, b: string): string;
|
||||
function nonDefaultParameterInBetween(a: string | undefined, b: string, c?: string): string;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user