From fa132e35c23f2cfe368fd0a7239584a2bc5c4f12 Mon Sep 17 00:00:00 2001
From: Happydev <81974850+MoustaphaDev@users.noreply.github.com>
Date: Fri, 17 Mar 2023 16:38:10 +0000
Subject: [PATCH] Fix error in empty markdown files with content (#6572)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* test: add test fixture

* test: add test case

* 🤏 fix

* chore: changeset

---------

Co-authored-by: Nate Moore <natemoo-re@users.noreply.github.com>
---
 .changeset/tidy-crabs-warn.md                     |  5 +++++
 packages/astro/src/content/utils.ts               |  5 +++--
 packages/astro/test/content-collections.test.js   | 15 +++++++++++++++
 .../package.json                                  |  9 +++++++++
 .../src/content/blog/empty.md                     |  0
 .../src/content/config.ts                         | 11 +++++++++++
 .../src/pages/index.astro                         |  6 ++++++
 pnpm-lock.yaml                                    |  6 ++++++
 8 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 .changeset/tidy-crabs-warn.md
 create mode 100644 packages/astro/test/fixtures/content-collections-empty-md-file/package.json
 create mode 100644 packages/astro/test/fixtures/content-collections-empty-md-file/src/content/blog/empty.md
 create mode 100644 packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts
 create mode 100644 packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro

diff --git a/.changeset/tidy-crabs-warn.md b/.changeset/tidy-crabs-warn.md
new file mode 100644
index 0000000000..43976ba0a2
--- /dev/null
+++ b/.changeset/tidy-crabs-warn.md
@@ -0,0 +1,5 @@
+---
+'astro': patch
+---
+
+Properly handle empty markdown files in content collections
\ No newline at end of file
diff --git a/packages/astro/src/content/utils.ts b/packages/astro/src/content/utils.ts
index f6b420acd7..e80b19872f 100644
--- a/packages/astro/src/content/utils.ts
+++ b/packages/astro/src/content/utils.ts
@@ -32,7 +32,7 @@ export const contentConfigParser = z.object({
 export type CollectionConfig = z.infer<typeof collectionConfigParser>;
 export type ContentConfig = z.infer<typeof contentConfigParser>;
 
-type EntryInternal = { rawData: string; filePath: string };
+type EntryInternal = { rawData: string | undefined; filePath: string };
 
 export type EntryInfo = {
 	id: string;
@@ -222,7 +222,8 @@ function hasUnderscoreBelowContentDirectoryPath(
 	return false;
 }
 
-function getFrontmatterErrorLine(rawFrontmatter: string, frontmatterKey: string) {
+function getFrontmatterErrorLine(rawFrontmatter: string | undefined, frontmatterKey: string) {
+	if (!rawFrontmatter) return 0;
 	const indexOfFrontmatterKey = rawFrontmatter.indexOf(`\n${frontmatterKey}`);
 	if (indexOfFrontmatterKey === -1) return 0;
 
diff --git a/packages/astro/test/content-collections.test.js b/packages/astro/test/content-collections.test.js
index 643f5858ff..10c65b0dd2 100644
--- a/packages/astro/test/content-collections.test.js
+++ b/packages/astro/test/content-collections.test.js
@@ -215,6 +215,21 @@ describe('Content Collections', () => {
 		});
 	});
 
+	describe('With empty markdown file', () => {
+		it('Throws the right error', async () => {
+			const fixture = await loadFixture({
+				root: './fixtures/content-collections-empty-md-file/',
+			});
+			let error;
+			try {
+				await fixture.build();
+			} catch (e) {
+				error = e.message;
+			}
+			expect(error).to.include('**title**: Required');
+		});
+	});
+
 	describe('SSR integration', () => {
 		let app;
 
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/package.json b/packages/astro/test/fixtures/content-collections-empty-md-file/package.json
new file mode 100644
index 0000000000..5e0d91a74d
--- /dev/null
+++ b/packages/astro/test/fixtures/content-collections-empty-md-file/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "@test/content-collections-empty-md-file",
+  "version": "0.0.0",
+  "private": true,
+  "type": "module",
+  "dependencies": {
+    "astro": "workspace:*"
+  }
+}
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/blog/empty.md b/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/blog/empty.md
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts b/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts
new file mode 100644
index 0000000000..9919944338
--- /dev/null
+++ b/packages/astro/test/fixtures/content-collections-empty-md-file/src/content/config.ts
@@ -0,0 +1,11 @@
+import { z, defineCollection } from 'astro:content';
+
+const blog = defineCollection({
+	schema: z.object({
+		title: z.string(),
+	}),
+});
+
+export const collections = {
+	blog,
+};
diff --git a/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro b/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro
new file mode 100644
index 0000000000..134d3cffa4
--- /dev/null
+++ b/packages/astro/test/fixtures/content-collections-empty-md-file/src/pages/index.astro
@@ -0,0 +1,6 @@
+---
+import { getEntryBySlug } from 'astro:content';
+const blogEntry = await getEntryBySlug('blog', 'empty');
+---
+
+{blogEntry.data.title}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 380705f814..cce9c363d9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1835,6 +1835,12 @@ importers:
       '@astrojs/mdx': link:../../../../integrations/mdx
       astro: link:../../..
 
+  packages/astro/test/fixtures/content-collections-empty-md-file:
+    specifiers:
+      astro: workspace:*
+    dependencies:
+      astro: link:../../..
+
   packages/astro/test/fixtures/content-collections-with-config-mjs:
     specifiers:
       astro: workspace:*