Skip to content

Commit aef0e9c

Browse files
Defmon3Yash-Singh1
andauthored
fix(git): preserve whitespace in file paths (#12464) (#12465)
Co-authored-by: Yash Singh <[email protected]>
1 parent 25629a7 commit aef0e9c

2 files changed

Lines changed: 69 additions & 4 deletions

File tree

‎packages/contracts/src/git.test.ts‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
GitRunStackedActionResult,
99
GitRunStackedActionInput,
1010
GitResolvePullRequestResult,
11+
VcsStatusLocalResult,
1112
} from "./git.ts";
1213

1314
const decodeCreateWorktreeInput = Schema.decodeUnknownSync(VcsCreateWorktreeInput);
@@ -20,6 +21,7 @@ const decodePreparePullRequestThreadResult = Schema.decodeUnknownSync(
2021
const decodeRunStackedActionInput = Schema.decodeUnknownSync(GitRunStackedActionInput);
2122
const decodeRunStackedActionResult = Schema.decodeUnknownSync(GitRunStackedActionResult);
2223
const decodeResolvePullRequestResult = Schema.decodeUnknownSync(GitResolvePullRequestResult);
24+
const decodeVcsStatusLocalResult = Schema.decodeUnknownSync(VcsStatusLocalResult);
2325

2426
describe("VcsCreateWorktreeInput", () => {
2527
it("accepts omitted newRefName for existing-refName worktrees", () => {
@@ -125,6 +127,70 @@ describe("GitRunStackedActionInput", () => {
125127
expect(parsed.actionId).toBe("action-1");
126128
expect(parsed.action).toBe("create_pr");
127129
});
130+
131+
it("preserves leading and trailing whitespace in file paths", () => {
132+
const parsed = decodeRunStackedActionInput({
133+
actionId: "action-1",
134+
cwd: "/repo",
135+
action: "commit",
136+
filePaths: [" leading.txt", "trailing.txt "],
137+
});
138+
139+
expect(parsed.filePaths).toEqual([" leading.txt", "trailing.txt "]);
140+
});
141+
142+
it("rejects an empty file path", () => {
143+
expect(() =>
144+
decodeRunStackedActionInput({
145+
actionId: "action-1",
146+
cwd: "/repo",
147+
action: "commit",
148+
filePaths: [""],
149+
}),
150+
).toThrow();
151+
});
152+
});
153+
154+
describe("VcsStatusLocalResult", () => {
155+
it("preserves leading and trailing whitespace in working-tree paths", () => {
156+
const parsed = decodeVcsStatusLocalResult({
157+
isRepo: true,
158+
hasPrimaryRemote: true,
159+
isDefaultRef: false,
160+
refName: "main",
161+
hasWorkingTreeChanges: true,
162+
workingTree: {
163+
files: [
164+
{ path: " leading.txt", insertions: 1, deletions: 0 },
165+
{ path: "trailing.txt ", insertions: 0, deletions: 1 },
166+
],
167+
insertions: 1,
168+
deletions: 1,
169+
},
170+
});
171+
172+
expect(parsed.workingTree.files.map((file) => file.path)).toEqual([
173+
" leading.txt",
174+
"trailing.txt ",
175+
]);
176+
});
177+
178+
it("rejects an empty working-tree path", () => {
179+
expect(() =>
180+
decodeVcsStatusLocalResult({
181+
isRepo: true,
182+
hasPrimaryRemote: true,
183+
isDefaultRef: false,
184+
refName: "main",
185+
hasWorkingTreeChanges: true,
186+
workingTree: {
187+
files: [{ path: "", insertions: 0, deletions: 0 }],
188+
insertions: 0,
189+
deletions: 0,
190+
},
191+
}),
192+
).toThrow();
193+
});
128194
});
129195

130196
describe("GitRunStackedActionResult", () => {

‎packages/contracts/src/git.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { SourceControlProviderError, SourceControlProviderInfo } from "./sourceC
1111
import { VcsDriverKind } from "./vcs.ts";
1212

1313
const TrimmedNonEmptyStringSchema = TrimmedNonEmptyString;
14+
const GitFilePath = Schema.String.check(Schema.isNonEmpty());
1415
const GIT_LIST_BRANCHES_MAX_LIMIT = 200;
1516

1617
// Domain Types
@@ -129,9 +130,7 @@ export const GitRunStackedActionInput = Schema.Struct({
129130
action: GitStackedAction,
130131
commitMessage: Schema.optional(TrimmedNonEmptyStringSchema.check(Schema.isMaxLength(10_000))),
131132
featureBranch: Schema.optional(Schema.Boolean),
132-
filePaths: Schema.optional(
133-
Schema.Array(TrimmedNonEmptyStringSchema).check(Schema.isMinLength(1)),
134-
),
133+
filePaths: Schema.optional(Schema.Array(GitFilePath).check(Schema.isMinLength(1))),
135134
/** The thread the action runs beside; a pull request it creates is linked to it. */
136135
threadId: Schema.optional(ThreadId),
137136
projectId: Schema.optional(ProjectId),
@@ -234,7 +233,7 @@ const VcsStatusLocalShape = {
234233
workingTree: Schema.Struct({
235234
files: Schema.Array(
236235
Schema.Struct({
237-
path: TrimmedNonEmptyStringSchema,
236+
path: GitFilePath,
238237
insertions: NonNegativeInt,
239238
deletions: NonNegativeInt,
240239
}),

0 commit comments

Comments
 (0)