JS: drop support of old library format

compiler/testData/cli/js/folderAsLib/LibraryExample.js

@@ -0,0 +1,44 @@
+if (typeof kotlin === 'undefined') {
+  throw new Error("Error loading module 'LibraryExample'. Its dependency 'kotlin' was not found. Please, check whether 'kotlin' is loaded prior to 'LibraryExample'.");
+}
+var LibraryExample = function (_, Kotlin) {
+  'use strict';
+  function pairAdd(p) {
+    return p.first + p.second | 0;
+  }
+  function pairMul(p) {
+    return Kotlin.imul(p.first, p.second);
+  }
+  function IntHolder(value) {
+    this.value = value;
+  }
+  IntHolder.$metadata$ = {
+    kind: Kotlin.Kind.CLASS,
+    simpleName: 'IntHolder',
+    interfaces: []
+  };
+  IntHolder.prototype.component1 = function () {
+    return this.value;
+  };
+  IntHolder.prototype.copy_za3lpa$ = function (value) {
+    return new IntHolder(value === void 0 ? this.value : value);
+  };
+  IntHolder.prototype.toString = function () {
+    return 'IntHolder(value=' + Kotlin.toString(this.value) + ')';
+  };
+  IntHolder.prototype.hashCode = function () {
+    var result = 0;
+    result = result * 31 + Kotlin.hashCode(this.value) | 0;
+    return result;
+  };
+  IntHolder.prototype.equals = function (other) {
+    return this === other || (other !== null && (typeof other === 'object' && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value))));
+  };
+  var package$library = _.library || (_.library = {});
+  var package$sample = package$library.sample || (package$library.sample = {});
+  package$sample.pairAdd_1fzo63$ = pairAdd;
+  package$sample.pairMul_1fzo63$ = pairMul;
+  package$sample.IntHolder = IntHolder;
+  Kotlin.defineModule('LibraryExample', _);
+  return _;
+}(typeof LibraryExample === 'undefined' ? {} : LibraryExample, kotlin);

compiler/testData/cli/js/lib/ReadMe.md

@@ -0,0 +1,5 @@
+# jslib
+
+Path to sources: `compiler/testData/cli/js/jslib`
+
+`folderAsLib/LibraryExample.js`, `folderAsLib/LibraryExample.meta.js` and `LibraryExample.jar` should be updated after changing some files in source folder.

compiler/testData/cli/js/notValidLibraryDir.args

@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -libraries
-compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib
+compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib
 -output
 $TEMP_DIR$/out.js

compiler/testData/cli/js/notValidLibraryDir.out

@@ -1,4 +1,4 @@
-warning: 'compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib' is not a valid Kotlin Javascript library
+warning: 'compiler/testData/integration/ant/js/simpleWithStdlibAndJsFileAsAnotherLib' is not a valid Kotlin Javascript library
 compiler/testData/cli/js/withLib.kt:2:8: error: unresolved reference: library
 import library.sample.*
        ^

compiler/testData/cli/js/withFolderAsLib.args

@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -libraries
-compiler/testData/integration/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
+$TESTDATA_DIR$/folderAsLib
 -output
 $TEMP_DIR$/out.js

compiler/testData/cli/js/withLib.args

@@ -1,5 +1,5 @@
 $TESTDATA_DIR$/withLib.kt
 -libraries
-compiler/testData/integration/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar
+$TESTDATA_DIR$/lib/LibraryExample.jar
 -output
 $TEMP_DIR$/out.js

compiler/util/src/org/jetbrains/kotlin/utils/LibraryUtils.kt

@@ -27,25 +27,20 @@ import java.util.jar.Manifest
 object LibraryUtils {
     private val LOG = Logger.getInstance(LibraryUtils::class.java)
 
-    val KOTLIN_JS_MODULE_NAME: String = "Kotlin-JS-Module-Name"
     private var TITLE_KOTLIN_JAVASCRIPT_STDLIB: String
-    private var TITLE_KOTLIN_JAVASCRIPT_LIB: String
 
     val META_INF = "META-INF/"
     private val MANIFEST_PATH = "${META_INF}MANIFEST.MF"
-    private val KOTLIN_JS_MODULE_ATTRIBUTE_NAME = Attributes.Name(KOTLIN_JS_MODULE_NAME)
 
     init {
         var jsStdLib = ""
-        var jsLib = ""
 
         val manifestProperties = LibraryUtils::class.java.getResourceAsStream("/kotlinManifest.properties")
         if (manifestProperties != null) {
             try {
                 val properties = Properties()
                 properties.load(manifestProperties)
                 jsStdLib = properties.getPropertyOrFail("manifest.impl.title.kotlin.javascript.stdlib")
-                jsLib = properties.getPropertyOrFail("manifest.spec.title.kotlin.javascript.lib")
             }
             catch (e: IOException) {
                 LOG.error(e)
@@ -57,27 +52,14 @@ object LibraryUtils {
         }
 
         TITLE_KOTLIN_JAVASCRIPT_STDLIB = jsStdLib
-        TITLE_KOTLIN_JAVASCRIPT_LIB = jsLib
     }
 
     @JvmStatic fun getJarFile(classesRoots: List<VirtualFile>, jarName: String): VirtualFile? {
         return classesRoots.firstOrNull { it.name == jarName }
     }
 
-    @JvmStatic fun getKotlinJsModuleName(library: File): String? {
-        return getManifestMainAttributesFromJarOrDirectory(library)?.getValue(KOTLIN_JS_MODULE_ATTRIBUTE_NAME)
-    }
-
-    @JvmStatic fun isOldKotlinJavascriptLibrary(library: File): Boolean =
-            checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_LIB, Attributes.Name.SPECIFICATION_TITLE) &&
-            getKotlinJsModuleName(library) != null
-
-    @JvmStatic fun isKotlinJavascriptLibraryWithMetadata(library: File): Boolean =
-            KotlinJavascriptMetadataUtils.loadMetadata(library).isNotEmpty()
-
     @Suppress("unused") // used in K2JSCompilerMojo
-    @JvmStatic fun isKotlinJavascriptLibrary(library: File): Boolean =
-            isOldKotlinJavascriptLibrary(library) || isKotlinJavascriptLibraryWithMetadata(library)
+    @JvmStatic fun isKotlinJavascriptLibrary(library: File): Boolean = KotlinJavascriptMetadataUtils.loadMetadata(library).isNotEmpty()
 
     @JvmStatic fun isKotlinJavascriptStdLibrary(library: File): Boolean {
         return checkAttributeValue(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB, Attributes.Name.IMPLEMENTATION_TITLE)

idea/src/META-INF/extensions/kotlin2js.xml

@@ -8,6 +8,5 @@
         <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressUnusedParameterForJsNative"/>
         <suppressStringProvider implementation="org.jetbrains.kotlin.js.analyze.SuppressNoBodyErrorsForNativeDeclarations"/>
         <diagnosticSuppressor implementation="org.jetbrains.kotlin.js.analyze.SuppressUninitializedErrorsForNativeDeclarations"/>
-        <diagnosticSuppressor implementation="org.jetbrains.kotlin.js.analyze.SuppressWarningsFromExternalModules"/>
     </extensions>
 </idea-plugin>

jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/KotlinJpsBuildTest.kt

@@ -98,36 +98,35 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
         private val EXPECTED_JS_FILES_IN_OUTPUT_NO_COPY = hashSetOf(
                 "$PROJECT_NAME.js",
                 "$PROJECT_NAME.meta.js",
-                "$PROJECT_NAME/root-package.kjsm",
-                "$PROJECT_NAME/library/sample/sample.kjsm"
+                "$PROJECT_NAME/root-package.kjsm"
         )
         private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf(
                 "$PROJECT_NAME.js",
                 "$PROJECT_NAME.meta.js",
                 "lib/kotlin.js",
                 "lib/kotlin.meta.js",
                 "lib/jslib-example.js",
+                "lib/jslib-example.meta.js",
                 "lib/file0.js",
                 "lib/dir/file1.js",
                 "lib/META-INF-ex/file2.js",
                 "lib/res0.js",
                 "lib/resdir/res1.js",
-                "$PROJECT_NAME/root-package.kjsm",
-                "$PROJECT_NAME/library/sample/sample.kjsm"
+                "$PROJECT_NAME/root-package.kjsm"
         )
         private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf(
                 "$PROJECT_NAME.js",
                 "$PROJECT_NAME.meta.js",
                 "custom/kotlin.js",
                 "custom/kotlin.meta.js",
                 "custom/jslib-example.js",
+                "custom/jslib-example.meta.js",
                 "custom/file0.js",
                 "custom/dir/file1.js",
                 "custom/META-INF-ex/file2.js",
                 "custom/res0.js",
                 "custom/resdir/res1.js",
-                "$PROJECT_NAME/root-package.kjsm",
-                "$PROJECT_NAME/library/sample/sample.kjsm"
+                "$PROJECT_NAME/root-package.kjsm"
         )
 
         private fun k2jsOutput(vararg moduleNames: String): Array<String> {

jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/META-INF/MANIFEST.MF

@@ -5,5 +5,4 @@ Built-By: JetBrains
 Implementation-Vendor: JetBrains
 Implementation-Version: snapshot
 Specification-Title: Kotlin JavaScript Lib
-Kotlin-JS-Module-Name: jslib-example
 

jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/ReadMe.md

@@ -1,6 +1,6 @@
 # jslib-example
 
-Path to sources: compiler/integration-tests/testData/ant/js/simpleWithStdlibAndFolderAsAnotherLib/jslib-example
+Path to sources: `compiler/testData/cli/js/jslib`
 
 The archive compiler/integration-tests/testData/ant/js/simpleWithStdlibAndAnotherLib/jslib-example.jar should be updated after
 changing some files in source folder.