Fix id collision by adding DirectoryPath to modules Identity (#100)

plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/data/PackageSearchModule.kt

@@ -2,6 +2,7 @@
 
 package com.jetbrains.packagesearch.plugin.core.data
 
+import com.jetbrains.packagesearch.plugin.core.utils.DirectoryPath
 import java.nio.file.Path
 import kotlinx.serialization.Serializable
 import org.jetbrains.packagesearch.api.v3.ApiRepository
@@ -42,5 +43,9 @@ sealed interface PackageSearchModule : IconProvider, PackageSearchModuleEditor {
     }
 
     @Serializable
-    data class Identity(val group: String, val path: String)
-}
+    data class Identity(
+        val group: String,
+        val path: String,
+        val projectDir: DirectoryPath,
+    )
+}

plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/DirectoryPath.kt

@@ -0,0 +1,30 @@
+package com.jetbrains.packagesearch.plugin.core.utils
+
+import java.nio.file.Path
+import kotlin.io.path.isDirectory
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.descriptors.SerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
+
+fun Path.toDirectory() = DirectoryPath(this)
+
+@Serializable(with = DirectoryPath.Companion::class)
+class DirectoryPath(path: Path) : Path by path {
+    init {
+        require(path.isDirectory()) { "Path $path is not a directory" }
+    }
+
+    companion object : KSerializer<DirectoryPath> {
+        override val descriptor: SerialDescriptor
+            get() = NioPathSerializer.descriptor
+
+        override fun deserialize(decoder: Decoder): DirectoryPath =
+            NioPathSerializer.deserialize(decoder).toDirectory()
+
+        override fun serialize(encoder: Encoder, value: DirectoryPath) {
+            NioPathSerializer.serialize(encoder, value)
+        }
+    }
+}

plugin/core/src/main/kotlin/com/jetbrains/packagesearch/plugin/core/utils/NioPathSerializer.kt

@@ -18,4 +18,4 @@ object NioPathSerializer : KSerializer<Path> {
         String.serializer().serialize(encoder, value.absolutePathString())
     }
 
-}
+}

plugin/gradle/base/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/GradleModuleProvider.kt

@@ -6,6 +6,7 @@ import com.intellij.openapi.module.Module
 import com.jetbrains.packagesearch.plugin.core.PackageSearch
 import com.jetbrains.packagesearch.plugin.core.data.PackageSearchModule
 import com.jetbrains.packagesearch.plugin.core.extensions.PackageSearchModuleBuilderContext
+import com.jetbrains.packagesearch.plugin.core.utils.toDirectory
 import com.jetbrains.packagesearch.plugin.gradle.utils.getDeclaredDependencies
 import com.jetbrains.packagesearch.plugin.gradle.utils.getDeclaredKnownRepositories
 import kotlinx.coroutines.flow.FlowCollector
@@ -37,7 +38,8 @@ class GradleModuleProvider : AbstractGradleModuleProvider() {
                 name = model.projectName,
                 identity = PackageSearchModule.Identity(
                     group = "gradle",
-                    path = model.projectIdentityPath
+                    path = model.projectIdentityPath,
+                    projectDir = model.projectDir.toDirectory(),
                 ),
                 buildFilePath = model.buildFilePath,
                 declaredKnownRepositories = module.getDeclaredKnownRepositories(),

plugin/gradle/kmp/src/main/kotlin/com/jetbrains/packagesearch/plugin/gradle/KotlinMultiplatformModuleProvider.kt

@@ -17,6 +17,7 @@ import com.jetbrains.packagesearch.plugin.core.data.IconProvider.Icons
 import com.jetbrains.packagesearch.plugin.core.data.PackageSearchModule
 import com.jetbrains.packagesearch.plugin.core.extensions.PackageSearchModuleBuilderContext
 import com.jetbrains.packagesearch.plugin.core.utils.icon
+import com.jetbrains.packagesearch.plugin.core.utils.toDirectory
 import com.jetbrains.packagesearch.plugin.gradle.utils.getDeclaredDependencies
 import com.jetbrains.packagesearch.plugin.gradle.utils.toGradleDependencyModel
 import kotlinx.coroutines.async
@@ -48,7 +49,8 @@ class KotlinMultiplatformModuleProvider : AbstractGradleModuleProvider() {
                         name = model.projectName,
                         identity = PackageSearchModule.Identity(
                             group = "gradle",
-                            path = model.projectIdentityPath
+                            path = model.projectIdentityPath,
+                            projectDir = model.projectDir.toDirectory(),
                         ),
                         buildFilePath = model.buildFilePath,
                         declaredKnownRepositories = knownRepositories - DependencyModifierService
@@ -137,11 +139,12 @@ class KotlinMultiplatformModuleProvider : AbstractGradleModuleProvider() {
                         gradlePackages {
                             kotlinMultiplatform {
                                 compilationTargets.forEach { compilationTarget ->
-                                    when  {
+                                    when {
                                         compilationTarget is Js -> when (compilationTarget.compiler) {
                                             Js.Compiler.IR -> jsIr()
                                             Js.Compiler.LEGACY -> jsLegacy()
                                         }
+
                                         compilationTarget is Native -> native(compilationTarget.target)
                                         compilationTarget == MppCompilationInfoModel.Wasm -> wasm()
                                     }

plugin/maven/src/main/kotlin/com/jetbrains/packagesearch/plugin/maven/MavenUtils.kt

@@ -21,10 +21,12 @@ import com.jetbrains.packagesearch.plugin.core.utils.flow
 import com.jetbrains.packagesearch.plugin.core.utils.icon
 import com.jetbrains.packagesearch.plugin.core.utils.mapUnit
 import com.jetbrains.packagesearch.plugin.core.utils.registryFlow
+import com.jetbrains.packagesearch.plugin.core.utils.toDirectory
 import com.jetbrains.packagesearch.plugin.core.utils.watchExternalFileChanges
 import java.io.File
 import java.nio.file.Path
 import java.nio.file.Paths
+import kotlin.io.path.Path
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.filter
@@ -104,13 +106,15 @@ suspend fun Module.toPackageSearch(
     mavenProject: MavenProject,
 ): PackageSearchMavenModule {
     val declaredDependencies = getDeclaredDependencies()
+    val pomPath = Path(mavenProject.file.path)
     return PackageSearchMavenModule(
         name = mavenProject.name ?: name,
         identity = PackageSearchModule.Identity(
             group = "maven",
-            path = buildMavenParentHierarchy(mavenProject.file.asRegularFile())
+            path = buildMavenParentHierarchy(mavenProject.file.asRegularFile()),
+            projectDir = pomPath.parent.toDirectory(),
         ),
-        buildFilePath = Paths.get(mavenProject.file.path),
+        buildFilePath = pomPath,
         declaredKnownRepositories = getDeclaredKnownRepositories(),
         declaredDependencies = declaredDependencies,
         availableScopes = commonScopes.plus(declaredDependencies.mapNotNull { it.declaredScope }).distinct(),
@@ -159,7 +163,7 @@ suspend fun Module.getDeclaredDependencies(): List<PackageSearchDeclaredBaseMave
         .mapNotNull { (packageId, declaredDependency) ->
             PackageSearchDeclaredBaseMavenPackage(
                 id = packageId,
-                declaredVersion = declaredDependency.version?.let { NormalizedVersion.fromStringOrNull(it ) },
+                declaredVersion = declaredDependency.version?.let { NormalizedVersion.fromStringOrNull(it) },
                 remoteInfo = remoteInfo[packageId]?.asMavenApiPackage(),
                 groupId = declaredDependency.groupId,
                 artifactId = declaredDependency.artifactId,