@storm-software/git-tools 2.130.40 → 2.131.7

package/dist/{chunk-GTHIKJY7.cjs → chunk-VOWQJXPC.cjs}

@@ -3,9 +3,10 @@
 var chunk7ZSL4J35_cjs = require('./chunk-7ZSL4J35.cjs');
 var chunk4VPJA7YJ_cjs = require('./chunk-4VPJA7YJ.cjs');
 var chunkOZEUXY3F_cjs = require('./chunk-OZEUXY3F.cjs');
-var defu = require('defu');
-var c12 = require('c12');
+var defu3 = require('defu');
 var fs = require('fs');
+var findMatchingProjects = require('nx/src/utils/find-matching-projects');
+var c12 = require('c12');
 var path = require('path');
 var promises = require('fs/promises');
 var axios2 = require('axios');
@@ -27,7 +28,7 @@ require('nx/src/command-line/release/utils/git');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
-var defu__default = /*#__PURE__*/_interopDefault(defu);
+var defu3__default = /*#__PURE__*/_interopDefault(defu3);
 var axios2__default = /*#__PURE__*/_interopDefault(axios2);
 var DefaultChangelogRenderer__default = /*#__PURE__*/_interopDefault(DefaultChangelogRenderer);
 
@@ -155,6 +156,37 @@ var isAbsolute = function(p) {
   return _IS_ABSOLUTE_RE.test(p);
 };
 
+// ../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());
+};
+
 // src/utilities/omit.ts
 function omit(obj, keys) {
   const result = { ...obj };
@@ -2393,7 +2425,7 @@ var getConfigFileByName = async (fileName, filePath, options = {}) => {
       ...options
     })
   ]);
-  return defu__default.default(configs[0] ?? {}, configs[1] ?? {});
+  return defu3__default.default(configs[0] ?? {}, configs[1] ?? {});
 };
 var getConfigFile = async (filePath, additionalFileNames = []) => {
   const workspacePath = filePath ? filePath : findWorkspaceRoot(filePath);
@@ -2424,7 +2456,7 @@ var getConfigFile = async (filePath, additionalFileNames = []) => {
             }
           );
         }
-        config2 = defu__default.default(result2.config ?? {}, config2 ?? {});
+        config2 = defu3__default.default(result2.config ?? {}, config2 ?? {});
       }
     }
   }
@@ -3039,7 +3071,7 @@ var createStormWorkspaceConfig = async (extensionName, schema, workspaceRoot, sk
       }
     }
     const defaultConfig = await getPackageJsonConfig(_workspaceRoot);
-    const configInput = defu__default.default(
+    const configInput = defu3__default.default(
       configEnv,
       configFile,
       defaultConfig
@@ -3535,32 +3567,77 @@ var DEFAULT_CONVENTIONAL_COMMITS_CONFIG2 = {
   questions: chunk7ZSL4J35_cjs.DEFAULT_MONOREPO_COMMIT_QUESTIONS,
   types: chunk4VPJA7YJ_cjs.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_RELEASE_GROUP_GIT_CONFIG = {
+  commit: false,
+  commitMessage: DEFAULT_COMMIT_MESSAGE,
+  commitArgs: "",
+  tag: false,
+  tagMessage: "",
+  tagArgs: "",
+  stageChanges: false,
+  pushArgs: ""
+};
+var DEFAULT_VERSION_RELEASE_CONFIG = {
+  currentVersionResolver: "git-tag",
+  fallbackCurrentVersionResolver: "disk",
+  specifierSource: "conventional-commits",
+  groupPreVersionCommand: "pnpm build",
+  preserveLocalDependencyProtocols: true,
+  preserveMatchingDependencyRanges: true,
+  logUnchangedProjects: true,
+  updateDependents: "always",
+  git: {
+    ...DEFAULT_RELEASE_GROUP_GIT_CONFIG,
+    stageChanges: true
+  }
+};
+var DEFAULT_CHANGELOG_RELEASE_CONFIG = {
+  createRelease: "github",
+  entryWhenNoChanges: "This was a version bump only for {projectName} to align it with other projects, there were no code changes.",
+  file: false,
+  renderOptions: {
+    authors: false,
+    commitReferences: true,
+    versionTitleDate: true
+  },
+  git: {
+    ...DEFAULT_RELEASE_GROUP_GIT_CONFIG,
+    commit: true,
+    tag: true,
+    push: true
+  }
+};
 var DEFAULT_RELEASE_GROUP_CONFIG = {
   projectsRelationship: "independent",
   changelog: {
-    createRelease: "github",
-    entryWhenNoChanges: false,
-    file: false,
-    renderOptions: {
-      authors: false,
-      commitReferences: true,
-      versionTitleDate: true
-    }
+    ...DEFAULT_CHANGELOG_RELEASE_CONFIG
   },
   version: {
-    currentVersionResolver: "git-tag",
-    fallbackCurrentVersionResolver: "disk",
-    specifierSource: "conventional-commits",
-    groupPreVersionCommand: "pnpm build"
+    ...DEFAULT_VERSION_RELEASE_CONFIG
+  },
+  releaseTag: {
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
+    preferDockerVersion: false
   },
-  releaseTag: { pattern: DEFAULT_RELEASE_TAG_PATTERN }
+  versionPlans: false
+};
+var DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG = {
+  projectsRelationship: "independent",
+  releaseTag: {
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN
+  }
+};
+var DEFAULT_FIXED_RELEASE_GROUP_CONFIG = {
+  projectsRelationship: "fixed",
+  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",
@@ -3576,10 +3653,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",
@@ -3591,40 +3665,123 @@ 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: defu3__default.default(
+      {
+        projects: ["packages/*"]
+      },
+      DEFAULT_JS_RELEASE_GROUP_CONFIG,
+      DEFAULT_RELEASE_GROUP_CONFIG
+    ),
+    crates: defu3__default.default(
+      {
+        projects: ["crates/*"]
+      },
+      DEFAULT_RUST_RELEASE_GROUP_CONFIG,
+      DEFAULT_RELEASE_GROUP_CONFIG
+    )
   },
   changelog: {
+    ...DEFAULT_CHANGELOG_RELEASE_CONFIG,
     automaticFromRef: true,
     workspaceChangelog: false,
     projectChangelogs: true
   },
-  releaseTag: { pattern: DEFAULT_RELEASE_TAG_PATTERN }
+  releaseTag: {
+    pattern: DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN,
+    preferDockerVersion: false
+  },
+  version: {
+    ...DEFAULT_VERSION_RELEASE_CONFIG
+  }
 };
-function getReleaseGroupConfig(releaseConfig, workspaceConfig) {
+function mergeReleaseGroupConfig(config2, defaultConfig, workspaceConfig) {
+  return defu3__default.default(
+    {
+      ...omit(defaultConfig, ["changelog", "version"]),
+      ...config2
+    },
+    {
+      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 config2 = defu__default.default(
-        {
-          ...omit(DEFAULT_RELEASE_GROUP_CONFIG, ["changelog", "version"]),
-          ...group
-        },
-        {
-          version: {
-            ...DEFAULT_RELEASE_GROUP_CONFIG.version
-          }
-        },
-        {
-          changelog: {
-            ...DEFAULT_RELEASE_GROUP_CONFIG.changelog,
-            renderer: StormChangelogRenderer,
-            renderOptions: {
-              ...DEFAULT_RELEASE_GROUP_CONFIG.changelog.renderOptions,
-              workspaceConfig
-            }
-          }
+      const matchingProjects = findMatchingProjects.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 && fs.existsSync(
+          joinPaths(
+            projectGraph.nodes[project]?.data.metadata?.root,
+            "package.json"
+          )
+        ))
+      )) {
+        languageDefaultConfig = defu3__default.default(
+          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 && fs.existsSync(
+          joinPaths(
+            projectGraph.nodes[project]?.data.metadata?.root,
+            "Cargo.toml"
+          )
+        ))
+      )) {
+        languageDefaultConfig = defu3__default.default(
+          DEFAULT_RUST_RELEASE_GROUP_CONFIG,
+          DEFAULT_RELEASE_GROUP_CONFIG
+        );
+      }
+      const config2 = mergeReleaseGroupConfig(
+        group,
+        defu3__default.default(
+          languageDefaultConfig,
+          group.projectsRelationship === "fixed" ? DEFAULT_FIXED_RELEASE_GROUP_CONFIG : DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG,
+          DEFAULT_RELEASE_GROUP_CONFIG
+        ),
+        workspaceConfig
       );
+      config2.projects = matchingProjects;
       if (workspaceConfig?.workspaceRoot) {
         if (config2.changelog?.renderer && typeof config2.changelog?.renderer === "string" && config2.changelog?.renderer?.toString().startsWith("./")) {
           config2.changelog.renderer = joinPaths(
@@ -3644,10 +3801,18 @@ function getReleaseGroupConfig(releaseConfig, workspaceConfig) {
   );
 }
 
+exports.DEFAULT_CHANGELOG_RELEASE_CONFIG = DEFAULT_CHANGELOG_RELEASE_CONFIG;
+exports.DEFAULT_COMMIT_MESSAGE = DEFAULT_COMMIT_MESSAGE;
 exports.DEFAULT_CONVENTIONAL_COMMITS_CONFIG = DEFAULT_CONVENTIONAL_COMMITS_CONFIG2;
+exports.DEFAULT_FIXED_RELEASE_GROUP_CONFIG = DEFAULT_FIXED_RELEASE_GROUP_CONFIG;
+exports.DEFAULT_FIXED_RELEASE_TAG_PATTERN = DEFAULT_FIXED_RELEASE_TAG_PATTERN;
+exports.DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG = DEFAULT_INDEPENDENT_RELEASE_GROUP_CONFIG;
+exports.DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN = DEFAULT_INDEPENDENT_RELEASE_TAG_PATTERN;
 exports.DEFAULT_JS_RELEASE_GROUP_CONFIG = DEFAULT_JS_RELEASE_GROUP_CONFIG;
 exports.DEFAULT_RELEASE_CONFIG = DEFAULT_RELEASE_CONFIG;
 exports.DEFAULT_RELEASE_GROUP_CONFIG = DEFAULT_RELEASE_GROUP_CONFIG;
-exports.DEFAULT_RELEASE_TAG_PATTERN = DEFAULT_RELEASE_TAG_PATTERN;
+exports.DEFAULT_RELEASE_GROUP_GIT_CONFIG = DEFAULT_RELEASE_GROUP_GIT_CONFIG;
 exports.DEFAULT_RUST_RELEASE_GROUP_CONFIG = DEFAULT_RUST_RELEASE_GROUP_CONFIG;
+exports.DEFAULT_VERSION_RELEASE_CONFIG = DEFAULT_VERSION_RELEASE_CONFIG;
 exports.getReleaseGroupConfig = getReleaseGroupConfig;
+exports.mergeReleaseGroupConfig = mergeReleaseGroupConfig;