merge serialization.js module into js.serializer

js/js.serializer/js.serializer.iml

@@ -9,7 +9,6 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="serialization" />
-    <orderEntry type="module" module-name="serialization.js" />
     <orderEntry type="module" module-name="util" />
     <orderEntry type="library" name="intellij-core" level="project" />
     <orderEntry type="module" module-name="frontend" />

js/js.serializer/src/js.proto

@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.js;
+
+option java_outer_classname = "JsProtoBuf";
+option optimize_for = LITE_RUNTIME;
+
+// For Kotlin/Javascript we reuse builtins serialization code.
+message Library {
+  message FileEntry {
+    required string path = 1;
+    required bytes content = 2;
+  }
+
+  repeated FileEntry entry = 1;
+}

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010-2015 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.kotlin.serialization.js
+
+import com.google.protobuf.ByteString
+import org.jetbrains.kotlin.builtins.BuiltinsPackageFragment
+import org.jetbrains.kotlin.descriptors.ModuleDescriptor
+import org.jetbrains.kotlin.descriptors.PackageFragmentProvider
+import org.jetbrains.kotlin.name.FqName
+import org.jetbrains.kotlin.serialization.deserialization.FlexibleTypeCapabilitiesDeserializer
+import org.jetbrains.kotlin.storage.LockBasedStorageManager
+import java.io.ByteArrayInputStream
+import java.io.ByteArrayOutputStream
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
+import kotlin.platform.platformStatic
+
+public object KotlinJavascriptSerializationUtil {
+    private val PACKAGE_FILE_SUFFIX = "/.kotlin_package"
+
+    platformStatic
+    public fun getPackageFragmentProviders(moduleDescriptor: ModuleDescriptor, metadata: ByteArray): List<PackageFragmentProvider> {
+        val gzipInputStream = GZIPInputStream(ByteArrayInputStream(metadata))
+        val content = JsProtoBuf.Library.parseFrom(gzipInputStream)
+        gzipInputStream.close()
+
+        val contentMap: MutableMap<String, ByteArray> = hashMapOf()
+        for(index in 0..content.getEntryCount()-1) {
+            val entry = content.getEntry(index)
+            contentMap[entry.getPath()] = entry.getContent().toByteArray()
+        }
+
+        val packages = getPackages(contentMap)
+
+        val load = { (path: String) -> if (!contentMap.containsKey(path)) null else ByteArrayInputStream(contentMap.get(path)) }
+
+        val providers = arrayListOf<PackageFragmentProvider>()
+        for (packageName in packages) {
+            val fqName = FqName(packageName)
+            val packageFragment = BuiltinsPackageFragment(fqName, LockBasedStorageManager(), moduleDescriptor, FlexibleTypeCapabilitiesDeserializer.Dynamic, load)
+            providers.add(packageFragment.provider)
+        }
+
+        return providers
+    }
+
+    public fun contentMapToByteArray(contentMap: Map<String, ByteArray>): ByteArray {
+        val contentBuilder = JsProtoBuf.Library.newBuilder()
+        contentMap forEach {
+            val entry = JsProtoBuf.Library.FileEntry.newBuilder().setPath(it.getKey()).setContent(ByteString.copyFrom(it.getValue())).build()
+            contentBuilder.addEntry(entry)
+        }
+
+        val byteStream = ByteArrayOutputStream()
+        val gzipOutputStream = GZIPOutputStream(byteStream)
+        contentBuilder.build().writeTo(gzipOutputStream)
+        gzipOutputStream.close()
+
+        return byteStream.toByteArray()
+    }
+
+    private fun getPackages(contentMap: Map<String, ByteArray>): List<String> =
+            contentMap.keySet().filter { it.endsWith(PACKAGE_FILE_SUFFIX) } map { it.substring(0, it.length() - PACKAGE_FILE_SUFFIX.length()).replace('/', '.') }
+}