Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-03-10 23:01:26 -05:00
Code Issues Activity

Fix file loader for JSON object files (#11801)

Browse source 
* Add `filePath` to `file()` loader entries when JSON file is an object

* Add changeset
This commit is contained in:
Chris Swithinbank 2024-08-21 13:17:52 +02:00 • committed by GitHub
parent 6814ff07f5
commit 9f943c1344
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changeset/four-rats-fail.md Normal file
View file

@ -0,0 +1,5 @@
---
'astro': patch
---
Fixes a bug where the `filePath` property was not available on content collection entries when using the content layer `file()` loader with a JSON file that contained an object instead of an array. This was breaking use of the `image()` schema utility among other things.

10
packages/astro/src/content/loaders/file.ts
View file

@ -26,6 +26,8 @@ export function file(fileName: string): Loader {
return; return;
} }
const normalizedFilePath = posixRelative(fileURLToPath(settings.config.root), filePath);
if (Array.isArray(json)) { if (Array.isArray(json)) {
if (json.length === 0) { if (json.length === 0) {
logger.warn(`No items found in ${fileName}`); logger.warn(`No items found in ${fileName}`);
@ -39,11 +41,7 @@ export function file(fileName: string): Loader {
continue; continue;
} }
const data = await parseData({ id, data: rawItem, filePath }); const data = await parseData({ id, data: rawItem, filePath });
store.set({ store.set({ id, data, filePath: normalizedFilePath });
id,
data,
filePath: posixRelative(fileURLToPath(settings.config.root), filePath),
});
} }
} else if (typeof json === 'object') { } else if (typeof json === 'object') {
const entries = Object.entries<Record<string, unknown>>(json); const entries = Object.entries<Record<string, unknown>>(json);
@ -51,7 +49,7 @@ export function file(fileName: string): Loader {
store.clear(); store.clear();
for (const [id, rawItem] of entries) { for (const [id, rawItem] of entries) {
const data = await parseData({ id, data: rawItem, filePath }); const data = await parseData({ id, data: rawItem, filePath });
store.set({ id, data }); store.set({ id, data, filePath: normalizedFilePath });
} }
} else { } else {
logger.error(`Invalid data in ${fileName}. Must be an array or object.`); logger.error(`Invalid data in ${fileName}. Must be an array or object.`);