Merge branch 'content-layer' into loader-types

withastro · Jun 28, 2024 · e98c6d5 · e98c6d5
2 parents 47649ca + a66df94
commit e98c6d5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/packages/astro/src/content/file.ts b/packages/astro/src/content/file.ts
@@ -16,7 +16,7 @@ export function file(fileName: string): Loader {
 		name: 'file-loader',
 		load: async ({ store, logger, settings, parseData }) => {
 			const contentDir = new URL('./content/', settings.config.srcDir);
-
+			logger.debug(`Loading data from ${fileName}`)
 			const url = new URL(fileName, contentDir);
 			if (!existsSync(url)) {
 				logger.error(`File not found: ${fileName}`);
@@ -40,6 +40,7 @@ export function file(fileName: string): Loader {
 				if (json.length === 0) {
 					logger.warn(`No items found in ${fileName}`);
 				}
+				logger.debug(`Found ${json.length} item array in ${fileName}`);
 				for (const rawItem of json) {
 					const id = (rawItem.id ?? rawItem.slug)?.toString();
 					if (!id) {
@@ -50,7 +51,9 @@ export function file(fileName: string): Loader {
 					store.set(id, item);
 				}
 			} else if (typeof json === 'object') {
-				for (const [id, rawItem] of Object.entries<Record<string, unknown>>(json)) {
+				const entries =  Object.entries<Record<string, unknown>>(json);
+				logger.debug(`Found object with ${entries.length} entries in ${fileName}`);
+				for (const [id, rawItem] of entries) {
 					const item = await parseData({ id, data: rawItem, filePath });
 					store.set(id, item);
 				}

diff --git a/packages/astro/src/content/loaders.ts b/packages/astro/src/content/loaders.ts
@@ -53,6 +53,7 @@ export async function syncContentLayer({
 	store,
 }: { settings: AstroSettings; logger: Logger; store?: DataStore }) {
 	const logger = globalLogger.forkIntegrationLogger('content');
+	logger.info('Syncing content');
 	if (!store) {
 		store = await DataStore.fromDisk(new URL(DATA_STORE_FILE, settings.config.cacheDir));
 		globalDataStore.set(store);
@@ -108,7 +109,7 @@ export async function syncContentLayer({
 				collection: name,
 				store: store.scopedStore(name),
 				meta: store.metaStore(name),
-				logger,
+				logger: globalLogger.forkIntegrationLogger(collection.loader.name ?? 'content'),
 				settings,
 				parseData,
 			});

diff --git a/packages/astro/src/core/dev/dev.ts b/packages/astro/src/core/dev/dev.ts
@@ -7,6 +7,7 @@ import { gt, major, minor, patch } from 'semver';
 import type * as vite from 'vite';
 import type { AstroInlineConfig } from '../../@types/astro.js';
 import { attachContentServerListeners } from '../../content/index.js';
+import { syncContentLayer } from '../../content/loaders.js';
 import { telemetry } from '../../events/index.js';
 import * as msg from '../messages.js';
 import { ensureProcessNodeEnv } from '../util.js';
@@ -102,6 +103,8 @@ export default async function dev(inlineConfig: AstroInlineConfig): Promise<DevS
 
 	await attachContentServerListeners(restart.container);
 
+	await syncContentLayer({ settings: restart.container.settings, logger: logger });
+
 	logger.info(null, green('watching for file changes...'));
 
 	return {

diff --git a/packages/astro/types/content.d.ts b/packages/astro/types/content.d.ts
@@ -49,7 +49,7 @@ declare module 'astro:content' {
 		/**  A simple KV store, designed for things like sync tokens */
 		meta: MetaStore;
 		logger: import('astro').AstroIntegrationLogger;
-		settings: any;
+		settings: import('astro').AstroSettings;
 		/** Validates and parses the data according to the schema */
 		parseData<T extends Record<string, unknown> = Record<string, unknown>>(
 			props: ParseDataOptions