singularity/singularity-forge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: replace TS parameter properties with explicit fields for Node strip-types compatibility

Browse source 
MergeConflictError used `public readonly` constructor parameter properties,
which are not supported by Node's --experimental-strip-types mode (type
stripping only, no TS-to-JS transforms). This crashed 19 test files on import.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Lex Christopherson 2026-03-13 23:33:21 -06:00
parent b287457250
commit 33e5ec6d37
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/resources/extensions/gsd/git-service.ts
View file

@ -50,17 +50,26 @@ export interface MergeSliceResult {
* caller can dispatch a fix-merge session to resolve it.
*/
export class MergeConflictError extends Error {
readonly conflictedFiles: string[];
readonly strategy: "squash" | "merge";
readonly branch: string;
readonly mainBranch: string;
constructor(
public readonly conflictedFiles: string[],
public readonly strategy: "squash" | "merge",
public readonly branch: string,
public readonly mainBranch: string,
conflictedFiles: string[],
strategy: "squash" | "merge",
branch: string,
mainBranch: string,
) {
super(
`${strategy === "merge" ? "Merge" : "Squash-merge"} of "${branch}" into "${mainBranch}" ` +
`failed with conflicts in ${conflictedFiles.length} non-.gsd file(s): ${conflictedFiles.join(", ")}`,
);
this.name = "MergeConflictError";
this.conflictedFiles = conflictedFiles;
this.strategy = strategy;
this.branch = branch;
this.mainBranch = mainBranch;
}
}