fix: fix dependencies from modules not properly created when building…

… project graph
tinesoft · Apr 29, 2024 · 06e0370 · 06e0370
1 parent 50ed737
commit 06e0370
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 16 deletions.
diff --git a/packages/common-jvm/src/lib/utils/gradle-utils.ts b/packages/common-jvm/src/lib/utils/gradle-utils.ts
@@ -533,7 +533,7 @@ export function getCoordinatesForGradleProjet(cwd: string): {
       /rootProject\.name\s*=\s*['"]([^"']+)['"]/
     )?.[1];
   }
-  artifactId = artifactId ?? name; // use the folder name as default if stil undefined
+  artifactId = artifactId ?? name; // use the folder name as default if still undefined
 
   if (hasGradleBuildFile(cwd)) {
     const buildGradle = getProjectFileContent({ root: cwd }, `build${ext}`);

diff --git a/packages/common-jvm/src/lib/utils/utils.ts b/packages/common-jvm/src/lib/utils/utils.ts
@@ -204,7 +204,7 @@ export function getJvmPackageInfo(project: { root: string }): PackageInfo {
       packageId: `${groupId}:${artifactId}`,
       packageFile: 'pom.xml',
       dependencies,
-      modules: modules.map((mod) => `${groupId}:${mod}`),
+      modules: modules.map((module) => `${project.root}/${module}`),
     };
   }
 
@@ -225,29 +225,46 @@ export function getJvmPackageInfo(project: { root: string }): PackageInfo {
         const id = match?.groups?.['id'];
         if (id) {
           // project dependencies start with ':', we prepend the groupId to it
-          dependencyIds.push(id.startsWith(':') ? `${groupId}${id}` : id);
+          dependencyIds.push(
+            id.startsWith(':')
+              ? `${project.root}${id.replaceAll(':', '/')}`
+              : id
+          );
         }
       } while (match);
     }
 
     const dependencies: PackageInfo[] = dependencyIds.map((depId) => {
-      return { packageId: depId, packageFile: `build${ext}` };
+      let depGroupId: string | null | undefined;
+      let depArtifactId: string | null | undefined;
+      if (depId.startsWith(':')) {
+        // project dependencies start with ':'
+        const coordinates = getCoordinatesForGradleProjet(
+          `${project.root}/${depId.replaceAll(':', '/')}`
+        );
+        depGroupId = coordinates.groupId;
+        depArtifactId = coordinates.artifactId;
+      } else {
+        [depGroupId, depArtifactId] = depId.split(':');
+      }
+
+      return {
+        packageId: `${depGroupId}:${depArtifactId}`,
+        packageFile: `build${ext}`,
+      };
     });
 
     const modules = getGradleModules(project.root);
 
-    const offsetFromRoot = getPathFromParentModule(project.root);
-    const pkgId = offsetFromRoot
-      ? offsetFromRoot.replaceAll('/', ':')
-      : artifactId;
-
     return {
-      packageId: `${groupId}:${pkgId}`,
+      packageId: `${groupId}:${artifactId}`,
       packageFile: hasGradleSettingsFile(project.root)
         ? `settings${ext}`
         : `build${ext}`,
       dependencies,
-      modules: modules.map((mod) => `${groupId}:${mod}`),
+      modules: modules.map(
+        (module) => `${project.root}/${module.replaceAll(':', '/')}`
+      ),
     };
   }
 

diff --git a/packages/common/src/lib/workspace/project-graph.ts b/packages/common/src/lib/workspace/project-graph.ts
@@ -73,8 +73,7 @@ function getDependenciesForProject(
   const sourceProjectRoot = getProjectRootFromFile(filePath);
   const sourcePkgInfo = workspace.projects[sourceProjectRoot];
 
-  if(!sourcePkgInfo)
-    return dependencies;
+  if (!sourcePkgInfo) return dependencies;
 
   sourcePkgInfo.dependencies?.forEach((depPkgInfo) => {
     const targetProjectName = workspace.packages[depPkgInfo.packageId];
@@ -93,12 +92,12 @@ function getDependenciesForProject(
   });
 
   sourcePkgInfo.modules?.forEach((moduleId) => {
-    const depProjectName = workspace.packages[moduleId];
+    const depProject = workspace.projects[moduleId];
 
-    if (depProjectName) {
+    if (depProject) {
       dependencies.push({
         source: sourceProjectName,
-        target: depProjectName,
+        target: workspace.packages[depProject.packageId],
         type: DependencyType.static,
         sourceFile: joinPathFragments(
           sourceProjectRoot,