@nx/gradle 22.2.0-canary.20251208-300493e → 22.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/gradle",
-  "version": "22.2.0-canary.20251208-300493e",
+  "version": "22.2.0",
   "private": false,
   "description": "The Nx Plugin for Gradle allows Gradle tasks to be run through Nx",
   "repository": {
@@ -39,11 +39,11 @@
     "migrations": "./migrations.json"
   },
   "dependencies": {
-    "@nx/devkit": "22.2.0-canary.20251208-300493e",
+    "@nx/devkit": "22.2.0",
     "toml-eslint-parser": "^0.10.0"
   },
   "devDependencies": {
-    "nx": "22.2.0-canary.20251208-300493e"
+    "nx": "22.2.0"
   },
   "publishConfig": {
     "access": "public"

package/src/generators/init/gradle-project-graph-plugin-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"gradle-project-graph-plugin-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/init/gradle-project-graph-plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAiB,MAAM,YAAY,CAAC;AAQpE;;;GAGG;AACH,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CASlD;AA8BD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAkBD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,eAAe,GAAE,MAAkC,iBAYpD"}
+{"version":3,"file":"gradle-project-graph-plugin-utils.d.ts","sourceRoot":"","sources":["../../../../../../packages/gradle/src/generators/init/gradle-project-graph-plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,IAAI,EAAiB,MAAM,YAAY,CAAC;AASpE;;;GAGG;AACH,wBAAsB,sCAAsC,CAC1D,IAAI,EAAE,IAAI,GACT,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,EAAE,CAAC,CASlD;AA8BD;;GAEG;AACH,wBAAsB,sBAAsB,CAC1C,cAAc,EAAE,MAAM,EACtB,aAAa,EAAE,MAAM,GACpB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAoBxB;AAkBD;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,MAAM,CASR;AAED;;GAEG;AACH,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,IAAI,EACV,eAAe,GAAE,MAAkC,iBAYpD"}

package/src/generators/init/gradle-project-graph-plugin-utils.js

@@ -8,6 +8,7 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const path_1 = require("path");
 const exec_gradle_1 = require("../../utils/exec-gradle");
+const version_catalog_ast_utils_1 = require("../../utils/version-catalog-ast-utils");
 /**
  * Adds a `build.gradle(.kts)` file next to each `settings.gradle(.kts)` file found in the workspace.
  * If the build.gradle file already exists, it reads its contents.
@@ -86,9 +87,60 @@ function updateNxPluginVersion(content, newVersion) {
  */
 async function addNxProjectGraphPlugin(tree, expectedVersion = versions_1.gradleProjectGraphVersion) {
     const files = await addBuildGradleFileNextToSettingsGradle(tree);
-    files.forEach(({ filePath, content }) => {
-        addNxProjectGraphPluginToBuildGradle(filePath, content, expectedVersion, tree);
-    });
+    for (const { filePath, content } of files) {
+        await addNxProjectGraphPluginToBuildGradle(filePath, content, expectedVersion, tree);
+    }
+}
+/**
+ * Converts a version catalog alias to a Gradle accessor path.
+ * In Gradle, dashes in aliases become dots in the accessor.
+ * e.g., "nx-project-graph" -> "nx.project.graph"
+ */
+function aliasToAccessorPath(alias) {
+    return alias.replace(/-/g, '.');
+}
+/**
+ * Finds a version catalog file near the given build.gradle file and returns
+ * the plugin alias if the Nx project graph plugin is defined in it.
+ * Searches in the following order:
+ * 1. Standard Gradle location: gradle/libs.versions.toml relative to the build.gradle file
+ * 2. Workspace root: gradle/libs.versions.toml at the workspace root
+ * 3. Any libs.versions.toml in subdirectories of the build.gradle file
+ */
+async function findVersionCatalogPluginAlias(gradleFilePath, tree) {
+    const gradleDir = (0, path_1.dirname)(gradleFilePath);
+    // Check standard Gradle version catalog locations
+    const possibleCatalogPaths = [
+        // Standard location relative to the build.gradle file
+        (0, path_1.join)(gradleDir, 'gradle', 'libs.versions.toml'),
+        // Workspace root location (common in monorepos)
+        'gradle/libs.versions.toml',
+    ];
+    for (const catalogPath of possibleCatalogPaths) {
+        if (tree.exists(catalogPath)) {
+            const catalogContent = tree.read(catalogPath, 'utf-8');
+            if (catalogContent) {
+                const alias = (0, version_catalog_ast_utils_1.getPluginAliasFromCatalogAst)(catalogContent, versions_1.gradleProjectGraphPluginName);
+                if (alias) {
+                    return alias;
+                }
+            }
+        }
+    }
+    // Fallback: search for any version catalog in subdirectories
+    const versionCatalogFiles = await (0, devkit_1.globAsync)(tree, [
+        (0, path_1.join)(gradleDir, '**/libs.versions.toml'),
+    ]);
+    for (const versionCatalogPath of versionCatalogFiles) {
+        const catalogContent = tree.read(versionCatalogPath, 'utf-8');
+        if (catalogContent) {
+            const alias = (0, version_catalog_ast_utils_1.getPluginAliasFromCatalogAst)(catalogContent, versions_1.gradleProjectGraphPluginName);
+            if (alias) {
+                return alias;
+            }
+        }
+    }
+    return null;
 }
 /**
  * Adds or updates the Nx Project Graph plugin in the build.gradle(.kts) file.
@@ -97,9 +149,22 @@ async function addNxProjectGraphPlugin(tree, expectedVersion = versions_1.gradle
  */
 async function addNxProjectGraphPluginToBuildGradle(gradleFilePath, buildGradleContent, expectedVersion = versions_1.gradleProjectGraphVersion, tree) {
     const isKotlinDsl = gradleFilePath.endsWith('.kts');
-    const nxProjectGraphReportPlugin = isKotlinDsl
-        ? `id(\"${versions_1.gradleProjectGraphPluginName}\") version(\"${expectedVersion}\")`
-        : `id \"${versions_1.gradleProjectGraphPluginName}\" version \"${expectedVersion}\"`;
+    // Check if a version catalog exists with the plugin alias
+    const pluginAlias = await findVersionCatalogPluginAlias(gradleFilePath, tree);
+    const versionCatalogPluginAccessor = pluginAlias
+        ? `libs.plugins.${aliasToAccessorPath(pluginAlias)}`
+        : null;
+    // Determine the plugin declaration syntax based on whether we have a version catalog
+    const nxProjectGraphReportPlugin = versionCatalogPluginAccessor
+        ? `alias(${versionCatalogPluginAccessor})`
+        : isKotlinDsl
+            ? `id("${versions_1.gradleProjectGraphPluginName}") version("${expectedVersion}")`
+            : `id "${versions_1.gradleProjectGraphPluginName}" version "${expectedVersion}"`;
+    // Check if the plugin is already included (directly or via version catalog alias)
+    const hasPluginDirectly = buildGradleContent.includes(versions_1.gradleProjectGraphPluginName);
+    const hasPluginViaAlias = versionCatalogPluginAccessor &&
+        buildGradleContent.includes(versionCatalogPluginAccessor);
+    const hasPlugin = hasPluginDirectly || hasPluginViaAlias;
     // Helper to add plugin to plugins block
     function addPluginToPluginsBlock(content) {
         return content.replace(/plugins\s*\{/, `plugins {\n    ${nxProjectGraphReportPlugin}`);
@@ -110,44 +175,51 @@ async function addNxProjectGraphPluginToBuildGradle(gradleFilePath, buildGradleC
     }
     // Helper to add plugin application to allprojects
     function addPluginToAllProjects(content) {
-        const applyPlugin = isKotlinDsl
-            ? `plugin(\"${versions_1.gradleProjectGraphPluginName}\")`
-            : `plugin(\"${versions_1.gradleProjectGraphPluginName}\")`;
+        const applyPlugin = versionCatalogPluginAccessor
+            ? `plugin(${versionCatalogPluginAccessor})`
+            : isKotlinDsl
+                ? `plugin("${versions_1.gradleProjectGraphPluginName}")`
+                : `plugin("${versions_1.gradleProjectGraphPluginName}")`;
         return `${content}\nallprojects {\n    apply {\n        ${applyPlugin}\n    }\n}`;
     }
-    // 1. Ensure plugins block and correct plugin version
+    // Add to plugins block if plugin not already present
     if (buildGradleContent.includes('plugins {')) {
-        if (buildGradleContent.includes(versions_1.gradleProjectGraphPluginName)) {
-            // Update version if needed
-            const currentVersion = await extractNxPluginVersion(gradleFilePath, buildGradleContent);
-            if (currentVersion && currentVersion !== expectedVersion) {
-                buildGradleContent = updateNxPluginVersion(buildGradleContent, expectedVersion);
+        if (hasPlugin) {
+            // Plugin already exists - update version if needed (only for direct declarations)
+            if (hasPluginDirectly) {
+                const currentVersion = await extractNxPluginVersion(gradleFilePath, buildGradleContent);
+                if (currentVersion && currentVersion !== expectedVersion) {
+                    buildGradleContent = updateNxPluginVersion(buildGradleContent, expectedVersion);
+                }
             }
         }
         else {
-            // Add plugin to plugins block
             buildGradleContent = addPluginToPluginsBlock(buildGradleContent);
         }
     }
     else {
-        // Add plugins block if missing
         buildGradleContent = addPluginsBlock(buildGradleContent);
     }
-    // 2. Ensure plugin is applied to all projects
-    const applyPluginPattern = new RegExp(`\\s*plugin\\(["']${versions_1.gradleProjectGraphPluginName}["']\\)`);
-    if (buildGradleContent.includes('allprojects {')) {
-        if (!applyPluginPattern.test(buildGradleContent)) {
-            // Add plugin to existing allprojects block
-            const applyPlugin = isKotlinDsl
-                ? `plugin("${versions_1.gradleProjectGraphPluginName}")`
-                : `plugin "${versions_1.gradleProjectGraphPluginName}"`;
-            buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n    apply ${applyPlugin}`);
+    // Skip allprojects handling if plugin was already correctly declared via version catalog alias
+    // In that case, the plugin is already applied and doesn't need to be propagated via allprojects
+    if (!hasPluginViaAlias) {
+        const applyPluginPattern = versionCatalogPluginAccessor
+            ? new RegExp(`\\s*plugin\\(${versionCatalogPluginAccessor.replace(/\./g, '\\.')}\\)`)
+            : new RegExp(`\\s*plugin\\(["']${versions_1.gradleProjectGraphPluginName}["']\\)`);
+        if (buildGradleContent.includes('allprojects {')) {
+            if (!applyPluginPattern.test(buildGradleContent)) {
+                const applyPlugin = versionCatalogPluginAccessor
+                    ? `plugin(${versionCatalogPluginAccessor})`
+                    : isKotlinDsl
+                        ? `plugin("${versions_1.gradleProjectGraphPluginName}")`
+                        : `plugin "${versions_1.gradleProjectGraphPluginName}"`;
+                buildGradleContent = buildGradleContent.replace(/allprojects\s*\{/, `allprojects {\n    apply ${applyPlugin}`);
+            }
+        }
+        else {
+            buildGradleContent = addPluginToAllProjects(buildGradleContent);
         }
     }
-    else {
-        buildGradleContent = addPluginToAllProjects(buildGradleContent);
-    }
-    // 3. Write and return updated content
     tree.write(gradleFilePath, buildGradleContent);
     return buildGradleContent;
 }

package/src/utils/version-catalog-ast-utils.d.ts

@@ -4,6 +4,11 @@ export declare function findVersionCatalogFiles(tree: Tree): Promise<string[]>;
  * Updates a plugin version in a TOML catalog while preserving formatting
  */
 export declare function updatePluginVersionInCatalogAst(sourceText: string, pluginName: string, newVersion: string): string | null;
+/**
+ * Gets the plugin alias from a version catalog for a given plugin ID
+ * Returns the alias name (e.g., "nxProjectGraph") if found, null otherwise
+ */
+export declare function getPluginAliasFromCatalogAst(sourceText: string, pluginName: string): string | null;
 /**
  * Extracts plugin version from catalog using AST parsing
  */

package/src/utils/version-catalog-ast-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version-catalog-ast-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/version-catalog-ast-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,YAAY,CAAC;AAI7C,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3E;AAiKD;;GAEG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CA6Gf;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CA4Df;AAED;;GAEG;AACH,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAkClB"}
+{"version":3,"file":"version-catalog-ast-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/gradle/src/utils/version-catalog-ast-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,IAAI,EAAE,MAAM,YAAY,CAAC;AAI7C,wBAAsB,uBAAuB,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAW3E;AAkKD;;GAEG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CA6Gf;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAC1C,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CAmBf;AAED;;GAEG;AACH,wBAAgB,kCAAkC,CAChD,UAAU,EAAE,MAAM,EAClB,UAAU,EAAE,MAAM,GACjB,MAAM,GAAG,IAAI,CA4Df;AAED;;GAEG;AACH,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,OAAO,CAAC,CAkClB"}

package/src/utils/version-catalog-ast-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findVersionCatalogFiles = findVersionCatalogFiles;
 exports.updatePluginVersionInCatalogAst = updatePluginVersionInCatalogAst;
+exports.getPluginAliasFromCatalogAst = getPluginAliasFromCatalogAst;
 exports.extractPluginVersionFromCatalogAst = extractPluginVersionFromCatalogAst;
 exports.updateNxPluginVersionInCatalogsAst = updateNxPluginVersionInCatalogsAst;
 const devkit_1 = require("@nx/devkit");
@@ -92,11 +93,12 @@ function findPluginConfig(pluginsTable, pluginName) {
     for (const item of pluginsTable.body) {
         if (item.type === 'TOMLKeyValue') {
             const value = item.value;
+            const alias = getKeyName(item.key);
             if (value.type === 'TOMLValue' && value.kind === 'string') {
                 // Simple format: plugin = "id:version"
                 const stringValue = value.value;
                 if (stringValue.startsWith(`${pluginName}:`)) {
-                    return { keyValue: item, format: 'simple' };
+                    return { keyValue: item, format: 'simple', alias };
                 }
             }
             else if (value.type === 'TOMLInlineTable') {
@@ -105,7 +107,7 @@ function findPluginConfig(pluginsTable, pluginName) {
                 if (idKeyValue) {
                     const idValue = getStringValue(idKeyValue.value);
                     if (idValue === pluginName) {
-                        return { keyValue: item, format: 'object' };
+                        return { keyValue: item, format: 'object', alias };
                     }
                 }
             }
@@ -252,6 +254,28 @@ function updatePluginVersionInCatalogAst(sourceText, pluginName, newVersion) {
         return null;
     }
 }
+/**
+ * Gets the plugin alias from a version catalog for a given plugin ID
+ * Returns the alias name (e.g., "nxProjectGraph") if found, null otherwise
+ */
+function getPluginAliasFromCatalogAst(sourceText, pluginName) {
+    try {
+        const ast = (0, toml_eslint_parser_1.parseTOML)(sourceText);
+        const pluginsTable = findPluginsTable(ast);
+        if (!pluginsTable) {
+            return null;
+        }
+        const pluginConfig = findPluginConfig(pluginsTable, pluginName);
+        if (!pluginConfig) {
+            return null;
+        }
+        return pluginConfig.alias;
+    }
+    catch (error) {
+        console.error('Error parsing TOML with AST:', error);
+        return null;
+    }
+}
 /**
  * Extracts plugin version from catalog using AST parsing
  */