@nx/gradle 23.0.0-beta.17 → 23.0.0-beta.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "23.0.0-beta.17",
+  "version": "23.0.0-beta.19",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -40,13 +40,13 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.17",
+    "@nx/devkit": "23.0.0-beta.19",
     "toml-eslint-parser": "^0.10.0",
     "tree-kill": "^1.2.2",
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.17"
+    "nx": "23.0.0-beta.19"
   },
   "publishConfig": {
     "access": "public"

package/src/plugin/nodes.d.ts

@@ -2,7 +2,7 @@ import { CreateNodesV2, CreateNodesContextV2, ProjectConfiguration, ProjectGraph
 import { GradlePluginOptions } from './utils/gradle-plugin-options';
 type GradleTargets = Record<string, Partial<ProjectConfiguration>>;
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (projects: Record<string, Partial<ProjectConfiguration>>, projectsCache?: GradleTargets, externalNodes?: Record<string, ProjectGraphExternalNode>) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2) => Promise<{
+export declare const makeCreateNodesForGradleConfigFile: (projects: Record<string, Partial<ProjectConfiguration>>, projectsCache?: GradleTargets, externalNodes?: Record<string, ProjectGraphExternalNode>, hashes?: string[]) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2, idx?: number) => Promise<{
     projects?: undefined;
     externalNodes?: undefined;
 } | {

package/src/plugin/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAEpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAcpB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAgFnE,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA0F5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,MAG5D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;;;EAyB9B,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAEpB,wBAAwB,EAEzB,MAAM,YAAY,CAAC;AAcpB,OAAO,EACL,mBAAmB,EAEpB,MAAM,+BAA+B,CAAC;AAEvC,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC;AAgFnE,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA8F5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,UAAU,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,gBAAe,aAAkB,EACjC,gBAAe,MAAM,CAAC,MAAM,EAAE,wBAAwB,CAAM,EAC5D,SAAS,MAAM,EAAE,MAGjB,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB,EAC7B,MAAM,MAAM;;;;;;;;EAyCb,CAAC"}

package/src/plugin/nodes.js

@@ -82,9 +82,12 @@ exports.createNodesV2 = [
         try {
             const results = [];
             const normalizedOptions = (0, gradle_plugin_options_1.normalizeOptions)(options);
-            for (const gradleFilePath of allBuildFiles) {
-                const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
-                const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, normalizedOptions ?? {}, context);
+            const buildFileProjectRoots = allBuildFiles.map((f) => (0, node_path_1.dirname)(f));
+            const buildFileHashes = await (0, internal_1.calculateHashesForCreateNodes)(buildFileProjectRoots, normalizedOptions ?? {}, context);
+            for (let i = 0; i < allBuildFiles.length; i++) {
+                const gradleFilePath = allBuildFiles[i];
+                const projectRoot = buildFileProjectRoots[i];
+                const hash = buildFileHashes[i];
                 // Get project from cache or nodes
                 if (!pluginCache.has(hash)) {
                     const nodeProject = nodes[projectRoot] ?? nodes[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
@@ -130,10 +133,23 @@ exports.createNodesV2 = [
         }
     },
 ];
-const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, externalNodes = {}) => async (gradleFilePath, options, context) => {
+const makeCreateNodesForGradleConfigFile = (projects, projectsCache = {}, externalNodes = {}, hashes) => async (gradleFilePath, options, context, idx) => {
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
     options = (0, gradle_plugin_options_1.normalizeOptions)(options);
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
+    let hash;
+    if (hashes && idx !== undefined) {
+        hash = hashes[idx];
+        if (hash === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+    }
+    else {
+        const [computed] = await (0, internal_1.calculateHashesForCreateNodes)([projectRoot], options ?? {}, context);
+        if (computed === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+        hash = computed;
+    }
     projectsCache[hash] ??=
         projects[projectRoot] ?? projects[(0, node_path_1.join)(devkit_1.workspaceRoot, projectRoot)];
     const project = projectsCache[hash];

package/src/plugin-v1/nodes.d.ts

@@ -14,7 +14,7 @@ export interface GradlePluginOptions {
  * Switch to the default `@nx/gradle` plugin.
  */
 export declare const createNodesV2: CreateNodesV2<GradlePluginOptions>;
-export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, pluginCache: PluginCache<Partial<ProjectConfiguration>>, gradleProjectRootToTestFilesMap?: Record<string, string[]>) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2) => Promise<{
+export declare const makeCreateNodesForGradleConfigFile: (gradleReport: GradleReport, pluginCache: PluginCache<Partial<ProjectConfiguration>>, gradleProjectRootToTestFilesMap?: Record<string, string[]>, hashes?: string[]) => (gradleFilePath: any, options: GradlePluginOptions | undefined, context: CreateNodesContextV2, idx?: number) => Promise<{
     projects?: undefined;
 } | {
     projects: {

package/src/plugin-v1/nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAC;AAsBnC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAYD;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CAuC5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,cAAc,YAAY,EAC1B,aAAa,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,kCAAiC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,MAG9D,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB;;;;;;EA+B9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,WAAW,oCAAgB,CAAC"}
+{"version":3,"file":"nodes.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/plugin-v1/nodes.ts"],"names":[],"mappings":"AACA,OAAO,EACL,aAAa,EACb,oBAAoB,EACpB,oBAAoB,EAGrB,MAAM,YAAY,CAAC;AAGpB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAGL,YAAY,EACb,MAAM,2BAA2B,CAAC;AAsBnC,MAAM,WAAW,mBAAmB;IAClC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,GAAG,OAAO,CAAC;CACxD;AAYD;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA8C5D,CAAC;AAEF,eAAO,MAAM,kCAAkC,GAE3C,cAAc,YAAY,EAC1B,aAAa,WAAW,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,EACvD,kCAAiC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAM,EAC9D,SAAS,MAAM,EAAE,MAGjB,mBAAc,EACd,SAAS,mBAAmB,GAAG,SAAS,EACxC,SAAS,oBAAoB,EAC7B,MAAM,MAAM;;;;;;EAgDb,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,WAAW,oCAAgB,CAAC"}

package/src/plugin-v1/nodes.js

@@ -40,17 +40,32 @@ exports.createNodesV2 = [
         const gradleReport = (0, get_gradle_report_1.getCurrentGradleReport)();
         const gradleProjectRootToTestFilesMap = getGradleProjectRootToTestFilesMap(testFiles, projectRoots);
         try {
-            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, pluginCache, gradleProjectRootToTestFilesMap), buildFiles, options, context);
+            const buildFileProjectRoots = buildFiles.map((f) => (0, node_path_1.dirname)(f));
+            const buildFileHashes = await (0, internal_1.calculateHashesForCreateNodes)(buildFileProjectRoots, normalizeOptions(options) ?? {}, context);
+            return (0, devkit_1.createNodesFromFiles)((0, exports.makeCreateNodesForGradleConfigFile)(gradleReport, pluginCache, gradleProjectRootToTestFilesMap, buildFileHashes), buildFiles, options, context);
         }
         finally {
             pluginCache.writeToDisk();
         }
     },
 ];
-const makeCreateNodesForGradleConfigFile = (gradleReport, pluginCache, gradleProjectRootToTestFilesMap = {}) => async (gradleFilePath, options, context) => {
+const makeCreateNodesForGradleConfigFile = (gradleReport, pluginCache, gradleProjectRootToTestFilesMap = {}, hashes) => async (gradleFilePath, options, context, idx) => {
     const projectRoot = (0, node_path_1.dirname)(gradleFilePath);
     options = normalizeOptions(options);
-    const hash = await (0, internal_1.calculateHashForCreateNodes)(projectRoot, options ?? {}, context);
+    let hash;
+    if (hashes && idx !== undefined) {
+        hash = hashes[idx];
+        if (hash === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+    }
+    else {
+        const [computed] = await (0, internal_1.calculateHashesForCreateNodes)([projectRoot], options ?? {}, context);
+        if (computed === undefined) {
+            throw new Error(`Failed to compute hash for gradle project at ${projectRoot}`);
+        }
+        hash = computed;
+    }
     if (!pluginCache.has(hash)) {
         pluginCache.set(hash, await createGradleProject(gradleReport, gradleFilePath, options, context, gradleProjectRootToTestFilesMap[projectRoot]));
     }