refactor: new lookupMap logic, better errors

packages/astro/src/content/types-generator.ts

@@ -205,10 +205,10 @@ export async function createContentTypesGenerator({
 					}
 					const collectionInfo = collectionEntryMap[collectionKey];
 					if (collectionInfo.type === 'content') {
-						throw new AstroError({
-							code: 99999,
-							message: `${collectionKey} contains a mix of content and data entries. All entries must be of the same type.`,
-						});
+						// Mixed content / data collection detected.
+						// `astro:content` virtual module should throw an error for the overlay.
+						// @see 'src/content/vite-plugin-virtual-mod.ts'
+						return { shouldGenerateTypes: false };
 					}
 					if (!(entryKey in collectionEntryMap[collectionKey])) {
 						collectionEntryMap[collectionKey] = {
@@ -240,10 +240,10 @@ export async function createContentTypesGenerator({
 		}
 		const collectionInfo = collectionEntryMap[collectionKey];
 		if (collectionInfo.type === 'data') {
-			throw new AstroError({
-				code: 99999,
-				message: `${collectionKey} contains a mix of content and data entries. All entries must be of the same type.`,
-			});
+			// Mixed content / data collection detected.
+			// `astro:content` virtual module should throw an error for the overlay.
+			// @see 'src/content/vite-plugin-virtual-mod.ts'
+			return { shouldGenerateTypes: false };
 		}
 		const entryKey = JSON.stringify(id);
 

packages/astro/src/content/vite-plugin-content-virtual-mod.ts

@@ -1,4 +1,4 @@
-import glob, { type Options as FastGlobOptions } from 'fast-glob';
+import glob from 'fast-glob';
 import fsMod from 'node:fs';
 import type { Plugin } from 'vite';
 import type { AstroSettings } from '../@types/astro.js';
@@ -12,7 +12,8 @@ import {
 	getContentEntryIdAndSlug,
 	getEntrySlug,
 	getDataEntryId,
-	hasUnderscoreBelowContentDirectoryPath,
+	getEntryType,
+	type ContentPaths,
 } from './utils.js';
 import { rootRelativePath } from '../core/util.js';
 import { extname } from 'node:path';
@@ -51,22 +52,21 @@ export function astroContentVirtualModPlugin({
 
 	return {
 		name: 'astro-content-virtual-mod-plugin',
-		enforce: 'pre',
 		resolveId(id) {
 			if (id === VIRTUAL_MODULE_ID) {
 				return astroContentVirtualModuleId;
 			}
 		},
 		async load(id) {
-			const stringifiedLookupMap = await getStringifiedLookupMap({
-				fs: fsMod,
-				contentDir: contentPaths.contentDir,
-				contentEntryConfigByExt,
-				dataEntryExts,
-				root: settings.config.root,
-			});
-
 			if (id === astroContentVirtualModuleId) {
+				const stringifiedLookupMap = await getStringifiedLookupMap({
+					fs: fsMod,
+					contentPaths,
+					contentEntryConfigByExt,
+					dataEntryExts,
+					root: settings.config.root,
+				});
+
 				return {
 					code: virtualModContents.replace(
 						'/* @@LOOKUP_MAP_ASSIGNMENT@@ */',
@@ -88,101 +88,93 @@ export type ContentLookupMap = {
  * @see `src/content/virtual-mod.mjs`
  */
 export async function getStringifiedLookupMap({
-	contentDir,
+	contentPaths,
 	contentEntryConfigByExt,
 	dataEntryExts,
 	root,
 	fs,
 }: {
 	contentEntryConfigByExt: ReturnType<typeof getContentEntryConfigByExtMap>;
 	dataEntryExts: string[];
-	contentDir: URL;
+	contentPaths: Pick<ContentPaths, 'contentDir' | 'config'>;
 	root: URL;
 	fs: typeof fsMod;
 }) {
-	const globOpts: FastGlobOptions = {
-		absolute: true,
-		cwd: fileURLToPath(root),
-		fs: {
-			readdir: fs.readdir.bind(fs),
-			readdirSync: fs.readdirSync.bind(fs),
-		},
-	};
-
-	let contentLookupMap: ContentLookupMap = {};
+	const { contentDir } = contentPaths;
 	const relContentDir = rootRelativePath(root, contentDir, false);
-	async function getGlob(exts: string[]) {
-		const result = await glob(`${relContentDir}**/*${getExtGlob(exts)}`, globOpts);
-		return result.filter(
-			(e) => !hasUnderscoreBelowContentDirectoryPath(pathToFileURL(e), contentDir)
-		);
-	}
+	const contentEntryExts = [...contentEntryConfigByExt.keys()];
 
-	// TODO: refactor to single glob with `getEntryType`
-	const contentGlob = await getGlob([...contentEntryConfigByExt.keys()]);
+	let lookupMap: ContentLookupMap = {};
+	const contentGlob = await glob(
+		`${relContentDir}**/*${getExtGlob([...dataEntryExts, ...contentEntryExts])}`,
+		{
+			absolute: true,
+			cwd: fileURLToPath(root),
+			fs: {
+				readdir: fs.readdir.bind(fs),
+				readdirSync: fs.readdirSync.bind(fs),
+			},
+		}
+	);
 
 	await Promise.all(
 		contentGlob.map(async (filePath) => {
-			const contentEntryType = contentEntryConfigByExt.get(extname(filePath));
-			if (!contentEntryType) return;
-			const collection = getEntryCollectionName({ contentDir, entry: pathToFileURL(filePath) });
-			// Globbed entry outside a collection directory
-			// Log warning during type generation, safe to ignore in lookup map
-			if (!collection) return;
-
-			const { id, slug: generatedSlug } = await getContentEntryIdAndSlug({
-				entry: pathToFileURL(filePath),
-				contentDir,
-				collection,
-			});
-			const slug = await getEntrySlug({
-				id,
-				collection,
-				generatedSlug,
-				fs,
-				fileUrl: pathToFileURL(filePath),
-				contentEntryType,
-			});
-			contentLookupMap[collection] = {
-				type: 'content',
-				entries: {
-					...contentLookupMap[collection]?.entries,
-					[slug]: rootRelativePath(root, filePath),
-				},
-			};
-		})
-	);
+			const entryType = getEntryType(filePath, contentPaths, contentEntryExts, dataEntryExts);
+			// Globbed ignored or unsupported entry.
+			// Logs warning during type generation, should ignore in lookup map.
+			if (entryType !== 'content' && entryType !== 'data') return;
 
-	const dataGlob = await getGlob(dataEntryExts);
-	await Promise.all(
-		dataGlob.map(async (filePath) => {
 			const collection = getEntryCollectionName({ contentDir, entry: pathToFileURL(filePath) });
-			// Globbed entry outside a collection directory
-			// Log warning during type generation, safe to ignore in lookup map
-			if (!collection) return;
-
-			const id = getDataEntryId({
-				entry: pathToFileURL(filePath),
-				contentDir,
-				collection,
-			});
+			if (!collection) throw UnexpectedLookupMapError;
 
-			if (contentLookupMap[collection]?.type === 'content') {
+			if (lookupMap[collection]?.type && lookupMap[collection].type !== entryType) {
 				throw new AstroError({
 					...AstroErrorData.MixedContentDataCollectionError,
 					message: AstroErrorData.MixedContentDataCollectionError.message(collection),
 				});
 			}
 
-			contentLookupMap[collection] = {
-				type: 'data',
-				entries: {
-					...contentLookupMap[collection]?.entries,
-					[id]: rootRelativePath(root, filePath),
-				},
-			};
+			if (entryType === 'content') {
+				const contentEntryType = contentEntryConfigByExt.get(extname(filePath));
+				if (!contentEntryType) throw UnexpectedLookupMapError;
+
+				const { id, slug: generatedSlug } = await getContentEntryIdAndSlug({
+					entry: pathToFileURL(filePath),
+					contentDir,
+					collection,
+				});
+				const slug = await getEntrySlug({
+					id,
+					collection,
+					generatedSlug,
+					fs,
+					fileUrl: pathToFileURL(filePath),
+					contentEntryType,
+				});
+				lookupMap[collection] = {
+					type: 'content',
+					entries: {
+						...lookupMap[collection]?.entries,
+						[slug]: rootRelativePath(root, filePath),
+					},
+				};
+			} else {
+				const id = getDataEntryId({ entry: pathToFileURL(filePath), contentDir, collection });
+				lookupMap[collection] = {
+					type: 'data',
+					entries: {
+						...lookupMap[collection]?.entries,
+						[id]: rootRelativePath(root, filePath),
+					},
+				};
+			}
 		})
 	);
 
-	return JSON.stringify(contentLookupMap);
+	return JSON.stringify(lookupMap);
 }
+
+const UnexpectedLookupMapError = new AstroError({
+	...AstroErrorData.UnknownContentCollectionError,
+	message: `Unexpected error while parsing content entry IDs and slugs.`,
+});