From c04d27265b01a1511635d1399483f52c0de3da8e Mon Sep 17 00:00:00 2001
From: Matthieu Morin <matthieu.bernard.morin@gmail.com>
Date: Fri, 5 Apr 2024 14:32:07 +0200
Subject: [PATCH] Metadata parsing and types update

---
 src/lib/types/ogMetadata.d.ts |  2 +-
 src/lib/types/service.d.ts    |  2 +-
 src/lib/utils/formatParse.ts  | 27 ---------------------------
 src/lib/utils/getMetadata.ts  | 21 +++++++++++++++++++++
 4 files changed, 23 insertions(+), 29 deletions(-)
 create mode 100644 src/lib/utils/getMetadata.ts

diff --git a/src/lib/types/ogMetadata.d.ts b/src/lib/types/ogMetadata.d.ts
index fdbc228..c6e810f 100644
--- a/src/lib/types/ogMetadata.d.ts
+++ b/src/lib/types/ogMetadata.d.ts
@@ -10,5 +10,5 @@ export interface OpenGraphMetadata {
 	imageType: OGImageType;
 	imageWidth: OGImageWidth;
 	imageHeight: OGImageHeight;
-	url: string;
+	canonical: string;
 };
diff --git a/src/lib/types/service.d.ts b/src/lib/types/service.d.ts
index bd656e2..5a3eeb3 100644
--- a/src/lib/types/service.d.ts
+++ b/src/lib/types/service.d.ts
@@ -2,7 +2,7 @@ import type { MarkdownMetadata } from '$lib/types/mdMetadata';
 import type { OpenGraphMetadata } from '$lib/types/ogMetadata';
 
 // Base service item type
-export interface Service {
+export type Service = {
     title: string;
     description: string;
     id: string;
diff --git a/src/lib/utils/formatParse.ts b/src/lib/utils/formatParse.ts
index bcb752c..cc60cdc 100644
--- a/src/lib/utils/formatParse.ts
+++ b/src/lib/utils/formatParse.ts
@@ -40,30 +40,3 @@ export const readJsonFile = async (filePath: string) => {
   const jsonData = await fs.readFileSync(path.join(process.cwd(), 'src', 'content', filePath), 'utf-8');
   return JSON.parse(jsonData);
 }
-
-// ======= MARKDOWN PARSER ========
-
-// https://github.com/jonschlinkert/gray-matter
-import * as matter from 'gray-matter';
-// https://github.com/markedjs/marked
-// import marked from 'marked';
-
-export const parseMarkdownFile = async (filePath: string) => {
-  const markdownData = await fs.readFileSync(path.join(process.cwd(), 'src', 'content', filePath), 'utf-8');
-  const { data, content } = matter(markdownData);
-  return { frontmatter: data, content }; 
-}
-// export function parseMarkdown<T>(filePath: string): { frontmatter: T; content: string } {
-//   const data = matter.read(filePath).data;
-//   return {
-//     frontmatter: data as T,
-//   };
-// }
-// export function parseMarkdownFile(filePath: string) {
-//   const markdownData = fs.readFileSync(path.join(process.cwd(), filePath), 'utf-8');
-//   const { data, content } = grayMatter(markdownData);
-
-//   return { frontmatter: data, content };
-// }
-
-console.log(parseMarkdownFile('../../content/permanentni-make-up/pmu/pmu.md'))
diff --git a/src/lib/utils/getMetadata.ts b/src/lib/utils/getMetadata.ts
new file mode 100644
index 0000000..d8dcb9e
--- /dev/null
+++ b/src/lib/utils/getMetadata.ts
@@ -0,0 +1,21 @@
+// ======= MARKDOWN PARSER ========
+
+// https://github.com/jonschlinkert/gray-matter
+import matter from 'gray-matter';
+// https://github.com/markedjs/marked;- unused
+// import marked from 'marked';
+import fs from 'fs';
+import path from 'path'
+
+export const parseMarkdownFile = async (filePath: string) => {
+  const markdownData = fs.readFileSync(path.join(process.cwd(), 'src', 'content', filePath), 'utf-8');
+  const { data, content } = matter(markdownData);
+  return { frontmatter: data, content }; 
+}
+// export function parseMarkdown<T>(filePath: string): { frontmatter: T; content: string } {
+//   const data = matter.read(filePath).data;
+//   return {
+//     frontmatter: data as T,
+//   };
+// }
+console.log(parseMarkdownFile('../../content/permanentni-make-up/pmu/pmu.md'))