fix: data props with schema

BearStudio · Jul 17, 2024 · 5dc5e08 · 5dc5e08
1 parent 5f06e5a
commit 5dc5e08
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 28 deletions.
diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
@@ -11,9 +11,9 @@ export default async function Page() {
 
       <ul>
         {posts.map((post) => (
-          <li key={post.title}>
+          <li key={post.data.title}>
             <Link href={`/blog/${post.metadata.slug}`}>
-              {post.title} {post.author && <>by {post.author}</>}
+              {post.data.title} {post.data.author && <>by {post.data.author}</>}
             </Link>
           </li>
         ))}

diff --git a/packages/typed-mdx/src/index.ts b/packages/typed-mdx/src/index.ts
@@ -80,14 +80,8 @@ async function stringifyMDX(mdxPath: string): Promise<string> {
 }
 
 const metadataSchema = z.object({
-  metadata: z.object({
-    slug: z.string(),
-    filePath: z.string(),
-  }),
-});
-
-const bodySchema = z.object({
-  body: z.string(),
+  slug: z.string(),
+  filePath: z.string(),
 });
 
 const MDX_ENTENSION = ".mdx";
@@ -99,7 +93,11 @@ async function getAll<Z extends z.Schema>({
   folder: string;
   schema: Z;
 }): Promise<
-  (z.infer<Z> & z.infer<typeof metadataSchema> & z.infer<typeof bodySchema>)[]
+  {
+    data: z.infer<Z>;
+    body: string;
+    metadata: z.infer<typeof metadataSchema>;
+  }[]
 > {
   assertSchemaIsObject(schema);
 
@@ -116,7 +114,7 @@ async function getAll<Z extends z.Schema>({
   const mdxFileNames = postFilePaths.filter(
     (postFilePath) => path.extname(postFilePath).toLowerCase() === MDX_ENTENSION
   );
-  const data = await Promise.all(
+  return await Promise.all(
     mdxFileNames.map(async (mdxFileName) => {
       const parsedFrontmatter = await parseMdxFile(
         `${folderPath}/${mdxFileName}`,
@@ -133,12 +131,9 @@ async function getAll<Z extends z.Schema>({
       };
       const body = await stringifyMDX(`${folderPath}/${mdxFileName}`);
 
-      return { metadata, body, ...parsedFrontmatter };
+      return { metadata, body, data: parsedFrontmatter };
     })
   );
-  return z
-    .array(schema.merge(metadataSchema).merge(bodySchema))
-    .parse(data.filter(Boolean)) as any; // TODO FIX THIS ANY
 }
 
 async function getBySlug<Z extends z.Schema>({
@@ -149,9 +144,11 @@ async function getBySlug<Z extends z.Schema>({
   folder: string;
   schema: Z;
   slug: string;
-}): Promise<
-  z.infer<Z> & z.infer<typeof metadataSchema> & z.infer<typeof bodySchema>
-> {
+}): Promise<{
+  data: z.infer<Z>;
+  body: string;
+  metadata: z.infer<typeof metadataSchema>;
+}> {
   assertSchemaIsObject(schema);
 
   const filePath = `${CONTENT_FOLDER}/${folder}/${slug}.mdx` as const;
@@ -178,16 +175,18 @@ export function defineCollection<Z extends z.Schema>(options: {
   strict?: boolean;
 }): {
   getAll: () => Promise<
-    Prettify<
-      z.infer<Z> & z.infer<typeof metadataSchema> & z.infer<typeof bodySchema>
-    >[]
+    Prettify<{
+      data: z.infer<Z>;
+      body: string;
+      metadata: z.infer<typeof metadataSchema>;
+    }>[]
   >;
-  getBySlug: (
-    slug: string
-  ) => Promise<
-    Prettify<
-      z.infer<Z> & z.infer<typeof metadataSchema> & z.infer<typeof bodySchema>
-    >
+  getBySlug: (slug: string) => Promise<
+    Prettify<{
+      data: z.infer<Z>;
+      body: string;
+      metadata: z.infer<typeof metadataSchema>;
+    }>
   >;
   schema: Z;
 } {