@nx/gradle 20.3.0-canary.20241214-4cd640a → 20.3.0-canary.20241218-fb40366

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "20.3.0-canary.20241214-4cd640a",
+  "version": "20.3.0-canary.20241218-fb40366",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -34,7 +34,7 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "20.3.0-canary.20241214-4cd640a"
+    "@nx/devkit": "20.3.0-canary.20241218-fb40366"
   },
   "publishConfig": {
     "access": "public"

package/src/utils/get-gradle-report.d.ts

@@ -8,6 +8,18 @@ export interface GradleReport {
     gradleProjectNameToProjectRootMap: Map<string, string>;
     gradleProjectToChildProjects: Map<string, string[]>;
 }
+export interface GradleReportJSON {
+    hash: string;
+    gradleFileToGradleProjectMap: Record<string, string>;
+    buildFileToDepsMap: Record<string, string>;
+    gradleFileToOutputDirsMap: Record<string, Record<string, string>>;
+    gradleProjectToTasksTypeMap: Record<string, Record<string, string>>;
+    gradleProjectToTasksMap: Record<string, Array<String>>;
+    gradleProjectToProjectName: Record<string, string>;
+    gradleProjectNameToProjectRootMap: Record<string, string>;
+    gradleProjectToChildProjects: Record<string, string[]>;
+}
+export declare function writeGradleReportToCache(cachePath: string, results: GradleReport): void;
 export declare function getCurrentGradleReport(): GradleReport;
 /**
  * This function populates the gradle report cache.

package/src/utils/get-gradle-report.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeGradleReportToCache = writeGradleReportToCache;
 exports.getCurrentGradleReport = getCurrentGradleReport;
 exports.populateGradleReport = populateGradleReport;
 exports.processProjectReports = processProjectReports;
@@ -10,8 +11,52 @@ const workspace_context_1 = require("nx/src/utils/workspace-context");
 const path_1 = require("path");
 const split_config_files_1 = require("./split-config-files");
 const get_project_report_lines_1 = require("./get-project-report-lines");
+const cache_directory_1 = require("nx/src/utils/cache-directory");
+function readGradleReportCache(cachePath, hash) {
+    const gradleReportJson = (0, node_fs_1.existsSync)(cachePath)
+        ? (0, devkit_1.readJsonFile)(cachePath)
+        : undefined;
+    if (!gradleReportJson || gradleReportJson.hash !== hash) {
+        return;
+    }
+    let results = {
+        gradleFileToGradleProjectMap: new Map(Object.entries(gradleReportJson['gradleFileToGradleProjectMap'])),
+        buildFileToDepsMap: new Map(Object.entries(gradleReportJson['buildFileToDepsMap'])),
+        gradleFileToOutputDirsMap: new Map(Object.entries(gradleReportJson['gradleFileToOutputDirsMap']).map(([key, value]) => [key, new Map(Object.entries(value))])),
+        gradleProjectToTasksTypeMap: new Map(Object.entries(gradleReportJson['gradleProjectToTasksTypeMap']).map(([key, value]) => [key, new Map(Object.entries(value))])),
+        gradleProjectToTasksMap: new Map(Object.entries(gradleReportJson['gradleProjectToTasksMap']).map(([key, value]) => [key, new Set(value)])),
+        gradleProjectToProjectName: new Map(Object.entries(gradleReportJson['gradleProjectToProjectName'])),
+        gradleProjectNameToProjectRootMap: new Map(Object.entries(gradleReportJson['gradleProjectNameToProjectRootMap'])),
+        gradleProjectToChildProjects: new Map(Object.entries(gradleReportJson['gradleProjectToChildProjects'])),
+    };
+    return results;
+}
+function writeGradleReportToCache(cachePath, results) {
+    let gradleReportJson = {
+        hash: gradleCurrentConfigHash,
+        gradleFileToGradleProjectMap: Object.fromEntries(results.gradleFileToGradleProjectMap),
+        buildFileToDepsMap: Object.fromEntries(results.buildFileToDepsMap),
+        gradleFileToOutputDirsMap: Object.fromEntries(Array.from(results.gradleFileToOutputDirsMap).map(([key, value]) => [
+            key,
+            Object.fromEntries(value),
+        ])),
+        gradleProjectToTasksTypeMap: Object.fromEntries(Array.from(results.gradleProjectToTasksTypeMap).map(([key, value]) => [
+            key,
+            Object.fromEntries(value),
+        ])),
+        gradleProjectToTasksMap: Object.fromEntries(Array.from(results.gradleProjectToTasksMap).map(([key, value]) => [
+            key,
+            Array.from(value),
+        ])),
+        gradleProjectToProjectName: Object.fromEntries(results.gradleProjectToProjectName),
+        gradleProjectNameToProjectRootMap: Object.fromEntries(results.gradleProjectNameToProjectRootMap),
+        gradleProjectToChildProjects: Object.fromEntries(results.gradleProjectToChildProjects),
+    };
+    (0, devkit_1.writeJsonFile)(cachePath, gradleReportJson);
+}
 let gradleReportCache;
 let gradleCurrentConfigHash;
+let gradleReportCachePath = (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, 'gradle-report.hash');
 function getCurrentGradleReport() {
     if (!gradleReportCache) {
         throw new devkit_1.AggregateCreateNodesError([
@@ -37,7 +82,9 @@ async function populateGradleReport(workspaceRoot, gradlewFiles) {
     const gradleConfigHash = await (0, workspace_context_1.hashWithWorkspaceContext)(workspaceRoot, [
         split_config_files_1.gradleConfigAndTestGlob,
     ]);
-    if (gradleReportCache && gradleConfigHash === gradleCurrentConfigHash) {
+    gradleReportCache ??= readGradleReportCache(gradleReportCachePath, gradleConfigHash);
+    if (gradleReportCache &&
+        (!gradleCurrentConfigHash || gradleConfigHash === gradleCurrentConfigHash)) {
         return;
     }
     const gradleProjectReportStart = performance.mark('gradleProjectReport:start');
@@ -50,6 +97,7 @@ async function populateGradleReport(workspaceRoot, gradlewFiles) {
     performance.measure('gradleProjectReport', gradleProjectReportStart.name, gradleProjectReportEnd.name);
     gradleCurrentConfigHash = gradleConfigHash;
     gradleReportCache = processProjectReports(projectReportLines);
+    writeGradleReportToCache(gradleReportCachePath, gradleReportCache);
 }
 function processProjectReports(projectReportLines) {
     /**