@optique/git 0.9.0-dev.264 → 0.9.0-dev.266

package/dist/index.cjs

@@ -28,6 +28,14 @@ const node_fs_promises = __toESM(require("node:fs/promises"));
 const node_process = __toESM(require("node:process"));
 
 //#region src/index.ts
+/**
+* Filesystem interface passed to isomorphic-git.
+*
+* Although this package only performs read operations (validation and listing),
+* isomorphic-git's FsClient type requires write methods to be present.
+* These methods are included for type compatibility but are never called
+* by our read-only operations.
+*/
 const gitFs = {
 	readFile: node_fs_promises.readFile,
 	writeFile: node_fs_promises.writeFile,
@@ -301,26 +309,14 @@ function gitRemote(options) {
 function gitCommit(options) {
 	const metavar = options?.metavar ?? "COMMIT";
 	return createAsyncValueParser(options, metavar, async (dir, input, errors) => {
-		try {
-			(0, __optique_core_nonempty.ensureNonEmptyString)(input);
-		} catch {
+		if (!/^[0-9a-f]{4,40}$/i.test(input)) {
 			if (errors?.invalidFormat) return {
 				success: false,
 				error: errors.invalidFormat(input)
 			};
 			return {
 				success: false,
-				error: __optique_core_message.message`Invalid commit SHA: ${(0, __optique_core_message.value)(input)}`
-			};
-		}
-		if (input.length < 4 || input.length > 40) {
-			if (errors?.invalidFormat) return {
-				success: false,
-				error: errors.invalidFormat(input)
-			};
-			return {
-				success: false,
-				error: __optique_core_message.message`Commit ${(0, __optique_core_message.value)(input)} must be between 4 and 40 characters.`
+				error: __optique_core_message.message`Invalid commit SHA: ${(0, __optique_core_message.value)(input)}. Commits must be 4–40 hexadecimal characters.`
 			};
 		}
 		try {
@@ -375,37 +371,37 @@ function gitCommit(options) {
 function gitRef(options) {
 	const metavar = options?.metavar ?? "REF";
 	return createAsyncValueParser(options, metavar, async (dir, input, errors) => {
+		let resolved;
 		try {
-			const resolved = await isomorphic_git.resolveRef({
+			resolved = await isomorphic_git.resolveRef({
 				fs: gitFs,
 				dir,
 				ref: input
 			});
+		} catch {}
+		if (resolved) return {
+			success: true,
+			value: resolved
+		};
+		try {
+			const oid = await isomorphic_git.expandOid({
+				fs: gitFs,
+				dir,
+				oid: input
+			});
 			return {
 				success: true,
-				value: resolved
+				value: oid
 			};
 		} catch {
-			try {
-				const oid = await isomorphic_git.expandOid({
-					fs: gitFs,
-					dir,
-					oid: input
-				});
-				return {
-					success: true,
-					value: oid
-				};
-			} catch {
-				if (errors?.notFound) return {
-					success: false,
-					error: errors.notFound(input)
-				};
-				return {
-					success: false,
-					error: __optique_core_message.message`Reference ${(0, __optique_core_message.value)(input)} does not exist. Provide a valid branch, tag, or commit SHA.`
-				};
-			}
+			if (errors?.notFound) return {
+				success: false,
+				error: errors.notFound(input)
+			};
+			return {
+				success: false,
+				error: __optique_core_message.message`Reference ${(0, __optique_core_message.value)(input)} does not exist. Provide a valid branch, tag, or commit SHA.`
+			};
 		}
 	}, async function* suggestRef(dir, prefix) {
 		try {
@@ -453,12 +449,30 @@ function gitRef(options) {
 */
 function createGitParsers(options) {
 	return {
-		branch: (branchOptions) => gitBranch(branchOptions ?? options),
-		remoteBranch: (remote, branchOptions) => gitRemoteBranch(remote, branchOptions ?? options),
-		tag: (tagOptions) => gitTag(tagOptions ?? options),
-		remote: (remoteOptions) => gitRemote(remoteOptions ?? options),
-		commit: (commitOptions) => gitCommit(commitOptions ?? options),
-		ref: (refOptions) => gitRef(refOptions ?? options)
+		branch: (branchOptions) => gitBranch({
+			...options,
+			...branchOptions
+		}),
+		remoteBranch: (remote, branchOptions) => gitRemoteBranch(remote, {
+			...options,
+			...branchOptions
+		}),
+		tag: (tagOptions) => gitTag({
+			...options,
+			...tagOptions
+		}),
+		remote: (remoteOptions) => gitRemote({
+			...options,
+			...remoteOptions
+		}),
+		commit: (commitOptions) => gitCommit({
+			...options,
+			...commitOptions
+		}),
+		ref: (refOptions) => gitRef({
+			...options,
+			...refOptions
+		})
 	};
 }
 

package/dist/index.js

@@ -6,6 +6,14 @@ import * as fs from "node:fs/promises";
 import process from "node:process";
 
 //#region src/index.ts
+/**
+* Filesystem interface passed to isomorphic-git.
+*
+* Although this package only performs read operations (validation and listing),
+* isomorphic-git's FsClient type requires write methods to be present.
+* These methods are included for type compatibility but are never called
+* by our read-only operations.
+*/
 const gitFs = {
 	readFile: fs.readFile,
 	writeFile: fs.writeFile,
@@ -279,26 +287,14 @@ function gitRemote(options) {
 function gitCommit(options) {
 	const metavar = options?.metavar ?? "COMMIT";
 	return createAsyncValueParser(options, metavar, async (dir, input, errors) => {
-		try {
-			ensureNonEmptyString(input);
-		} catch {
+		if (!/^[0-9a-f]{4,40}$/i.test(input)) {
 			if (errors?.invalidFormat) return {
 				success: false,
 				error: errors.invalidFormat(input)
 			};
 			return {
 				success: false,
-				error: message`Invalid commit SHA: ${value(input)}`
-			};
-		}
-		if (input.length < 4 || input.length > 40) {
-			if (errors?.invalidFormat) return {
-				success: false,
-				error: errors.invalidFormat(input)
-			};
-			return {
-				success: false,
-				error: message`Commit ${value(input)} must be between 4 and 40 characters.`
+				error: message`Invalid commit SHA: ${value(input)}. Commits must be 4–40 hexadecimal characters.`
 			};
 		}
 		try {
@@ -353,37 +349,37 @@ function gitCommit(options) {
 function gitRef(options) {
 	const metavar = options?.metavar ?? "REF";
 	return createAsyncValueParser(options, metavar, async (dir, input, errors) => {
+		let resolved;
 		try {
-			const resolved = await git.resolveRef({
+			resolved = await git.resolveRef({
 				fs: gitFs,
 				dir,
 				ref: input
 			});
+		} catch {}
+		if (resolved) return {
+			success: true,
+			value: resolved
+		};
+		try {
+			const oid = await git.expandOid({
+				fs: gitFs,
+				dir,
+				oid: input
+			});
 			return {
 				success: true,
-				value: resolved
+				value: oid
 			};
 		} catch {
-			try {
-				const oid = await git.expandOid({
-					fs: gitFs,
-					dir,
-					oid: input
-				});
-				return {
-					success: true,
-					value: oid
-				};
-			} catch {
-				if (errors?.notFound) return {
-					success: false,
-					error: errors.notFound(input)
-				};
-				return {
-					success: false,
-					error: message`Reference ${value(input)} does not exist. Provide a valid branch, tag, or commit SHA.`
-				};
-			}
+			if (errors?.notFound) return {
+				success: false,
+				error: errors.notFound(input)
+			};
+			return {
+				success: false,
+				error: message`Reference ${value(input)} does not exist. Provide a valid branch, tag, or commit SHA.`
+			};
 		}
 	}, async function* suggestRef(dir, prefix) {
 		try {
@@ -431,12 +427,30 @@ function gitRef(options) {
 */
 function createGitParsers(options) {
 	return {
-		branch: (branchOptions) => gitBranch(branchOptions ?? options),
-		remoteBranch: (remote, branchOptions) => gitRemoteBranch(remote, branchOptions ?? options),
-		tag: (tagOptions) => gitTag(tagOptions ?? options),
-		remote: (remoteOptions) => gitRemote(remoteOptions ?? options),
-		commit: (commitOptions) => gitCommit(commitOptions ?? options),
-		ref: (refOptions) => gitRef(refOptions ?? options)
+		branch: (branchOptions) => gitBranch({
+			...options,
+			...branchOptions
+		}),
+		remoteBranch: (remote, branchOptions) => gitRemoteBranch(remote, {
+			...options,
+			...branchOptions
+		}),
+		tag: (tagOptions) => gitTag({
+			...options,
+			...tagOptions
+		}),
+		remote: (remoteOptions) => gitRemote({
+			...options,
+			...remoteOptions
+		}),
+		commit: (commitOptions) => gitCommit({
+			...options,
+			...commitOptions
+		}),
+		ref: (refOptions) => gitRef({
+			...options,
+			...refOptions
+		})
 	};
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optique/git",
-  "version": "0.9.0-dev.264+07364667",
+  "version": "0.9.0-dev.266+49a4cc82",
   "description": "Git value parsers for Optique",
   "keywords": [
     "CLI",