JS: repair serialization of type aliases

compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.kt

@@ -497,31 +497,13 @@ class DescriptorSerializer private constructor(
 
     @JvmOverloads
     fun packageProto(
-            fragments: Collection<PackageFragmentDescriptor>, skip: ((DeclarationDescriptor) -> Boolean)? = null
+            fragments: Collection<PackageFragmentDescriptor>,
+            skip: (DeclarationDescriptor) -> Boolean = { false }
     ): ProtoBuf.Package.Builder {
-        val builder = ProtoBuf.Package.newBuilder()
+        val members = fragments
-
+                .flatMap { fragment -> DescriptorUtils.getAllDescriptors(fragment.getMemberScope()) }
-        val members = fragments.flatMap { fragment ->
+                .filter { !skip(it) }
-            DescriptorUtils.getAllDescriptors(fragment.getMemberScope())
+        return packagePartProto(members)
-        }
-
-        for (declaration in sort(members)) {
-            if (skip?.invoke(declaration) == true) continue
-
-            when (declaration) {
-                is PropertyDescriptor -> builder.addProperty(propertyProto(declaration))
-                is FunctionDescriptor -> builder.addFunction(functionProto(declaration))
-            }
-        }
-
-        val typeTableProto = typeTable.serialize()
-        if (typeTableProto != null) {
-            builder.typeTable = typeTableProto
-        }
-
-        extension.serializePackage(builder)
-
-        return builder
     }
 
     fun packagePartProto(members: Collection<DeclarationDescriptor>): ProtoBuf.Package.Builder {

js/js.serializer/src/org/jetbrains/kotlin/serialization/js/KotlinJavascriptSerializationUtil.kt

@@ -135,7 +135,7 @@ object KotlinJavascriptSerializationUtil {
         val packageStream = ByteArrayOutputStream()
         val fragments = packageView.fragments
         val packageProto = serializer.packageProto(fragments, skip).build() ?: error("Package fragments not serialized: $fragments")
-        if (packageProto.functionCount > 0 || packageProto.propertyCount > 0) {
+        if (packageProto.functionCount > 0 || packageProto.propertyCount > 0 || packageProto.typeAliasCount > 0) {
             packageProto.writeTo(packageStream)
             writeFun(KotlinJavascriptSerializedResourcePaths.getPackageFilePath(fqName), packageStream.toByteArray())
         }

js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/MultiModuleTestGenerated.java

@@ -41,6 +41,12 @@ public class MultiModuleTestGenerated extends AbstractMultiModuleTest {
         doTest(fileName);
     }
 
+    @TestMetadata("typealiases")
+    public void testTypealiases() throws Exception {
+        String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/typealiases/");
+        doTest(fileName);
+    }
+
     @TestMetadata("useElementsFromDefaultPackageInAnotherModule")
     public void testUseElementsFromDefaultPackageInAnotherModule() throws Exception {
         String fileName = KotlinTestUtils.navigationMetadata("js/js.translator/testData/multiModule/cases/useElementsFromDefaultPackageInAnotherModule/");

js/js.translator/testData/multiModule/cases/typealiases/dependencies.txt

@@ -0,0 +1,2 @@
+lib->
+main->lib

js/js.translator/testData/multiModule/cases/typealiases/lib/lib.kt

@@ -0,0 +1,13 @@
+package lib
+
+object O {
+    val x = "O"
+
+    val y = "K"
+}
+
+class C {
+    typealias B = O
+}
+
+typealias A = O

js/js.translator/testData/multiModule/cases/typealiases/main/main.kt

@@ -0,0 +1,5 @@
+package foo
+
+import lib.*
+
+fun box() = A.x + C.B.y