@optique/git 1.0.0-dev.886 → 1.0.0-dev.896

package/dist/index.cjs

@@ -76,6 +76,45 @@ function listFailureMessage(error, dir, errors, fallback) {
 }
 /** Default depth for commit suggestions. */
 const DEFAULT_SUGGESTION_DEPTH = 15;
+/**
+* Computes the shortest unique short OID for each given full OID within the
+* provided set, starting from a minimum length.  When two or more OIDs share
+* the same short prefix, their prefixes are lengthened until each is unique
+* (up to the full 40-char OID).
+*
+* Note: this only disambiguates within the given set, not against the entire
+* object database.  In the rare case that a suggested short OID collides with
+* an older commit outside the suggestion window, the parser will report a
+* clear "ambiguous" error prompting the user to type more characters.
+*/
+function uniqueShortOids(oids, minLength) {
+	const result = /* @__PURE__ */ new Map();
+	const lengths = /* @__PURE__ */ new Map();
+	for (const oid of oids) lengths.set(oid, minLength);
+	let remaining = new Set(oids);
+	while (remaining.size > 0) {
+		const groups = /* @__PURE__ */ new Map();
+		for (const oid of remaining) {
+			const len = lengths.get(oid);
+			const short = oid.slice(0, len);
+			const group = groups.get(short);
+			if (group != null) group.push(oid);
+			else groups.set(short, [oid]);
+		}
+		const nextRemaining = /* @__PURE__ */ new Set();
+		for (const [short, group] of groups) if (group.length === 1) result.set(group[0], short);
+		else for (const oid of group) {
+			const currentLen = lengths.get(oid);
+			if (currentLen >= oid.length) result.set(oid, oid);
+			else {
+				lengths.set(oid, currentLen + 1);
+				nextRemaining.add(oid);
+			}
+		}
+		remaining = nextRemaining;
+	}
+	return result;
+}
 function createAsyncValueParser(options, metavar, parseFn, suggestFn) {
 	(0, __optique_core_nonempty.ensureNonEmptyString)(metavar);
 	if (options?.suggestionDepth !== void 0) {
@@ -400,8 +439,11 @@ function gitCommit(options) {
 				dir,
 				depth
 			});
-			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
-				const shortOid = commit.oid.slice(0, Math.max(7, prefix.length));
+			const matching = commits.filter((c) => c.oid.startsWith(prefix));
+			const minLen = Math.max(7, prefix.length);
+			const shortOids = uniqueShortOids(matching.map((c) => c.oid), minLen);
+			for (const commit of matching) {
+				const shortOid = shortOids.get(commit.oid);
 				const firstLine = commit.commit.message.split("\n")[0];
 				yield {
 					kind: "literal",
@@ -500,8 +542,11 @@ function gitRef(options) {
 					text: tag
 				};
 			}
-			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
-				const shortOid = commit.oid.slice(0, Math.max(7, prefix.length));
+			const matching = commits.filter((c) => c.oid.startsWith(prefix));
+			const minLen = Math.max(7, prefix.length);
+			const shortOids = uniqueShortOids(matching.map((c) => c.oid), minLen);
+			for (const commit of matching) {
+				const shortOid = shortOids.get(commit.oid);
 				if (seen.has(shortOid)) continue;
 				seen.add(shortOid);
 				const firstLine = commit.commit.message.split("\n")[0];

package/dist/index.js

@@ -54,6 +54,45 @@ function listFailureMessage(error, dir, errors, fallback) {
 }
 /** Default depth for commit suggestions. */
 const DEFAULT_SUGGESTION_DEPTH = 15;
+/**
+* Computes the shortest unique short OID for each given full OID within the
+* provided set, starting from a minimum length.  When two or more OIDs share
+* the same short prefix, their prefixes are lengthened until each is unique
+* (up to the full 40-char OID).
+*
+* Note: this only disambiguates within the given set, not against the entire
+* object database.  In the rare case that a suggested short OID collides with
+* an older commit outside the suggestion window, the parser will report a
+* clear "ambiguous" error prompting the user to type more characters.
+*/
+function uniqueShortOids(oids, minLength) {
+	const result = /* @__PURE__ */ new Map();
+	const lengths = /* @__PURE__ */ new Map();
+	for (const oid of oids) lengths.set(oid, minLength);
+	let remaining = new Set(oids);
+	while (remaining.size > 0) {
+		const groups = /* @__PURE__ */ new Map();
+		for (const oid of remaining) {
+			const len = lengths.get(oid);
+			const short = oid.slice(0, len);
+			const group = groups.get(short);
+			if (group != null) group.push(oid);
+			else groups.set(short, [oid]);
+		}
+		const nextRemaining = /* @__PURE__ */ new Set();
+		for (const [short, group] of groups) if (group.length === 1) result.set(group[0], short);
+		else for (const oid of group) {
+			const currentLen = lengths.get(oid);
+			if (currentLen >= oid.length) result.set(oid, oid);
+			else {
+				lengths.set(oid, currentLen + 1);
+				nextRemaining.add(oid);
+			}
+		}
+		remaining = nextRemaining;
+	}
+	return result;
+}
 function createAsyncValueParser(options, metavar, parseFn, suggestFn) {
 	ensureNonEmptyString(metavar);
 	if (options?.suggestionDepth !== void 0) {
@@ -378,8 +417,11 @@ function gitCommit(options) {
 				dir,
 				depth
 			});
-			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
-				const shortOid = commit.oid.slice(0, Math.max(7, prefix.length));
+			const matching = commits.filter((c) => c.oid.startsWith(prefix));
+			const minLen = Math.max(7, prefix.length);
+			const shortOids = uniqueShortOids(matching.map((c) => c.oid), minLen);
+			for (const commit of matching) {
+				const shortOid = shortOids.get(commit.oid);
 				const firstLine = commit.commit.message.split("\n")[0];
 				yield {
 					kind: "literal",
@@ -478,8 +520,11 @@ function gitRef(options) {
 					text: tag
 				};
 			}
-			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
-				const shortOid = commit.oid.slice(0, Math.max(7, prefix.length));
+			const matching = commits.filter((c) => c.oid.startsWith(prefix));
+			const minLen = Math.max(7, prefix.length);
+			const shortOids = uniqueShortOids(matching.map((c) => c.oid), minLen);
+			for (const commit of matching) {
+				const shortOid = shortOids.get(commit.oid);
 				if (seen.has(shortOid)) continue;
 				seen.add(shortOid);
 				const firstLine = commit.commit.message.split("\n")[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/git",
-  "version": "1.0.0-dev.886+4b42a9bd",
+  "version": "1.0.0-dev.896+5a811a7f",
   "description": "Git value parsers for Optique",
   "keywords": [
     "CLI",
@@ -59,7 +59,7 @@
   "dependencies": {
     "@logtape/logtape": "^1.2.2",
     "isomorphic-git": "^1.36.1",
-    "@optique/core": "1.0.0-dev.886+4b42a9bd"
+    "@optique/core": "1.0.0-dev.896+5a811a7f"
   },
   "devDependencies": {
     "@types/node": "^20.19.9",