cross-bump 0.2.0 → 0.2.2

package/dist/index.d.ts

@@ -6,10 +6,16 @@ declare const DEFAULT_IGNORED_GLOBS: string[];
 declare const G_GITIGNORE = "**/.gitignore";
 declare function getGitignores(cwd?: string, ignoreGlobs?: string[]): Set<string>;
 /**
-* parse gitignore to globs
-* @param content gitignore file content
-*/
-declare function parseGitingore(content: string): string[];
+ * Parses gitignore content into an array of glob patterns.
+ *
+ * rules ref: https://git-scm.com/docs/gitignore#_pattern_format
+ *
+ * @param content The content of the .gitignore file.
+ * @param gitignoreFilePath Absolute path to the .gitignore file.
+ * @param projectRoot Absolute path to the project root (cwd for fast-glob).
+ * @returns An array of glob patterns.
+ */
+declare function parseGitingore(content: string, gitignoreFilePath: string, projectRoot: string): string[];
 
 //#endregion
 //#region src/project.d.ts
@@ -19,23 +25,23 @@ declare const supportedProjectGlobs: string[];
 type ProjectCategory = typeof supportedProjectCategory[number];
 type ProjectFileName = typeof supportedProjectFiles[number];
 type ProjectFile = {
-    /**
-     * project category
-     */
-    category: ProjectCategory;
-    /**
-     * project file path
-     */
-    path: string;
+  /**
+   * project category
+   */
+  category: ProjectCategory;
+  /**
+   * project file path
+   */
+  path: string;
 };
 /**
-* Searches for all project files in the specified directory and its subdirectories.
-*
-* @param dir - The directory to search in.
-* @param ignore - The directories to exclude from the search.
-* @param recursive - Whether to recursively search. @default false
-* @return An array of file paths that match the search criteria.
-*/
+ * Searches for all project files in the specified directory and its subdirectories.
+ *
+ * @param dir - The directory to search in.
+ * @param ignore - The directories to exclude from the search.
+ * @param recursive - Whether to recursively search. @default false
+ * @return An array of file paths that match the search criteria.
+ */
 declare function findProjectFiles(cwd?: string, ignore?: string[], recursive?: boolean): ProjectFile[];
 
 //#endregion
@@ -45,72 +51,72 @@ declare function isBlankPath(path?: PathLike): path is "" | undefined;
 //#endregion
 //#region src/version.d.ts
 type VersionNumbers = {
-    nextMajor: string;
-    nextMinor: string;
-    nextPatch: string;
-    nextPreMajor: string;
-    nextPreMinor: string;
-    nextPrePatch: string;
-    nextRelease: string;
+  nextMajor: string;
+  nextMinor: string;
+  nextPatch: string;
+  nextPreMajor: string;
+  nextPreMinor: string;
+  nextPrePatch: string;
+  nextRelease: string;
 };
 type UpgradeOptions = {
-    dry?: boolean;
-    finalNewline?: boolean;
+  dry?: boolean;
+  finalNewline?: boolean;
 };
 /**
-* Generates the next versions based on the given version.
-*
-* @param version - Optional. The version to generate the next versions from.
-* @param coerce - Optional. Whether to coerce the version or not. Defaults to false.
-* @return An object containing the next major, minor, patch, release, pre-major, pre-minor, and pre-patch versions.
-*/
+ * Generates the next versions based on the given version.
+ *
+ * @param version - Optional. The version to generate the next versions from.
+ * @param coerce - Optional. Whether to coerce the version or not. Defaults to false.
+ * @return An object containing the next major, minor, patch, release, pre-major, pre-minor, and pre-patch versions.
+ */
 declare function getNextVersions(version?: semver.SemVer | string, coerce?: boolean): VersionNumbers;
 /**
-* Upgrades the version of the POM file.
-*
-* @param filePath - The path to the POM file.
-* @param version - The new version to set.
-* @param dry - Whether to perform a dry run or not. @default process.env.DRY
-* @return A promise that resolves when the version upgrade is complete.
-*/
+ * Upgrades the version of the POM file.
+ *
+ * @param filePath - The path to the POM file.
+ * @param version - The new version to set.
+ * @param dry - Whether to perform a dry run or not. @default process.env.DRY
+ * @return A promise that resolves when the version upgrade is complete.
+ */
 declare function upgradePomVersion(filePath: PathLike, version: string, opts?: UpgradeOptions): void;
 /**
-* Retrieves the version of the Java project.
-*
-* @return The version of the Java project.
-*/
+ * Retrieves the version of the Java project.
+ *
+ * @return The version of the Java project.
+ */
 declare function getJavaProjectVersion(filePath: PathLike): string | undefined;
 /**
-* Updates the version of a package in a specified file.
-*
-* @param filePath - The path to the file.
-* @param version - The new version to set.
-* @param dry - Whether to perform a dry run. @default process.env.DRY
-* @return A promise that resolves when the version is upgraded.
-*/
+ * Updates the version of a package in a specified file.
+ *
+ * @param filePath - The path to the file.
+ * @param version - The new version to set.
+ * @param dry - Whether to perform a dry run. @default process.env.DRY
+ * @return A promise that resolves when the version is upgraded.
+ */
 declare function upgradePackageVersion(filePath: PathLike, version: string, opts?: UpgradeOptions): void;
 /**
-* Reads the package.json file at the specified file path and returns the version number.
-*
-* @param filePath - The path to the package.json file.
-* @return The version number as a string, or undefined if the file cannot be read or parsed.
-*/
+ * Reads the package.json file at the specified file path and returns the version number.
+ *
+ * @param filePath - The path to the package.json file.
+ * @return The version number as a string, or undefined if the file cannot be read or parsed.
+ */
 declare function getJSProjectVersion(filePath: PathLike): string | undefined;
 /**
-* Retrieves the version of a Rust project based on the contents of a specified file.
-*
-* @param filePath - The path to the file containing the Rust project details.
-* @return The version of the Rust project, or undefined if the version is not available.
-*/
+ * Retrieves the version of a Rust project based on the contents of a specified file.
+ *
+ * @param filePath - The path to the file containing the Rust project details.
+ * @return The version of the Rust project, or undefined if the version is not available.
+ */
 declare function getRustProjectVersion(filePath: PathLike): Promise<string | undefined>;
 /**
-* Upgrade the cargo version in the specified file.
-*
-* @param filePath - The path to the file.
-* @param version - The version to upgrade to.
-* @param dry - Whether to perform a dry run. @default process.env.DRY
-* @return A promise that resolves when the upgrade is complete.
-*/
+ * Upgrade the cargo version in the specified file.
+ *
+ * @param filePath - The path to the file.
+ * @param version - The version to upgrade to.
+ * @param dry - Whether to perform a dry run. @default process.env.DRY
+ * @return A promise that resolves when the upgrade is complete.
+ */
 declare function upgradeCargoVersion(filePath: PathLike, version: string, opts?: UpgradeOptions): Promise<void>;
 declare function upgradeProjectVersion(nextVersion: string, projectFile?: ProjectFile, opts?: UpgradeOptions): Promise<void>;
 declare function getProjectVersion(projectFile: ProjectFile): Promise<string | undefined>;

package/dist/index.js

@@ -1,9 +1,8 @@
 import * as fs$1 from "node:fs";
 import fs, { readFileSync } from "node:fs";
-import fg from "fast-glob";
-import isGlob from "is-glob";
 import path from "node:path";
 import process from "node:process";
+import fg from "fast-glob";
 import initTomlEdit, { edit, parse } from "@rainbowatcher/toml-edit-js";
 import * as cheerio from "cheerio";
 import detectIndent from "detect-indent";
@@ -19,50 +18,95 @@ const DEFAULT_IGNORED_GLOBS = [
 ];
 const G_GITIGNORE = "**/.gitignore";
 function getGitignores(cwd, ignoreGlobs = DEFAULT_IGNORED_GLOBS) {
-	const gitignores = fg.sync(G_GITIGNORE, {
+	const gitignoreFiles = fg.sync(G_GITIGNORE, {
 		absolute: true,
 		cwd,
 		ignore: ignoreGlobs,
 		onlyFiles: true
 	});
 	const set = new Set();
-	for (const gi of gitignores) {
-		const rules = readFileSync(gi, { encoding: "utf8" });
-		const globs = parseGitingore(rules);
+	for (const gitignoreFilePath of gitignoreFiles) {
+		const rules = readFileSync(gitignoreFilePath, { encoding: "utf8" });
+		const globs = parseGitingore(rules, gitignoreFilePath, cwd = process.cwd());
 		if (globs.length === 0) continue;
 		for (const item of globs) set.add(item);
 	}
 	return set;
 }
 /**
-* parse gitignore to globs
-* @param content gitignore file content
+* Processes a raw line from .gitignore content.
+* Handles empty lines, comments, trailing whitespace
+*/
+function processRawGitignoreLine(rawLine) {
+	let line = rawLine.trimStart();
+	if (line.length === 0 || line.startsWith("#")) return {
+		cleanedLine: "",
+		shouldSkip: true
+	};
+	line = normalizeIgnoreRule(line);
+	let isNegative = false;
+	if (/\\\s*$/.test(line)) line = `${line.replace(/\\\s*$/, "")} `;
+	else line = line.trimEnd();
+	if (line.startsWith("!")) {
+		line = line.slice(1);
+		isNegative = true;
+	}
+	return {
+		cleanedLine: line,
+		isNegative
+	};
+}
+/**
+* Converts the gitignore pattern to a glob pattern relative to the project root.
+* @param result The processed gitignore line result
+* @param gitignoreFileDirAbs Absolute path to the directory containing the .gitignore file.
+* @param projectRoot Absolute path to the project root.
 */
-function parseGitingore(content) {
-	const globs = [];
+function toRelativeGlob(result, gitignoreFileDirAbs, projectRoot) {
+	const { cleanedLine, isNegative } = result;
+	const pattern = cleanedLine.replaceAll(/\\([# !])/g, "$1");
+	const relativeGitignoreDir = path.relative(projectRoot, gitignoreFileDirAbs);
+	let glob;
+	if (pattern.includes("/")) {
+		const _pattern = pattern.startsWith("/") ? pattern.slice(1) : pattern.startsWith("**/") ? pattern : `**/${pattern.endsWith("/") ? pattern.slice(0, -1) : pattern}`;
+		const targetPath = path.resolve(gitignoreFileDirAbs, _pattern);
+		glob = path.relative(projectRoot, targetPath) || ".";
+	} else glob = path.join(relativeGitignoreDir, "**", pattern);
+	if (glob === "*" || glob === ".") glob = path.join(relativeGitignoreDir, glob);
+	return isNegative ? `!${glob}` : glob;
+}
+/**
+* Normalizes the gitignore rule
+* Converts path separators to `/`, removes leading `./`, and handles empty globs.
+*/
+function normalizeIgnoreRule(glob) {
+	let normalized = glob.replaceAll("\\\\", "/");
+	if (normalized.startsWith("./")) normalized = normalized.slice(2);
+	if (normalized === "") normalized = ".";
+	return normalized;
+}
+/**
+* Parses gitignore content into an array of glob patterns.
+*
+* rules ref: https://git-scm.com/docs/gitignore#_pattern_format
+*
+* @param content The content of the .gitignore file.
+* @param gitignoreFilePath Absolute path to the .gitignore file.
+* @param projectRoot Absolute path to the project root (cwd for fast-glob).
+* @returns An array of glob patterns.
+*/
+function parseGitingore(content, gitignoreFilePath, projectRoot) {
+	const resultGlobs = [];
 	const lines = content.split(/\r\n?|\n/);
+	const gitignoreFileDirAbs = path.dirname(gitignoreFilePath);
 	for (const rawLine of lines) {
-		const line = rawLine.trim();
-		if (line.startsWith("#") || line.length === 0) continue;
-		let isNegative = false;
-		let pattern = line;
-		if (pattern.startsWith("!")) {
-			isNegative = true;
-			pattern = pattern.slice(1);
-		}
-		if (isGlob(pattern)) {
-			globs.push(isNegative ? `!${pattern}` : pattern);
-			continue;
-		}
-		if (pattern.endsWith("/")) {
-			const dirPattern = pattern.slice(0, -1);
-			globs.push(isNegative ? `!**/${dirPattern}/**` : `**/${dirPattern}/**`);
-		} else if (pattern.startsWith("/")) {
-			const rootPattern = pattern.slice(1);
-			globs.push(isNegative ? `!${rootPattern}` : rootPattern, isNegative ? `!${rootPattern}/**` : `${rootPattern}/**`);
-		} else globs.push(isNegative ? `!**/${pattern}` : `**/${pattern}`, isNegative ? `!**/${pattern}/**` : `**/${pattern}/**`);
+		const result = processRawGitignoreLine(rawLine);
+		if (result.shouldSkip) continue;
+		const relativeGlob = toRelativeGlob(result, gitignoreFileDirAbs, projectRoot);
+		resultGlobs.push(relativeGlob);
+		if (!relativeGlob.endsWith("*") && relativeGlob !== ".") resultGlobs.push(`${relativeGlob}/**`);
 	}
-	return globs;
+	return [...new Set(resultGlobs)];
 }
 
 //#endregion

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cross-bump",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "cross language bump utility",
   "author": {
     "name": "rainbowatcher",
@@ -39,7 +39,7 @@
     "detect-indent": "^7.0.1",
     "fast-glob": "^3.3.3",
     "is-glob": "^4.0.3",
-    "semver": "^7.7.1"
+    "semver": "^7.7.2"
   },
   "scripts": {
     "clean": "rimraf dist/*",