記事データの持ち方を修正

ビルド時に1ページづつインスタンスが破棄されると思いこんでいて毎回ファイルの読み込みからやり直していた。

4 files changed, 30 insertions, 28 deletions

diff --git a/src/app/article/_components/articleListElement.tsx b/src/app/article/_components/articleListElement.tsx
index 0fe3d70..5437c04 100644
--- a/src/app/article/_components/articleListElement.tsx
+++ b/src/app/article/_components/articleListElement.tsx
@@ -5,7 +5,7 @@ dateformat.i18n.dayNames = [
   '日', '月', '火', '水', '木', '金', '土',
   '日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'
 ];
-type DisplayData = Awaited<ReturnType<ArticleLoader["loadData"]>>[number];
+type DisplayData = Awaited<ReturnType<ArticleLoader["loadData"]>>["articles"][number];
 export function ArticleListElement(displayData: DisplayData[]) {
   return (
     <table className="w-full">
diff --git a/src/app/article/all/[pageId]/page.tsx b/src/app/article/all/[pageId]/page.tsx
index fda6fbb..e076aa0 100644
--- a/src/app/article/all/[pageId]/page.tsx
+++ b/src/app/article/all/[pageId]/page.tsx
@@ -22,12 +22,12 @@ export async function generateMetadata(context: PageType) {
 export default async function Page(context: PageType) {
   const pageId = getPageIdNumber(context.params.pageId);
   const loadedData = await ArticleLoader.instance.loadData();
-  const chunkdData = chunk(loadedData, PPV);
+  const chunkdData = chunk(loadedData.articles, PPV);
   const displayData = chunkdData[pageId - 1];
   return (
     <div className="p-1 gap-16">
       {pagenationElement(pageId, chunkdData.length)}
-      <div className="text-right">全:{loadedData.length}件</div>
+      <div className="text-right">全:{loadedData.articles.length}件</div>
       {ArticleListElement(displayData)}
       {pagenationElement(pageId, chunkdData.length)}
     </div>
@@ -142,7 +142,7 @@ if (!Number.isInteger(PPV)) {
 //export const dynamicParams = true;
 export async function generateStaticParams() {
   const loadedData = await ArticleLoader.instance.loadData();
-  const chunkdData = chunk(loadedData, PPV);
+  const chunkdData = chunk(loadedData.articles, PPV);
   return chunkdData.map((data, index) => {
     return { pageId: `page-${index + 1}`, data: data };
   });
diff --git a/src/app/article/tag/[tagName]/page.tsx b/src/app/article/tag/[tagName]/page.tsx
index 84c1677..991ebfc 100644
--- a/src/app/article/tag/[tagName]/page.tsx
+++ b/src/app/article/tag/[tagName]/page.tsx
@@ -14,7 +14,7 @@ export async function generateMetadata(context: PageType) {
 export default async function Page(context: PageType) {
   const nowPageTagName = decodeURIComponent(context.params.tagName);
   const loadedData = await ArticleLoader.instance.loadData().then(articles => {
-    const filterd = articles.filter(article => {
+    const filterd = articles.articles.filter(article => {
       if (article.tags.includes(nowPageTagName)) {
         return true;
       }
@@ -34,8 +34,10 @@ export default async function Page(context: PageType) {
   );
 }
 export async function generateStaticParams() {
-  const tagList = await ArticleLoader.instance.getTagList();
-  return tagList.map((data, index) => {
-    return { tagName: data.tag };
-  });
+  const articleData = await ArticleLoader.instance.loadData();
+  const result: { tagName: string }[] = [];
+  for (const tag of articleData.categoryTag.data.keys()) {
+    result.push({ tagName: tag });
+  }
+  return result;
 }
diff --git a/src/app/article/tag/page.tsx b/src/app/article/tag/page.tsx
index 4f6ae0b..1d6efc3 100644
--- a/src/app/article/tag/page.tsx
+++ b/src/app/article/tag/page.tsx
@@ -13,7 +13,7 @@ export async function generateMetadata(context: PageType) {
   }
 }
 export default async function Page(context: PageType) {
-  const tagList = await ArticleLoader.instance.getTagList();
+  const articleData = await ArticleLoader.instance.loadData();
   type TAG = { tag: string, count: number, primary?: boolean };
   const elementListPcPart: TAG[] = [];
   const elementListAkiba: TAG[] = [];
@@ -22,25 +22,25 @@ export default async function Page(context: PageType) {
   const elementListGame: TAG[] = [];
   const elementListHobby: TAG[] = [];
   const elementListOther: TAG[] = [];
-  for (const tag of tagList) {
-    if (tag.category == "PCパーツ") {
-      elementListPcPart.push({ tag: tag.tag, count: tag.count, primary: tag.tag == "PCパーツ" });
-    } else if (tag.category == "アキバ") {
-      elementListAkiba.push({ tag: tag.tag, count: tag.count, primary: tag.tag == "アキバ" });
-    } else if (tag.category == "アニメ") {
-      elementListAnime.push({ tag: tag.tag, count: tag.count, primary: tag.tag == "アニメ" });
-    } else if (tag.category == "ゲーム") {
-      elementListGame.push({ tag: tag.tag, count: tag.count, primary: tag.tag == "ゲーム" });
-    } else if (tag.category == "ホビー") {
-      elementListHobby.push({ tag: tag.tag, count: tag.count, primary: tag.tag == "ホビー" });
-    } else if (tag.tag.match(/^\d+(春|夏|秋|冬)?アニメ$/)) {
-      elementListAnimeSeason.push({ tag: tag.tag, count: tag.count });
-    } else if (tag.tag == "G.E.M.シリーズ") {
-      elementListHobby.push({ tag: tag.tag, count: tag.count });
-    } else if (["3DS", "PS4ゲームレビュー", "PS Vita", "PS5ゲームレビュー", "Switchインディーズ", "ポケモンGO", "Steamゲームレビュー"].includes(tag.tag)) {
-      elementListGame.push({ tag: tag.tag, count: tag.count });
+  for (const [tag, categoryAndCount] of articleData.categoryTag.data.entries()) {
+    if (categoryAndCount.category == "PCパーツ") {
+      elementListPcPart.push({ tag: tag, count: categoryAndCount.count, primary: tag == "PCパーツ" });
+    } else if (categoryAndCount.category == "アキバ") {
+      elementListAkiba.push({ tag: tag, count: categoryAndCount.count, primary: tag == "アキバ" });
+    } else if (categoryAndCount.category == "アニメ") {
+      elementListAnime.push({ tag: tag, count: categoryAndCount.count, primary: tag == "アニメ" });
+    } else if (categoryAndCount.category == "ゲーム") {
+      elementListGame.push({ tag: tag, count: categoryAndCount.count, primary: tag == "ゲーム" });
+    } else if (categoryAndCount.category == "ホビー") {
+      elementListHobby.push({ tag: tag, count: categoryAndCount.count, primary: tag == "ホビー" });
+    } else if (tag.match(/^\d+(春|夏|秋|冬)?アニメ$/)) {
+      elementListAnimeSeason.push({ tag: tag, count: categoryAndCount.count });
+    } else if (tag == "G.E.M.シリーズ") {
+      elementListHobby.push({ tag: tag, count: categoryAndCount.count });
+    } else if (["3DS", "PS4ゲームレビュー", "PS Vita", "PS5ゲームレビュー", "Switchインディーズ", "ポケモンGO", "Steamゲームレビュー"].includes(tag)) {
+      elementListGame.push({ tag: tag, count: categoryAndCount.count });
     } else {
-      elementListOther.push({ tag: tag.tag, count: tag.count });
+      elementListOther.push({ tag: tag, count: categoryAndCount.count });
     }
   }
   return (