Update errors

Author: ascorbic

packages/astro/src/content/config.ts

@@ -182,17 +182,18 @@ export function defineCollection<S extends BaseSchema>(
 		});
 	}
 
-	// TODO: add links to the migration guide in these errors
 	if (!('loader' in config)) {
-		throw new AstroUserError(
-			`Collections must have a \`loader\` defined. Check your collection definitions in ${importerFilename ?? 'your content config file'}. `,
-		);
+		throw new AstroError({
+			...AstroErrorData.ContentCollectionMissingLoader,
+			message: AstroErrorData.ContentCollectionMissingLoader.message(importerFilename),
+		});
 	}
 
 	if (config.type && config.type !== CONTENT_LAYER_TYPE) {
-		throw new AstroUserError(
-			`Invalid collection type "${config.type}". Remove the type from your collection definition in ${importerFilename ?? 'your content config file'}.`,
-		);
+		throw new AstroError({
+			...AstroErrorData.ContentCollectionInvalidType,
+			message: AstroErrorData.ContentCollectionInvalidType.message(config.type, importerFilename),
+		});
 	}
 
 	if (

packages/astro/src/content/runtime.ts

@@ -210,11 +210,13 @@ export function createGetEntry({ liveCollections }: { liveCollections: LiveColle
 				...entry,
 				collection,
 			} as DataEntryResult | ContentEntryResult;
+			// TODO: remove in Astro 7
 			warnForPropertyAccess(
 				result.data,
 				'slug',
 				`[content] Attempted to access deprecated property on "${collection}" entry.\nThe "slug" property is no longer automatically added to entries. Please use the "id" property instead.`,
 			);
+			// TODO: remove in Astro 7
 			warnForPropertyAccess(
 				result,
 				'render',

packages/astro/src/core/errors/errors-data.ts

@@ -1670,6 +1670,42 @@ export const LegacyContentConfigError = {
 	hint: 'See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on updating collections.',
 } satisfies ErrorData;
 
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Collections must have a `loader` defined. Check your collection definitions in your content config file.<br/>
+ * @description
+ * A content collection is missing a `loader` definition. Make sure that each collection in your content config file has a `loader`.
+ * See the [Content collections documentation](https://docs.astro.build/en/guides/content-collections/) for more information.
+ */
+
+export const ContentCollectionMissingLoader = {
+	name: 'ContentCollectionMissingLoader',
+	title: 'Content collection is missing a `loader` definition.',
+	message: (file = 'your content config file') =>
+		`Collections must have a \`loader\` defined. Check your collection definitions in ${file}.`,
+	hint: 'See https://docs.astro.build/en/guides/content-collections/ for more information on content loaders and https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections.',
+} satisfies ErrorData;
+
+/**
+ * @docs
+ * @message
+ * **Example error message:**<br/>
+ * Invalid collection type "data". Remove the type from your collection definition in your content config file.
+ * @description
+ * Content collections should no longer have a `type` field. Remove this field from your content config file.
+ * See the [Astro 6 migration guide](https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections) for more information.
+ */
+
+export const ContentCollectionInvalidType = {
+	name: 'ContentCollectionInvalidType',
+	title: 'Content collection has an invalid `type` field.',
+	message: (type: string, file = 'your content config file') =>
+		`Invalid collection type "${type}". Remove the type from your collection definition in ${file}.`,
+	hint: 'See https://docs.astro.build/en/guides/upgrade-to/v6/#removed-legacy-content-collections for more information on migrating from legacy collections.',
+} satisfies ErrorData;
+
 /**
  * @docs
  * @message

packages/astro/templates/content/module.mjs

@@ -38,6 +38,8 @@ export const getLiveEntry = createGetLiveEntry({
 	liveCollections,
 });
 
+// TODO: remove in Astro 7
 export const getEntryBySlug = createDeprecatedFunction('getEntryBySlug');
 
+// TODO: remove in Astro 7
 export const getDataEntryById = createDeprecatedFunction('getDataEntryById');