Update: spread data instead of creating object

Author: Goku-kun

publish/index.js

@@ -38,33 +38,39 @@ async function main() {
       "utf-8",
     );
 
-    const { source, content, data } = await parseMarkdown({ markdown: blog });
+    const { source, content, data } = parseMarkdown({ markdown: blog });
 
     if (!blogExists) {
-      await firestore.collection("blogs").doc(fileNameWithoutExtension).set(
-        {
-          source,
-          content: content,
-          data,
-          dateCreated: data.dateCreated.toUTCString(),
-          dateUpdated: new Date().toUTCString(),
-          likes: 0,
-          link: fileNameWithoutExtension,
-        },
-        { merge: true },
-      );
+      await firestore
+        .collection("blogs")
+        .doc(fileNameWithoutExtension)
+        .set(
+          {
+            source,
+            content:content,
+            ...data,
+            dateCreated: blogMatter.data.dateCreated.toUTCString(),
+            dateUpdated: new Date().toUTCString(),
+            likes: 0,
+            link: fileNameWithoutExtension,
+          },
+          { merge: true },
+        );
     } else {
-      await firestore.collection("blogs").doc(fileNameWithoutExtension).set(
-        {
-          source,
-          content: content,
-          data,
-          dateCreated: data.dateCreated.toUTCString(),
-          dateUpdated: new Date().toUTCString(),
-          link: fileNameWithoutExtension,
-        },
-        { merge: true },
-      );
+      await firestore
+        .collection("blogs")
+        .doc(fileNameWithoutExtension)
+        .set(
+          {
+            source,
+            content: content,
+            ...data,
+            dateCreated: blogMatter.data.dateCreated.toUTCString(),
+            dateUpdated: new Date().toUTCString(),
+            link: fileNameWithoutExtension,
+          },
+          { merge: true },
+        );
     }
   }
 }