[Gradle, JS] KT-37207 Possibility to add dependency on not module dir

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/build.gradle.kts

@@ -18,6 +18,7 @@ kotlin.sourceSets {
             implementation(npm("@yworks/optimizer", "1.0.6"))
             implementation(npm("file-dependency", projectDir.resolve("file-dependency")))
             implementation(npm(projectDir.resolve("file-dependency-2")))
+            implementation(npm(projectDir.resolve("file-dependency-3")))
         }
     }
 

libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/npm-dependencies/file-dependency-3/index.js

@@ -0,0 +1,5 @@
+/*
+ * Copyright 2010-2020 JetBrains s.r.o. and Kotlin Programming Language contributors.
+ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
+ */
+

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/mpp/DefaultKotlinDependencyHandler.kt

@@ -89,11 +89,15 @@ class DefaultKotlinDependencyHandler(
             version = version
         )
 
-    override fun npm(name: String, directory: File): NpmDependency =
+    override fun npm(name: String, directory: File): NpmDependency {
-        npm(
+        check(directory.isDirectory) {
+            "Dependency on local path should point on directory but $directory found"
+        }
+        return npm(
             name = name,
             version = fileVersion(directory)
         )
+    }
 
     override fun npm(directory: File): NpmDependency =
         npm(

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependency.kt

@@ -133,11 +133,11 @@ internal fun fileVersion(directory: File): String =
 internal fun moduleName(directory: File): String {
     val packageJson = directory.resolve(PACKAGE_JSON)
 
-    check(packageJson.isFile) {
+    if (packageJson.isFile) {
-        "There is no NPM module in $directory. Declare valid $PACKAGE_JSON in it."
+        return fromSrcPackageJson(packageJson)!!.name
     }
 
-    return fromSrcPackageJson(packageJson)!!.name
+    return directory.name
 }
 
 const val FILE_VERSION_PREFIX = "file:"

libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/npm/NpmDependencyExtension.kt

@@ -30,11 +30,15 @@ fun Project.addNpmDependencyExtension() {
                 version = version
             )
 
-        override operator fun invoke(name: String, directory: File): NpmDependency =
+        override operator fun invoke(name: String, directory: File): NpmDependency {
-            invoke(
+            check(directory.isDirectory) {
+                "Dependency on local path should point on directory but $directory found"
+            }
+            return invoke(
                 name = name,
                 version = fileVersion(directory)
             )
+        }
 
         override operator fun invoke(directory: File): NpmDependency =
             invoke(