@gitkraken/core-gitlens 0.6.0 → 0.7.0

package/dist/git-cli/parsers/signatureParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"signatureParser.js","sourceRoot":"","sources":["../../../src/git-cli/parsers/signatureParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"signatureParser.js","names":[],"sources":["../../../../git-cli/src/parsers/signatureParser.ts"],"sourcesContent":["import type { CommitSignature, SignatureStatus, SigningFormat, TrustLevel } from '@gitlens/git/models/signature.js';\n\nconst hexFingerprintRegex = /^[0-9A-Fa-f]{16,40}$/;\nconst hexKeyIdRegex = /^[0-9A-Fa-f]{8,16}$/;\n\n/**\n * Git format specifiers for signature information:\n * - %G?: Signature status (G/B/U/X/Y/R/E/N)\n * - %GS: Signer name\n * - %GK: Key ID\n * - %GF: Key fingerprint\n * - %GP: Primary key fingerprint (preferred over %GF)\n * - %GT: Trust level\n * - %GG: Raw verification message\n *\n * Fields separated by ASCII 0x1D (Group Separator)\n */\nexport const signatureFormat = '%G?%x1D%GS%x1D%GK%x1D%GF%x1D%GP%x1D%GT%x1D%GG';\n\nconst fieldSeparator = '\\x1D';\n\n/**\n * Maps Git signature status codes to SignatureStatus enum\n * @param statusCode Git status code from %G?\n * @returns SignatureStatus or undefined for unsigned commits\n */\nfunction mapStatusCode(statusCode: string): SignatureStatus | undefined {\n\tswitch (statusCode) {\n\t\tcase 'G': // Good signature\n\t\t\treturn 'good';\n\t\tcase 'B': // Bad signature\n\t\t\treturn 'bad';\n\t\tcase 'U': // Good signature with unknown validity\n\t\t\treturn 'unknown';\n\t\tcase 'X': // Good signature that has expired\n\t\tcase 'Y': // Good signature made by expired key\n\t\t\treturn 'expired';\n\t\tcase 'R': // Good signature made by revoked key\n\t\t\treturn 'revoked';\n\t\tcase 'E': // Signature cannot be checked (e.g., missing key)\n\t\t\treturn 'error';\n\t\tcase 'N': // No signature\n\t\t\treturn undefined;\n\t\tdefault:\n\t\t\treturn undefined;\n\t}\n}\n\n/**\n * Infers the signing format from signature data patterns\n * @param signer Signer identity string\n * @param keyId Key ID\n * @param fingerprint Key fingerprint\n * @returns Inferred SigningFormat or undefined\n */\nfunction inferSigningFormat(\n\tsigner: string | undefined,\n\tkeyId: string | undefined,\n\tfingerprint: string | undefined,\n): SigningFormat | undefined {\n\t// X.509: Distinguished Name format with slashes (e.g., \"/C=US/O=Org/CN=Name\")\n\tif (signer?.startsWith('/') && signer.includes('/CN=')) {\n\t\treturn 'x509';\n\t}\n\n\t// SSH: key ID or fingerprint starts with \"SHA256:\" or \"SHA512:\" prefix\n\tif (\n\t\tkeyId?.startsWith('SHA256:') ||\n\t\tkeyId?.startsWith('SHA512:') ||\n\t\tfingerprint?.startsWith('SHA256:') ||\n\t\tfingerprint?.startsWith('SHA512:')\n\t) {\n\t\treturn 'ssh';\n\t}\n\n\t// GPG/OpenPGP: fingerprints are hex strings (typically 16-40 chars)\n\t// Signer format is \"Name <email@example.com>\"\n\tif (fingerprint && hexFingerprintRegex.test(fingerprint)) {\n\t\treturn 'gpg';\n\t}\n\n\t// If signer has angle bracket email format, likely GPG\n\tif (signer?.includes('<') && signer?.includes('>')) {\n\t\treturn 'gpg';\n\t}\n\n\t// If keyId looks like a hex GPG key ID (8-16 hex chars)\n\tif (keyId && hexKeyIdRegex.test(keyId)) {\n\t\treturn 'gpg';\n\t}\n\n\treturn undefined;\n}\n\n/**\n * Maps Git trust level string to TrustLevel enum\n * @param trustStr Git trust level from %GT\n * @returns TrustLevel\n */\nfunction mapTrustLevel(trustStr: string | undefined): TrustLevel {\n\tif (!trustStr) return 'unknown';\n\n\tconst normalized = trustStr.toLowerCase().trim();\n\tswitch (normalized) {\n\t\tcase 'ultimate':\n\t\t\treturn 'ultimate';\n\t\tcase 'fully':\n\t\t\treturn 'full';\n\t\tcase 'marginal':\n\t\t\treturn 'marginal';\n\t\tcase 'never':\n\t\t\treturn 'never';\n\t\tcase 'undefined':\n\t\tcase 'unknown':\n\t\tcase '':\n\t\t\treturn 'unknown';\n\t\tdefault:\n\t\t\treturn 'unknown';\n\t}\n}\n\n/**\n * Parses Git signature output from format specifiers\n * @param output Raw Git output using signatureFormat\n * @returns CommitSignature or undefined if unsigned\n */\nexport function parseSignatureOutput(output: string): CommitSignature | undefined {\n\tconst trimmed = output.trim();\n\tif (!trimmed) return undefined;\n\n\t// Split by field separator\n\tconst fields = trimmed.split(fieldSeparator);\n\tif (fields.length !== 7) return undefined;\n\n\tconst [statusCode, signer, keyId, subkeyFingerprint, primaryFingerprint, trustStr, rawMessage] = fields;\n\n\t// Map status code\n\tconst status = mapStatusCode(statusCode);\n\tif (status === undefined) return undefined; // Unsigned commit (N)\n\n\t// Prefer primary key fingerprint over subkey fingerprint\n\tconst fingerprint = primaryFingerprint || subkeyFingerprint || undefined;\n\n\t// Map trust level\n\tconst trustLevel = mapTrustLevel(trustStr);\n\n\t// Use raw message as error message for non-good signatures\n\tconst errorMessage = status !== 'good' && rawMessage ? rawMessage.trim() : undefined;\n\n\t// Infer signing format from signature data\n\tconst format = inferSigningFormat(signer, keyId, fingerprint);\n\n\treturn {\n\t\tstatus: status,\n\t\tformat: format,\n\t\tsigner: signer || undefined,\n\t\tkeyId: keyId || undefined,\n\t\tfingerprint: fingerprint,\n\t\ttrustLevel: trustLevel,\n\t\terrorMessage: errorMessage,\n\t};\n}\n"],"mappings":";AAEA,MAAM,sBAAsB;AAC5B,MAAM,gBAAgB;;;;;;;;;;;;;AActB,MAAa,kBAAkB;AAE/B,MAAM,iBAAiB;;;;;;AAOvB,SAAS,cAAc,YAAiD;CACvE,QAAQ,YAAR;EACC,KAAK,KACJ,OAAO;EACR,KAAK,KACJ,OAAO;EACR,KAAK,KACJ,OAAO;EACR,KAAK;EACL,KAAK,KACJ,OAAO;EACR,KAAK,KACJ,OAAO;EACR,KAAK,KACJ,OAAO;EACR,KAAK,KACJ;EACD,SACC;CACF;AACD;;;;;;;;AASA,SAAS,mBACR,QACA,OACA,aAC4B;CAE5B,IAAI,QAAQ,WAAW,GAAG,KAAK,OAAO,SAAS,MAAM,GACpD,OAAO;CAIR,IACC,OAAO,WAAW,SAAS,KAC3B,OAAO,WAAW,SAAS,KAC3B,aAAa,WAAW,SAAS,KACjC,aAAa,WAAW,SAAS,GAEjC,OAAO;CAKR,IAAI,eAAe,oBAAoB,KAAK,WAAW,GACtD,OAAO;CAIR,IAAI,QAAQ,SAAS,GAAG,KAAK,QAAQ,SAAS,GAAG,GAChD,OAAO;CAIR,IAAI,SAAS,cAAc,KAAK,KAAK,GACpC,OAAO;AAIT;;;;;;AAOA,SAAS,cAAc,UAA0C;CAChE,IAAI,CAAC,UAAU,OAAO;CAGtB,QADmB,SAAS,YAAY,CAAC,CAAC,KACzB,GAAjB;EACC,KAAK,YACJ,OAAO;EACR,KAAK,SACJ,OAAO;EACR,KAAK,YACJ,OAAO;EACR,KAAK,SACJ,OAAO;EACR,KAAK;EACL,KAAK;EACL,KAAK,IACJ,OAAO;EACR,SACC,OAAO;CACT;AACD;;;;;;AAOA,SAAgB,qBAAqB,QAA6C;CACjF,MAAM,UAAU,OAAO,KAAK;CAC5B,IAAI,CAAC,SAAS,OAAO,KAAA;CAGrB,MAAM,SAAS,QAAQ,MAAM,cAAc;CAC3C,IAAI,OAAO,WAAW,GAAG,OAAO,KAAA;CAEhC,MAAM,CAAC,YAAY,QAAQ,OAAO,mBAAmB,oBAAoB,UAAU,cAAc;CAGjG,MAAM,SAAS,cAAc,UAAU;CACvC,IAAI,WAAW,KAAA,GAAW,OAAO,KAAA;CAGjC,MAAM,cAAc,sBAAsB,qBAAqB,KAAA;CAG/D,MAAM,aAAa,cAAc,QAAQ;CAGzC,MAAM,eAAe,WAAW,UAAU,aAAa,WAAW,KAAK,IAAI,KAAA;CAK3E,OAAO;EACE;EACR,QAJc,mBAAmB,QAAQ,OAAO,WAInC;EACb,QAAQ,UAAU,KAAA;EAClB,OAAO,SAAS,KAAA;EACH;EACD;EACE;CACf;AACD"}

package/dist/git-cli/parsers/sshSignatureParser.d.ts

@@ -1,11 +1,12 @@
-import type { SshPublicKey } from '../../git/models/signature.js';
+import { SshPublicKey } from "../../git/models/signature.js";
+//#region ../git-cli/src/parsers/sshSignatureParser.d.ts
 /**
  * Extracts the committer's name and raw email from a commit object. The raw email (not a mailmapped one) is the
  * principal Git checks an SSH signature against, so it's what an `allowed_signers` entry must use.
  */
 export declare function extractCommitterFromCommitObject(commitObject: string): {
-    name: string;
-    email: string;
+  name: string;
+  email: string;
 } | undefined;
 /**
  * Extracts the signer's full SSH public key from a commit object's `gpgsig` SSH signature.
@@ -18,4 +19,5 @@ export declare function extractCommitterFromCommitObject(commitObject: string):
  * @returns The key type and base64 public-key blob, or `undefined` if the commit isn't SSH-signed or can't be parsed.
  */
 export declare function extractSshPublicKeyFromCommitObject(commitObject: string): SshPublicKey | undefined;
+//#endregion
 //# sourceMappingURL=sshSignatureParser.d.ts.map

package/dist/git-cli/parsers/sshSignatureParser.js

@@ -1,78 +1,69 @@
-import { isValidSshKeyData, isValidSshKeyType } from '../../git/utils/sshKey.utils.js';
-const sshSigMagic = 'SSHSIG';
+import { isValidSshKeyData, isValidSshKeyType } from "../../git/utils/sshKey.utils.js";
+//#region ../git-cli/src/parsers/sshSignatureParser.ts
+const sshSigMagic = "SSHSIG";
 const gpgSigHeaderRegex = /^gpgsig(?:-sha256)? /;
 const sshSigArmorRegex = /-----BEGIN SSH SIGNATURE-----\n([\s\S]*?)\n-----END SSH SIGNATURE-----/;
-// A commit header line: `committer Display Name <email> <unix-ts> <tz>`.
 const committerRegex = /^committer (.*) <([^>]*)> \d+ [-+]\d+$/m;
 /**
- * Extracts the committer's name and raw email from a commit object. The raw email (not a mailmapped one) is the
- * principal Git checks an SSH signature against, so it's what an `allowed_signers` entry must use.
- */
-export function extractCommitterFromCommitObject(commitObject) {
-    const match = committerRegex.exec(commitObject);
-    if (match == null)
-        return undefined;
-    return { name: match[1], email: match[2] };
+* Extracts the committer's name and raw email from a commit object. The raw email (not a mailmapped one) is the
+* principal Git checks an SSH signature against, so it's what an `allowed_signers` entry must use.
+*/
+function extractCommitterFromCommitObject(commitObject) {
+	const match = committerRegex.exec(commitObject);
+	if (match == null) return void 0;
+	return {
+		name: match[1],
+		email: match[2]
+	};
 }
 /**
- * Extracts the signer's full SSH public key from a commit object's `gpgsig` SSH signature.
- *
- * A commit signed with `gpg.format=ssh` stores an armored `-----BEGIN SSH SIGNATURE-----` (SSHSIG) blob in its
- * `gpgsig` header, and the SSHSIG wire format embeds the signer's full public key — exactly what an `allowed_signers`
- * entry requires. (`git log`'s signature fields only expose the key fingerprint, never the full key.)
- *
- * @param commitObject Raw commit object text, as produced by `git cat-file commit <sha>`
- * @returns The key type and base64 public-key blob, or `undefined` if the commit isn't SSH-signed or can't be parsed.
- */
-export function extractSshPublicKeyFromCommitObject(commitObject) {
-    const armored = extractArmoredSignature(commitObject);
-    if (armored == null)
-        return undefined;
-    const buffer = Buffer.from(armored, 'base64');
-    // SSHSIG wire format (see OpenSSH PROTOCOL.sshsig):
-    //   byte[6] MAGIC "SSHSIG" | uint32 version | string publickey | string namespace | ...
-    // where each `string` is a big-endian uint32 length followed by that many bytes.
-    if (buffer.length < 10 || buffer.toString('latin1', 0, 6) !== sshSigMagic)
-        return undefined;
-    // `publickey` is the first length-prefixed string, after the 6-byte magic and 4-byte version.
-    const pubKeyBlob = readSshString(buffer, 10);
-    if (pubKeyBlob == null)
-        return undefined;
-    // The public-key blob itself begins with its key type as a length-prefixed string.
-    const keyType = readSshString(pubKeyBlob, 0)?.toString('utf8');
-    if (!keyType)
-        return undefined;
-    const keyData = pubKeyBlob.toString('base64');
-    // The signature blob is attacker-controllable (Git stores it verbatim and never verifies it on read), so reject
-    // anything that isn't a recognized key type / well-formed base64 before it can become an `allowed_signers` entry.
-    if (!isValidSshKeyType(keyType) || !isValidSshKeyData(keyData))
-        return undefined;
-    return { keyType: keyType, keyData: keyData };
+* Extracts the signer's full SSH public key from a commit object's `gpgsig` SSH signature.
+*
+* A commit signed with `gpg.format=ssh` stores an armored `-----BEGIN SSH SIGNATURE-----` (SSHSIG) blob in its
+* `gpgsig` header, and the SSHSIG wire format embeds the signer's full public key — exactly what an `allowed_signers`
+* entry requires. (`git log`'s signature fields only expose the key fingerprint, never the full key.)
+*
+* @param commitObject Raw commit object text, as produced by `git cat-file commit <sha>`
+* @returns The key type and base64 public-key blob, or `undefined` if the commit isn't SSH-signed or can't be parsed.
+*/
+function extractSshPublicKeyFromCommitObject(commitObject) {
+	const armored = extractArmoredSignature(commitObject);
+	if (armored == null) return void 0;
+	const buffer = Buffer.from(armored, "base64");
+	if (buffer.length < 10 || buffer.toString("latin1", 0, 6) !== sshSigMagic) return void 0;
+	const pubKeyBlob = readSshString(buffer, 10);
+	if (pubKeyBlob == null) return void 0;
+	const keyType = readSshString(pubKeyBlob, 0)?.toString("utf8");
+	if (!keyType) return void 0;
+	const keyData = pubKeyBlob.toString("base64");
+	if (!isValidSshKeyType(keyType) || !isValidSshKeyData(keyData)) return void 0;
+	return {
+		keyType,
+		keyData
+	};
 }
 /** Extracts and concatenates the base64 body of the armored SSH signature from a commit's `gpgsig` header. */
 function extractArmoredSignature(commitObject) {
-    const lines = commitObject.split('\n');
-    const start = lines.findIndex(l => gpgSigHeaderRegex.test(l));
-    if (start === -1)
-        return undefined;
-    // The header value, followed by continuation lines (each indented with a single leading space).
-    const block = [lines[start].replace(gpgSigHeaderRegex, '')];
-    for (let i = start + 1; i < lines.length; i++) {
-        if (!lines[i].startsWith(' '))
-            break;
-        block.push(lines[i].slice(1));
-    }
-    const match = sshSigArmorRegex.exec(block.join('\n'));
-    return match != null ? match[1].replace(/\s+/g, '') : undefined;
+	const lines = commitObject.split("\n");
+	const start = lines.findIndex((l) => gpgSigHeaderRegex.test(l));
+	if (start === -1) return void 0;
+	const block = [lines[start].replace(gpgSigHeaderRegex, "")];
+	for (let i = start + 1; i < lines.length; i++) {
+		if (!lines[i].startsWith(" ")) break;
+		block.push(lines[i].slice(1));
+	}
+	const match = sshSigArmorRegex.exec(block.join("\n"));
+	return match != null ? match[1].replace(/\s+/g, "") : void 0;
 }
 /** Reads a length-prefixed SSH wire-format string (big-endian uint32 length + bytes) at `offset`. */
 function readSshString(buffer, offset) {
-    if (offset + 4 > buffer.length)
-        return undefined;
-    const start = offset + 4;
-    const end = start + buffer.readUInt32BE(offset);
-    if (end > buffer.length)
-        return undefined;
-    return buffer.subarray(start, end);
+	if (offset + 4 > buffer.length) return void 0;
+	const start = offset + 4;
+	const end = start + buffer.readUInt32BE(offset);
+	if (end > buffer.length) return void 0;
+	return buffer.subarray(start, end);
 }
+//#endregion
+export { extractCommitterFromCommitObject, extractSshPublicKeyFromCommitObject };
+
 //# sourceMappingURL=sshSignatureParser.js.map

package/dist/git-cli/parsers/sshSignatureParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"sshSignatureParser.js","sourceRoot":"","sources":["../../../src/git-cli/parsers/sshSignatureParser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sshSignatureParser.js","names":[],"sources":["../../../../git-cli/src/parsers/sshSignatureParser.ts"],"sourcesContent":["import type { SshPublicKey } from '@gitlens/git/models/signature.js';\nimport { isValidSshKeyData, isValidSshKeyType } from '@gitlens/git/utils/sshKey.utils.js';\n\nconst sshSigMagic = 'SSHSIG';\nconst gpgSigHeaderRegex = /^gpgsig(?:-sha256)? /;\nconst sshSigArmorRegex = /-----BEGIN SSH SIGNATURE-----\\n([\\s\\S]*?)\\n-----END SSH SIGNATURE-----/;\n// A commit header line: `committer Display Name <email> <unix-ts> <tz>`.\nconst committerRegex = /^committer (.*) <([^>]*)> \\d+ [-+]\\d+$/m;\n\n/**\n * Extracts the committer's name and raw email from a commit object. The raw email (not a mailmapped one) is the\n * principal Git checks an SSH signature against, so it's what an `allowed_signers` entry must use.\n */\nexport function extractCommitterFromCommitObject(commitObject: string): { name: string; email: string } | undefined {\n\tconst match = committerRegex.exec(commitObject);\n\tif (match == null) return undefined;\n\n\treturn { name: match[1], email: match[2] };\n}\n\n/**\n * Extracts the signer's full SSH public key from a commit object's `gpgsig` SSH signature.\n *\n * A commit signed with `gpg.format=ssh` stores an armored `-----BEGIN SSH SIGNATURE-----` (SSHSIG) blob in its\n * `gpgsig` header, and the SSHSIG wire format embeds the signer's full public key — exactly what an `allowed_signers`\n * entry requires. (`git log`'s signature fields only expose the key fingerprint, never the full key.)\n *\n * @param commitObject Raw commit object text, as produced by `git cat-file commit <sha>`\n * @returns The key type and base64 public-key blob, or `undefined` if the commit isn't SSH-signed or can't be parsed.\n */\nexport function extractSshPublicKeyFromCommitObject(commitObject: string): SshPublicKey | undefined {\n\tconst armored = extractArmoredSignature(commitObject);\n\tif (armored == null) return undefined;\n\n\tconst buffer = Buffer.from(armored, 'base64');\n\n\t// SSHSIG wire format (see OpenSSH PROTOCOL.sshsig):\n\t//   byte[6] MAGIC \"SSHSIG\" | uint32 version | string publickey | string namespace | ...\n\t// where each `string` is a big-endian uint32 length followed by that many bytes.\n\tif (buffer.length < 10 || buffer.toString('latin1', 0, 6) !== sshSigMagic) return undefined;\n\n\t// `publickey` is the first length-prefixed string, after the 6-byte magic and 4-byte version.\n\tconst pubKeyBlob = readSshString(buffer, 10);\n\tif (pubKeyBlob == null) return undefined;\n\n\t// The public-key blob itself begins with its key type as a length-prefixed string.\n\tconst keyType = readSshString(pubKeyBlob, 0)?.toString('utf8');\n\tif (!keyType) return undefined;\n\n\tconst keyData = pubKeyBlob.toString('base64');\n\t// The signature blob is attacker-controllable (Git stores it verbatim and never verifies it on read), so reject\n\t// anything that isn't a recognized key type / well-formed base64 before it can become an `allowed_signers` entry.\n\tif (!isValidSshKeyType(keyType) || !isValidSshKeyData(keyData)) return undefined;\n\n\treturn { keyType: keyType, keyData: keyData };\n}\n\n/** Extracts and concatenates the base64 body of the armored SSH signature from a commit's `gpgsig` header. */\nfunction extractArmoredSignature(commitObject: string): string | undefined {\n\tconst lines = commitObject.split('\\n');\n\tconst start = lines.findIndex(l => gpgSigHeaderRegex.test(l));\n\tif (start === -1) return undefined;\n\n\t// The header value, followed by continuation lines (each indented with a single leading space).\n\tconst block = [lines[start].replace(gpgSigHeaderRegex, '')];\n\tfor (let i = start + 1; i < lines.length; i++) {\n\t\tif (!lines[i].startsWith(' ')) break;\n\n\t\tblock.push(lines[i].slice(1));\n\t}\n\n\tconst match = sshSigArmorRegex.exec(block.join('\\n'));\n\treturn match != null ? match[1].replace(/\\s+/g, '') : undefined;\n}\n\n/** Reads a length-prefixed SSH wire-format string (big-endian uint32 length + bytes) at `offset`. */\nfunction readSshString(buffer: Buffer, offset: number): Buffer | undefined {\n\tif (offset + 4 > buffer.length) return undefined;\n\n\tconst start = offset + 4;\n\tconst end = start + buffer.readUInt32BE(offset);\n\tif (end > buffer.length) return undefined;\n\n\treturn buffer.subarray(start, end);\n}\n"],"mappings":";;AAGA,MAAM,cAAc;AACpB,MAAM,oBAAoB;AAC1B,MAAM,mBAAmB;AAEzB,MAAM,iBAAiB;;;;;AAMvB,SAAgB,iCAAiC,cAAmE;CACnH,MAAM,QAAQ,eAAe,KAAK,YAAY;CAC9C,IAAI,SAAS,MAAM,OAAO,KAAA;CAE1B,OAAO;EAAE,MAAM,MAAM;EAAI,OAAO,MAAM;CAAG;AAC1C;;;;;;;;;;;AAYA,SAAgB,oCAAoC,cAAgD;CACnG,MAAM,UAAU,wBAAwB,YAAY;CACpD,IAAI,WAAW,MAAM,OAAO,KAAA;CAE5B,MAAM,SAAS,OAAO,KAAK,SAAS,QAAQ;CAK5C,IAAI,OAAO,SAAS,MAAM,OAAO,SAAS,UAAU,GAAG,CAAC,MAAM,aAAa,OAAO,KAAA;CAGlF,MAAM,aAAa,cAAc,QAAQ,EAAE;CAC3C,IAAI,cAAc,MAAM,OAAO,KAAA;CAG/B,MAAM,UAAU,cAAc,YAAY,CAAC,CAAC,EAAE,SAAS,MAAM;CAC7D,IAAI,CAAC,SAAS,OAAO,KAAA;CAErB,MAAM,UAAU,WAAW,SAAS,QAAQ;CAG5C,IAAI,CAAC,kBAAkB,OAAO,KAAK,CAAC,kBAAkB,OAAO,GAAG,OAAO,KAAA;CAEvE,OAAO;EAAW;EAAkB;CAAQ;AAC7C;;AAGA,SAAS,wBAAwB,cAA0C;CAC1E,MAAM,QAAQ,aAAa,MAAM,IAAI;CACrC,MAAM,QAAQ,MAAM,WAAU,MAAK,kBAAkB,KAAK,CAAC,CAAC;CAC5D,IAAI,UAAU,IAAI,OAAO,KAAA;CAGzB,MAAM,QAAQ,CAAC,MAAM,MAAM,CAAC,QAAQ,mBAAmB,EAAE,CAAC;CAC1D,KAAK,IAAI,IAAI,QAAQ,GAAG,IAAI,MAAM,QAAQ,KAAK;EAC9C,IAAI,CAAC,MAAM,EAAE,CAAC,WAAW,GAAG,GAAG;EAE/B,MAAM,KAAK,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;CAC7B;CAEA,MAAM,QAAQ,iBAAiB,KAAK,MAAM,KAAK,IAAI,CAAC;CACpD,OAAO,SAAS,OAAO,MAAM,EAAE,CAAC,QAAQ,QAAQ,EAAE,IAAI,KAAA;AACvD;;AAGA,SAAS,cAAc,QAAgB,QAAoC;CAC1E,IAAI,SAAS,IAAI,OAAO,QAAQ,OAAO,KAAA;CAEvC,MAAM,QAAQ,SAAS;CACvB,MAAM,MAAM,QAAQ,OAAO,aAAa,MAAM;CAC9C,IAAI,MAAM,OAAO,QAAQ,OAAO,KAAA;CAEhC,OAAO,OAAO,SAAS,OAAO,GAAG;AAClC"}

package/dist/git-cli/parsers/statusParser.d.ts

@@ -1,4 +1,6 @@
-import { GitStatus } from '../../git/models/status.js';
-import type { Uri } from '../../utils/uri.js';
+import { Uri } from "../../utils/uri.js";
+import { GitStatus } from "../../git/models/status.js";
+//#region ../git-cli/src/parsers/statusParser.d.ts
 export declare function parseGitStatus(data: string, repoPath: string, porcelainVersion: number, getUri: (path: string) => Uri): GitStatus | undefined;
+//#endregion
 //# sourceMappingURL=statusParser.d.ts.map

package/dist/git-cli/parsers/statusParser.js

@@ -1,216 +1,159 @@
-var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
-    if (value !== null && value !== void 0) {
-        if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
-        var dispose, inner;
-        if (async) {
-            if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
-            dispose = value[Symbol.asyncDispose];
-        }
-        if (dispose === void 0) {
-            if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
-            dispose = value[Symbol.dispose];
-            if (async) inner = dispose;
-        }
-        if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
-        if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
-        env.stack.push({ value: value, dispose: dispose, async: async });
-    }
-    else if (async) {
-        env.stack.push({ async: true });
-    }
-    return value;
-};
-var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
-    return function (env) {
-        function fail(e) {
-            env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
-            env.hasError = true;
-        }
-        var r, s = 0;
-        function next() {
-            while (r = env.stack.pop()) {
-                try {
-                    if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
-                    if (r.dispose) {
-                        var result = r.dispose.call(r.value);
-                        if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
-                    }
-                    else s |= 1;
-                }
-                catch (e) {
-                    fail(e);
-                }
-            }
-            if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
-            if (env.hasError) throw env.error;
-        }
-        return next();
-    };
-})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
-    var e = new Error(message);
-    return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
-});
-import { GitStatus } from '../../git/models/status.js';
-import { GitStatusFile } from '../../git/models/statusFile.js';
-import { normalizePath } from '../../utils/path.js';
-import { maybeStopWatch } from '../../utils/stopwatch.js';
+import { normalizePath } from "../../utils/path.js";
+import { maybeStopWatch } from "../../utils/stopwatch.js";
+import _usingCtx from "../../_virtual/@oxc-project+runtime/helpers/esm/usingCtx.js";
+import { GitStatus } from "../../git/models/status.js";
+import { GitStatusFile } from "../../git/models/statusFile.js";
+//#region ../git-cli/src/parsers/statusParser.ts
 const aheadStatusV1Regex = /(?:ahead ([0-9]+))/;
 const behindStatusV1Regex = /(?:behind ([0-9]+))/;
 const quoteRegex = /"/g;
-export function parseGitStatus(data, repoPath, porcelainVersion, getUri) {
-    const env_1 = { stack: [], error: void 0, hasError: false };
-    try {
-        const sw = __addDisposableResource(env_1, maybeStopWatch(`Git.parseStatus(${repoPath}, v=${porcelainVersion})`, {
-            log: { onlyExit: true, level: 'debug' },
-        }), false);
-        if (!data) {
-            sw?.stop({ suffix: ` no data` });
-            return undefined;
-        }
-        const lines = data.split('\n').filter((i) => Boolean(i));
-        if (lines.length === 0) {
-            sw?.stop({ suffix: ` parsed no files` });
-            return undefined;
-        }
-        const status = porcelainVersion < 2 ? parseStatusV1(lines, repoPath, getUri) : parseStatusV2(lines, repoPath, getUri);
-        sw?.stop({ suffix: ` parsed ${status.files.length} files` });
-        return status;
-    }
-    catch (e_1) {
-        env_1.error = e_1;
-        env_1.hasError = true;
-    }
-    finally {
-        __disposeResources(env_1);
-    }
+function parseGitStatus(data, repoPath, porcelainVersion, getUri) {
+	try {
+		var _usingCtx$1 = _usingCtx();
+		const sw = _usingCtx$1.u(maybeStopWatch(`Git.parseStatus(${repoPath}, v=${porcelainVersion})`, { log: {
+			onlyExit: true,
+			level: "debug"
+		} }));
+		if (!data) {
+			sw?.stop({ suffix: ` no data` });
+			return;
+		}
+		const lines = data.split("\n").filter((i) => Boolean(i));
+		if (lines.length === 0) {
+			sw?.stop({ suffix: ` parsed no files` });
+			return;
+		}
+		const status = porcelainVersion < 2 ? parseStatusV1(lines, repoPath, getUri) : parseStatusV2(lines, repoPath, getUri);
+		sw?.stop({ suffix: ` parsed ${status.files.length} files` });
+		return status;
+	} catch (_) {
+		_usingCtx$1.e = _;
+	} finally {
+		_usingCtx$1.d();
+	}
 }
 function parseStatusV1(lines, repoPath, getUri) {
-    let branch;
-    const files = [];
-    const state = {
-        ahead: 0,
-        behind: 0,
-    };
-    let upstream;
-    let missing = false;
-    let position = -1;
-    while (++position < lines.length) {
-        const line = lines[position];
-        // Header
-        if (line.startsWith('##')) {
-            const lineParts = line.split(' ');
-            [branch, upstream] = lineParts[1].split('...');
-            if (lineParts.length > 2) {
-                const upstreamStatus = lineParts.slice(2).join(' ');
-                if (upstreamStatus === '[gone]') {
-                    missing = true;
-                    state.ahead = 0;
-                    state.behind = 0;
-                }
-                else {
-                    const aheadStatus = aheadStatusV1Regex.exec(upstreamStatus);
-                    state.ahead = aheadStatus == null ? 0 : Number(aheadStatus[1]) || 0;
-                    const behindStatus = behindStatusV1Regex.exec(upstreamStatus);
-                    state.behind = behindStatus == null ? 0 : Number(behindStatus[1]) || 0;
-                }
-            }
-        }
-        else {
-            const rawStatus = line.substring(0, 2);
-            const fileName = line.substring(3);
-            if (rawStatus.startsWith('R') || rawStatus.startsWith('C')) {
-                const [file1, file2] = fileName.replace(quoteRegex, '').split(' -> ');
-                files.push(parseStatusFile(repoPath, rawStatus, file2.trim(), getUri, file1.trim()));
-            }
-            else {
-                files.push(parseStatusFile(repoPath, rawStatus, fileName, getUri));
-            }
-        }
-    }
-    return new GitStatus(normalizePath(repoPath), branch ?? '', '', files, upstream ? { name: upstream, missing: missing, state: state } : undefined);
+	let branch;
+	const files = [];
+	const state = {
+		ahead: 0,
+		behind: 0
+	};
+	let upstream;
+	let missing = false;
+	let position = -1;
+	while (++position < lines.length) {
+		const line = lines[position];
+		if (line.startsWith("##")) {
+			const lineParts = line.split(" ");
+			[branch, upstream] = lineParts[1].split("...");
+			if (lineParts.length > 2) {
+				const upstreamStatus = lineParts.slice(2).join(" ");
+				if (upstreamStatus === "[gone]") {
+					missing = true;
+					state.ahead = 0;
+					state.behind = 0;
+				} else {
+					const aheadStatus = aheadStatusV1Regex.exec(upstreamStatus);
+					state.ahead = aheadStatus == null ? 0 : Number(aheadStatus[1]) || 0;
+					const behindStatus = behindStatusV1Regex.exec(upstreamStatus);
+					state.behind = behindStatus == null ? 0 : Number(behindStatus[1]) || 0;
+				}
+			}
+		} else {
+			const rawStatus = line.substring(0, 2);
+			const fileName = line.substring(3);
+			if (rawStatus.startsWith("R") || rawStatus.startsWith("C")) {
+				const [file1, file2] = fileName.replace(quoteRegex, "").split(" -> ");
+				files.push(parseStatusFile(repoPath, rawStatus, file2.trim(), getUri, file1.trim()));
+			} else files.push(parseStatusFile(repoPath, rawStatus, fileName, getUri));
+		}
+	}
+	return new GitStatus(normalizePath(repoPath), branch ?? "", "", files, upstream ? {
+		name: upstream,
+		missing,
+		state
+	} : void 0);
 }
 function parseStatusV2(lines, repoPath, getUri) {
-    let branch;
-    const files = [];
-    let sha;
-    const state = {
-        ahead: 0,
-        behind: 0,
-    };
-    let missing = true;
-    let upstream;
-    let position = -1;
-    while (++position < lines.length) {
-        const line = lines[position];
-        // Headers
-        if (line.startsWith('#')) {
-            const lineParts = line.split(' ');
-            switch (lineParts[1]) {
-                case 'branch.oid':
-                    sha = lineParts[2];
-                    break;
-                case 'branch.head':
-                    branch = lineParts[2];
-                    break;
-                case 'branch.upstream':
-                    upstream = lineParts[2];
-                    break;
-                case 'branch.ab':
-                    missing = false;
-                    state.ahead = Number(lineParts[2].substring(1));
-                    state.behind = Number(lineParts[3].substring(1));
-                    break;
-            }
-        }
-        else {
-            const lineParts = line.split(' ');
-            switch (lineParts[0][0]) {
-                case '1': {
-                    // normal: 1 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <path>
-                    // <sub> starts with 'S' if submodule, 'N' if not
-                    const submodule = lineParts[2]?.startsWith('S')
-                        ? { oid: lineParts[7], previousOid: lineParts[6] }
-                        : undefined;
-                    files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(8).join(' '), getUri, undefined, submodule));
-                    break;
-                }
-                case '2': {
-                    // rename: 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path>\t<origPath>
-                    const submodule = lineParts[2]?.startsWith('S')
-                        ? { oid: lineParts[7], previousOid: lineParts[6] }
-                        : undefined;
-                    const file = lineParts.slice(9).join(' ').split('\t');
-                    files.push(parseStatusFile(repoPath, lineParts[1], file[0], getUri, file[1], submodule));
-                    break;
-                }
-                case 'u': {
-                    // unmerged: u <XY> <sub> <m1> <m2> <m3> <mW> <h1> <h2> <h3> <path>
-                    const submodule = lineParts[2]?.startsWith('S')
-                        ? { oid: lineParts[9], previousOid: lineParts[7] }
-                        : undefined;
-                    files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(10).join(' '), getUri, undefined, submodule));
-                    break;
-                }
-                case '?': // untracked
-                    files.push(parseStatusFile(repoPath, '??', lineParts.slice(1).join(' '), getUri));
-                    break;
-            }
-        }
-    }
-    return new GitStatus(normalizePath(repoPath), branch ?? '', sha ?? '', files, upstream ? { name: upstream, missing: missing, state: state } : undefined);
+	let branch;
+	const files = [];
+	let sha;
+	const state = {
+		ahead: 0,
+		behind: 0
+	};
+	let missing = true;
+	let upstream;
+	let position = -1;
+	while (++position < lines.length) {
+		const line = lines[position];
+		if (line.startsWith("#")) {
+			const lineParts = line.split(" ");
+			switch (lineParts[1]) {
+				case "branch.oid":
+					sha = lineParts[2];
+					break;
+				case "branch.head":
+					branch = lineParts[2];
+					break;
+				case "branch.upstream":
+					upstream = lineParts[2];
+					break;
+				case "branch.ab":
+					missing = false;
+					state.ahead = Number(lineParts[2].substring(1));
+					state.behind = Number(lineParts[3].substring(1));
+			}
+		} else {
+			const lineParts = line.split(" ");
+			switch (lineParts[0][0]) {
+				case "1": {
+					const submodule = lineParts[2]?.startsWith("S") ? {
+						oid: lineParts[7],
+						previousOid: lineParts[6]
+					} : void 0;
+					files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(8).join(" "), getUri, void 0, submodule));
+					break;
+				}
+				case "2": {
+					const submodule = lineParts[2]?.startsWith("S") ? {
+						oid: lineParts[7],
+						previousOid: lineParts[6]
+					} : void 0;
+					const file = lineParts.slice(9).join(" ").split("	");
+					files.push(parseStatusFile(repoPath, lineParts[1], file[0], getUri, file[1], submodule));
+					break;
+				}
+				case "u": {
+					const submodule = lineParts[2]?.startsWith("S") ? {
+						oid: lineParts[9],
+						previousOid: lineParts[7]
+					} : void 0;
+					files.push(parseStatusFile(repoPath, lineParts[1], lineParts.slice(10).join(" "), getUri, void 0, submodule));
+					break;
+				}
+				case "?": files.push(parseStatusFile(repoPath, "??", lineParts.slice(1).join(" "), getUri));
+			}
+		}
+	}
+	return new GitStatus(normalizePath(repoPath), branch ?? "", sha ?? "", files, upstream ? {
+		name: upstream,
+		missing,
+		state
+	} : void 0);
 }
 function parseStatusFile(repoPath, rawStatus, fileName, getUri, originalFileName, submodule) {
-    let x = !rawStatus.startsWith('.') ? rawStatus[0].trim() : undefined;
-    if (x == null || x.length === 0) {
-        x = undefined;
-    }
-    let y = undefined;
-    if (rawStatus.length > 1) {
-        y = rawStatus[1] !== '.' ? rawStatus[1].trim() : undefined;
-        if (y == null || y.length === 0) {
-            y = undefined;
-        }
-    }
-    return new GitStatusFile(repoPath, x, y, fileName, getUri(fileName), originalFileName, submodule);
+	let x = !rawStatus.startsWith(".") ? rawStatus[0].trim() : void 0;
+	if (x == null || x.length === 0) x = void 0;
+	let y = void 0;
+	if (rawStatus.length > 1) {
+		y = rawStatus[1] !== "." ? rawStatus[1].trim() : void 0;
+		if (y == null || y.length === 0) y = void 0;
+	}
+	return new GitStatusFile(repoPath, x, y, fileName, getUri(fileName), originalFileName, submodule);
 }
+//#endregion
+export { parseGitStatus };
+
 //# sourceMappingURL=statusParser.js.map