fix(cli): subfolder renders read an ancestor's record however it is stored or spelled (#7847)

The received-files lookup above a rendered folder now treats a record path
that exists but is not a readable file (a folder, a dangling link, any
other kind of file) as an unreadable record, the same answer the folder's
own record gives. Only a missing record means nothing was received.

A listed file now counts as inside the rendered subfolder when one of its
parent folders is the same folder on disk, so naming the subfolder in
another letter case on a case-insensitive disk keeps its received files.
This commit is contained in:
Michael Wang
2026-11-15 19:19:11 +00:00
committed by GitHub
parent 064c436557
commit fe21bee3cf
2 changed files with 71 additions and 10 deletions
+33 -10
View File
@@ -34,21 +34,32 @@ interface ReceivedRecord {
listed: unknown;
}
function recordFileAt(dir: string): boolean {
type RecordKind = "absent" | "file" | "other" | "unknown";
function recordKind(dir: string): RecordKind {
const path = join(dir, RECEIVED_RECORD);
let found;
try {
return statSync(join(dir, RECEIVED_RECORD)).isFile();
found = lstatSync(path, { throwIfNoEntry: false });
} catch (error) {
return (error as NodeJS.ErrnoException).code === "ENOTDIR" ? "absent" : "unknown";
}
if (!found) return "absent";
try {
return statSync(path).isFile() ? "file" : "other";
} catch {
return false;
return "other";
}
}
function readRecord(dir: string, ownFolder: boolean): { listed: unknown } | null {
if (!ownFolder && !recordFileAt(dir)) return null;
const kind = recordKind(dir);
if (kind === "absent" || (kind === "unknown" && !ownFolder)) return null;
if (kind !== "file") return { listed: undefined };
try {
return { listed: JSON.parse(readFileSync(join(dir, RECEIVED_RECORD), "utf-8")).files };
} catch (error) {
const code = (error as NodeJS.ErrnoException).code;
return ownFolder && (code === "ENOENT" || code === "ENOTDIR") ? null : { listed: undefined };
} catch {
return { listed: undefined };
}
}
@@ -161,10 +172,22 @@ export function receivedFiles(projectDir: string): (path: string) => boolean {
}
function listedUnder(record: ReceivedRecord): string[] {
const entries = (record.listed as unknown[]).map(String);
const prefix = record.projectDirFromRoot ? `${record.projectDirFromRoot}/`.normalize("NFC") : "";
return (record.listed as unknown[])
.map(String)
.filter((entry) => entry.normalize("NFC").startsWith(prefix))
const folder = prefix ? fileIdentity(join(record.root, record.projectDirFromRoot)) : null;
const identities = new Map<string, string | null>();
const inFolderOnDisk = (path: string) => {
for (let dir = dirname(path); folder && dir.length > record.root.length; dir = dirname(dir)) {
if (!identities.has(dir)) identities.set(dir, fileIdentity(dir));
if (identities.get(dir) === folder) return true;
}
return false;
};
return entries
.filter(
(entry) =>
entry.normalize("NFC").startsWith(prefix) || inFolderOnDisk(join(record.root, entry)),
)
.map((entry) => join(record.root, entry));
}