fork-version 3.0.2 → 3.1.4

package/dist/{chunk-AZZVHG2X.js → chunk-4NLPWDCQ.js}

@@ -73,11 +73,26 @@ var ChangelogPresetConfigSchema = z.object({
 var ForkConfigSchema = z.object({
   // Commands
   //
+  /**
+   * The command to run, can be one of the following:
+   *
+   * - `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.
+   * - `validate-config` - Validates the configuration and exits.
+   *
+   * @default "main"
+   */
+  command: 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."
+  ),
   /**
    * If set, Fork-Version will print the current version and exit.
    * @default false
+   *
+   * @deprecated Set the `inspect-version` command instead.
    */
-  inspectVersion: z.boolean().describe("If set, Fork-Version will print the current version and exit."),
+  inspectVersion: z.boolean().optional().describe("If set, Fork-Version will print the current version and exit."),
   // Options
   //
   /**
@@ -266,6 +281,13 @@ var ForkConfigSchema = z.object({
    */
   releaseMessageSuffix: z.string().optional().describe("Add a suffix to the release commit message.")
 });
+
+// src/utils/escape-regex.ts
+function escapeRegex(input) {
+  return input.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+
+// src/services/git.ts
 var Git = class {
   constructor(config) {
     this.config = config;
@@ -446,12 +468,13 @@ var Git = class {
     const logOutput = await this.log("--decorate", "--no-color", "--date-order");
     const TAG_REGEX = /tag:\s*(?<tag>.+?)[,)]/gi;
     const tags = [];
+    const escapedTagPrefix = tagPrefix ? escapeRegex(tagPrefix) : void 0;
     let tagMatch = null;
     while (tagMatch = TAG_REGEX.exec(logOutput)) {
       const { tag = "" } = tagMatch.groups ?? {};
       if (tagPrefix) {
         if (tag.startsWith(tagPrefix)) {
-          const tagWithoutPrefix = tag.replace(new RegExp(`^${tagPrefix}`), "");
+          const tagWithoutPrefix = tag.replace(new RegExp(`^${escapedTagPrefix}`), "");
           if (semver.valid(tagWithoutPrefix)) {
             tags.push(tag);
           }
@@ -484,9 +507,10 @@ var Git = class {
    */
   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(`^${tagPrefix}`), "");
+      const tagWithoutPrefix = tag.replace(new RegExp(`^${escapedTagPrefix}`), "");
       const cleanedTag = semver.clean(tagWithoutPrefix);
       if (cleanedTag) {
         cleanedTags.push(cleanedTag);
@@ -534,6 +558,8 @@ var Git = class {
       // body
       "%H",
       // hash
+      "%d",
+      // ref names
       "%cI",
       // committer date
       "%cN",
@@ -628,7 +654,7 @@ function getChangelogPresetConfig(mergedConfig, cliArguments, detectedGitHost) {
 // src/config/defaults.ts
 var DEFAULT_CONFIG = {
   // Commands
-  inspectVersion: false,
+  command: "main",
   // Options
   files: [
     "package.json",
@@ -764,12 +790,12 @@ function mergeFiles(configFiles, cliFiles, globResults) {
 
 // src/config/user-config.ts
 async function getUserConfig(cliArguments) {
-  const cwd = cliArguments.path ? resolve(cliArguments.path) : process.cwd();
+  const cwd = cliArguments.flags.path ? resolve(cliArguments.flags.path) : process.cwd();
   const configFile = await loadConfigFile(cwd);
   const mergedConfig = {
     ...DEFAULT_CONFIG,
     ...configFile,
-    ...cliArguments
+    ...cliArguments.flags
   };
   let globResults = [];
   if (mergedConfig.glob) {
@@ -779,21 +805,33 @@ async function getUserConfig(cliArguments) {
       nodir: true
     });
   }
-  const files = mergeFiles(configFile?.files, cliArguments?.files, globResults);
+  const files = mergeFiles(configFile?.files, cliArguments.flags.files, globResults);
   const detectedGitHost = await detectGitHost(cwd);
   const changelogPresetConfig = getChangelogPresetConfig(
     mergedConfig,
-    cliArguments,
+    cliArguments.flags,
     detectedGitHost
   );
+  let command = DEFAULT_CONFIG.command;
+  if (cliArguments.input.length > 0 && cliArguments.input[0].trim()) {
+    command = cliArguments.input[0].trim().toLowerCase();
+  } else if (mergedConfig.command.trim()) {
+    command = mergedConfig.command.trim().toLowerCase();
+  }
+  if (mergedConfig.inspectVersion) {
+    command = "inspect-version";
+  }
+  const shouldBeSilent = ![DEFAULT_CONFIG.command].includes(command);
   return {
     ...mergedConfig,
+    command,
     files,
     path: cwd,
     preRelease: (
       // Meow doesn't support multiple flags with the same name, so we need to check both.
-      cliArguments.preReleaseTag ?? cliArguments.preRelease ?? configFile.preRelease
+      cliArguments.flags.preReleaseTag ?? cliArguments.flags.preRelease ?? configFile.preRelease
     ),
+    silent: shouldBeSilent || mergedConfig.silent,
     changelogPresetConfig
   };
 }
@@ -806,7 +844,7 @@ var Logger = class {
     this.warn = this.warn.bind(this);
     this.error = this.error.bind(this);
     this.debug = this.debug.bind(this);
-    this.disableLogs = this.config.silent || this.config.inspectVersion;
+    this.disableLogs = this.config.silent;
   }
   disableLogs = false;
   log(...messages) {
@@ -1142,6 +1180,76 @@ var FileManager = class {
   }
 };
 
+// src/commands/validate-config.ts
+function validateConfig(config) {
+  console.log(`
+\u2699\uFE0F Configuration:
+${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.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) {
   const items = [];
@@ -1240,6 +1348,7 @@ var CommitParser = class {
       subject: "",
       body: "",
       hash: "",
+      refNames: "",
       date: "",
       name: "",
       email: "",
@@ -1251,7 +1360,8 @@ var CommitParser = class {
       revert: null,
       notes: [],
       mentions: [],
-      references: []
+      references: [],
+      tags: []
     };
   }
   /**
@@ -1274,6 +1384,7 @@ var CommitParser = class {
     const email = parts.pop();
     const name = parts.pop();
     const date = parts.pop();
+    const refNames = parts.pop();
     const hash = parts.pop();
     if (email) parsedCommit.email = email.trim();
     if (name) parsedCommit.name = name.trim();
@@ -1283,6 +1394,17 @@ var CommitParser = class {
         throw new ParserError("Unable to parse commit date", rawCommit);
       }
     }
+    if (refNames) {
+      parsedCommit.refNames = refNames.trim();
+      const TAG_REGEX = /tag:\s*(?<tag>.+?)[,)]/gi;
+      let tagMatch = null;
+      while (tagMatch = TAG_REGEX.exec(refNames)) {
+        const { tag = "" } = tagMatch.groups ?? {};
+        if (tag) {
+          parsedCommit.tags.push(tag);
+        }
+      }
+    }
     if (hash) parsedCommit.hash = hash.trim();
     const subject = parts.shift()?.trimStart();
     if (subject) {
@@ -1616,53 +1738,6 @@ async function getCommitsSinceTag(config, logger, git) {
     commits: filteredCommits
   };
 }
-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.rsort(Array.from(versions))[0];
-  if (config.inspectVersion) {
-    console.log(currentVersion);
-    process.exit(0);
-  }
-  logger.log(`Current version: ${currentVersion}`);
-  return {
-    files,
-    version: currentVersion
-  };
-}
 function getPriority(type) {
   return ["patch", "minor", "major"].indexOf(type ?? "");
 }
@@ -1894,6 +1969,29 @@ async function tagChanges(config, logger, git, nextVersion) {
   );
 }
 
-export { CommitParser, FileManager, ForkConfigSchema, Git, Logger, commitChanges, createParserOptions, filterRevertedCommits, getCommitsSinceTag, getCurrentVersion, getNextVersion, getUserConfig, tagChanges, updateChangelog };
-//# sourceMappingURL=chunk-AZZVHG2X.js.map
-//# sourceMappingURL=chunk-AZZVHG2X.js.map
+// src/commands/main.ts
+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 next = await getNextVersion(config, logger, commits.commits, current.version);
+  logger.log("Updating files: ");
+  for (const outFile of current.files) {
+    logger.log(`  - ${outFile.path}`);
+    fileManager.write(outFile, next.version);
+  }
+  await updateChangelog(config, logger, next.version);
+  await commitChanges(config, logger, git, current.files, next.version);
+  await tagChanges(config, logger, git, next.version);
+  return {
+    config,
+    commits,
+    current,
+    next
+  };
+}
+
+export { CommitParser, FileManager, ForkConfigSchema, Git, Logger, commitChanges, createParserOptions, filterRevertedCommits, getCommitsSinceTag, getCurrentVersion, getNextVersion, getUserConfig, inspectTag, inspectVersion, main, tagChanges, updateChangelog, validateConfig };
+//# sourceMappingURL=chunk-4NLPWDCQ.js.map
+//# sourceMappingURL=chunk-4NLPWDCQ.js.map