Skip to content

[compiler][snap] Fix for filter mode with nested files, 'error.' prefix #35215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 25, 2025
+10 −20
Merged

[compiler][snap] Fix for filter mode with nested files, 'error.' prefix #35215

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 10 additions & 20 deletions compiler/packages/snap/src/fixture-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,6 @@ function stripExtension(filename: string, extensions: Array<string>): string {
return filename;
}

/**
* Strip all extensions from a filename
* e.g., "foo.expect.md" -> "foo"
*/
function stripAllExtensions(filename: string): string {
let result = filename;
while (true) {
const extension = path.extname(result);
if (extension === '') {
return result;
}
result = path.basename(result, extension);
}
}

export async function readTestFilter(): Promise<TestFilter | null> {
if (!(await exists(FILTER_PATH))) {
throw new Error(`testfilter file not found at \`${FILTER_PATH}\``);
Expand Down Expand Up @@ -134,13 +119,15 @@ async function readInputFixtures(
// `alias-while` => search for `alias-while{.js,.jsx,.ts,.tsx}`
// `alias-while.js` => search as-is
// `alias-while.expect.md` => search for `alias-while{.js,.jsx,.ts,.tsx}`
const basename = path.basename(pattern);
const basenameWithoutExt = stripAllExtensions(basename);
const hasExtension = basename !== basenameWithoutExt;
const patternWithoutExt = stripExtension(pattern, [
...INPUT_EXTENSIONS,
SNAPSHOT_EXTENSION,
]);
const hasExtension = pattern !== patternWithoutExt;
const globPattern =
hasExtension && !pattern.endsWith(SNAPSHOT_EXTENSION)
? pattern
: `${basenameWithoutExt}{${INPUT_EXTENSIONS.join(',')}}`;
: `${patternWithoutExt}{${INPUT_EXTENSIONS.join(',')}}`;
return glob.glob(globPattern, {
cwd: rootDir,
});
Expand Down Expand Up @@ -181,7 +168,10 @@ async function readOutputFixtures(
await Promise.all(
filter.paths.map(pattern => {
// Strip all extensions and find matching .expect.md files
const basenameWithoutExt = stripAllExtensions(pattern);
const basenameWithoutExt = stripExtension(pattern, [
...INPUT_EXTENSIONS,
SNAPSHOT_EXTENSION,
]);
return glob.glob(`${basenameWithoutExt}${SNAPSHOT_EXTENSION}`, {
cwd: rootDir,
});
Expand Down