@optique/git 0.9.0-dev.254 → 0.9.0-dev.258

package/dist/index.cjs

@@ -54,14 +54,6 @@ function listFailureMessage(error, dir, errors, fallback) {
 	if (hasErrorCode(error, "NotAGitRepositoryError") || hasErrorCode(error, "NotFoundError")) return __optique_core_message.message`${(0, __optique_core_message.value)(dir)} is not a git repository.`;
 	return fallback;
 }
-function formatChoiceList(choices) {
-	let result = [];
-	for (let i = 0; i < choices.length; i++) {
-		if (i > 0) result = [...result, ...__optique_core_message.message`, `];
-		result = [...result, ...__optique_core_message.message`${choices[i]}`];
-	}
-	return result;
-}
 function createAsyncValueParser(options, metavar, parseFn, suggestFn) {
 	(0, __optique_core_nonempty.ensureNonEmptyString)(metavar);
 	return {
@@ -116,7 +108,7 @@ function gitBranch(options) {
 			};
 			return {
 				success: false,
-				error: __optique_core_message.message`Branch ${(0, __optique_core_message.value)(input)} does not exist. Available branches: ${formatChoiceList(branches)}`
+				error: __optique_core_message.message`Branch ${(0, __optique_core_message.value)(input)} does not exist. Available branches: ${(0, __optique_core_message.valueSet)(branches)}`
 			};
 		} catch (error) {
 			const fallback = __optique_core_message.message`Failed to list branches. Ensure ${(0, __optique_core_message.value)(dir)} is a valid git repository.`;
@@ -176,7 +168,7 @@ function gitRemoteBranch(remote, options) {
 			};
 			return {
 				success: false,
-				error: __optique_core_message.message`Remote branch ${(0, __optique_core_message.value)(input)} does not exist on remote ${(0, __optique_core_message.value)(remote)}. Available branches: ${formatChoiceList(branches)}`
+				error: __optique_core_message.message`Remote branch ${(0, __optique_core_message.value)(input)} does not exist on remote ${(0, __optique_core_message.value)(remote)}. Available branches: ${(0, __optique_core_message.valueSet)(branches)}`
 			};
 		} catch (error) {
 			const fallback = __optique_core_message.message`Failed to list remote branches. Ensure remote ${(0, __optique_core_message.value)(remote)} exists.`;
@@ -224,7 +216,7 @@ function gitTag(options) {
 			};
 			return {
 				success: false,
-				error: __optique_core_message.message`Tag ${(0, __optique_core_message.value)(input)} does not exist. Available tags: ${formatChoiceList(tags)}`
+				error: __optique_core_message.message`Tag ${(0, __optique_core_message.value)(input)} does not exist. Available tags: ${(0, __optique_core_message.valueSet)(tags)}`
 			};
 		} catch (error) {
 			const fallback = __optique_core_message.message`Failed to list tags. Ensure ${(0, __optique_core_message.value)(dir)} is a valid git repository.`;
@@ -272,7 +264,7 @@ function gitRemote(options) {
 			};
 			return {
 				success: false,
-				error: __optique_core_message.message`Remote ${(0, __optique_core_message.value)(input)} does not exist. Available remotes: ${formatChoiceList(names)}`
+				error: __optique_core_message.message`Remote ${(0, __optique_core_message.value)(input)} does not exist. Available remotes: ${(0, __optique_core_message.valueSet)(names)}`
 			};
 		} catch (error) {
 			const fallback = __optique_core_message.message`Failed to list remotes. Ensure ${(0, __optique_core_message.value)(dir)} is a valid git repository.`;
@@ -349,6 +341,23 @@ function gitCommit(options) {
 				error: __optique_core_message.message`Commit ${(0, __optique_core_message.value)(input)} does not exist. Provide a valid commit SHA.`
 			};
 		}
+	}, async function* suggestCommit(dir, prefix) {
+		try {
+			const commits = await isomorphic_git.log({
+				fs: gitFs,
+				dir,
+				depth: 15
+			});
+			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
+				const shortOid = commit.oid.slice(0, 7);
+				const firstLine = commit.commit.message.split("\n")[0];
+				yield {
+					kind: "literal",
+					text: shortOid,
+					description: __optique_core_message.message`${firstLine}`
+				};
+			}
+		} catch {}
 	});
 }
 /**
@@ -398,13 +407,21 @@ function gitRef(options) {
 		}
 	}, async function* suggestRef(dir, prefix) {
 		try {
-			const [branches, tags] = await Promise.all([isomorphic_git.listBranches({
-				fs: gitFs,
-				dir
-			}), isomorphic_git.listTags({
-				fs: gitFs,
-				dir
-			})]);
+			const [branches, tags, commits] = await Promise.all([
+				isomorphic_git.listBranches({
+					fs: gitFs,
+					dir
+				}),
+				isomorphic_git.listTags({
+					fs: gitFs,
+					dir
+				}),
+				isomorphic_git.log({
+					fs: gitFs,
+					dir,
+					depth: 10
+				})
+			]);
 			for (const branch of branches) if (branch.startsWith(prefix)) yield {
 				kind: "literal",
 				text: branch
@@ -413,6 +430,15 @@ function gitRef(options) {
 				kind: "literal",
 				text: tag
 			};
+			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
+				const shortOid = commit.oid.slice(0, 7);
+				const firstLine = commit.commit.message.split("\n")[0];
+				yield {
+					kind: "literal",
+					text: shortOid,
+					description: __optique_core_message.message`${firstLine}`
+				};
+			}
 		} catch {}
 	});
 }

package/dist/index.js

@@ -1,4 +1,4 @@
-import { message, value } from "@optique/core/message";
+import { message, value, valueSet } from "@optique/core/message";
 import { ensureNonEmptyString } from "@optique/core/nonempty";
 import * as git from "isomorphic-git";
 import { expandOid, listBranches, listRemotes, listTags, readObject, resolveRef } from "isomorphic-git";
@@ -32,14 +32,6 @@ function listFailureMessage(error, dir, errors, fallback) {
 	if (hasErrorCode(error, "NotAGitRepositoryError") || hasErrorCode(error, "NotFoundError")) return message`${value(dir)} is not a git repository.`;
 	return fallback;
 }
-function formatChoiceList(choices) {
-	let result = [];
-	for (let i = 0; i < choices.length; i++) {
-		if (i > 0) result = [...result, ...message`, `];
-		result = [...result, ...message`${choices[i]}`];
-	}
-	return result;
-}
 function createAsyncValueParser(options, metavar, parseFn, suggestFn) {
 	ensureNonEmptyString(metavar);
 	return {
@@ -94,7 +86,7 @@ function gitBranch(options) {
 			};
 			return {
 				success: false,
-				error: message`Branch ${value(input)} does not exist. Available branches: ${formatChoiceList(branches)}`
+				error: message`Branch ${value(input)} does not exist. Available branches: ${valueSet(branches)}`
 			};
 		} catch (error) {
 			const fallback = message`Failed to list branches. Ensure ${value(dir)} is a valid git repository.`;
@@ -154,7 +146,7 @@ function gitRemoteBranch(remote, options) {
 			};
 			return {
 				success: false,
-				error: message`Remote branch ${value(input)} does not exist on remote ${value(remote)}. Available branches: ${formatChoiceList(branches)}`
+				error: message`Remote branch ${value(input)} does not exist on remote ${value(remote)}. Available branches: ${valueSet(branches)}`
 			};
 		} catch (error) {
 			const fallback = message`Failed to list remote branches. Ensure remote ${value(remote)} exists.`;
@@ -202,7 +194,7 @@ function gitTag(options) {
 			};
 			return {
 				success: false,
-				error: message`Tag ${value(input)} does not exist. Available tags: ${formatChoiceList(tags)}`
+				error: message`Tag ${value(input)} does not exist. Available tags: ${valueSet(tags)}`
 			};
 		} catch (error) {
 			const fallback = message`Failed to list tags. Ensure ${value(dir)} is a valid git repository.`;
@@ -250,7 +242,7 @@ function gitRemote(options) {
 			};
 			return {
 				success: false,
-				error: message`Remote ${value(input)} does not exist. Available remotes: ${formatChoiceList(names)}`
+				error: message`Remote ${value(input)} does not exist. Available remotes: ${valueSet(names)}`
 			};
 		} catch (error) {
 			const fallback = message`Failed to list remotes. Ensure ${value(dir)} is a valid git repository.`;
@@ -327,6 +319,23 @@ function gitCommit(options) {
 				error: message`Commit ${value(input)} does not exist. Provide a valid commit SHA.`
 			};
 		}
+	}, async function* suggestCommit(dir, prefix) {
+		try {
+			const commits = await git.log({
+				fs: gitFs,
+				dir,
+				depth: 15
+			});
+			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
+				const shortOid = commit.oid.slice(0, 7);
+				const firstLine = commit.commit.message.split("\n")[0];
+				yield {
+					kind: "literal",
+					text: shortOid,
+					description: message`${firstLine}`
+				};
+			}
+		} catch {}
 	});
 }
 /**
@@ -376,13 +385,21 @@ function gitRef(options) {
 		}
 	}, async function* suggestRef(dir, prefix) {
 		try {
-			const [branches, tags] = await Promise.all([git.listBranches({
-				fs: gitFs,
-				dir
-			}), git.listTags({
-				fs: gitFs,
-				dir
-			})]);
+			const [branches, tags, commits] = await Promise.all([
+				git.listBranches({
+					fs: gitFs,
+					dir
+				}),
+				git.listTags({
+					fs: gitFs,
+					dir
+				}),
+				git.log({
+					fs: gitFs,
+					dir,
+					depth: 10
+				})
+			]);
 			for (const branch of branches) if (branch.startsWith(prefix)) yield {
 				kind: "literal",
 				text: branch
@@ -391,6 +408,15 @@ function gitRef(options) {
 				kind: "literal",
 				text: tag
 			};
+			for (const commit of commits) if (commit.oid.startsWith(prefix)) {
+				const shortOid = commit.oid.slice(0, 7);
+				const firstLine = commit.commit.message.split("\n")[0];
+				yield {
+					kind: "literal",
+					text: shortOid,
+					description: message`${firstLine}`
+				};
+			}
 		} catch {}
 	});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/git",
-  "version": "0.9.0-dev.254+390a74da",
+  "version": "0.9.0-dev.258+a42f88c2",
   "description": "Git value parsers for Optique",
   "keywords": [
     "CLI",