fork-version 4.1.4 → 4.1.7

package/dist/{chunk-CISRFIID.cjs → chunk-JYQTKLHN.cjs}

@@ -2,7 +2,7 @@
 
 var zod = require('zod');
 var child_process = require('child_process');
-var semver = require('semver');
+var semver5 = require('semver');
 var path = require('path');
 var promises = require('fs/promises');
 var conventionalChangelogConfigSpec = require('conventional-changelog-config-spec');
@@ -35,7 +35,7 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var semver__default = /*#__PURE__*/_interopDefault(semver);
+var semver5__default = /*#__PURE__*/_interopDefault(semver5);
 var conventionalChangelogConfigSpec__default = /*#__PURE__*/_interopDefault(conventionalChangelogConfigSpec);
 var JoyCon__default = /*#__PURE__*/_interopDefault(JoyCon);
 var cheerio__namespace = /*#__PURE__*/_interopNamespace(cheerio);
@@ -108,12 +108,13 @@ var ForkConfigSchema = zod.z.object({
    * - `main` - Bumps the version, update files, generate changelog, commit, and tag.
    * - `inspect-version` - Prints the current version and exits.
    * - `inspect-tag` - Prints the current git tag and exits.
+   * - `inspect` - Prints the current version and git tag and exits.
    * - `validate-config` - Validates the configuration and exits.
    *
    * @default "main"
    */
-  command: zod.z.literal(["main", "inspect-version", "inspect-tag", "validate-config"]).describe(
-    "The command to run. Can be one of: main, inspect-version, inspect-tag, validate-config. Defaults to main."
+  command: zod.z.literal(["main", "inspect", "inspect-version", "inspect-tag", "validate-config"]).describe(
+    "The command to run. Can be one of: main, inspect, inspect-version, inspect-tag, validate-config. Defaults to main."
   ),
   /**
    * If set, Fork-Version will print the current version and exit.
@@ -276,6 +277,11 @@ var ForkConfigSchema = zod.z.object({
    * @default false
    */
   verify: zod.z.boolean().describe("If true, git will run user defined git hooks before committing."),
+  /**
+   * Output result as JSON.
+   * @default false
+   */
+  asJson: zod.z.boolean().describe("Output the result as JSON."),
   // Skip Steps
   //
   /**
@@ -318,8 +324,11 @@ function escapeRegex(input) {
 
 // src/services/git.ts
 var Git = class {
+  #path;
+  #dryRun;
   constructor(config) {
-    this.config = config;
+    this.#path = config.path;
+    this.#dryRun = config.dryRun ?? false;
     this.add = this.add.bind(this);
     this.commit = this.commit.bind(this);
     this.tag = this.tag.bind(this);
@@ -329,8 +338,6 @@ var Git = class {
     this.getRemoteUrl = this.getRemoteUrl.bind(this);
     this.getTags = this.getTags.bind(this);
     this.getMostRecentTag = this.getMostRecentTag.bind(this);
-    this.getCleanedTags = this.getCleanedTags.bind(this);
-    this.getHighestSemverVersionFromTags = this.getHighestSemverVersionFromTags.bind(this);
     this.getCommits = this.getCommits.bind(this);
   }
   async #execGit(command, args) {
@@ -339,7 +346,7 @@ var Git = class {
         "git",
         [command, ...args],
         {
-          cwd: this.config.path,
+          cwd: this.#path,
           maxBuffer: Infinity
         },
         (error, stdout, stderr) => {
@@ -363,7 +370,7 @@ var Git = class {
    * ```
    */
   async add(...args) {
-    if (this.config.dryRun) {
+    if (this.#dryRun) {
       return "";
     }
     return this.#execGit("add", args.filter(Boolean));
@@ -379,7 +386,7 @@ var Git = class {
    * ```
    */
   async commit(...args) {
-    if (this.config.dryRun) {
+    if (this.#dryRun) {
       return "";
     }
     return this.#execGit("commit", args.filter(Boolean));
@@ -395,7 +402,7 @@ var Git = class {
    * ```
    */
   async tag(...args) {
-    if (this.config.dryRun) {
+    if (this.#dryRun) {
       return "";
     }
     return this.#execGit("tag", args.filter(Boolean));
@@ -504,18 +511,18 @@ var Git = class {
       if (tagPrefix) {
         if (tag.startsWith(tagPrefix)) {
           const tagWithoutPrefix = tag.replace(new RegExp(`^${escapedTagPrefix}`), "");
-          if (semver__default.default.valid(tagWithoutPrefix)) {
+          if (semver5__default.default.valid(tagWithoutPrefix)) {
             tags.push(tag);
           }
         }
-      } else if (/^\d/.test(tag) && semver__default.default.valid(tag)) {
+      } else if (/^\d/.test(tag) && semver5__default.default.valid(tag)) {
         tags.push(tag);
       }
     }
     return tags;
   }
   /**
-   * Returns the latest git tag based on commit date
+   * Returns the most recent tag from the commit history, or `undefined` if no valid semver tags are found
    *
    * @example
    * ```ts
@@ -526,40 +533,6 @@ var Git = class {
     const tags = await this.getTags(tagPrefix);
     return tags[0] || void 0;
   }
-  /**
-   * Get cleaned semver tags, with any tag prefix's removed
-   *
-   * @example
-   * ```ts
-   * await git.getCleanedTags("v"); // ["1.2.3", "1.2.2", "1.2.1"]
-   * ```
-   */
-  async getCleanedTags(tagPrefix) {
-    const tags = await this.getTags(tagPrefix);
-    const escapedTagPrefix = tagPrefix ? escapeRegex(tagPrefix) : void 0;
-    const cleanedTags = [];
-    for (const tag of tags) {
-      const tagWithoutPrefix = tag.replace(new RegExp(`^${escapedTagPrefix}`), "");
-      const cleanedTag = semver__default.default.clean(tagWithoutPrefix);
-      if (cleanedTag) {
-        cleanedTags.push(cleanedTag);
-      }
-    }
-    return cleanedTags;
-  }
-  /**
-   * Get the highest semver version from git tags. This will return the highest
-   * semver version found for the given tag prefix, regardless of the commit date.
-   *
-   * @example
-   * ```ts
-   * await git.getHighestSemverVersionFromTags("v"); // "1.2.3"
-   * ```
-   */
-  async getHighestSemverVersionFromTags(tagPrefix) {
-    const cleanedTags = await this.getCleanedTags(tagPrefix);
-    return cleanedTags.sort(semver__default.default.rcompare)[0] || void 0;
-  }
   /**
    * Get commit history in a parsable format
    *
@@ -714,6 +687,7 @@ All notable changes to this project will be documented in this file. See [fork-v
   gitTagFallback: true,
   sign: false,
   verify: false,
+  asJson: false,
   // Skip Steps
   skipBump: false,
   skipChangelog: false,
@@ -723,11 +697,8 @@ All notable changes to this project will be documented in this file. See [fork-v
 };
 
 // src/config/detect-git-host.ts
-async function detectGitHost(cwd) {
-  const remoteUrl = await new Git({
-    path: cwd,
-    dryRun: false
-  }).getRemoteUrl();
+async function detectGitHost(path) {
+  const remoteUrl = await new Git({ path }).getRemoteUrl();
   if (remoteUrl.startsWith("https://") && remoteUrl.includes("@dev.azure.com/")) {
     const match = /^https:\/\/(?<atorganisation>.*?)@dev.azure.com\/(?<organisation>.*?)\/(?<project>.*?)\/_git\/(?<repository>.*?)(?:\.git)?$/.exec(
       remoteUrl
@@ -871,33 +842,34 @@ async function getUserConfig(cliArguments) {
   };
 }
 var Logger = class {
+  #silent;
+  #debug;
   constructor(config) {
-    this.config = config;
+    this.#silent = config.silent ?? false;
+    this.#debug = config.debug ?? false;
     this.log = this.log.bind(this);
     this.warn = this.warn.bind(this);
     this.error = this.error.bind(this);
     this.debug = this.debug.bind(this);
     this.skipping = this.skipping.bind(this);
-    this.disableLogs = this.config.silent;
   }
-  disableLogs = false;
   log(message) {
-    if (!this.disableLogs) {
+    if (!this.#silent) {
       console.log(message);
     }
   }
   warn(message) {
-    if (!this.disableLogs) {
+    if (!this.#silent) {
       console.warn(util.styleText("yellowBright", message));
     }
   }
   error(message) {
-    if (!this.disableLogs) {
+    if (!this.#silent) {
       console.error(util.styleText("redBright", message));
     }
   }
   debug(message, ...optionalParams) {
-    if (this.config.debug && !this.disableLogs) {
+    if (!this.#silent && this.#debug) {
       console.debug(util.styleText("cyanBright", message));
       if (optionalParams.length > 0) {
         console.debug(...optionalParams);
@@ -905,7 +877,7 @@ var Logger = class {
     }
   }
   skipping(message) {
-    if (!this.disableLogs) {
+    if (!this.#silent) {
       console.log(util.styleText("magenta", message));
     }
   }
@@ -1233,66 +1205,6 @@ ${JSON.stringify(config, null, 2)}
 \u2705 Configuration is valid.
 `);
 }
-async function getCurrentVersion(config, logger, git, fileManager, filesToUpdate) {
-  const files = [];
-  const versions = /* @__PURE__ */ new Set();
-  for (const file of filesToUpdate) {
-    if (await git.isIgnored(file)) {
-      logger.debug(`[Git Ignored] ${file}`);
-      continue;
-    }
-    const fileState = fileManager.read(file);
-    if (fileState) {
-      files.push(fileState);
-      if (!config.currentVersion) {
-        versions.add(fileState.version);
-      }
-    }
-  }
-  if (config.currentVersion) {
-    versions.add(config.currentVersion);
-  }
-  if (versions.size === 0 && config.gitTagFallback) {
-    const version = await git.getHighestSemverVersionFromTags(config.tagPrefix);
-    if (version) {
-      logger.warn(`Using latest git tag as fallback`);
-      versions.add(version);
-    }
-  }
-  if (versions.size === 0) {
-    throw new Error("Unable to find current version");
-  } else if (versions.size > 1) {
-    if (!config.allowMultipleVersions) {
-      throw new Error("Found multiple versions");
-    }
-    logger.warn(
-      `Found multiple versions (${Array.from(versions).join(", ")}), using the higher semver version`
-    );
-  }
-  const currentVersion = semver__default.default.rsort(Array.from(versions))[0];
-  logger.log(`Current version: ${currentVersion}`);
-  return {
-    files,
-    version: currentVersion
-  };
-}
-
-// src/commands/inspect-version.ts
-async function inspectVersion(config, logger, fileManager, git) {
-  let foundVersion = "";
-  try {
-    const currentVersion = await getCurrentVersion(config, logger, git, fileManager, config.files);
-    if (currentVersion) foundVersion = currentVersion.version;
-  } catch {
-  }
-  console.log(foundVersion);
-}
-
-// src/commands/inspect-tag.ts
-async function inspectTag(config, git) {
-  const tag = await git.getMostRecentTag(config.tagPrefix);
-  console.log(tag ?? "");
-}
 
 // src/utils/trim-string-array.ts
 function trimStringArray(array) {
@@ -1756,6 +1668,12 @@ function filterRevertedCommits(parsedCommits) {
   }
   return commitsWithoutReverts;
 }
+function cleanTag(tag, tagPrefix) {
+  if (!tag) return void 0;
+  const escapedTagPrefix = tagPrefix ? escapeRegex(tagPrefix) : void 0;
+  const tagWithoutPrefix = escapedTagPrefix ? tag.replace(new RegExp(`^${escapedTagPrefix}`), "") : tag;
+  return semver5__default.default.clean(tagWithoutPrefix) ?? void 0;
+}
 
 // src/process/get-commits.ts
 async function getCommitsSinceTag(config, logger, git) {
@@ -1779,14 +1697,130 @@ async function getCommitsSinceTag(config, logger, git) {
   );
   return {
     latestTag,
+    latestTagVersion: cleanTag(latestTag, config.tagPrefix),
     commits: filteredCommits
   };
 }
+async function getCurrentVersion(config, logger, git, fileManager, filesToUpdate, latestTagVersion) {
+  const files = [];
+  const versions = /* @__PURE__ */ new Set();
+  for (const file of filesToUpdate) {
+    if (await git.isIgnored(file)) {
+      logger.debug(`[Git Ignored] ${file}`);
+      continue;
+    }
+    const fileState = fileManager.read(file);
+    if (fileState) {
+      files.push(fileState);
+      if (!config.currentVersion) {
+        versions.add(fileState.version);
+      }
+    }
+  }
+  if (config.currentVersion) {
+    versions.add(config.currentVersion);
+  }
+  if (versions.size === 0 && config.gitTagFallback && latestTagVersion) {
+    logger.warn(`Using latest git tag as fallback`);
+    versions.add(latestTagVersion);
+  }
+  if (versions.size === 0) {
+    throw new Error("Unable to find current version");
+  } else if (versions.size > 1) {
+    if (!config.allowMultipleVersions) {
+      throw new Error("Found multiple versions");
+    }
+    logger.warn(
+      `Found multiple versions (${Array.from(versions).join(", ")}), using the higher semver version`
+    );
+  }
+  const currentVersion = semver5__default.default.rsort(Array.from(versions))[0];
+  logger.log(`Current version: ${currentVersion}`);
+  return {
+    files,
+    version: currentVersion
+  };
+}
+async function inspect(config, logger, fileManager, git) {
+  let latestTag = "";
+  let latestVersion = "";
+  try {
+    const commits = await getCommitsSinceTag(config, logger, git);
+    if (commits.latestTag) {
+      latestTag = commits.latestTag;
+      latestVersion = commits.latestTagVersion ?? "";
+    }
+    const currentVersion = await getCurrentVersion(
+      config,
+      logger,
+      git,
+      fileManager,
+      config.files,
+      latestVersion
+    );
+    if (currentVersion.version) {
+      latestVersion = currentVersion.version;
+    }
+  } catch {
+  }
+  if (!latestVersion && !latestTag) {
+    console.error(
+      util.styleText(
+        "yellowBright",
+        "No version found. Make sure you have at least one tag in your repository."
+      )
+    );
+    process.exit(1);
+    return;
+  }
+  switch (config.command) {
+    case "inspect-version": {
+      console.log(
+        config.asJson ? JSON.stringify(
+          {
+            version: latestVersion
+          },
+          null,
+          2
+        ) : latestVersion
+      );
+      return;
+    }
+    case "inspect-tag": {
+      console.log(
+        config.asJson ? JSON.stringify(
+          {
+            tag: latestTag
+          },
+          null,
+          2
+        ) : latestTag
+      );
+      return;
+    }
+    default: {
+      console.log(
+        config.asJson ? JSON.stringify(
+          {
+            version: latestVersion,
+            tag: latestTag
+          },
+          null,
+          2
+        ) : `
+Version: ${latestVersion}
+Tag: ${latestTag}
+`.trim()
+      );
+      return;
+    }
+  }
+}
 function getPriority(type) {
   return ["patch", "minor", "major"].indexOf(type ?? "");
 }
 function getVersionType(version) {
-  const parseVersion = semver__default.default.parse(version);
+  const parseVersion = semver5__default.default.parse(version);
   if (parseVersion?.major) {
     return "major";
   } else if (parseVersion?.minor) {
@@ -1800,7 +1834,7 @@ function getReleaseType(releaseType, currentVersion, preReleaseTag) {
   if (!preReleaseTag) {
     return releaseType;
   }
-  const currentVersionsIsPreRelease = Array.isArray(semver__default.default.prerelease(currentVersion));
+  const currentVersionsIsPreRelease = Array.isArray(semver5__default.default.prerelease(currentVersion));
   if (currentVersionsIsPreRelease) {
     const currentReleaseType = getVersionType(currentVersion);
     if (currentReleaseType === releaseType || getPriority(currentReleaseType) > getPriority(releaseType)) {
@@ -1819,7 +1853,7 @@ async function getNextVersion(config, logger, commits, currentVersion) {
     };
   }
   if (config.nextVersion) {
-    if (!semver__default.default.valid(config.nextVersion)) {
+    if (!semver5__default.default.valid(config.nextVersion)) {
       throw new Error(`Invalid Version: ${config.nextVersion}`);
     }
     logger.log(`Next version: ${config.nextVersion}`);
@@ -1827,7 +1861,7 @@ async function getNextVersion(config, logger, commits, currentVersion) {
       version: config.nextVersion
     };
   }
-  const isPreMajor = semver__default.default.lt(currentVersion, "1.0.0");
+  const isPreMajor = semver5__default.default.lt(currentVersion, "1.0.0");
   let releaseType = "patch";
   const changes = {
     major: 0,
@@ -1877,7 +1911,7 @@ async function getNextVersion(config, logger, commits, currentVersion) {
     }
   }
   const releaseTypeOrPreRelease = getReleaseType(releaseType, currentVersion, config.preRelease);
-  const nextVersion = semver__default.default.inc(
+  const nextVersion = semver5__default.default.inc(
     currentVersion,
     releaseTypeOrPreRelease,
     typeof config.preRelease === "string" ? config.preRelease : ""
@@ -2029,7 +2063,14 @@ async function main(config, logger, fileManager, git) {
   logger.log(`Running fork-version - ${(/* @__PURE__ */ new Date()).toUTCString()}`);
   logger.warn(config.dryRun ? "[Dry Run] No changes will be written to disk.\n" : "");
   const commits = await getCommitsSinceTag(config, logger, git);
-  const current = await getCurrentVersion(config, logger, git, fileManager, config.files);
+  const current = await getCurrentVersion(
+    config,
+    logger,
+    git,
+    fileManager,
+    config.files,
+    commits.latestTagVersion
+  );
   const next = await getNextVersion(config, logger, commits.commits, current.version);
   logger.log("Updating files: ");
   for (const outFile of current.files) {
@@ -2059,11 +2100,10 @@ exports.getCommitsSinceTag = getCommitsSinceTag;
 exports.getCurrentVersion = getCurrentVersion;
 exports.getNextVersion = getNextVersion;
 exports.getUserConfig = getUserConfig;
-exports.inspectTag = inspectTag;
-exports.inspectVersion = inspectVersion;
+exports.inspect = inspect;
 exports.main = main;
 exports.tagChanges = tagChanges;
 exports.updateChangelog = updateChangelog;
 exports.validateConfig = validateConfig;
-//# sourceMappingURL=chunk-CISRFIID.cjs.map
-//# sourceMappingURL=chunk-CISRFIID.cjs.map
+//# sourceMappingURL=chunk-JYQTKLHN.cjs.map
+//# sourceMappingURL=chunk-JYQTKLHN.cjs.map