@storm-software/git-tools 2.131.6 → 2.131.8

package/bin/git.js

@@ -8,7 +8,7 @@ import { prePushHook } from './chunk-ABI4JM6L.js';
 import './chunk-HBLWPOJV.js';
 import { prepareHook } from './chunk-AZGQVIYO.js';
 import { run, runAsync } from './chunk-RPK5AKGK.js';
-import { getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, isVerbose, writeWarning, defu, writeTrace, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-7ES3CGZQ.js';
+import { defu, getConfig, handleProcess, writeSuccess, exitWithSuccess, exitWithError, writeInfo, brandIcon, findWorkspaceRootSafe, writeFatal, getWorkspaceConfig, joinPaths, writeDebug, isVerbose, writeWarning, writeTrace, __require, STORM_DEFAULT_RELEASE_BANNER } from './chunk-7ES3CGZQ.js';
 import TOML from '@ltd/j-toml';
 import { Command } from 'commander';
 import '@inquirer/checkbox';
@@ -63,10 +63,10 @@ import { validateResolvedVersionPlansAgainstFilter } from 'nx/src/command-line/r
 import { readNxJson } from 'nx/src/config/nx-json';
 import { FsTree } from 'nx/src/generators/tree';
 import { createFileMapUsingProjectGraph } from 'nx/src/project-graph/file-map-utils';
-import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
 import importsPlugin from 'prettier-plugin-organize-imports';
 import DefaultChangelogRenderer from 'nx/release/changelog-renderer';
 import { DEFAULT_CONVENTIONAL_COMMITS_CONFIG } from 'nx/src/command-line/release/config/conventional-commits';
+import { findMatchingProjects } from 'nx/src/utils/find-matching-projects';
 import { IMPLICIT_DEFAULT_RELEASE_GROUP } from 'nx/src/command-line/release/config/config.js';
 import { deriveSpecifierFromConventionalCommits } from 'nx/src/command-line/release/version/derive-specifier-from-conventional-commits';
 import { deriveSpecifierFromVersionPlan } from 'nx/src/command-line/release/version/deriver-specifier-from-version-plans';
@@ -3266,16 +3266,44 @@ var StormChangelogRenderer = class extends DefaultChangelogRenderer {
   }
 };
 
-// src/release/config.ts
+// ../package-constants/src/tags.ts
+var ProjectTagConstants = {
+  Language: {
+    TAG_ID: "language",
+    TYPESCRIPT: "typescript",
+    RUST: "rust"
+  }};
+var formatProjectTag = (variant, value) => {
+  return `${variant}:${value}`;
+};
+var hasProjectTag = (project, variant) => {
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  return project.tags.some(
+    (tag) => tag.startsWith(prefix) && tag.length > prefix.length
+  );
+};
+var getProjectTag = (project, variant) => {
+  if (!hasProjectTag(project, variant)) {
+    return void 0;
+  }
+  project.tags = project.tags ?? [];
+  const prefix = formatProjectTag(variant, "");
+  const tag = project.tags.find((tag2) => tag2.startsWith(prefix));
+  return tag?.replace(prefix, "");
+};
+var isEqualProjectTag = (project, variant, value) => {
+  const tag = getProjectTag(project, variant);
+  return !!(tag && tag?.toUpperCase() === value.toUpperCase());
+};
 var DEFAULT_CONVENTIONAL_COMMITS_CONFIG2 = {
   useCommitScope: true,
   questions: DEFAULT_MONOREPO_COMMIT_QUESTIONS,
   types: DEFAULT_COMMIT_TYPES
 };
-var DEFAULT_RELEASE_TAG_PATTERN = "{projectName}@{version}";
+var DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN = "{projectName}@{version}";
 var DEFAULT_FIXED_RELEASE_TAG_PATTERN = "{releaseGroupName}@{version}";
 var DEFAULT_COMMIT_MESSAGE = "release(monorepo): Publish v{version} release updates";
-var DEFAULT_VERSION_ACTIONS_PATH = "@nx/js/src/release/version-actions";
 var DEFAULT_RELEASE_GROUP_GIT_CONFIG = {
   commit: false,
   commitMessage: DEFAULT_COMMIT_MESSAGE,
@@ -3291,8 +3319,6 @@ var DEFAULT_VERSION_RELEASE_CONFIG = {
   fallbackCurrentVersionResolver: "disk",
   specifierSource: "conventional-commits",
   groupPreVersionCommand: "pnpm build",
-  versionActions: DEFAULT_VERSION_ACTIONS_PATH,
-  versionActionsOptions: {},
   preserveLocalDependencyProtocols: true,
   preserveMatchingDependencyRanges: true,
   logUnchangedProjects: true,
@@ -3327,24 +3353,25 @@ var DEFAULT_RELEASE_GROUP_CONFIG = {
     ...DEFAULT_VERSION_RELEASE_CONFIG
   },
   releaseTag: {
-    pattern: DEFAULT_RELEASE_TAG_PATTERN,
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
     preferDockerVersion: false
   },
   versionPlans: false
 };
+var DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG = {
+  projectsRelationship: "independent",
+  releaseTag: {
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN
+  }
+};
 var DEFAULT_FIXED_RELEASE_GROUP_CONFIG = {
-  ...DEFAULT_RELEASE_GROUP_CONFIG,
   projectsRelationship: "fixed",
   releaseTag: {
-    ...DEFAULT_RELEASE_GROUP_CONFIG.releaseTag,
     pattern: DEFAULT_FIXED_RELEASE_TAG_PATTERN
   }
 };
 var DEFAULT_JS_RELEASE_GROUP_CONFIG = {
-  ...DEFAULT_RELEASE_GROUP_CONFIG,
-  projects: ["packages/*"],
   version: {
-    ...DEFAULT_RELEASE_GROUP_CONFIG.version,
     versionActions: "@storm-software/workspace-tools/release/js-version-actions",
     versionActionsOptions: {
       currentVersionResolver: "git-tag",
@@ -3360,10 +3387,7 @@ var DEFAULT_JS_RELEASE_GROUP_CONFIG = {
   }
 };
 var DEFAULT_RUST_RELEASE_GROUP_CONFIG = {
-  ...DEFAULT_RELEASE_GROUP_CONFIG,
-  projects: ["crates/*"],
   version: {
-    ...DEFAULT_RELEASE_GROUP_CONFIG.version,
     versionActions: "@storm-software/workspace-tools/release/rust-version-actions",
     versionActionsOptions: {
       currentVersionResolver: "git-tag",
@@ -3375,8 +3399,20 @@ var DEFAULT_RUST_RELEASE_GROUP_CONFIG = {
 var DEFAULT_RELEASE_CONFIG = {
   conventionalCommits: DEFAULT_CONVENTIONAL_COMMITS_CONFIG2,
   groups: {
-    packages: DEFAULT_JS_RELEASE_GROUP_CONFIG,
-    crates: DEFAULT_RUST_RELEASE_GROUP_CONFIG
+    packages: defu(
+      {
+        projects: ["packages/*"]
+      },
+      DEFAULT_JS_RELEASE_GROUP_CONFIG,
+      DEFAULT_RELEASE_GROUP_CONFIG
+    ),
+    crates: defu(
+      {
+        projects: ["crates/*"]
+      },
+      DEFAULT_RUST_RELEASE_GROUP_CONFIG,
+      DEFAULT_RELEASE_GROUP_CONFIG
+    )
   },
   changelog: {
     ...DEFAULT_CHANGELOG_RELEASE_CONFIG,
@@ -3385,40 +3421,101 @@ var DEFAULT_RELEASE_CONFIG = {
     projectChangelogs: true
   },
   releaseTag: {
-    pattern: DEFAULT_RELEASE_TAG_PATTERN,
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
     preferDockerVersion: false
   },
   version: {
     ...DEFAULT_VERSION_RELEASE_CONFIG
   }
 };
-function getReleaseGroupConfig(releaseConfig, workspaceConfig) {
+function mergeReleaseGroupConfig(config5, defaultConfig, workspaceConfig) {
+  return defu(
+    {
+      ...omit(defaultConfig, ["changelog", "version"]),
+      ...config5
+    },
+    {
+      version: {
+        ...defaultConfig.version
+      }
+    },
+    {
+      changelog: {
+        ...typeof defaultConfig.changelog === "object" ? defaultConfig.changelog : {},
+        renderer: StormChangelogRenderer,
+        renderOptions: {
+          ...typeof defaultConfig.changelog === "object" && defaultConfig.changelog.renderOptions || {},
+          workspaceConfig
+        }
+      }
+    }
+  );
+}
+function getReleaseGroupConfig(projectGraph, releaseConfig, workspaceConfig) {
+  const alreadyMatchedProjects = /* @__PURE__ */ new Set();
   return !releaseConfig?.groups || Object.keys(releaseConfig.groups).length === 0 ? {} : Object.fromEntries(
     Object.entries(releaseConfig.groups).map(([name, group]) => {
-      const config5 = defu(
-        {
-          ...omit(
-            group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_RELEASE_GROUP_CONFIG,
-            ["changelog", "version"]
-          ),
-          ...group
-        },
-        {
-          version: {
-            ...(group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_RELEASE_GROUP_CONFIG).version
-          }
-        },
-        {
-          changelog: {
-            ...(group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_RELEASE_GROUP_CONFIG).changelog,
-            renderer: StormChangelogRenderer,
-            renderOptions: {
-              ...(group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_RELEASE_GROUP_CONFIG).changelog.renderOptions,
-              workspaceConfig
-            }
-          }
+      const matchingProjects = findMatchingProjects(
+        typeof group.projects === "string" ? [group.projects] : group.projects,
+        projectGraph.nodes
+      );
+      if (!matchingProjects.length) {
+        throw new Error(
+          `Release group "${name}" does not have any matching projects.`
+        );
+      }
+      for (const project of matchingProjects) {
+        if (alreadyMatchedProjects.has(project)) {
+          throw new Error(
+            `Project "${project}" is included in more than one release group. Please ensure that each project is only included in one release group, or remove the "projects" property from the release group configuration to allow it to be included in the same release group as other projects with overlapping globs.`
+          );
         }
+        alreadyMatchedProjects.add(project);
+      }
+      let languageDefaultConfig = {};
+      if (matchingProjects.every(
+        (project) => projectGraph.nodes[project]?.data && (projectGraph.nodes[project]?.data.metadata?.js || isEqualProjectTag(
+          projectGraph.nodes[project]?.data,
+          ProjectTagConstants.Language.TAG_ID,
+          ProjectTagConstants.Language.TYPESCRIPT
+        ) || projectGraph.nodes[project]?.data.metadata?.root && existsSync$1(
+          joinPaths(
+            projectGraph.nodes[project]?.data.metadata?.root,
+            "package.json"
+          )
+        ))
+      )) {
+        languageDefaultConfig = defu(
+          DEFAULT_JS_RELEASE_GROUP_CONFIG,
+          DEFAULT_RELEASE_GROUP_CONFIG
+        );
+      } else if (matchingProjects.every(
+        (project) => projectGraph.nodes[project]?.data && (projectGraph.nodes[project]?.data.metadata?.rust || projectGraph.nodes[project]?.data.metadata?.cargo || isEqualProjectTag(
+          projectGraph.nodes[project]?.data,
+          ProjectTagConstants.Language.TAG_ID,
+          ProjectTagConstants.Language.RUST
+        ) || projectGraph.nodes[project]?.data.metadata?.root && existsSync$1(
+          joinPaths(
+            projectGraph.nodes[project]?.data.metadata?.root,
+            "Cargo.toml"
+          )
+        ))
+      )) {
+        languageDefaultConfig = defu(
+          DEFAULT_RUST_RELEASE_GROUP_CONFIG,
+          DEFAULT_RELEASE_GROUP_CONFIG
+        );
+      }
+      const config5 = mergeReleaseGroupConfig(
+        group,
+        defu(
+          languageDefaultConfig,
+          group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
+          DEFAULT_RELEASE_GROUP_CONFIG
+        ),
+        workspaceConfig
       );
+      config5.projects = matchingProjects;
       if (workspaceConfig?.workspaceRoot) {
         if (config5.changelog?.renderer && typeof config5.changelog?.renderer === "string" && config5.changelog?.renderer?.toString().startsWith("./")) {
           config5.changelog.renderer = joinPaths(
@@ -4118,10 +4215,15 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
         }
       },
       {
-        groups: getReleaseGroupConfig(releaseConfig, workspaceConfig)
+        groups: getReleaseGroupConfig(
+          projectGraph,
+          releaseConfig,
+          workspaceConfig
+        )
       },
       {
         groups: getReleaseGroupConfig(
+          projectGraph,
           nxJson.release ?? {},
           workspaceConfig
         )
@@ -4147,35 +4249,6 @@ var StormReleaseClient = class _StormReleaseClient extends ReleaseClient {
         })
       );
     }
-    const alreadyMatchedProjects = /* @__PURE__ */ new Set();
-    normalizedConfig.groups = Object.fromEntries(
-      Object.entries(normalizedConfig.groups ?? {}).map(([name, group]) => {
-        const matchingProjects = findMatchingProjects(
-          group.projects,
-          projectGraph.nodes
-        );
-        if (!matchingProjects.length) {
-          throw new Error(
-            `Release group "${name}" does not have any matching projects.`
-          );
-        }
-        for (const project of matchingProjects) {
-          if (alreadyMatchedProjects.has(project)) {
-            throw new Error(
-              `Project "${project}" is included in more than one release group. Please ensure that each project is only included in one release group, or remove the "projects" property from the release group configuration to allow it to be included in the same release group as other projects with overlapping globs.`
-            );
-          }
-          alreadyMatchedProjects.add(project);
-        }
-        return [
-          name,
-          {
-            ...group,
-            projects: matchingProjects
-          }
-        ];
-      })
-    );
     return new _StormReleaseClient(
       projectGraph,
       config5,