refactor: combine blog formats into one collection

azrdn · azrdn · commit a6dae471f833 · 2026-03-06T09:05:57.000+07:00
diff --git a/src/content.config.ts b/src/content.config.ts
@@ -2,19 +2,14 @@ import { defineCollection, z } from "astro:content"
 import { glob } from "astro/loaders"
 
 const posts_path = import.meta.env.PROD ? "./posts" : "./src/test/posts"
-const schema = z.object({
-	title: z.string().min(1, "Title cannot be empty"),
-	createdAt: z.date(),
-	updatedAt: z.date().optional(),
-})
 
 export const collections = {
 	blog: defineCollection({
-		loader: glob({ pattern: "**/*.md", base: posts_path }),
-		schema,
-	}),
-	blog_mdx: defineCollection({
-		loader: glob({ pattern: "**/*.mdx", base: posts_path }),
-		schema,
+		loader: glob({ pattern: "**/*.{md,mdx}", base: posts_path }),
+		schema: z.object({
+			title: z.string().min(1, "Title cannot be empty"),
+			createdAt: z.date(),
+			updatedAt: z.date().optional(),
+		})
 	}),
 }
diff --git a/src/pages/api/hits.ts b/src/pages/api/hits.ts
@@ -2,11 +2,7 @@ import { getCollection } from "astro:content"
 import type { APIRoute } from "astro"
 
 const ResCode = (status: number) => new Response(null, { status })
-const collections = await Promise.all([
-	getCollection("blog"),
-	getCollection("blog_mdx"),
-])
-const ids = collections.flat().map(post => post.id)
+const ids = await getCollection("blog").then(c => c.map(post => post.id))
 
 export const prerender = false
 export const POST: APIRoute = async ({ locals, request }) => {
diff --git a/src/pages/blog.astro b/src/pages/blog.astro
@@ -4,14 +4,11 @@ import Footer from "../components/footer.astro"
 import Navbar from "../components/navbar.astro"
 import Layout from "../layouts/posinega.astro"
 
-const collections = await Promise.all([
-	getCollection("blog"),
-	getCollection("blog_mdx"),
-])
+const collections = await getCollection("blog")
 
-const posts = collections
-	.flat()
-	.sort((a, b) => b.data.createdAt.getTime() - a.data.createdAt.getTime())
+const posts = collections.sort((a, b) => {
+	return b.data.createdAt.getTime() - a.data.createdAt.getTime()
+})
 
 const style = `
 	display: inline-block;
diff --git a/src/pages/blog/[...slug].astro b/src/pages/blog/[...slug].astro
@@ -11,16 +11,8 @@ import "../../styles/blog.css"
 
 const iso_date = (date: Date) => date.toISOString().slice(0, 10)
 export const getStaticPaths = (async () => {
-	const [md_collection, mdx_collection] = await Promise.all([
-		getCollection("blog"),
-		getCollection("blog_mdx"),
-	])
-	const all_posts = [
-		...md_collection.map(post => ({ ...post, type: "md" })),
-		...mdx_collection.map(post => ({ ...post, type: "mdx" })),
-	]
-
-	return all_posts.map(post => ({
+	const collection = await getCollection("blog")
+	return collection.map(post => ({
 		params: { slug: post.id },
 		props: { post, fm: post.data },
 	}))
diff --git a/src/pages/index.astro b/src/pages/index.astro
@@ -11,13 +11,9 @@ const social_links = [
 	{ href: "mailto:hi+web@azrd.dev", text: "email" },
 ]
 
-const collections = await Promise.all([
-	getCollection("blog"),
-	getCollection("blog_mdx"),
-])
+const collections = await getCollection("blog")
 
 const recent_posts = collections
-	.flat()
 	.sort((a, b) => b.data.createdAt.getTime() - a.data.createdAt.getTime())
 	.slice(0, 3)
 
diff --git a/src/pages/rss.xml.ts b/src/pages/rss.xml.ts
@@ -1,20 +1,17 @@
+import type { APIRoute } from "astro"
 import { getCollection } from "astro:content"
 import rss from "@astrojs/rss"
-import type { APIRoute } from "astro"
 
-export const GET: APIRoute = async ctx => {
-	const posts = await Promise.all([
-		getCollection("blog"),
-		getCollection("blog_mdx"),
-	])
+export const GET: APIRoute = async (ctx) => {
+	const posts = await getCollection("blog")
 
 	return rss({
 		title: "azrd",
 		description: "My personal site blog",
 		site: import.meta.env.DEV
 			? `http://localhost:${ctx.url.port}`
 			: import.meta.env.SITE,
-		items: posts.flat().map(post => ({
+		items: posts.map(post => ({
 			title: post.data.title,
 			pubDate: post.data.createdAt,
 			link: `/blog/${post.id}`,
