@gitkraken/core-gitlens 0.7.2 → 0.9.0

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

@@ -1 +1 @@
-{"version":3,"file":"reflogParser.js","names":[],"sources":["../../../../git-cli/src/parsers/reflogParser.ts"],"sourcesContent":["import type { GitReflog } from '@gitlens/git/models/reflog.js';\nimport { GitReflogRecord } from '@gitlens/git/models/reflog.js';\nimport { maybeStopWatch } from '@gitlens/utils/stopwatch.js';\nimport type { LogParser } from './logParser.js';\nimport { createLogParser } from './logParser.js';\n\n// Layer 1 — Raw parser: extracts fields using binary separators via createLogParser\n\nconst reflogMapping = {\n\tsha: '%H',\n\tselector: '%gD',\n\tsubject: '%gs',\n};\n\ntype ReflogLogParser = LogParser<typeof reflogMapping>;\nlet _reflogParser: ReflogLogParser | undefined;\n\nexport function getReflogParser(): ReflogLogParser {\n\t_reflogParser ??= createLogParser(reflogMapping);\n\treturn _reflogParser;\n}\n\n// Layer 2 — Smart parser: correlates raw entries into GitReflogRecords\n\nfunction isHEADSelector(selector: string): boolean {\n\treturn selector === 'HEAD' || selector.endsWith('/HEAD');\n}\n\nexport function parseGitRefLog(\n\tparser: ReflogLogParser,\n\tdata: string,\n\trepoPath: string,\n\tcommands: string[],\n\tlimit: number,\n\ttotalLimit: number,\n): GitReflog | undefined {\n\tusing sw = maybeStopWatch(`Git.parseRefLog(${repoPath})`, { log: { onlyExit: true, level: 'debug' } });\n\tif (!data) {\n\t\tsw?.stop({ suffix: ` no data` });\n\t\treturn undefined;\n\t}\n\n\tconst records: GitReflogRecord[] = [];\n\n\tlet sha: string;\n\tlet selector: string;\n\tlet date: string;\n\tlet command: string;\n\tlet commandArgs: string | undefined;\n\tlet details: string | undefined;\n\n\tlet head: string | undefined;\n\tlet headDate: string | undefined;\n\tlet headSha: string | undefined;\n\n\tlet count = 0;\n\tlet total = 0;\n\tlet recordDate: string | undefined;\n\tlet record: GitReflogRecord | undefined;\n\n\tlet idx: number;\n\n\tfor (const entry of parser.parse(data)) {\n\t\t// Parse selector: \"refs/heads/main@{date}\" → selector + date\n\t\tidx = entry.selector.indexOf('@{');\n\t\tif (idx === -1) continue;\n\n\t\tselector = entry.selector.substring(0, idx);\n\t\tdate = entry.selector.substring(idx + 2, entry.selector.length - 1);\n\t\tsha = entry.sha;\n\n\t\t// Extract command early (everything before the first space or colon)\n\t\t// to allow skipping the full subject parse for filtered-out entries\n\t\tconst subject = entry.subject;\n\t\tconst spaceIdx = subject.indexOf(' ');\n\t\tconst colonIdx = subject.indexOf(':');\n\n\t\tif (spaceIdx === -1 && colonIdx === -1) {\n\t\t\tcommand = subject;\n\t\t} else if (colonIdx !== -1 && (spaceIdx === -1 || colonIdx < spaceIdx)) {\n\t\t\tcommand = subject.substring(0, colonIdx);\n\t\t} else {\n\t\t\tcommand = subject.substring(0, spaceIdx);\n\t\t}\n\n\t\ttotal++;\n\n\t\tif (record !== undefined) {\n\t\t\t// If the next record has the same sha as the previous, use it if it is not pointing to just HEAD and the previous is\n\t\t\tif (\n\t\t\t\tsha === record.sha &&\n\t\t\t\t(date !== recordDate || !isHEADSelector(record.selector) || isHEADSelector(selector))\n\t\t\t) {\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tif (sha !== record.sha) {\n\t\t\t\tif (\n\t\t\t\t\thead != null &&\n\t\t\t\t\theadDate === recordDate &&\n\t\t\t\t\theadSha === record.sha &&\n\t\t\t\t\tisHEADSelector(record.selector)\n\t\t\t\t) {\n\t\t\t\t\trecord.update(sha, head);\n\t\t\t\t} else {\n\t\t\t\t\trecord.update(sha);\n\t\t\t\t}\n\n\t\t\t\trecords.push(record);\n\t\t\t\trecord = undefined;\n\t\t\t\trecordDate = undefined;\n\n\t\t\t\tcount++;\n\t\t\t\tif (limit !== 0 && count >= limit) break;\n\t\t\t}\n\t\t}\n\n\t\tif (command === 'HEAD') {\n\t\t\thead = selector;\n\t\t\theadDate = date;\n\t\t\theadSha = sha;\n\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (commands.includes(command)) {\n\t\t\t// Only parse args/details when we're actually creating a record\n\t\t\tif (colonIdx === -1) {\n\t\t\t\tcommandArgs = spaceIdx !== -1 ? subject.substring(spaceIdx + 1) : undefined;\n\t\t\t\tdetails = undefined;\n\t\t\t} else {\n\t\t\t\tconst commandAndArgs = subject.substring(0, colonIdx);\n\t\t\t\tidx = commandAndArgs.indexOf(' ');\n\t\t\t\tcommandArgs = idx !== -1 ? commandAndArgs.substring(idx + 1) : undefined;\n\t\t\t\tdetails = colonIdx < subject.length - 1 ? subject.substring(colonIdx + 1).trimStart() : undefined;\n\t\t\t}\n\n\t\t\trecord = new GitReflogRecord(repoPath, sha, selector, new Date(date), command, commandArgs, details);\n\t\t\trecordDate = date;\n\t\t}\n\t}\n\n\tsw?.stop({ suffix: ` parsed ${records.length} records` });\n\n\treturn {\n\t\trepoPath: repoPath,\n\t\trecords: records,\n\t\tcount: count,\n\t\ttotal: total,\n\t\tlimit: limit,\n\t\thasMore: (limit !== 0 && count >= limit) || (totalLimit !== 0 && total >= totalLimit),\n\t};\n}\n"],"mappings":";;;;;AAQA,MAAM,gBAAgB;CACrB,KAAK;CACL,UAAU;CACV,SAAS;AACV;AAGA,IAAI;AAEJ,SAAgB,kBAAmC;CAClD,kBAAkB,gBAAgB,aAAa;CAC/C,OAAO;AACR;AAIA,SAAS,eAAe,UAA2B;CAClD,OAAO,aAAa,UAAU,SAAS,SAAS,OAAO;AACxD;AAEA,SAAgB,eACf,QACA,MACA,UACA,UACA,OACA,YACwB;;;EACxB,MAAM,KAAA,YAAA,EAAK,eAAe,mBAAmB,SAAS,IAAI,EAAE,KAAK;GAAE,UAAU;GAAM,OAAO;EAAQ,EAAE,CAAC,CAAA;EACrG,IAAI,CAAC,MAAM;GACV,IAAI,KAAK,EAAE,QAAQ,WAAW,CAAC;GAC/B;EACD;EAEA,MAAM,UAA6B,CAAC;EAEpC,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,IAAI;EACJ,IAAI;EAEJ,IAAI;EACJ,IAAI;EACJ,IAAI;EAEJ,IAAI,QAAQ;EACZ,IAAI,QAAQ;EACZ,IAAI;EACJ,IAAI;EAEJ,IAAI;EAEJ,KAAK,MAAM,SAAS,OAAO,MAAM,IAAI,GAAG;GAEvC,MAAM,MAAM,SAAS,QAAQ,IAAI;GACjC,IAAI,QAAQ,IAAI;GAEhB,WAAW,MAAM,SAAS,UAAU,GAAG,GAAG;GAC1C,OAAO,MAAM,SAAS,UAAU,MAAM,GAAG,MAAM,SAAS,SAAS,CAAC;GAClE,MAAM,MAAM;GAIZ,MAAM,UAAU,MAAM;GACtB,MAAM,WAAW,QAAQ,QAAQ,GAAG;GACpC,MAAM,WAAW,QAAQ,QAAQ,GAAG;GAEpC,IAAI,aAAa,MAAM,aAAa,IACnC,UAAU;QACJ,IAAI,aAAa,OAAO,aAAa,MAAM,WAAW,WAC5D,UAAU,QAAQ,UAAU,GAAG,QAAQ;QAEvC,UAAU,QAAQ,UAAU,GAAG,QAAQ;GAGxC;GAEA,IAAI,WAAW,KAAA,GAAW;IAEzB,IACC,QAAQ,OAAO,QACd,SAAS,cAAc,CAAC,eAAe,OAAO,QAAQ,KAAK,eAAe,QAAQ,IAEnF;IAGD,IAAI,QAAQ,OAAO,KAAK;KACvB,IACC,QAAQ,QACR,aAAa,cACb,YAAY,OAAO,OACnB,eAAe,OAAO,QAAQ,GAE9B,OAAO,OAAO,KAAK,IAAI;UAEvB,OAAO,OAAO,GAAG;KAGlB,QAAQ,KAAK,MAAM;KACnB,SAAS,KAAA;KACT,aAAa,KAAA;KAEb;KACA,IAAI,UAAU,KAAK,SAAS,OAAO;IACpC;GACD;GAEA,IAAI,YAAY,QAAQ;IACvB,OAAO;IACP,WAAW;IACX,UAAU;IAEV;GACD;GAEA,IAAI,SAAS,SAAS,OAAO,GAAG;IAE/B,IAAI,aAAa,IAAI;KACpB,cAAc,aAAa,KAAK,QAAQ,UAAU,WAAW,CAAC,IAAI,KAAA;KAClE,UAAU,KAAA;IACX,OAAO;KACN,MAAM,iBAAiB,QAAQ,UAAU,GAAG,QAAQ;KACpD,MAAM,eAAe,QAAQ,GAAG;KAChC,cAAc,QAAQ,KAAK,eAAe,UAAU,MAAM,CAAC,IAAI,KAAA;KAC/D,UAAU,WAAW,QAAQ,SAAS,IAAI,QAAQ,UAAU,WAAW,CAAC,CAAC,CAAC,UAAU,IAAI,KAAA;IACzF;IAEA,SAAS,IAAI,gBAAgB,UAAU,KAAK,UAAU,IAAI,KAAK,IAAI,GAAG,SAAS,aAAa,OAAO;IACnG,aAAa;GACd;EACD;EAEA,IAAI,KAAK,EAAE,QAAQ,WAAW,QAAQ,OAAO,UAAU,CAAC;EAExD,OAAO;GACI;GACD;GACF;GACA;GACA;GACP,SAAU,UAAU,KAAK,SAAS,SAAW,eAAe,KAAK,SAAS;EAC3E;;;;;;AACD"}
+{"version":3,"file":"reflogParser.js","names":[],"sources":["../../../../git-cli/src/parsers/reflogParser.ts"],"sourcesContent":["import type { GitReflog } from '@gitlens/git/models/reflog.js';\nimport { GitReflogRecord } from '@gitlens/git/models/reflog.js';\nimport { maybeStopWatch } from '@gitlens/utils/stopwatch.js';\nimport type { LogParser } from './logParser.js';\nimport { createLogParser } from './logParser.js';\n\n// Layer 1 — Raw parser: extracts fields using binary separators via createLogParser\n\nconst reflogMapping = {\n\tsha: '%H',\n\tselector: '%gD',\n\tsubject: '%gs',\n};\n\ntype ReflogLogParser = LogParser<typeof reflogMapping>;\nlet _reflogParser: ReflogLogParser | undefined;\n\nexport function getReflogParser(): ReflogLogParser {\n\t_reflogParser ??= createLogParser(reflogMapping);\n\treturn _reflogParser;\n}\n\nconst reflogEntryMapping = {\n\tsha: '%H',\n\tsubject: '%gs',\n};\n\ntype ReflogEntryLogParser = LogParser<typeof reflogEntryMapping>;\nlet _reflogEntryParser: ReflogEntryLogParser | undefined;\n\n/** Just a reflog entry's sha and message, for a read that never needs the selector */\nexport function getReflogEntryParser(): ReflogEntryLogParser {\n\t_reflogEntryParser ??= createLogParser(reflogEntryMapping);\n\treturn _reflogEntryParser;\n}\n\n// Layer 2 — Smart parser: correlates raw entries into GitReflogRecords\n\nfunction isHEADSelector(selector: string): boolean {\n\treturn selector === 'HEAD' || selector.endsWith('/HEAD');\n}\n\nexport function parseGitRefLog(\n\tparser: ReflogLogParser,\n\tdata: string,\n\trepoPath: string,\n\tcommands: string[],\n\tlimit: number,\n\ttotalLimit: number,\n): GitReflog | undefined {\n\tusing sw = maybeStopWatch(`Git.parseRefLog(${repoPath})`, { log: { onlyExit: true, level: 'debug' } });\n\tif (!data) {\n\t\tsw?.stop({ suffix: ` no data` });\n\t\treturn undefined;\n\t}\n\n\tconst records: GitReflogRecord[] = [];\n\n\tlet sha: string;\n\tlet selector: string;\n\tlet date: string;\n\tlet command: string;\n\tlet commandArgs: string | undefined;\n\tlet details: string | undefined;\n\n\tlet head: string | undefined;\n\tlet headDate: string | undefined;\n\tlet headSha: string | undefined;\n\n\tlet count = 0;\n\tlet total = 0;\n\tlet recordDate: string | undefined;\n\tlet record: GitReflogRecord | undefined;\n\n\tlet idx: number;\n\n\tfor (const entry of parser.parse(data)) {\n\t\t// Parse selector: \"refs/heads/main@{date}\" → selector + date\n\t\tidx = entry.selector.indexOf('@{');\n\t\tif (idx === -1) continue;\n\n\t\tselector = entry.selector.substring(0, idx);\n\t\tdate = entry.selector.substring(idx + 2, entry.selector.length - 1);\n\t\tsha = entry.sha;\n\n\t\t// Extract command early (everything before the first space or colon)\n\t\t// to allow skipping the full subject parse for filtered-out entries\n\t\tconst subject = entry.subject;\n\t\tconst spaceIdx = subject.indexOf(' ');\n\t\tconst colonIdx = subject.indexOf(':');\n\n\t\tif (spaceIdx === -1 && colonIdx === -1) {\n\t\t\tcommand = subject;\n\t\t} else if (colonIdx !== -1 && (spaceIdx === -1 || colonIdx < spaceIdx)) {\n\t\t\tcommand = subject.substring(0, colonIdx);\n\t\t} else {\n\t\t\tcommand = subject.substring(0, spaceIdx);\n\t\t}\n\n\t\ttotal++;\n\n\t\tif (record !== undefined) {\n\t\t\t// If the next record has the same sha as the previous, use it if it is not pointing to just HEAD and the previous is\n\t\t\tif (\n\t\t\t\tsha === record.sha &&\n\t\t\t\t(date !== recordDate || !isHEADSelector(record.selector) || isHEADSelector(selector))\n\t\t\t) {\n\t\t\t\tcontinue;\n\t\t\t}\n\n\t\t\tif (sha !== record.sha) {\n\t\t\t\tif (\n\t\t\t\t\thead != null &&\n\t\t\t\t\theadDate === recordDate &&\n\t\t\t\t\theadSha === record.sha &&\n\t\t\t\t\tisHEADSelector(record.selector)\n\t\t\t\t) {\n\t\t\t\t\trecord.update(sha, head);\n\t\t\t\t} else {\n\t\t\t\t\trecord.update(sha);\n\t\t\t\t}\n\n\t\t\t\trecords.push(record);\n\t\t\t\trecord = undefined;\n\t\t\t\trecordDate = undefined;\n\n\t\t\t\tcount++;\n\t\t\t\tif (limit !== 0 && count >= limit) break;\n\t\t\t}\n\t\t}\n\n\t\tif (command === 'HEAD') {\n\t\t\thead = selector;\n\t\t\theadDate = date;\n\t\t\theadSha = sha;\n\n\t\t\tcontinue;\n\t\t}\n\n\t\tif (commands.includes(command)) {\n\t\t\t// Only parse args/details when we're actually creating a record\n\t\t\tif (colonIdx === -1) {\n\t\t\t\tcommandArgs = spaceIdx !== -1 ? subject.substring(spaceIdx + 1) : undefined;\n\t\t\t\tdetails = undefined;\n\t\t\t} else {\n\t\t\t\tconst commandAndArgs = subject.substring(0, colonIdx);\n\t\t\t\tidx = commandAndArgs.indexOf(' ');\n\t\t\t\tcommandArgs = idx !== -1 ? commandAndArgs.substring(idx + 1) : undefined;\n\t\t\t\tdetails = colonIdx < subject.length - 1 ? subject.substring(colonIdx + 1).trimStart() : undefined;\n\t\t\t}\n\n\t\t\trecord = new GitReflogRecord(repoPath, sha, selector, new Date(date), command, commandArgs, details);\n\t\t\trecordDate = date;\n\t\t}\n\t}\n\n\tsw?.stop({ suffix: ` parsed ${records.length} records` });\n\n\treturn {\n\t\trepoPath: repoPath,\n\t\trecords: records,\n\t\tcount: count,\n\t\ttotal: total,\n\t\tlimit: limit,\n\t\thasMore: (limit !== 0 && count >= limit) || (totalLimit !== 0 && total >= totalLimit),\n\t};\n}\n"],"mappings":"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"}

package/dist/git-cli/providers/branches.d.ts

@@ -16,7 +16,9 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
   private readonly cache;
   private readonly provider;
   constructor(context: GitServiceContext, git: Git, cache: Cache, provider: CliGitProviderInternal);
-  getBranch(repoPath: string, name?: string, cancellation?: AbortSignal): Promise<GitBranch | undefined>;
+  getBranch(repoPath: string, name?: string, options?: {
+    force?: boolean;
+  }, cancellation?: AbortSignal): Promise<GitBranch | undefined>;
   private getCurrentBranch;
   getBranches(repoPath: string, options?: {
     filter?: (b: GitBranch) => boolean;
@@ -59,6 +61,13 @@ export declare class BranchesGitSubProvider implements GitBranchesSubProvider {
   deleteLocalBranch(repoPath: string, names: string | string[], options?: {
     force?: boolean;
   }): Promise<void>;
+  /**
+   * Drops what GitLens keeps for a local branch beyond its ref, for both ways one is deleted
+   * (`deleteLocalBranch` and `refs.deleteReference`). The persisted gk metadata goes too, not just the
+   * cached resolution: `getBaseBranchName` reads `branch.<ref>.gk-merge-base` before falling back to the
+   * reflog, so leaving it behind would hand a later branch reusing this name its predecessor's base.
+   */
+  forgetDeletedBranch(repoPath: string, name: string): Promise<void>;
   /**
    * Drops the cached and persisted per-branch metadata for whichever of `names` no longer exists. Only
    * for the partial-failure path — one extra `for-each-ref` is cheap while already handling an error,

package/dist/git-cli/providers/branches.js

@@ -34,7 +34,8 @@ var BranchesGitSubProvider = class {
 		this.cache = cache;
 		this.provider = provider;
 	}
-	async getBranch(repoPath, name, cancellation) {
+	async getBranch(repoPath, name, options, cancellation) {
+		if (options?.force) this.cache.evictCaches(repoPath, "branches");
 		if (name != null) {
 			const { values: [branch] } = await this.getBranches(repoPath, { filter: (b) => b.name === name }, cancellation);
 			return branch;
@@ -244,7 +245,7 @@ var BranchesGitSubProvider = class {
 			if (mergeTarget == null && options?.associatedPullRequest != null) {
 				const pr = await options.associatedPullRequest;
 				if (pr?.refs?.base != null) {
-					const branch = await this.getBranch(repoPath, ref, cancellation);
+					const branch = await this.getBranch(repoPath, ref, void 0, cancellation);
 					if (branch == null) return void 0;
 					mergeTarget = `${branch.remoteName}/${pr.refs.base.branch}`;
 					if (pr.stack == null) this.storeMergeTargetBranchName(repoPath, ref, mergeTarget, { skipInvalidation: ["branchOverviews"] });
@@ -460,10 +461,7 @@ var BranchesGitSubProvider = class {
 		];
 		try {
 			await this.git.run({ cwd: repoPath }, ...args);
-			for (const branch of branches) {
-				this.cache.deleteBaseBranchName(repoPath, branch);
-				await this.provider.config.removeGkConfigBranchSection(repoPath, branch);
-			}
+			for (const branch of branches) await this.forgetDeletedBranch(repoPath, branch);
 			this.context.hooks?.cache?.onReset?.(repoPath, "branches");
 			this.context.hooks?.repository?.onChanged?.(repoPath, ["heads"]);
 		} catch (ex) {
@@ -491,6 +489,16 @@ var BranchesGitSubProvider = class {
 		}
 	}
 	/**
+	* Drops what GitLens keeps for a local branch beyond its ref, for both ways one is deleted
+	* (`deleteLocalBranch` and `refs.deleteReference`). The persisted gk metadata goes too, not just the
+	* cached resolution: `getBaseBranchName` reads `branch.<ref>.gk-merge-base` before falling back to the
+	* reflog, so leaving it behind would hand a later branch reusing this name its predecessor's base.
+	*/
+	async forgetDeletedBranch(repoPath, name) {
+		this.cache.deleteBaseBranchName(repoPath, name);
+		await this.provider.config.removeGkConfigBranchSection(repoPath, name);
+	}
+	/**
 	* Drops the cached and persisted per-branch metadata for whichever of `names` no longer exists. Only
 	* for the partial-failure path — one extra `for-each-ref` is cheap while already handling an error,
 	* and keeps the success path free of it.
@@ -511,8 +519,7 @@ var BranchesGitSubProvider = class {
 			for (const name of names) {
 				if (surviving.has(name)) continue;
 				anyDeleted = true;
-				this.cache.deleteBaseBranchName(repoPath, name);
-				await this.provider.config.removeGkConfigBranchSection(repoPath, name);
+				await this.forgetDeletedBranch(repoPath, name);
 			}
 			return anyDeleted;
 		} catch {
@@ -898,17 +905,15 @@ var BranchesGitSubProvider = class {
 		const priority = options?.priority;
 		const priorityOpts = priority != null ? { priority } : void 0;
 		try {
-			let result = await this.git.run({
-				cwd: repoPath,
-				cancellation,
-				...priorityOpts
-			}, "reflog", ref, "--grep-reflog=branch: Created from *.");
-			let entries = result.stdout.split("\n").filter((entry) => Boolean(entry));
+			let entries = await this.provider.refs.getReflogEntries(repoPath, ref, {
+				grep: "branch: Created from *.",
+				priority
+			}, cancellation);
 			if (entries.length !== 1) return {
 				branch: void 0,
 				failed: false
 			};
-			let match = entries[0].match(/branch: Created from (.*)$/);
+			let match = entries[0].message.match(/branch: Created from (.*)$/);
 			if (match?.length === 2) {
 				let name = match[1];
 				if (name !== "HEAD") {
@@ -926,17 +931,15 @@ var BranchesGitSubProvider = class {
 					};
 				}
 			}
-			result = await this.git.run({
-				cwd: repoPath,
-				cancellation,
-				...priorityOpts
-			}, "reflog", "HEAD", `--grep-reflog=checkout: moving from .* to ${ref.replace("refs/heads/", "")}`);
-			entries = result.stdout.split("\n").filter((entry) => Boolean(entry));
+			entries = await this.provider.refs.getReflogEntries(repoPath, "HEAD", {
+				grep: `checkout: moving from .* to ${ref.replace("refs/heads/", "")}`,
+				priority
+			}, cancellation);
 			if (!entries.length) return {
 				branch: void 0,
 				failed: false
 			};
-			match = entries.at(-1).match(/checkout: moving from ([^\s]+)\s/);
+			match = entries.at(-1).message.match(/checkout: moving from ([^\s]+)\s/);
 			if (match?.length === 2) {
 				let name = match[1];
 				if (options?.upstream) {
@@ -954,6 +957,12 @@ var BranchesGitSubProvider = class {
 			}
 		} catch (ex) {
 			if (isCancellationError(ex)) throw ex;
+			const msg = ex?.toString() ?? "";
+			const stderr = ex instanceof GitError ? ex.stderr : void 0;
+			if ([GitErrors.badRevision, GitErrors.ambiguousArgument].some((error) => error.test(msg) || stderr != null && error.test(stderr))) return {
+				branch: void 0,
+				failed: false
+			};
 			return {
 				branch: void 0,
 				failed: true