@eclipse-glsp/cli 2.7.0 → 2.8.0-next.3

package/dist/cli.js

@@ -13443,7 +13443,7 @@ var child = __toESM(require("child_process"));
 var path3 = __toESM(require("path"));
 
 // package.json
-var version = "2.7.0";
+var version = "2.8.0-next";
 
 // src/util/logger.ts
 var levels = {
@@ -13646,6 +13646,30 @@ function commitChanges(message, path26) {
 function getChangesOfLastCommit(path26) {
   return exec("git diff --name-only HEAD^", { cwd: path26 }).split("\n").map((file) => (0, import_path.resolve)(path26 ?? process.cwd(), file));
 }
+function getChangesComparedToDefaultBranch(path26) {
+  const baseRef = getDefaultBranchRef(path26);
+  const committedChanges = baseRef ? exec(`git diff --name-only ${baseRef}...HEAD`, { cwd: path26, silent: true }).split("\n").filter((value) => value.trim().length !== 0).map((file) => (0, import_path.resolve)(path26 ?? process.cwd(), file.trim())) : [];
+  return [.../* @__PURE__ */ new Set([...committedChanges, ...getUncommittedChanges(path26)])];
+}
+function getDefaultBranchRef(path26) {
+  try {
+    const ref = exec("git symbolic-ref --short refs/remotes/origin/HEAD", { cwd: path26, silent: true, fatal: false });
+    if (ref) {
+      return ref;
+    }
+  } catch {
+  }
+  const candidates = ["origin/main", "origin/master", "main", "master"];
+  return candidates.find((ref) => refExists(ref, path26));
+}
+function refExists(ref, path26) {
+  try {
+    exec(`git rev-parse --verify --quiet ${ref}`, { cwd: path26, silent: true, fatal: false });
+    return true;
+  } catch {
+    return false;
+  }
+}
 function getLastModificationDate(filePath, repoRoot, excludeMessage) {
   const additionalArgs = excludeMessage ? `--grep="${excludeMessage}" --invert-grep` : "";
   try {
@@ -13896,7 +13920,7 @@ var AUTO_FIX_MESSAGE = "Fix copyright header violations";
 var CheckHeaderCommand = baseCommand().name("checkHeaders").description("Validates the copyright year range (end year) of license header files").argument("<rootDir>", "The starting directory for the check", validateGitDirectory).addOption(
   new Option(
     "-t, --type <type>",
-    "The scope of the check. In addition to a full recursive check, is also possible to only consider pending changes or the last commit"
+    "The scope of the check. In addition to a full recursive check, it is also possible to only consider the files changed compared to the default branch (`changes`, incl. uncommitted changes - i.e. the files that would show up in a pull request) or the files changed with the last commit (`lastCommit`)"
   ).choices(checkTypes).default("full")
 ).option("-f, --fileExtensions <extensions...>", "File extensions that should be checked", ["ts", "tsx"]).addOption(
   new Option(
@@ -13933,7 +13957,7 @@ async function getFiles(rootDir, options) {
     });
     return resolveFiles(result2);
   }
-  let changedFiles = options.type === "changes" ? getUncommittedChanges(rootDir) : getChangesOfLastCommit(rootDir);
+  let changedFiles = options.type === "changes" ? getChangesComparedToDefaultBranch(rootDir) : getChangesOfLastCommit(rootDir);
   changedFiles = changedFiles.filter(minimatch.filter(includePattern));
   excludePattern.forEach((pattern) => {
     changedFiles = changedFiles.filter(minimatch.filter(`!${pattern}`));
@@ -14732,6 +14756,14 @@ function resolveWorkspaceDir(cliDir) {
   }
   return process.cwd();
 }
+function resolveRepoDir(repo, cliDir) {
+  const workspaceDir = resolveWorkspaceDir(cliDir);
+  const repoDir = path11.resolve(workspaceDir, repo);
+  if (!fs10.existsSync(repoDir) && path11.basename(workspaceDir) === repo) {
+    return workspaceDir;
+  }
+  return repoDir;
+}
 function discoverRepos(dir) {
   if (!fs10.existsSync(dir)) {
     return [];
@@ -15479,16 +15511,14 @@ function resolveBundlePath(repoDir, relativePath, label) {
 var BrowserBundleCommand = baseCommand().name("browser-bundle").description("Print the absolute path to the browser (Web Worker) server bundle").option("-d, --dir <path>", "Target directory where repos are cloned").option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
-  const dir = resolveWorkspaceDir(cli.dir);
-  const repoDir = path20.resolve(dir, "glsp-server-node");
+  const repoDir = resolveRepoDir("glsp-server-node", cli.dir);
   const bundlePath = resolveBundlePath(repoDir, BROWSER_BUNDLE_PATH, "Browser bundle");
   process.stdout.write(bundlePath);
 });
 var NodeBundleCommand = baseCommand().name("node-bundle").description("Print the absolute path to the Node.js server bundle").option("-d, --dir <path>", "Target directory where repos are cloned").option("-v, --verbose", "Verbose output", false).action(async (_cmdOptions, thisCmd) => {
   const cli = thisCmd.opts();
   configureRepoEnv(cli);
-  const dir = resolveWorkspaceDir(cli.dir);
-  const repoDir = path20.resolve(dir, "glsp-server-node");
+  const repoDir = resolveRepoDir("glsp-server-node", cli.dir);
   const bundlePath = resolveBundlePath(repoDir, NODE_BUNDLE_PATH, "Node server bundle");
   process.stdout.write(bundlePath);
 });