@tenjuu99/blog 0.1.8 → 0.1.9

package/README.md

@@ -1,5 +1,7 @@
 # @tenjuu99/blog
 
+静的なブログを作るのにどうして React を必要としてしまったんですか
+
 ## setup
 
 ```

package/helper/index.js

@@ -1,5 +1,6 @@
 import { allData } from "../lib/indexer.js";
 import { replaceVariablesFilter } from "../lib/filter.js";
+import config from '../lib/config.js'
 
 export function readIndex (filter = null) {
   const data = Object.entries(allData)
@@ -51,3 +52,65 @@ export function indexedItems() {
   indexedItemsSorted = sorted
   return indexedItemsSorted
 }
+
+/**
+ * 配列を再帰的に順不同リストに変換する
+ * @param {Array|string} arrayOrText
+ * @returns {mixed}
+ */
+export function arrayToList(arrayOrText) {
+  if (typeof arrayOrText === 'string') {
+    return `<li>${arrayOrText}</li>`
+  }
+  if (Array.isArray(arrayOrText)) {
+    let resultListText = '<ul>'
+    for (const item of arrayOrText) {
+      if (Array.isArray(item)) {
+        resultListText += `<li>${arrayToList(item)}</li>`
+      } else {
+        resultListText += `<li>${item}</li>`
+      }
+    }
+    resultListText += '</ul>'
+    arrayOrText = resultListText
+  }
+  return arrayOrText
+}
+
+export function renderIndex(pages, nodate = 'nodate', headingTag = 'h3') {
+  if (!pages) {
+    pages = readIndex()
+  }
+
+  const renderList = {}
+  for (const page of pages) {
+    if (page.index) {
+      const url = config.relative_path ? config.relative_path + page.url : page.url
+      if (page.published === '1970-01-01') {
+        if (!renderList[nodate]) {
+          renderList[nodate] = []
+        }
+        renderList[nodate].push(`<a href="${url}">${page.title}</a>`)
+        continue
+      }
+      const published = new Date(page.published)
+      const year = `${published.getFullYear()}年`
+      const date = `${published.getMonth() +1}月${published.getDate()}日`
+      if (!renderList[year]) {
+        renderList[year] = []
+      }
+      renderList[year].push(`<a href="${url}">${page.title}</a> (${date})`)
+    }
+  }
+
+  const resultText = []
+  for (const key in renderList) {
+    resultText.push(`<${headingTag}>${key}</${headingTag}>`)
+    if (Array.isArray(renderList[key])) {
+      resultText.push(arrayToList(renderList[key]))
+    } else {
+      resultText.push(`<p>${renderList[key]}</p>`)
+    }
+  }
+  return resultText.join('\n')
+}

package/lib/filter.js

@@ -2,37 +2,7 @@ import helper from '../lib/helper.js'
 import includeFilter from './includeFilter.js'
 import { srcDir } from './dir.js'
 import config from './config.js'
-
-/**
- * @param {string} text
- * @params {object} variables
- * @return {text}
- */
-const replaceVariablesFilter = (text, variables) => {
-  const matched = [...text.matchAll(/(\\)?{{\s?([\w\d\s,-_\(\)]+)\s?}}/g)]
-  const replace = Object.fromEntries(matched.map(match => [match[2].toLowerCase(), {replace: match[0], backslash: match[1]}]))
-  let replaced = text
-  for (const elm in replace) {
-    const toBeReplace = replace[elm].replace
-    const toBeReplaceScript = toBeReplace.match(/([\w\d_]+)\((.*)\)/)
-   
-    if (replace[elm].backslash) { // escape variable syntax
-      const removeBackslash = replace[elm].replace.replace(/\\/, '')
-      replaced = replaced.replaceAll(toBeReplace, removeBackslash)
-    } else if (toBeReplaceScript) { // execute helper
-      const func = toBeReplaceScript[1]
-      const args = toBeReplaceScript[2].split(',').map(v => variables[v.trim()] ?? undefined)
-      if (!helper[func]) {
-        throw new Error('helper function is missing. function name: ' + func);
-      }
-      const replaceText = helper[func].call(null, ...args)
-      replaced = replaced.replaceAll(toBeReplace, replaceText)
-    } else {
-      replaced = replaced.replaceAll(toBeReplace, variables[elm])
-    }
-  }
-  return replaced
-}
+import replaceVariablesFilter from './replaceVariablesFilter.js'
 
 /**
  * @param {string} condition
@@ -136,22 +106,13 @@ const replaceScriptFilter = async (text, variables) => {
     if (result instanceof Promise) {
       result = await result
     }
-    if (typeof result === 'undefined') {
-      result = null
+    switch (typeof result) {
+      case 'undefined':
+      case 'null':
+        result = ''
     }
     if (Array.isArray(result)) {
-      result = arrayToList(result)
-    } else if (typeof result === 'object') {
-      const resultText = []
-      for (const key in result) {
-        resultText.push(`<h3>${key}</h3>`)
-        if (Array.isArray(result[key])) {
-          resultText.push(arrayToList(result[key]))
-        } else {
-          resultText.push(`<p>${result[key]}</p>`)
-        }
-      }
-      result = resultText.join('\n')
+      result = helper.arrayToList(result)
     }
     replaced = replaced.replace(script.replace, result)
   }

package/lib/replaceVariablesFilter.js

@@ -0,0 +1,54 @@
+import helper from './helper.js'
+
+/**
+ * テキストに含まれる変数を一括変換する
+ * ヘルパー処理もここで行われる
+ *
+ * @param {string} text
+ * @params {object} variables
+ * @return {text}
+ */
+const replaceVariablesFilter = (text, variables) => {
+  const matched = [...text.matchAll(/(\\)?{{[\s]*([^{}]+)[\s]*}}/g)]
+  const replace = Object.fromEntries(matched.map(match => [match[0], {variableName: match[2].trim().toLowerCase(), backslash: !!match[1]}]))
+  let replaced = text
+  for (const elm in replace) {
+    const [toBeReplace, replacedText] = replaceVariable(replace[elm].variableName, elm, replace[elm].backslash, variables)
+    replaced = replaced.replaceAll(toBeReplace, replacedText)
+  }
+  return replaced
+}
+
+/**
+ * @param {string} target
+ * @param {string} replaceTargetRawText
+ * @param {boolean} backslash
+ * @param {object} variables
+ * @return {Array.<string>}
+ */
+const replaceVariable = (target, replaceTargetRawText, backslash, variables) => {
+    const toBeReplace = replaceTargetRawText
+    const toBeReplaceScript = toBeReplace.match(/([\w\d_]+)\((.*)\)/)
+    if (backslash) { // escape variable syntax
+      const removeBackslash = replaceTargetRawText.replace(/\\/, '')
+      return [replaceTargetRawText, removeBackslash]
+    } else if (toBeReplaceScript) { // execute helper
+      const func = toBeReplaceScript[1]
+      const args = toBeReplaceScript[2].split(',').map(v => {
+        const val = v.trim()
+        const argAsString = val.match(/^['"](.+)['"]$/)
+        if (argAsString) {
+          return argAsString[1]
+        }
+        return variables[val] ?? undefined
+      })
+      if (!helper[func]) {
+        throw new Error('helper function is missing. function name: ' + func);
+      }
+      const replaceText = helper[func].call(null, ...args)
+      return [replaceTargetRawText, replaceText]
+    }
+    return [replaceTargetRawText, variables[target]]
+}
+
+export default replaceVariablesFilter

package/lib/server.js

@@ -33,7 +33,8 @@ const contentType = (ext) => {
 const server = () => {
   return http.createServer((request, response) => {
     const url = new URL(`http://${request.headers.host}${request.url}`)
-    let path = url.pathname === '/' ? '/index.html' : decodeURIComponent(url.pathname)
+    const isIndex = url.pathname.match(/(.+)?\/$/)
+    let path = isIndex ? `${url.pathname}index.html` : decodeURIComponent(url.pathname)
     if (!path.includes('.')) {
       path += '.html'
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.1.8",
+  "version": "0.1.9",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/src-sample/pages/index.md

@@ -2,34 +2,7 @@
 title: INDEX
 template: index.html
 index: false
-url: /
-published: 2023-03-03 20:21
-modified: 2023-03-03 20:21
 ---
 ## INDEX
 
-{script}
-const data = helper.readIndex()
-
-const pages = {}
-for (const page of data) {
-  if (page.index) {
-    const url = variables.relative_path ? variables.relative_path + page.url : page.url
-    if (page.published === '1970-01-01') {
-      if (!pages['日付なし']) {
-          pages['日付なし'] = []
-      }
-      pages['日付なし'].push(`<a href="${url}">${page.title}</a>`)
-      continue
-    }
-    const published = new Date(page.published)
-    const year = `${published.getFullYear()}年`
-    const date = `${published.getMonth() +1}月${published.getDate()}日`
-    if (!pages[year]) {
-      pages[year] = []
-    }
-    pages[year].push(`<a href="${url}">${page.title}</a> (${date})`)
-  }
-}
-return pages
-{/script}
+{{ renderIndex(null, "日付なし") }}

package/src-sample/template/default.html

@@ -1,9 +1,6 @@
 <!DOCTYPE html>
 <html lang="{{LANG}}">
 <head prefix="og: http://ogp.me/ns#">
-  {if gtag_id}
-  {include('template/gtag.html')}
-  {/if}
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{{TITLE}} | {{SITE_NAME}}</title>
@@ -37,9 +34,9 @@
       <h1>{{TITLE}}</h1>
       {if published != '1970-01-01'}
       <aside class="published">
-        <p>投稿: {script}return helper.dateFormat(variables.published){/script}
+        <p>投稿: {{ dateFormat(published) }}
       {/if}
-      {if modified} / 更新: {script}return helper.dateFormat(variables.modified){/script}{/if}
+      {if modified} / 更新: {{ dateFormat(modified) }}{/if}
       {if published}
         </p>
       </aside>

package/src-sample/template/index.html

@@ -4,9 +4,6 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{{SITE_NAME}}</title>
-  {if gtag_id}
-  {include('template/gtag.html')}
-  {/if}
   {include('template/css.html')}
 </head>
 <body>