Skip to content

Commit e042099

Browse files
committed
test(server): expand regression coverage for submodule workspace indexing
- add coverage for nested initialized git submodules in workspace search - verify submodule-local ignore rules are respected when indexing submodule files - extract small git test helpers to keep submodule setup readable - harden the existing regression suite against future indexing regressions
1 parent 029c07f commit e042099

1 file changed

Lines changed: 82 additions & 8 deletions

File tree

‎apps/server/src/workspaceEntries.test.ts‎

Lines changed: 82 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,17 @@ function runGit(cwd: string, args: string[], options?: { config?: string[] }): v
3030
}
3131
}
3232

33+
function initGitRepo(cwd: string): void {
34+
runGit(cwd, ["init"]);
35+
runGit(cwd, ["config", "user.email", "[email protected]"]);
36+
runGit(cwd, ["config", "user.name", "Test User"]);
37+
}
38+
39+
function commitAll(cwd: string, message: string): void {
40+
runGit(cwd, ["add", "."]);
41+
runGit(cwd, ["commit", "-m", message]);
42+
}
43+
3344
describe("searchWorkspaceEntries", () => {
3445
afterEach(() => {
3546
vi.restoreAllMocks();
@@ -147,18 +158,13 @@ describe("searchWorkspaceEntries", () => {
147158

148159
it("includes files inside initialized git submodules", async () => {
149160
const submoduleOrigin = makeTempDir("t3code-workspace-submodule-origin-");
150-
runGit(submoduleOrigin, ["init"]);
151-
runGit(submoduleOrigin, ["config", "user.email", "[email protected]"]);
152-
runGit(submoduleOrigin, ["config", "user.name", "Test User"]);
161+
initGitRepo(submoduleOrigin);
153162
writeFile(submoduleOrigin, "src/submodule-file.ts", "export {};");
154163
writeFile(submoduleOrigin, "README.md", "# submodule\n");
155-
runGit(submoduleOrigin, ["add", "."]);
156-
runGit(submoduleOrigin, ["commit", "-m", "Initial submodule"]);
164+
commitAll(submoduleOrigin, "Initial submodule");
157165

158166
const cwd = makeTempDir("t3code-workspace-submodule-root-");
159-
runGit(cwd, ["init"]);
160-
runGit(cwd, ["config", "user.email", "[email protected]"]);
161-
runGit(cwd, ["config", "user.name", "Test User"]);
167+
initGitRepo(cwd);
162168
writeFile(cwd, "src/root.ts", "export {};");
163169
runGit(cwd, ["add", "src/root.ts"]);
164170
runGit(cwd, ["commit", "-m", "Initial root"]);
@@ -187,6 +193,74 @@ describe("searchWorkspaceEntries", () => {
187193
);
188194
});
189195

196+
it("includes files inside nested initialized git submodules", async () => {
197+
const nestedOrigin = makeTempDir("t3code-workspace-nested-submodule-origin-");
198+
initGitRepo(nestedOrigin);
199+
writeFile(nestedOrigin, "src/nested-file.ts", "export {};");
200+
commitAll(nestedOrigin, "Initial nested submodule");
201+
202+
const submoduleOrigin = makeTempDir("t3code-workspace-parent-submodule-origin-");
203+
initGitRepo(submoduleOrigin);
204+
writeFile(submoduleOrigin, "src/submodule-file.ts", "export {};");
205+
commitAll(submoduleOrigin, "Initial parent submodule");
206+
runGit(submoduleOrigin, ["submodule", "add", "-q", nestedOrigin, "deps/nested-submodule"], {
207+
config: ["protocol.file.allow=always"],
208+
});
209+
runGit(submoduleOrigin, ["commit", "-am", "Add nested submodule"]);
210+
211+
const cwd = makeTempDir("t3code-workspace-nested-submodule-root-");
212+
initGitRepo(cwd);
213+
writeFile(cwd, "src/root.ts", "export {};");
214+
runGit(cwd, ["add", "src/root.ts"]);
215+
runGit(cwd, ["commit", "-m", "Initial root"]);
216+
runGit(cwd, ["submodule", "add", "-q", submoduleOrigin, "vendor/submodule"], {
217+
config: ["protocol.file.allow=always"],
218+
});
219+
runGit(cwd, ["commit", "-am", "Add submodule"]);
220+
runGit(cwd, ["submodule", "update", "--init", "--recursive"], {
221+
config: ["protocol.file.allow=always"],
222+
});
223+
224+
const result = await searchWorkspaceEntries({ cwd, query: "", limit: 200 });
225+
const paths = result.entries.map((entry) => entry.path);
226+
227+
assert.include(paths, "vendor/submodule");
228+
assert.include(paths, "vendor/submodule/deps");
229+
assert.include(paths, "vendor/submodule/deps/nested-submodule");
230+
assert.include(paths, "vendor/submodule/deps/nested-submodule/src");
231+
assert.include(paths, "vendor/submodule/deps/nested-submodule/src/nested-file.ts");
232+
assert.isFalse(
233+
result.entries.some(
234+
(entry) => entry.path === "vendor/submodule/deps/nested-submodule" && entry.kind === "file",
235+
),
236+
);
237+
});
238+
239+
it("applies submodule-local ignore rules when listing submodule files", async () => {
240+
const submoduleOrigin = makeTempDir("t3code-workspace-submodule-ignore-origin-");
241+
initGitRepo(submoduleOrigin);
242+
writeFile(submoduleOrigin, ".gitignore", "ignored.ts\n");
243+
writeFile(submoduleOrigin, "src/submodule-file.ts", "export {};");
244+
commitAll(submoduleOrigin, "Initial submodule");
245+
246+
const cwd = makeTempDir("t3code-workspace-submodule-ignore-root-");
247+
initGitRepo(cwd);
248+
writeFile(cwd, "src/root.ts", "export {};");
249+
runGit(cwd, ["add", "src/root.ts"]);
250+
runGit(cwd, ["commit", "-m", "Initial root"]);
251+
runGit(cwd, ["submodule", "add", "-q", submoduleOrigin, "vendor/submodule"], {
252+
config: ["protocol.file.allow=always"],
253+
});
254+
writeFile(cwd, "vendor/submodule/ignored.ts", "export {};");
255+
writeFile(cwd, "vendor/submodule/keep.ts", "export {};");
256+
257+
const result = await searchWorkspaceEntries({ cwd, query: "", limit: 200 });
258+
const paths = result.entries.map((entry) => entry.path);
259+
260+
assert.include(paths, "vendor/submodule/keep.ts");
261+
assert.notInclude(paths, "vendor/submodule/ignored.ts");
262+
});
263+
190264
it("deduplicates concurrent index builds for the same cwd", async () => {
191265
const cwd = makeTempDir("t3code-workspace-concurrent-build-");
192266
writeFile(cwd, "src/components/Composer.tsx");

0 commit comments

Comments
 (0)