JS: drop support of old library format

Original commit: 7192529733

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

@@ -98,8 +98,7 @@ 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/root-package.kjsm"
-                "$PROJECT_NAME/library/sample/sample.kjsm"
         )
         private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_DEFAULT_DIR = hashSetOf(
                 "$PROJECT_NAME.js",
@@ -107,13 +106,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
                 "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/root-package.kjsm"
-                "$PROJECT_NAME/library/sample/sample.kjsm"
         )
         private val EXPECTED_JS_FILES_IN_OUTPUT_WITH_ADDITIONAL_LIB_AND_CUSTOM_DIR = hashSetOf(
                 "$PROJECT_NAME.js",
@@ -121,13 +120,13 @@ class KotlinJpsBuildTest : AbstractKotlinJpsBuildTestCase() {
                 "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/root-package.kjsm"
-                "$PROJECT_NAME/library/sample/sample.kjsm"
         )
 
         private fun k2jsOutput(vararg moduleNames: String): Array<String> {

jps/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/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.

jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.js

@@ -1,37 +1,44 @@
-(function (Kotlin) {
+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';
-  var _ = Kotlin.defineRootPackage(null, /** @lends _ */ {
+  function pairAdd(p) {
-    library: Kotlin.definePackage(null, /** @lends _.library */ {
+    return p.first + p.second | 0;
-      sample: Kotlin.definePackage(null, /** @lends _.library.sample */ {
+  }
-        pairAdd_bunuun$: function (p) {
+  function pairMul(p) {
-          return p.first + p.second;
+    return Kotlin.imul(p.first, p.second);
-        },
+  }
-        pairMul_bunuun$: function (p) {
+  function IntHolder(value) {
-          return p.first * p.second;
+    this.value = value;
-        },
+  }
-        IntHolder: Kotlin.createClass(null, function (value) {
+  IntHolder.$metadata$ = {
-          this.value = value;
+    kind: Kotlin.Kind.CLASS,
-        }, /** @lends _.library.sample.IntHolder.prototype */ {
+    simpleName: 'IntHolder',
-          component1: function () {
+    interfaces: []
-            return this.value;
+  };
-          },
+  IntHolder.prototype.component1 = function () {
-          copy_za3lpa$: function (value) {
+    return this.value;
-            return new _.library.sample.IntHolder(value === void 0 ? this.value : value);
+  };
-          },
+  IntHolder.prototype.copy_za3lpa$ = function (value) {
-          toString: function () {
+    return new IntHolder(value === void 0 ? this.value : value);
-            return 'IntHolder(value=' + Kotlin.toString(this.value) + ')';
+  };
-          },
+  IntHolder.prototype.toString = function () {
-          hashCode: function () {
+    return 'IntHolder(value=' + Kotlin.toString(this.value) + ')';
-            var result = 0;
+  };
-            result = result * 31 + Kotlin.hashCode(this.value) | 0;
+  IntHolder.prototype.hashCode = function () {
-            return result;
+    var result = 0;
-          },
+    result = result * 31 + Kotlin.hashCode(this.value) | 0;
-          equals_za3rmp$: function (other) {
+    return result;
-            return this === other || (other !== null && (Object.getPrototypeOf(this) === Object.getPrototypeOf(other) && Kotlin.equals(this.value, other.value)));
+  };
-          }
+  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 = {});
-  Kotlin.defineModule('jslib-example', _);
+  package$sample.pairAdd_1fzo63$ = pairAdd;
-}(Kotlin));
+  package$sample.pairMul_1fzo63$ = pairMul;
+  package$sample.IntHolder = IntHolder;
+  Kotlin.defineModule('LibraryExample', _);
+  return _;
+}(typeof LibraryExample === 'undefined' ? {} : LibraryExample, kotlin);

jps/jps-plugin/testData/general/KotlinJavaScriptProjectWithDirectoryAsLibrary/jslib-example/jslib-example.meta.js

@@ -0,0 +1 @@
+// Kotlin.kotlin_module_metadata(1, "LibraryExample", "H4sIAAAAAAAAAJVW227TQBB1fF1Pb64LJTUgRBEgbiWkCIEESC19KJWQgIoPcJ1tsqmzG9ZO0v4Ar0h9QP2UfAGf0N+BcS5O0tRu6gfvaHdmzlzOjq2490FxFa94Rv4Nn0LXHsmnRHE9sMD49oOz2NVBdRTPPCNK11aSs4cwD+aRiEPGQWXChUQBdKI4hUQNffVcvIabqZol6WFIgxjUeuQ6I318Fxw1sVK7tjp0rtf9tg96K2ZhlvOXsJo6n6fHTSpZg/LYzzToBV3/2aLyBNQWy1J7BzdAE7IKWmczAK0iGqAFUeSuXowZ36qjJaZa19YS0yfgpCGZ0udVGmWh7MNGqgqBkAJT5TSazASA8VgyHrFgJvwNWBoP/bgm8yv9CBbSIJJEr1OSlgxnCakIRs90mkO3gQzbMX34AGCEmBXWxhi95gLRaPqSRYJn1vw5rKT6dkQRmgfZHXqBSacdakqBbYlZtvqFYMKE6ywnmAn3IwLkXaVeQayjmhRcRGB06EE1zG/wZY2L2tVZGvcebl00NWkbaTkTEycGRD0zqx4H+mrTHNgcq1AP3zhosbCSn/FTWJ4aOVnobyZSnMMGHwrZ8JEU+RjPwE0xCN5QKnn21NmC9asvej7ebw3+FMAK2YH0cXaZkd9ohhTszzzeFWGFylGZtvgJGG0/bFHQ8DhBbDQFR5BXoAeiidbIez+MwNoWIqQ+B0PENXRBan5U+yQqFEgs9pOpUwVzsFpNn8mtSgUKTdC/otzf+dIK3Y9jgZtJ4EUFdzSUNUdHOVnNwQqDdXGwLhcVb8e76yx5askou47jLbq6i3L/XSJdouCxm3Pcr/M6I79IUS2rJX2buKZjJBZ7tmMl6+5fbW/FISiqZYI8NfqbBdy0UTTLxJnz9GKhpO+ea2g03zs/L6C4gKKF4veBSwQ8JSpMDdpkdM7OygMpOhGVWYR5C2tjvhe4iNkhC/z+MMlFKSHKyNI4pHFQy7d4DIuTUyUrqERxmIAe0+PMOzXxSam3Mz8pd8BOGT199T9A8eLwQcbJCMk4y/Qp46AfmVsdIY+ovGbxWEivsFgDs/+fMh3/Dty79MdnbFzMkMbEJ8LnyIQeCzJK6g1U/wOSAB0W3QkAAA==");