10 files changed, 47 insertions, 225 deletions

diff --git a/vhosts/blog/nuldoc-src/pages/about.tsx b/vhosts/blog/nuldoc-src/pages/AboutPage.tsx
index 91d7fee4..0000edf5 100644
--- a/vhosts/blog/nuldoc-src/pages/about.tsx
+++ b/vhosts/blog/nuldoc-src/pages/AboutPage.tsx
@@ -3,19 +3,15 @@ import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import StaticScript from "../components/StaticScript.tsx";
 import { Config } from "../config.ts";
-import { renderToDOM } from "../jsx/render.ts";
-import { Page } from "../page.ts";
 import { dateToString } from "../revision.ts";
-import { getPostPublishedDate } from "./post.tsx";
-import { SlidePage } from "./slide.tsx";
+import { getPostPublishedDate } from "../generators/post.ts";
+import { SlidePage } from "../generators/slide.ts";
 
-export type AboutPage = Page;
-
-export async function generateAboutPage(
+export default function AboutPage(
   slides: SlidePage[],
   config: Config,
-): Promise<AboutPage> {
-  const html = await renderToDOM(
+) {
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="このサイトの著者について"
@@ -93,13 +89,6 @@ export async function generateAboutPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/about/index.html",
-    href: "/about/",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/home.tsx b/vhosts/blog/nuldoc-src/pages/HomePage.tsx
index a9a5d542..8850d039 100644
--- a/vhosts/blog/nuldoc-src/pages/home.tsx
+++ b/vhosts/blog/nuldoc-src/pages/HomePage.tsx
@@ -1,14 +1,10 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import { Config } from "../config.ts";
-import { Page } from "../page.ts";
 
-export type HomePage = Page;
-
-export async function generateHomePage(config: Config): Promise<HomePage> {
-  const html = await renderToDOM(
+export default function HomePage(config: Config) {
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="nsfisis のブログサイト"
@@ -52,13 +48,6 @@ export async function generateHomePage(config: Config): Promise<HomePage> {
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/index.html",
-    href: "/",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/not_found.tsx b/vhosts/blog/nuldoc-src/pages/NotFoundPage.tsx
index 27be0738..9631fef2 100644
--- a/vhosts/blog/nuldoc-src/pages/not_found.tsx
+++ b/vhosts/blog/nuldoc-src/pages/NotFoundPage.tsx
@@ -1,16 +1,12 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import { Config } from "../config.ts";
-import { Page } from "../page.ts";
 
-export type NotFoundPage = Page;
-
-export async function generateNotFoundPage(
+export default function NotFoundPage(
   config: Config,
-): Promise<NotFoundPage> {
-  const html = await renderToDOM(
+) {
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="リクエストされたページが見つかりません"
@@ -26,13 +22,6 @@ export async function generateNotFoundPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/404.html",
-    href: "/404.html",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/post_list.tsx b/vhosts/blog/nuldoc-src/pages/PostListPage.tsx
index 3cf17df4..3fcfbf1f 100644
--- a/vhosts/blog/nuldoc-src/pages/post_list.tsx
+++ b/vhosts/blog/nuldoc-src/pages/PostListPage.tsx
@@ -1,22 +1,18 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import PostPageEntry from "../components/PostPageEntry.tsx";
 import { Config } from "../config.ts";
-import { Page } from "../page.ts";
 import { dateToString } from "../revision.ts";
-import { getPostPublishedDate, PostPage } from "./post.tsx";
+import { getPostPublishedDate, PostPage } from "../generators/post.ts";
 
-export type PostListPage = Page;
-
-export async function generatePostListPage(
+export default function PostListPage(
   posts: PostPage[],
   config: Config,
-): Promise<PostListPage> {
+) {
   const pageTitle = "投稿一覧";
 
-  const html = await renderToDOM(
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="投稿した記事の一覧"
@@ -40,13 +36,6 @@ export async function generatePostListPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/posts/index.html",
-    href: "/posts/",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/post.tsx b/vhosts/blog/nuldoc-src/pages/PostPage.tsx
index 541c33e3..e6aa83aa 100644
--- a/vhosts/blog/nuldoc-src/pages/post.tsx
+++ b/vhosts/blog/nuldoc-src/pages/PostPage.tsx
@@ -1,46 +1,17 @@
-import { join } from "std/path/mod.ts";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalFooter from "../components/GlobalFooter.tsx";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import { Config, getTagLabel } from "../config.ts";
 import { Element } from "../dom.ts";
 import { Document } from "../ndoc/document.ts";
-import { Page } from "../page.ts";
-import { Date, dateToString, Revision } from "../revision.ts";
+import { dateToString } from "../revision.ts";
+import { getPostPublishedDate } from "../generators/post.ts";
 
-export interface PostPage extends Page {
-  title: string;
-  description: string;
-  tags: string[];
-  revisions: Revision[];
-  published: Date;
-  updated: Date;
-  uuid: string;
-}
-
-export function getPostPublishedDate(page: { revisions: Revision[] }): Date {
-  for (const rev of page.revisions) {
-    if (!rev.isInternal) {
-      return rev.date;
-    }
-  }
-  return page.revisions[0].date;
-}
-
-export function getPostUpdatedDate(page: { revisions: Revision[] }): Date {
-  return page.revisions[page.revisions.length - 1].date;
-}
-
-export function postHasAnyUpdates(page: { revisions: Revision[] }): boolean {
-  return 2 <= page.revisions.filter((rev) => !rev.isInternal).length;
-}
-
-export async function generatePostPage(
+export default function PostPage(
   doc: Document,
   config: Config,
-): Promise<PostPage> {
-  const html = await renderToDOM(
+) {
+  return (
     <PageLayout
       metaCopyrightYear={getPostPublishedDate(doc).year}
       metaDescription={doc.description}
@@ -98,26 +69,6 @@ export async function generatePostPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
-  );
-
-  const cwd = Deno.cwd();
-  const contentDir = join(cwd, config.locations.contentDir);
-  const destFilePath = join(
-    doc.sourceFilePath.replace(contentDir, "").replace(".ndoc", ""),
-    "index.html",
+    </PageLayout>
   );
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: destFilePath,
-    href: destFilePath.replace("index.html", ""),
-    title: doc.title,
-    description: doc.description,
-    tags: doc.tags,
-    revisions: doc.revisions,
-    published: getPostPublishedDate(doc),
-    updated: getPostUpdatedDate(doc),
-    uuid: doc.uuid,
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/slide_list.tsx b/vhosts/blog/nuldoc-src/pages/SlideListPage.tsx
index e42cfcea..44d6afff 100644
--- a/vhosts/blog/nuldoc-src/pages/slide_list.tsx
+++ b/vhosts/blog/nuldoc-src/pages/SlideListPage.tsx
@@ -1,23 +1,19 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import SlidePageEntry from "../components/SlidePageEntry.tsx";
 import { Config } from "../config.ts";
-import { Page } from "../page.ts";
 import { dateToString } from "../revision.ts";
-import { getPostPublishedDate } from "./post.tsx";
-import { SlidePage } from "./slide.tsx";
+import { getPostPublishedDate } from "../generators/post.ts";
+import { SlidePage } from "../generators/slide.ts";
 
-export type SlideListPage = Page;
-
-export async function generateSlideListPage(
+export default function SlideListPage(
   slides: SlidePage[],
   config: Config,
-): Promise<SlideListPage> {
+) {
   const pageTitle = "スライド一覧";
 
-  const html = await renderToDOM(
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="登壇したイベントで使用したスライドの一覧"
@@ -41,13 +37,6 @@ export async function generateSlideListPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/slides/index.html",
-    href: "/slides/",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/slide.tsx b/vhosts/blog/nuldoc-src/pages/SlidePage.tsx
index 843f539b..6d167036 100644
--- a/vhosts/blog/nuldoc-src/pages/slide.tsx
+++ b/vhosts/blog/nuldoc-src/pages/SlidePage.tsx
@@ -1,33 +1,17 @@
-import { join } from "std/path/mod.ts";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalFooter from "../components/GlobalFooter.tsx";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import StaticScript from "../components/StaticScript.tsx";
 import { Config, getTagLabel } from "../config.ts";
-import { Page } from "../page.ts";
-import { Date, dateToString, Revision } from "../revision.ts";
+import { dateToString } from "../revision.ts";
 import { Slide } from "../slide/slide.ts";
-import { getPostPublishedDate, getPostUpdatedDate } from "./post.tsx";
+import { getPostPublishedDate } from "../generators/post.ts";
 
-export interface SlidePage extends Page {
-  title: string;
-  description: string;
-  event: string;
-  talkType: string;
-  slideLink: string;
-  tags: string[];
-  revisions: Revision[];
-  published: Date;
-  updated: Date;
-  uuid: string;
-}
-
-export async function generateSlidePage(
+export default function SlidePage(
   slide: Slide,
   config: Config,
-): Promise<SlidePage> {
-  const html = await renderToDOM(
+) {
+  return (
     <PageLayout
       metaCopyrightYear={getPostPublishedDate(slide).year}
       metaDescription={slide.title}
@@ -81,29 +65,6 @@ export async function generateSlidePage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
-  );
-
-  const cwd = Deno.cwd();
-  const contentDir = join(cwd, config.locations.contentDir);
-  const destFilePath = join(
-    slide.sourceFilePath.replace(contentDir, "").replace(".toml", ""),
-    "index.html",
+    </PageLayout>
   );
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: destFilePath,
-    href: destFilePath.replace("index.html", ""),
-    title: slide.title,
-    description: `登壇: ${slide.event} (${slide.talkType})`,
-    event: slide.event,
-    talkType: slide.talkType,
-    slideLink: slide.slideLink,
-    tags: slide.tags,
-    revisions: slide.revisions,
-    published: getPostPublishedDate(slide),
-    updated: getPostUpdatedDate(slide),
-    uuid: slide.uuid,
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/tag_list.tsx b/vhosts/blog/nuldoc-src/pages/TagListPage.tsx
index 728384f4..cdb83ea5 100644
--- a/vhosts/blog/nuldoc-src/pages/tag_list.tsx
+++ b/vhosts/blog/nuldoc-src/pages/TagListPage.tsx
@@ -1,20 +1,16 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import { Config } from "../config.ts";
-import { Page } from "../page.ts";
-import { TagPage } from "./tag.tsx";
+import { TagPage } from "../generators/tag.ts";
 
-export type TagListPage = Page;
-
-export async function generateTagListPage(
+export default function TagListPage(
   tags: TagPage[],
   config: Config,
-): Promise<TagListPage> {
+) {
   const pageTitle = "タグ一覧";
 
-  const html = await renderToDOM(
+  return (
     <PageLayout
       metaCopyrightYear={config.blog.siteCopyrightYear}
       metaDescription="タグの一覧"
@@ -56,13 +52,6 @@ export async function generateTagListPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: "/tags/index.html",
-    href: "/tags/",
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/tag.tsx b/vhosts/blog/nuldoc-src/pages/TagPage.tsx
index f7df1f13..568dfaa6 100644
--- a/vhosts/blog/nuldoc-src/pages/tag.tsx
+++ b/vhosts/blog/nuldoc-src/pages/TagPage.tsx
@@ -1,30 +1,21 @@
 import GlobalFooter from "../components/GlobalFooter.tsx";
-import { renderToDOM } from "../jsx/render.ts";
 import GlobalHeader from "../components/GlobalHeader.tsx";
 import PageLayout from "../components/PageLayout.tsx";
 import PostPageEntry from "../components/PostPageEntry.tsx";
 import SlidePageEntry from "../components/SlidePageEntry.tsx";
 import { Config, getTagLabel } from "../config.ts";
-import { Page } from "../page.ts";
-import { getPostPublishedDate } from "./post.tsx";
-import { TaggedPage } from "./tagged_page.ts";
+import { getPostPublishedDate } from "../generators/post.ts";
+import { TaggedPage } from "../generators/tagged_page.ts";
 
-export interface TagPage extends Page {
-  tagSlug: string;
-  tagLabel: string;
-  numOfPosts: number;
-  numOfSlides: number;
-}
-
-export async function generateTagPage(
+export default function TagPage(
   tagSlug: string,
   pages: TaggedPage[],
   config: Config,
-): Promise<TagPage> {
+) {
   const tagLabel = getTagLabel(config, tagSlug);
   const pageTitle = `タグ「${tagLabel}」一覧`;
 
-  const html = await renderToDOM(
+  return (
     <PageLayout
       metaCopyrightYear={getPostPublishedDate(pages[pages.length - 1]).year}
       metaDescription={`タグ「${tagLabel}」のついた記事またはスライドの一覧`}
@@ -47,17 +38,6 @@ export async function generateTagPage(
         </main>
         <GlobalFooter config={config} />
       </body>
-    </PageLayout>,
+    </PageLayout>
   );
-
-  return {
-    root: html,
-    renderer: "html",
-    destFilePath: `/tags/${tagSlug}/index.html`,
-    href: `/tags/${tagSlug}/`,
-    tagSlug: tagSlug,
-    tagLabel: tagLabel,
-    numOfPosts: pages.filter((p) => !("event" in p)).length,
-    numOfSlides: pages.filter((p) => "event" in p).length,
-  };
 }
diff --git a/vhosts/blog/nuldoc-src/pages/tagged_page.ts b/vhosts/blog/nuldoc-src/pages/tagged_page.ts
deleted file mode 100644
index 026ca91f..00000000
--- a/vhosts/blog/nuldoc-src/pages/tagged_page.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { PostPage } from "./post.tsx";
-import { SlidePage } from "./slide.tsx";
-
-export type TaggedPage = PostPage | SlidePage;