diff options
| author | nsfisis <nsfisis@gmail.com> | 2024-08-14 02:43:14 +0900 |
|---|---|---|
| committer | nsfisis <nsfisis@gmail.com> | 2024-08-14 02:43:14 +0900 |
| commit | 59d83667eda9ecdab05961da81c18f058a8ac065 (patch) | |
| tree | a0ab3e1cf14af3a6aa4f2373507a7ec9d7f92090 /vhosts/blog/nuldoc-src | |
| parent | fdd26f20fc8777aa56681f0b360b8f8c494524e4 (diff) | |
| download | nsfisis.dev-59d83667eda9ecdab05961da81c18f058a8ac065.tar.gz nsfisis.dev-59d83667eda9ecdab05961da81c18f058a8ac065.tar.zst nsfisis.dev-59d83667eda9ecdab05961da81c18f058a8ac065.zip | |
refactor(blog/nuldoc): use string value directly instead of `text()` helper for creating text nodes
Diffstat (limited to 'vhosts/blog/nuldoc-src')
| -rw-r--r-- | vhosts/blog/nuldoc-src/atom/generate.ts | 20 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/global_footer.ts | 6 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/global_header.ts | 12 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/page_layout.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/post_page_entry.ts | 16 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/components/slide_page_entry.ts | 16 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/dom.ts | 6 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/about.ts | 32 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/home.ts | 10 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/not_found.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/post.ts | 14 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/post_list.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/slide.ts | 18 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/slide_list.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/tag.ts | 4 | ||||
| -rw-r--r-- | vhosts/blog/nuldoc-src/pages/tag_list.ts | 10 |
16 files changed, 85 insertions, 95 deletions
diff --git a/vhosts/blog/nuldoc-src/atom/generate.ts b/vhosts/blog/nuldoc-src/atom/generate.ts index cb425aba..7c8e2ea4 100644 --- a/vhosts/blog/nuldoc-src/atom/generate.ts +++ b/vhosts/blog/nuldoc-src/atom/generate.ts @@ -1,5 +1,5 @@ import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { Entry, Feed } from "./types.ts"; import { PostPage } from "../pages/post.ts"; @@ -63,23 +63,23 @@ function buildXmlTree(feed: Feed) { return el( "feed", [["xmlns", "http://www.w3.org/2005/Atom"]], - el("id", [], text(feed.id)), - el("title", [], text(feed.title)), + el("id", [], feed.id), + el("title", [], feed.title), el("link", [["rel", "alternate"], ["href", feed.linkToAlternate]]), el("link", [["rel", "self"], ["href", feed.linkToSelf]]), - el("author", [], el("name", [], text(feed.author))), - el("updated", [], text(feed.updated)), + el("author", [], el("name", [], feed.author)), + el("updated", [], feed.updated), ...feed.entries.map( (entry) => el( "entry", [], - el("id", [], text(entry.id)), + el("id", [], entry.id), el("link", [["rel", "alternate"], ["href", entry.linkToAlternate]]), - el("title", [], text(entry.title)), - el("summary", [], text(entry.summary)), - el("published", [], text(entry.published)), - el("updated", [], text(entry.updated)), + el("title", [], entry.title), + el("summary", [], entry.summary), + el("published", [], entry.published), + el("updated", [], entry.updated), ), ), ); diff --git a/vhosts/blog/nuldoc-src/components/global_footer.ts b/vhosts/blog/nuldoc-src/components/global_footer.ts index 4c9d2457..7499fd8a 100644 --- a/vhosts/blog/nuldoc-src/components/global_footer.ts +++ b/vhosts/blog/nuldoc-src/components/global_footer.ts @@ -1,12 +1,10 @@ import { Config } from "../config.ts"; -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; export function globalFooter(config: Config): Element { return el( "footer", [["class", "footer"]], - text( - `© ${config.blog.siteCopyrightYear} ${config.blog.author}`, - ), + `© ${config.blog.siteCopyrightYear} ${config.blog.author}`, ); } diff --git a/vhosts/blog/nuldoc-src/components/global_header.ts b/vhosts/blog/nuldoc-src/components/global_header.ts index 2913ea6d..93ff5ec9 100644 --- a/vhosts/blog/nuldoc-src/components/global_header.ts +++ b/vhosts/blog/nuldoc-src/components/global_header.ts @@ -1,5 +1,5 @@ import { Config } from "../config.ts"; -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; export function globalHeader(config: Config): Element { return el( @@ -8,7 +8,7 @@ export function globalHeader(config: Config): Element { el( "div", [["class", "site-logo"]], - el("a", [["href", "/"]], text(config.blog.siteName)), + el("a", [["href", "/"]], config.blog.siteName), ), el( "nav", @@ -19,22 +19,22 @@ export function globalHeader(config: Config): Element { el( "li", [], - el("a", [["href", "/about/"]], text("About")), + el("a", [["href", "/about/"]], "About"), ), el( "li", [], - el("a", [["href", "/posts/"]], text("Posts")), + el("a", [["href", "/posts/"]], "Posts"), ), el( "li", [], - el("a", [["href", "/slides/"]], text("Slides")), + el("a", [["href", "/slides/"]], "Slides"), ), el( "li", [], - el("a", [["href", "/tags/"]], text("Tags")), + el("a", [["href", "/tags/"]], "Tags"), ), ), ), diff --git a/vhosts/blog/nuldoc-src/components/page_layout.ts b/vhosts/blog/nuldoc-src/components/page_layout.ts index 90eb3b2c..391305c1 100644 --- a/vhosts/blog/nuldoc-src/components/page_layout.ts +++ b/vhosts/blog/nuldoc-src/components/page_layout.ts @@ -1,5 +1,5 @@ import { Config } from "../config.ts"; -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; import { stylesheetLinkElement } from "./utils.ts"; type Params = { @@ -70,7 +70,7 @@ export async function pageLayout( ? [linkElement("alternate", metaAtomFeedHref, "application/atom+xml")] : []), linkElement("icon", "/favicon.svg", "image/svg+xml"), - el("title", [], text(metaTitle)), + el("title", [], metaTitle), await stylesheetLinkElement("/style.css", config), ...( requiresSyntaxHighlight diff --git a/vhosts/blog/nuldoc-src/components/post_page_entry.ts b/vhosts/blog/nuldoc-src/components/post_page_entry.ts index 9a58efb1..408cec72 100644 --- a/vhosts/blog/nuldoc-src/components/post_page_entry.ts +++ b/vhosts/blog/nuldoc-src/components/post_page_entry.ts @@ -1,4 +1,4 @@ -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; import { getPostPublishedDate, getPostUpdatedDate, @@ -17,12 +17,12 @@ export function postPageEntry(post: PostPage): Element { el( "header", [["class", "entry-header"]], - el("h2", [], text(post.title)), + el("h2", [], post.title), ), el( "section", [["class", "entry-content"]], - el("p", [], text(post.description)), + el("p", [], post.description), ), el( "footer", @@ -30,17 +30,17 @@ export function postPageEntry(post: PostPage): Element { el( "time", [["datetime", dateToString(getPostPublishedDate(post))]], - text(dateToString(getPostPublishedDate(post))), + dateToString(getPostPublishedDate(post)), ), - text(" 投稿"), + " 投稿", ...(postHasAnyUpdates(post) ? [ - text("、"), + "、", el("time", [[ "datetime", dateToString(getPostUpdatedDate(post)), - ]], text(dateToString(getPostUpdatedDate(post)))), - text(" 更新"), + ]], dateToString(getPostUpdatedDate(post))), + " 更新", ] : []), ), diff --git a/vhosts/blog/nuldoc-src/components/slide_page_entry.ts b/vhosts/blog/nuldoc-src/components/slide_page_entry.ts index bd2d8978..84422c36 100644 --- a/vhosts/blog/nuldoc-src/components/slide_page_entry.ts +++ b/vhosts/blog/nuldoc-src/components/slide_page_entry.ts @@ -1,4 +1,4 @@ -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; import { getPostPublishedDate, getPostUpdatedDate, @@ -17,12 +17,12 @@ export function slidePageEntry(slide: SlidePage): Element { el( "header", [["class", "entry-header"]], - el("h2", [], text(slide.description)), + el("h2", [], slide.description), ), el( "section", [["class", "entry-content"]], - el("p", [], text(slide.title)), + el("p", [], slide.title), ), el( "footer", @@ -30,17 +30,17 @@ export function slidePageEntry(slide: SlidePage): Element { el( "time", [["datetime", dateToString(getPostPublishedDate(slide))]], - text(dateToString(getPostPublishedDate(slide))), + dateToString(getPostPublishedDate(slide)), ), - text(" 登壇"), + " 登壇", ...(postHasAnyUpdates(slide) ? [ - text("、"), + "、", el("time", [[ "datetime", dateToString(getPostUpdatedDate(slide)), - ]], text(dateToString(getPostUpdatedDate(slide)))), - text(" 更新"), + ]], dateToString(getPostUpdatedDate(slide))), + " 更新", ] : []), ), diff --git a/vhosts/blog/nuldoc-src/dom.ts b/vhosts/blog/nuldoc-src/dom.ts index 1147f01b..0358d53b 100644 --- a/vhosts/blog/nuldoc-src/dom.ts +++ b/vhosts/blog/nuldoc-src/dom.ts @@ -79,7 +79,7 @@ export function forEachChildRecursively(e: Element, f: (n: Node) => void) { forEachChild(e, g); } -export function text(content: string): Text { +function makeTextNode(content: string): Text { return { kind: "text", content: content, @@ -90,12 +90,12 @@ export function text(content: string): Text { export function el( name: string, attrs: [string, string][], - ...children: Node[] + ...children: (Node | string)[] ): Element { return { kind: "element", name: name, attributes: new Map(attrs), - children: children, + children: children.map((n) => typeof n === "string" ? makeTextNode(n) : n), }; } diff --git a/vhosts/blog/nuldoc-src/pages/about.ts b/vhosts/blog/nuldoc-src/pages/about.ts index e78c109f..5ee55629 100644 --- a/vhosts/blog/nuldoc-src/pages/about.ts +++ b/vhosts/blog/nuldoc-src/pages/about.ts @@ -3,7 +3,7 @@ import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { staticScriptElement } from "../components/utils.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { dateToString } from "../revision.ts"; import { getPostPublishedDate } from "./post.ts"; @@ -31,7 +31,7 @@ export async function generateAboutPage( el( "h1", [["class", "post-title"]], - text("nsfisis"), + "nsfisis", ), el( "div", @@ -58,14 +58,12 @@ export async function generateAboutPage( el( "h2", [], - text("読み方"), + "読み方", ), el( "p", [], - text( - "読み方は決めていません。音にする必要があるときは本名である「いまむら」をお使いください。", - ), + "読み方は決めていません。音にする必要があるときは本名である「いまむら」をお使いください。", ), ), el( @@ -74,7 +72,7 @@ export async function generateAboutPage( el( "h2", [], - text("アカウント"), + "アカウント", ), el( "ul", @@ -85,7 +83,7 @@ export async function generateAboutPage( el( "a", [["href", "https://twitter.com/nsfisis"]], - text("Twitter (現 𝕏): @nsfisis"), + "Twitter (現 𝕏): @nsfisis", ), ), el( @@ -94,7 +92,7 @@ export async function generateAboutPage( el( "a", [["href", "https://github.com/nsfisis"]], - text("GitHub: @nsfisis"), + "GitHub: @nsfisis", ), ), ), @@ -105,7 +103,7 @@ export async function generateAboutPage( el( "h2", [], - text("仕事"), + "仕事", ), el( "ul", @@ -113,11 +111,11 @@ export async function generateAboutPage( el( "li", [], - text("2021-01~現在: "), + "2021-01~現在: ", el( "a", [["href", "https://www.dgcircus.com/"]], - text("デジタルサーカス株式会社"), + "デジタルサーカス株式会社", ), ), ), @@ -128,7 +126,7 @@ export async function generateAboutPage( el( "h2", [], - text("登壇"), + "登壇", ), el( "ul", @@ -146,11 +144,9 @@ export async function generateAboutPage( el( "a", [["href", slide.href]], - text( - `${ - dateToString(getPostPublishedDate(slide)) - }: ${slide.event} (${slide.talkType})`, - ), + `${ + dateToString(getPostPublishedDate(slide)) + }: ${slide.event} (${slide.talkType})`, ), ) ), diff --git a/vhosts/blog/nuldoc-src/pages/home.ts b/vhosts/blog/nuldoc-src/pages/home.ts index adecb59b..773f1d0d 100644 --- a/vhosts/blog/nuldoc-src/pages/home.ts +++ b/vhosts/blog/nuldoc-src/pages/home.ts @@ -2,7 +2,7 @@ import { globalFooter } from "../components/global_footer.ts"; import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; export type HomePage = Page; @@ -27,7 +27,7 @@ export async function generateHomePage(config: Config): Promise<HomePage> { el( "header", [["class", "entry-header"]], - el("h2", [], text("About")), + el("h2", [], "About"), ), ), ), @@ -40,7 +40,7 @@ export async function generateHomePage(config: Config): Promise<HomePage> { el( "header", [["class", "entry-header"]], - el("h2", [], text("Posts")), + el("h2", [], "Posts"), ), ), ), @@ -53,7 +53,7 @@ export async function generateHomePage(config: Config): Promise<HomePage> { el( "header", [["class", "entry-header"]], - el("h2", [], text("Slides")), + el("h2", [], "Slides"), ), ), ), @@ -66,7 +66,7 @@ export async function generateHomePage(config: Config): Promise<HomePage> { el( "header", [["class", "entry-header"]], - el("h2", [], text("Tags")), + el("h2", [], "Tags"), ), ), ), diff --git a/vhosts/blog/nuldoc-src/pages/not_found.ts b/vhosts/blog/nuldoc-src/pages/not_found.ts index dcc3046e..ab1b3d08 100644 --- a/vhosts/blog/nuldoc-src/pages/not_found.ts +++ b/vhosts/blog/nuldoc-src/pages/not_found.ts @@ -2,7 +2,7 @@ import { globalFooter } from "../components/global_footer.ts"; import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; export type NotFoundPage = Page; @@ -23,7 +23,7 @@ export async function generateNotFoundPage( el( "div", [["class", "not-found"]], - text("404"), + "404", ), ), ), diff --git a/vhosts/blog/nuldoc-src/pages/post.ts b/vhosts/blog/nuldoc-src/pages/post.ts index b5f954ea..17670801 100644 --- a/vhosts/blog/nuldoc-src/pages/post.ts +++ b/vhosts/blog/nuldoc-src/pages/post.ts @@ -3,7 +3,7 @@ import { globalFooter } from "../components/global_footer.ts"; import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { Config, getTagLabel } from "../config.ts"; -import { el, Element, text } from "../dom.ts"; +import { el, Element } from "../dom.ts"; import { Document } from "../ndoc/document.ts"; import { Page } from "../page.ts"; import { Date, dateToString, Revision } from "../revision.ts"; @@ -55,7 +55,7 @@ export async function generatePostPage( el( "h1", [["class", "post-title"]], - text(doc.title), + doc.title, ), ...(doc.tags.length === 0 ? [] : [ el( @@ -68,9 +68,7 @@ export async function generatePostPage( el( "a", [["href", `/tags/${slug}/`]], - text( - getTagLabel(config, slug), - ), + getTagLabel(config, slug), ), ) ), @@ -86,7 +84,7 @@ export async function generatePostPage( el( "h2", [["id", "changelog"]], - text("更新履歴"), + "更新履歴", ), el( "ol", @@ -98,9 +96,9 @@ export async function generatePostPage( el( "time", [["datetime", dateToString(rev.date)]], - text(dateToString(rev.date)), + dateToString(rev.date), ), - text(`: ${rev.remark}`), + `: ${rev.remark}`, ) ), ), diff --git a/vhosts/blog/nuldoc-src/pages/post_list.ts b/vhosts/blog/nuldoc-src/pages/post_list.ts index 111ecd62..2da2b2c6 100644 --- a/vhosts/blog/nuldoc-src/pages/post_list.ts +++ b/vhosts/blog/nuldoc-src/pages/post_list.ts @@ -3,7 +3,7 @@ import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { postPageEntry } from "../components/post_page_entry.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { dateToString } from "../revision.ts"; import { getPostPublishedDate, PostPage } from "./post.ts"; @@ -29,7 +29,7 @@ export async function generatePostListPage( el( "h1", [], - text(pageTitle), + pageTitle, ), ), ...Array.from(posts).sort((a, b) => { diff --git a/vhosts/blog/nuldoc-src/pages/slide.ts b/vhosts/blog/nuldoc-src/pages/slide.ts index 9a39ffe0..b283beb7 100644 --- a/vhosts/blog/nuldoc-src/pages/slide.ts +++ b/vhosts/blog/nuldoc-src/pages/slide.ts @@ -4,7 +4,7 @@ import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { staticScriptElement } from "../components/utils.ts"; import { Config, getTagLabel } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { Date, dateToString, Revision } from "../revision.ts"; import { Slide } from "../slide/slide.ts"; @@ -43,7 +43,7 @@ export async function generateSlidePage( el( "h1", [["class", "post-title"]], - text(slide.title), + slide.title, ), ...(slide.tags.length === 0 ? [] : [ el( @@ -56,9 +56,7 @@ export async function generateSlidePage( el( "a", [["href", `/tags/${slug}/`]], - text( - getTagLabel(config, slug), - ), + getTagLabel(config, slug), ), ) ), @@ -74,7 +72,7 @@ export async function generateSlidePage( el( "h2", [["id", "changelog"]], - text("更新履歴"), + "更新履歴", ), el( "ol", @@ -86,9 +84,9 @@ export async function generateSlidePage( el( "time", [["datetime", dateToString(rev.date)]], - text(dateToString(rev.date)), + dateToString(rev.date), ), - text(`: ${rev.remark}`), + `: ${rev.remark}`, ) ), ), @@ -100,8 +98,8 @@ export async function generateSlidePage( el( "div", [], - el("button", [["id", "prev"]], text("Prev")), - el("button", [["id", "next"]], text("Next")), + el("button", [["id", "prev"]], "Prev"), + el("button", [["id", "next"]], "Next"), ), await staticScriptElement("/slide.js", [["type", "module"]], config), ), diff --git a/vhosts/blog/nuldoc-src/pages/slide_list.ts b/vhosts/blog/nuldoc-src/pages/slide_list.ts index 738f42ac..a77a567e 100644 --- a/vhosts/blog/nuldoc-src/pages/slide_list.ts +++ b/vhosts/blog/nuldoc-src/pages/slide_list.ts @@ -3,7 +3,7 @@ import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { slidePageEntry } from "../components/slide_page_entry.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { dateToString } from "../revision.ts"; import { getPostPublishedDate } from "./post.ts"; @@ -30,7 +30,7 @@ export async function generateSlideListPage( el( "h1", [], - text(pageTitle), + pageTitle, ), ), ...Array.from(slides).sort((a, b) => { diff --git a/vhosts/blog/nuldoc-src/pages/tag.ts b/vhosts/blog/nuldoc-src/pages/tag.ts index ea1fe35e..174f84c3 100644 --- a/vhosts/blog/nuldoc-src/pages/tag.ts +++ b/vhosts/blog/nuldoc-src/pages/tag.ts @@ -4,7 +4,7 @@ import { pageLayout } from "../components/page_layout.ts"; import { postPageEntry } from "../components/post_page_entry.ts"; import { slidePageEntry } from "../components/slide_page_entry.ts"; import { Config, getTagLabel } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { getPostPublishedDate } from "./post.ts"; import { TaggedPage } from "./tagged_page.ts"; @@ -31,7 +31,7 @@ export async function generateTagPage( el( "main", [["class", "main"]], - el("header", [["class", "page-header"]], el("h1", [], text(pageTitle))), + el("header", [["class", "page-header"]], el("h1", [], pageTitle)), ...pages.map((page) => "event" in page ? slidePageEntry(page) : postPageEntry(page) ), diff --git a/vhosts/blog/nuldoc-src/pages/tag_list.ts b/vhosts/blog/nuldoc-src/pages/tag_list.ts index b58f45a9..f2e25f6d 100644 --- a/vhosts/blog/nuldoc-src/pages/tag_list.ts +++ b/vhosts/blog/nuldoc-src/pages/tag_list.ts @@ -2,7 +2,7 @@ import { globalFooter } from "../components/global_footer.ts"; import { globalHeader } from "../components/global_header.ts"; import { pageLayout } from "../components/page_layout.ts"; import { Config } from "../config.ts"; -import { el, text } from "../dom.ts"; +import { el } from "../dom.ts"; import { Page } from "../page.ts"; import { TagPage } from "./tag.ts"; @@ -27,7 +27,7 @@ export async function generateTagListPage( el( "h1", [], - text(pageTitle), + pageTitle, ), ), ...Array.from(tags).sort((a, b) => { @@ -46,12 +46,12 @@ export async function generateTagListPage( el( "header", [["class", "entry-header"]], - el("h2", [], text(tag.tagLabel)), + el("h2", [], tag.tagLabel), ), el( "footer", [["class", "entry-footer"]], - text((() => { + (() => { const posts = tag.numOfPosts === 0 ? "" : `${tag.numOfPosts}件の記事`; @@ -59,7 +59,7 @@ export async function generateTagListPage( ? "" : `${tag.numOfSlides}件のスライド`; return `${posts}${posts && slides ? "、" : ""}${slides}`; - })()), + })(), ), ), ) |
