From 528e09a26f2a7f482700239107727b741c547cdb Mon Sep 17 00:00:00 2001
From: eggy <danielchen04@hotmail.ca>
Date: Wed, 24 May 2023 12:25:31 -0400
Subject: [PATCH] chore: clean up parsedcontent types

---
 components/Date.vue            | 4 ++--
 components/PostPreviewCard.vue | 4 ++--
 components/StoryStatBox.vue    | 2 +-
 pages/[...slug].vue            | 6 ++----
 shared/metadata.ts             | 8 ++++----
 shared/types.d.ts              | 2 ++
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/Date.vue b/components/Date.vue
index 46ea4c4..8f5f518 100644
--- a/components/Date.vue
+++ b/components/Date.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { getPrettyDate, getUtcDate } from "~~/shared/metadata";
-import { BlogParsedContent, StoryParsedContent } from "~~/shared/types";
+import { AnyParsedContent } from "~~/shared/types";
 
-const props = defineProps<{ doc: StoryParsedContent | BlogParsedContent }>();
+const props = defineProps<{ doc: AnyParsedContent }>();
 
 const prettyDate = getPrettyDate(props.doc);
 const utcDate = getUtcDate(props.doc);
diff --git a/components/PostPreviewCard.vue b/components/PostPreviewCard.vue
index 2944a66..c76be36 100644
--- a/components/PostPreviewCard.vue
+++ b/components/PostPreviewCard.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import type { StoryParsedContent, BlogParsedContent } from "@/shared/types";
+import type { AnyParsedContent } from "@/shared/types";
 import { calcReadingTime } from "@/shared/metadata";
 
 const props = defineProps<{
-  post: StoryParsedContent | BlogParsedContent;
+  post: AnyParsedContent;
   type: "stories" | "blog";
   highlighttags?: string[];
 }>();
diff --git a/components/StoryStatBox.vue b/components/StoryStatBox.vue
index 6e0b049..e205426 100644
--- a/components/StoryStatBox.vue
+++ b/components/StoryStatBox.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { type StoryParsedContent } from "@/shared/types";
+import type { StoryParsedContent } from "@/shared/types";
 import { calcReadingTime } from "@/shared/metadata";
 
 const docs = await queryContent<StoryParsedContent>("/stories")
diff --git a/pages/[...slug].vue b/pages/[...slug].vue
index 4c7dbe6..0aac031 100644
--- a/pages/[...slug].vue
+++ b/pages/[...slug].vue
@@ -1,16 +1,14 @@
 <script setup lang="ts">
-import type { BlogParsedContent, StoryParsedContent } from "@/shared/types";
+import type { AnyParsedContent } from "@/shared/types";
 import { calcReadingTime } from "@/shared/metadata";
 
-type GeneralParsedContent = BlogParsedContent | StoryParsedContent;
-
 const route = useRoute();
 // definePageMeta({
 //   layout: "withtop",
 // });
 
 // we're not using ContentDoc because i need control
-const doc = await queryContent<GeneralParsedContent>(route.path).findOne();
+const doc = await queryContent<AnyParsedContent>(route.path).findOne();
 const type = route.path.startsWith("/stories")
   ? "stories"
   : route.path.startsWith("/blog")
diff --git a/shared/metadata.ts b/shared/metadata.ts
index 3d81f69..0cf1d0e 100644
--- a/shared/metadata.ts
+++ b/shared/metadata.ts
@@ -1,4 +1,4 @@
-import type { BlogParsedContent, StoryParsedContent } from "./types";
+import type { AnyParsedContent } from "./types";
 import readingTime from "reading-time";
 import dayjs from "dayjs";
 import utc from "dayjs/plugin/utc.js";
@@ -28,17 +28,17 @@ function search(obj: Record<string, any>, results: string[] = []) {
   return results;
 }
 
-export function calcReadingTime(doc: BlogParsedContent | StoryParsedContent) {
+export function calcReadingTime(doc: AnyParsedContent) {
   let body: string[] = search(doc.body);
   return readingTime(body.join(" "));
 }
 
-export function getPrettyDate(doc: BlogParsedContent | StoryParsedContent) {
+export function getPrettyDate(doc: AnyParsedContent) {
   const date = dayjs(doc.date).utc();
   return date.format("DD MMM YYYY");
 }
 
-export function getUtcDate(doc: BlogParsedContent | StoryParsedContent) {
+export function getUtcDate(doc: AnyParsedContent) {
   const date = dayjs(doc.date).utc();
   return date.format("YYYY-MM-DD");
 }
diff --git a/shared/types.d.ts b/shared/types.d.ts
index 5aa3f87..25f2176 100644
--- a/shared/types.d.ts
+++ b/shared/types.d.ts
@@ -24,3 +24,5 @@ interface StoryParsedContent extends ParsedContent {
   readingTime: ReadingTime;
   nopreview?: boolean;
 }
+
+type AnyParsedContent = BlogParsedContent | StoryParsedContent;