@jaydenfyi/diffx 0.0.1 → 0.0.3

package/README.md

@@ -38,13 +38,13 @@ diffx --name-status
 
 ## `diffx` vs `git diff`
 
-| Capability | `diffx` | `git diff` |
-| ---------- | ------- | ---------- |
-| Full working tree snapshot (tracked + untracked) | ✅ | ❌ |
-| Direct GitHub PR and GitLab MR diffing | ✅ | ❌ |
-| Cross-remote and fork comparisons | ✅ | ❌ |
-| Include/exclude glob filtering | ✅ | ❌ |
-| `git diff` compatibility | ✅ | ✅ |
+| Capability                                       | `diffx` | `git diff` |
+| ------------------------------------------------ | ------- | ---------- |
+| Full working tree snapshot (tracked + untracked) | ✅      | ❌         |
+| Direct GitHub PR and GitLab MR diffing           | ✅      | ❌         |
+| Cross-remote and fork comparisons                | ✅      | ❌         |
+| Include/exclude glob filtering                   | ✅      | ❌         |
+| `git diff` compatibility                         | ✅      | ✅         |
 
 ## Command
 
@@ -124,6 +124,13 @@ diffx gitlab:owner/repo@main..feature
 diffx gitlab:owner/repo!123
 ```
 
+### Two-dot vs three-dot
+
+All range formats support both `..` and `...` separators:
+
+- `A..B` compares the two tips directly (same as `git diff A B`)
+- `A...B` compares from the merge-base of A and B to B (same as `git diff A...B`)
+
 ## Output Modes
 
 `diffx` defaults to `diff` mode.

package/dist/bin.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { n as handleError, t as diffxCommand } from "./command-5FPIcmTx.mjs";
+import { n as handleError, t as diffxCommand } from "./command-CWAThFBF.mjs";
 import { cli } from "gunshi";
 
 //#region src/bin.ts

package/dist/{command-5FPIcmTx.mjs → command-CWAThFBF.mjs}

@@ -95,25 +95,31 @@ function parsePRRef(input) {
 	};
 }
 function parseGithubRefRange(input) {
-	const result = input.match(/^github:([^/]+)\/([^@]+)@(.+)\.\.(.+)$/i);
+	const result = input.match(/^github:([^/]+)\/([^@]+)@(.+)(\.\.\.?)(.+)$/i);
 	if (!result) return null;
 	const owner = result[1];
 	const repo = result[2];
 	const left = result[3].trim();
-	const right = result[4].trim();
+	const separator = result[4];
+	const right = result[5].trim();
+	const rangeSyntax = separator.length === 3 ? "three-dot" : "two-dot";
 	if (!owner || !repo || !left || !right) return null;
 	return {
 		ownerRepo: `${owner}/${repo}`,
 		left,
-		right
+		right,
+		rangeSyntax
 	};
 }
 function parsePRRange(input) {
 	if (!input.includes("..")) return null;
-	const parts = input.split("..");
-	if (parts.length !== 2) return null;
-	const left = parseGitHubPRUrl(parts[0].trim()) ?? parsePRRef(parts[0].trim());
-	const right = parseGitHubPRUrl(parts[1].trim()) ?? parsePRRef(parts[1].trim());
+	const separatorMatch = input.match(/\.\.\.|\.\./);
+	if (!separatorMatch || separatorMatch.index === void 0) return null;
+	const leftStr = input.slice(0, separatorMatch.index).trim();
+	const rightStr = input.slice(separatorMatch.index + separatorMatch[0].length).trim();
+	if (!leftStr || !rightStr) return null;
+	const left = parseGitHubPRUrl(leftStr) ?? parsePRRef(leftStr);
+	const right = parseGitHubPRUrl(rightStr) ?? parsePRRef(rightStr);
 	if (!left || !right) return null;
 	return {
 		left,
@@ -125,10 +131,13 @@ function parsePRRange(input) {
 //#region src/parsers/range/git-url-parser.ts
 function parseGitUrlRange(input) {
 	const isGitUrl = (s) => s.includes("://") || s.includes("@") && s.includes(":");
-	const doubleDotIndex = input.indexOf("..");
-	if (doubleDotIndex !== -1) {
-		const leftPart = input.slice(0, doubleDotIndex);
-		const rightPart = input.slice(doubleDotIndex + 2);
+	const separatorMatch = input.match(/\.\.\.|\.\./);
+	if (separatorMatch && separatorMatch.index !== void 0) {
+		const sepIdx = separatorMatch.index;
+		const sepLen = separatorMatch[0].length;
+		const rangeSyntax = sepLen === 3 ? "three-dot" : "two-dot";
+		const leftPart = input.slice(0, sepIdx);
+		const rightPart = input.slice(sepIdx + sepLen);
 		const lastAtLeft = leftPart.lastIndexOf("@");
 		const lastAtRight = rightPart.lastIndexOf("@");
 		if (lastAtLeft !== -1 && lastAtRight !== -1) {
@@ -140,20 +149,42 @@ function parseGitUrlRange(input) {
 				leftUrl,
 				leftRef,
 				rightUrl,
-				rightRef
+				rightRef,
+				rangeSyntax
 			};
 		}
 	}
-	const atBeforeDoubleDot = input.lastIndexOf("@", input.indexOf(".."));
-	if (atBeforeDoubleDot !== -1 && input.includes("..")) {
-		const url = input.slice(0, atBeforeDoubleDot);
-		const parts = input.slice(atBeforeDoubleDot + 1).split("..");
-		if (parts.length === 2 && isGitUrl(url)) return {
-			leftUrl: url,
-			leftRef: parts[0],
-			rightUrl: url,
-			rightRef: parts[1]
-		};
+	if (separatorMatch && separatorMatch.index !== void 0) {
+		const sepIdx = separatorMatch.index;
+		const atBeforeSep = input.lastIndexOf("@", sepIdx);
+		if (atBeforeSep !== -1) {
+			const url = input.slice(0, atBeforeSep);
+			const refPart = input.slice(atBeforeSep + 1);
+			const rangeSyntax = separatorMatch[0].length === 3 ? "three-dot" : "two-dot";
+			if (rangeSyntax === "three-dot") {
+				const dotIdx = refPart.indexOf("...");
+				if (dotIdx !== -1) {
+					const leftRef = refPart.slice(0, dotIdx);
+					const rightRef = refPart.slice(dotIdx + 3);
+					if (leftRef && rightRef && isGitUrl(url)) return {
+						leftUrl: url,
+						leftRef,
+						rightUrl: url,
+						rightRef,
+						rangeSyntax
+					};
+				}
+			} else {
+				const parts = refPart.split("..");
+				if (parts.length === 2 && parts[0] && parts[1] && isGitUrl(url)) return {
+					leftUrl: url,
+					leftRef: parts[0],
+					rightUrl: url,
+					rightRef: parts[1],
+					rangeSyntax
+				};
+			}
+		}
 	}
 	return null;
 }
@@ -170,27 +201,32 @@ function parseMRRef(input) {
 	};
 }
 function parseGitlabRefRange(input) {
-	const result = input.match(/^gitlab:([^/]+)\/([^@]+)@(.+)\.\.(.+)$/i);
+	const result = input.match(/^gitlab:([^/]+)\/([^@]+)@(.+)(\.\.\.?)(.+)$/i);
 	if (!result) return null;
 	const owner = result[1];
 	const repo = result[2];
 	const left = result[3].trim();
-	const right = result[4].trim();
+	const separator = result[4];
+	const right = result[5].trim();
+	const rangeSyntax = separator.length === 3 ? "three-dot" : "two-dot";
 	if (!owner || !repo || !left || !right) return null;
 	return {
 		ownerRepo: `${owner}/${repo}`,
 		left,
-		right
+		right,
+		rangeSyntax
 	};
 }
 
 //#endregion
 //#region src/parsers/range/ref-range-parser.ts
 function parseRemoteRefRange(input) {
-	const separatorIndex = input.indexOf("..");
-	if (separatorIndex === -1) return null;
+	const separatorMatch = input.match(/\.\.\.|\.\./);
+	if (!separatorMatch || separatorMatch.index === void 0) return null;
+	const separatorIndex = separatorMatch.index;
+	const rangeSyntax = separatorMatch[0].length === 3 ? "three-dot" : "two-dot";
 	const leftPart = input.slice(0, separatorIndex).trim();
-	const rightPart = input.slice(separatorIndex + 2).trim();
+	const rightPart = input.slice(separatorIndex + separatorMatch[0].length).trim();
 	if (!leftPart || !rightPart) return null;
 	const parseRemoteSide = (value) => {
 		const match = value.match(/^([^/]+)\/([^@]+)@(.+)$/);
@@ -213,29 +249,34 @@ function parseRemoteRefRange(input) {
 		return {
 			left: `${left.owner}/${left.repo}@${left.ref}`,
 			right: `${rightFull.owner}/${rightFull.repo}@${rightFull.ref}`,
-			ownerRepo: `${left.owner}/${left.repo}`
+			ownerRepo: `${left.owner}/${left.repo}`,
+			rangeSyntax
 		};
 	}
 	return {
 		left: `${left.owner}/${left.repo}@${left.ref}`,
 		right: `${left.owner}/${left.repo}@${rightPart}`,
-		ownerRepo: `${left.owner}/${left.repo}`
+		ownerRepo: `${left.owner}/${left.repo}`,
+		rangeSyntax
 	};
 }
 function parseLocalRefRange(input) {
-	const parts = input.split("..");
-	if (parts.length !== 2 || !parts[0] || !parts[1]) return null;
+	const separatorMatch = input.match(/\.\.(?:\.?)/);
+	if (!separatorMatch || separatorMatch.index === void 0) return null;
+	const separatorIndex = separatorMatch.index;
+	const rangeSyntax = separatorMatch[0].length === 3 ? "three-dot" : "two-dot";
+	const left = input.slice(0, separatorIndex).trim();
+	const right = input.slice(separatorIndex + separatorMatch[0].length).trim();
+	if (!left || !right) return null;
 	return {
-		left: parts[0].trim(),
-		right: parts[1].trim()
+		left,
+		right,
+		rangeSyntax
 	};
 }
 
 //#endregion
 //#region src/parsers/range-parser.ts
-/**
-* Parse a range input string into a RefRange
-*/
 function parseRangeInput(input) {
 	const prRange = parsePRRange(input);
 	if (prRange) return {
@@ -243,7 +284,8 @@ function parseRangeInput(input) {
 		left: "",
 		right: "",
 		leftPr: prRange.left,
-		rightPr: prRange.right
+		rightPr: prRange.right,
+		rangeSyntax: void 0
 	};
 	const gitUrlRange = parseGitUrlRange(input);
 	if (gitUrlRange) return {
@@ -251,7 +293,8 @@ function parseRangeInput(input) {
 		left: gitUrlRange.leftRef,
 		right: gitUrlRange.rightRef,
 		leftGitUrl: gitUrlRange.leftUrl,
-		rightGitUrl: gitUrlRange.rightUrl
+		rightGitUrl: gitUrlRange.rightUrl,
+		rangeSyntax: gitUrlRange.rangeSyntax
 	};
 	const githubCompare = parseGitHubCompareUrl(input);
 	if (githubCompare) return {
@@ -262,7 +305,8 @@ function parseRangeInput(input) {
 		leftRef: githubCompare.leftRef,
 		rightRef: githubCompare.rightRef,
 		rightOwner: githubCompare.rightOwner,
-		rightRepo: githubCompare.rightRepo
+		rightRepo: githubCompare.rightRepo,
+		rangeSyntax: void 0
 	};
 	const githubPrChanges = parseGitHubPRChangesUrl(input);
 	if (githubPrChanges) return {
@@ -272,7 +316,8 @@ function parseRangeInput(input) {
 		ownerRepo: `${githubPrChanges.owner}/${githubPrChanges.repo}`,
 		prNumber: githubPrChanges.prNumber,
 		leftCommitSha: githubPrChanges.leftCommitSha,
-		rightCommitSha: githubPrChanges.rightCommitSha
+		rightCommitSha: githubPrChanges.rightCommitSha,
+		rangeSyntax: void 0
 	};
 	const githubPr = parseGitHubPRUrl(input);
 	if (githubPr) return {
@@ -280,7 +325,8 @@ function parseRangeInput(input) {
 		left: "",
 		right: "",
 		ownerRepo: `${githubPr.owner}/${githubPr.repo}`,
-		prNumber: githubPr.prNumber
+		prNumber: githubPr.prNumber,
+		rangeSyntax: void 0
 	};
 	const githubCommit = parseGitHubCommitUrl(input);
 	if (githubCommit) return {
@@ -288,7 +334,8 @@ function parseRangeInput(input) {
 		left: "",
 		right: "",
 		ownerRepo: `${githubCommit.owner}/${githubCommit.repo}`,
-		commitSha: githubCommit.commitSha
+		commitSha: githubCommit.commitSha,
+		rangeSyntax: void 0
 	};
 	const githubRefRange = parseGithubRefRange(input);
 	if (githubRefRange) {
@@ -298,7 +345,8 @@ function parseRangeInput(input) {
 			left: githubRefRange.left,
 			right: githubRefRange.right,
 			leftGitUrl: gitUrl,
-			rightGitUrl: gitUrl
+			rightGitUrl: gitUrl,
+			rangeSyntax: githubRefRange.rangeSyntax
 		};
 	}
 	const gitlabRefRange = parseGitlabRefRange(input);
@@ -309,7 +357,8 @@ function parseRangeInput(input) {
 			left: gitlabRefRange.left,
 			right: gitlabRefRange.right,
 			leftGitUrl: gitUrl,
-			rightGitUrl: gitUrl
+			rightGitUrl: gitUrl,
+			rangeSyntax: gitlabRefRange.rangeSyntax
 		};
 	}
 	const prRef = parsePRRef(input);
@@ -318,7 +367,8 @@ function parseRangeInput(input) {
 		left: "",
 		right: "",
 		ownerRepo: `${prRef.owner}/${prRef.repo}`,
-		prNumber: prRef.prNumber
+		prNumber: prRef.prNumber,
+		rangeSyntax: void 0
 	};
 	const mrRef = parseMRRef(input);
 	if (mrRef) return {
@@ -326,22 +376,25 @@ function parseRangeInput(input) {
 		left: "",
 		right: "",
 		ownerRepo: `${mrRef.owner}/${mrRef.repo}`,
-		prNumber: mrRef.mrNumber
+		prNumber: mrRef.mrNumber,
+		rangeSyntax: void 0
 	};
 	const remoteRange = parseRemoteRefRange(input);
 	if (remoteRange) return {
 		type: "remote-range",
 		left: remoteRange.left,
 		right: remoteRange.right,
-		ownerRepo: remoteRange.ownerRepo
+		ownerRepo: remoteRange.ownerRepo,
+		rangeSyntax: remoteRange.rangeSyntax
 	};
 	const localRange = parseLocalRefRange(input);
 	if (localRange) return {
 		type: "local-range",
 		left: localRange.left,
-		right: localRange.right
+		right: localRange.right,
+		rangeSyntax: localRange.rangeSyntax
 	};
-	throw new DiffxError(`Invalid range or URL: ${input}\n\nSupported formats:\n  - Local refs: main..feature, abc123..def456\n  - Remote refs: owner/repo@main..owner/repo@feature\n  - Git URL: git@github.com:owner/repo.git@main..feature\n  - Git URL (HTTPS): https://github.com/owner/repo.git@main..feature\n  - GitHub refs: github:owner/repo@main..feature\n  - GitHub PR ref: github:owner/repo#123\n  - GitHub PR range: github:owner/repo#123..github:owner/repo#456\n  - GitHub PR URL: https://github.com/owner/repo/pull/123\n  - PR URL range: https://github.com/owner/repo/pull/123..https://github.com/owner/repo/pull/456\n  - GitHub commit URL: https://github.com/owner/repo/commit/abc123\n  - GitHub PR changes URL: https://github.com/owner/repo/pull/123/changes/abc123..def456\n  - GitHub compare URL: https://github.com/owner/repo/compare/main...feature\n  - Cross-fork compare: https://github.com/owner/repo/compare/main...other:repo:feature\n  - GitLab refs: gitlab:owner/repo@main..feature\n  - GitLab MR ref: gitlab:owner/repo!123`, ExitCode.INVALID_INPUT);
+	throw new DiffxError(`Invalid range or URL: ${input}\n\nSupported formats:\n  - Local refs: main..feature, main...feature, abc123..def456\n  - Remote refs: owner/repo@main..owner/repo@feature\n  - Git URL: git@github.com:owner/repo.git@main..feature\n  - Git URL (HTTPS): https://github.com/owner/repo.git@main..feature\n  - GitHub refs: github:owner/repo@main..feature\n  - GitHub PR ref: github:owner/repo#123\n  - GitHub PR range: github:owner/repo#123..github:owner/repo#456\n  - GitHub PR URL: https://github.com/owner/repo/pull/123\n  - PR URL range: https://github.com/owner/repo/pull/123..https://github.com/owner/repo/pull/456\n  - GitHub commit URL: https://github.com/owner/repo/commit/abc123\n  - GitHub PR changes URL: https://github.com/owner/repo/pull/123/changes/abc123..def456\n  - GitHub compare URL: https://github.com/owner/repo/compare/main...feature\n  - Cross-fork compare: https://github.com/owner/repo/compare/main...other:repo:feature\n  - GitLab refs: gitlab:owner/repo@main..feature\n  - GitLab MR ref: gitlab:owner/repo!123`, ExitCode.INVALID_INPUT);
 }
 
 //#endregion
@@ -894,6 +947,10 @@ async function resolveLocalRefs(range) {
 	const rightExists = await gitClient.refExistsAny(right);
 	if (!leftExists) throw new DiffxError(`Left ref does not exist: ${range.left}`, ExitCode.INVALID_INPUT);
 	if (!rightExists) throw new DiffxError(`Right ref does not exist: ${range.right}`, ExitCode.INVALID_INPUT);
+	if (range.rangeSyntax === "three-dot") return {
+		left: (await gitClient.mergeBase(left, right)).trim(),
+		right
+	};
 	return {
 		left,
 		right
@@ -920,6 +977,13 @@ async function resolveRemoteRefs(range) {
 	const rightDestRef = `${tempPrefix}/right`;
 	try {
 		await gitClient.fetchFromUrl(remoteUrl, [`${leftRemoteRef}:${leftDestRef}`, `${rightRemoteRef}:${rightDestRef}`], 1);
+		if (range.rangeSyntax === "three-dot") return {
+			left: (await gitClient.mergeBase(leftDestRef, rightDestRef)).trim(),
+			right: rightDestRef,
+			cleanup: async () => {
+				await gitClient.deleteRefs([leftDestRef, rightDestRef]);
+			}
+		};
 		return {
 			left: leftDestRef,
 			right: rightDestRef,
@@ -1116,6 +1180,13 @@ async function resolveGitUrlRefs(range) {
 			await gitClient.fetchFromUrl(leftUrl, [`${leftRef}:${leftDestRef}`], 1);
 			await gitClient.fetchFromUrl(rightUrl, [`${rightRef}:${rightDestRef}`], 1);
 		}
+		if (range.rangeSyntax === "three-dot") return {
+			left: (await gitClient.mergeBase(leftDestRef, rightDestRef)).trim(),
+			right: rightDestRef,
+			cleanup: async () => {
+				await gitClient.deleteRefs([leftDestRef, rightDestRef]);
+			}
+		};
 		return {
 			left: leftDestRef,
 			right: rightDestRef,
@@ -2431,4 +2502,4 @@ const diffxCommand = define({
 
 //#endregion
 export { DiffxError as a, parseRangeInput as i, handleError as n, ExitCode as o, resolveRefs as r, diffxCommand as t };
-//# sourceMappingURL=command-5FPIcmTx.mjs.map
+//# sourceMappingURL=command-CWAThFBF.mjs.map