@tenjuu99/blog 0.2.15 → 0.2.17

package/bin/dev-server

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn } from 'child_process'
-import { srcDir, watch as watchDir } from '../lib/dir.js'
+import { srcDir, watch as watchDir, packageDir, packageDirCore } from '../lib/dir.js'
 import { watchers, watch } from '../lib/watcher.js'
 import generate from '../lib/generate.js'
 import path from 'path'
@@ -27,7 +27,7 @@ watchers.push({
   event: ['change', 'unlink', 'add']
 })
 watchers.push({
-  paths: [watchDir.serverDir, watchDir.helperDir, libDir],
+  paths: [watchDir.serverDir, watchDir.helperDir, libDir, packageDir, packageDirCore],
   callback: () => {
     childProcess.kill('SIGINT')
     childProcess = proceed()
@@ -61,3 +61,7 @@ const proceed = () => {
 }
 
 childProcess = proceed()
+
+process.on('exit', () => {
+  childProcess.kill('SIGINT')
+})

package/index.js

@@ -0,0 +1,4 @@
+import { allData } from './lib/indexer.js'
+import config from './lib/config.js'
+
+export { allData, config }

package/lib/config.js

@@ -9,7 +9,7 @@ const config = {
   "distribute_raw": "image",
   "relative_path": "",
   "helper": "",
-  "package": ""
+  "packages": ""
 }
 try {
   const file = rootDir + '/blog.json'

package/lib/dir.js

@@ -58,20 +58,52 @@ const cache = () => {
 // generate の中でもコールしているが、同一プロセスであれば alreadyCached 変数で制御される
 cache()
 
+let packageDirectoriesLoaded = []
+const packageDirectories = () => {
+  if (packageDirectoriesLoaded.length > 0) {
+    return packageDirectoriesLoaded
+  }
+  const watchTargetDir = ['pages', 'template', 'css', 'helper', 'server', 'js']
+  const packages = config.packages.split(',').reduce((prev, packageName) => {
+    if (fs.existsSync(`${packageDir}/${packageName}`)) {
+      prev.push(fs.realpathSync(`${packageDir}/${packageName}`))
+    }
+    prev.push(fs.realpathSync(`${packageDirCore}/${packageName}`))
+    return prev
+  }, [srcDir])
+
+  for (const baseDir of packages) {
+    for (const target of watchTargetDir) {
+      if (!fs.existsSync(`${baseDir}/${target}`)) {
+        continue;
+      }
+      const targetDir = `${baseDir}/${target}`
+      packageDirectoriesLoaded.push(targetDir)
+    }
+  }
+  return packageDirectoriesLoaded
+}
+
 const resolveDestinationPath = (path) => {
-  for (const key of Object.keys(watch)) {
-    if (path.startsWith(watch[key])) {
-      const dir = watch[key].split('/').pop()
-      const srcFile = `${dir}${path.replace(watch[key], '')}`
+  for (const targetDir of packageDirectories()) {
+    if (path.startsWith(targetDir)) {
+      const dir = targetDir.split('/').pop()
+      const srcFile = `${dir}${path.replace(targetDir, '')}`
       return `${cacheDir}/${srcFile}`
     }
   }
 }
 watchers.push({
-  paths: [srcDir],
+  paths: [srcDir, packageDir, packageDirCore],
   event: ['change', 'add', 'unlink'],
   callback: ( path ) => {
     const dest = resolveDestinationPath(path)
+    if (!dest) {
+      console.log(styleText('red', `[watcher] cannot resolve destination path: ${path}`))
+      alreadyCached = false
+      cache()
+      return true
+    }
     if (fs.existsSync(path)) {
       fs.cpSync(path, dest, { force: true })
       console.log(styleText('blue', `update ${path} => ${dest}`))
@@ -95,5 +127,7 @@ export {
   serverDir,
   helperDir,
   watch,
-  cache
+  cache,
+  packageDir,
+  packageDirCore
 }

package/lib/server.js

@@ -35,8 +35,9 @@ const server = () => {
   return http.createServer(async (request, response) => {
     request.setEncoding('utf8')
     const url = new URL(`http://${request.headers.host}${request.url}`)
-    const isIndex = url.pathname.match(/(.+)?\/$/)
-    let path = isIndex ? `${url.pathname}index.html` : decodeURIComponent(url.pathname)
+    const urlPathNameDecoded = decodeURIComponent(url.pathname)
+    const isIndex = urlPathNameDecoded.match(/(.+)?\/$/)
+    let path = isIndex ? `${urlPathNameDecoded}index.html` : urlPathNameDecoded
     if (!path.includes('.')) {
       const result = await handle(path, request, response)
       if (result) {

package/package.json

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

package/packages/editor/server/editor.js

@@ -1,5 +1,5 @@
 import { IncomingMessage, ServerResponse } from 'http'
-import fs from 'node:fs/promises'
+import fs from 'node:fs'
 import { styleText } from 'node:util'
 import config from '@tenjuu99/blog/lib/config.js'
 import { watch } from '@tenjuu99/blog/lib/dir.js'
@@ -24,7 +24,13 @@ export const post = async (req, res) => {
         }))
         return
       }
-      await fs.writeFile(`${watch.pageDir}/${file}`, json.content)
+      const filenameSplitted = file.split('/')
+      const filename = filenameSplitted.pop()
+      const dir = [watch.pageDir, ...filenameSplitted].join('/')
+      if (!fs.existsSync(dir)) {
+        fs.mkdirSync(dir, { recursive: true })
+      }
+      fs.writeFileSync(`${dir}/${filename}`, json.content)
       console.log(styleText('blue', '[editor/post] finished'))
 
       const href = file.split('.')[0]

package/src-sample/css/layout.css

@@ -58,9 +58,6 @@ header a, header a:visited {
 
 main {
   flex-grow: 1;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
 }
 
 footer {

package/src-sample/helper/index.js

@@ -1,6 +1,4 @@
-import { allData } from '@tenjuu99/blog/lib/indexer.js'
-import replaceVariablesFilter from '@tenjuu99/blog/lib/replaceVariablesFilter.js'
-import config from '@tenjuu99/blog/lib/config.js'
+import { allData, config } from '@tenjuu99/blog'
 
 export function readIndex (filter = null) {
   const data = Object.entries(allData)
@@ -15,44 +13,10 @@ export function dateFormat(dateString) {
   return `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`
 }
 
-export function render(text, variables) {
-  return replaceVariablesFilter(text, variables)
-}
-
 export function getPageData(name) {
   return allData[name]
 }
 
-let indexedItemsSorted = null
-export function indexedItems() {
-  if (indexedItemsSorted) {
-    return indexedItemsSorted
-  }
-  const sorted = readIndex()
-    .filter(v => v.index && v.published != '1970-01-01')
-    .sort((a, b) => new Date(a.published) - new Date(b.published))
-  let prev, next
-  for (const item of sorted) {
-    if (prev) {
-      prev.next = {
-        name: item.name,
-        published: item.published,
-        url: item.url,
-        title: item.title,
-      }
-      item.prev = {
-        name: prev.name,
-        published: prev.published,
-        url: prev.url,
-        title: prev.title,
-      }
-    }
-    prev = item
-  }
-  indexedItemsSorted = sorted
-  return indexedItemsSorted
-}
-
 /**
  * 配列を再帰的に順不同リストに変換する
  * @param {Array|string} arrayOrText
@@ -118,3 +82,21 @@ export function renderIndex(pages, nodate = 'nodate', headingTag = 'h3') {
 export function isEditorEnabled() {
   return allData.editor && allData.editor.distribute
 }
+
+export function breadcrumbList(pageName) {
+  const pageData = allData[pageName]
+  const breadCrumbs = ['/']
+  pageData.url.split('/').reduce((prev, curr) => {
+    breadCrumbs.push([`/${prev}${curr}/`, curr])
+    return `${prev}${curr}/`
+  })
+  const last = breadCrumbs.pop()
+  last[0] = last[0].substring(0, last[0].length - 1)
+
+  const output = breadCrumbs.map(v => {
+    return `<div style="margin-left: 10px;"><a href="${v[0]}">${v[0] === '/' ? 'top' : v[1]}</a> > </div>`
+  }).join('') + `<div style="margin-left: 10px;">${last[1]}</div>`
+  return '<div style="display: flex;flex-wrap: wrap;">'
+    + output
+    + '</div>'
+}

package/src-sample/template/default.html

@@ -28,6 +28,9 @@
     <p class="container"><a href="{{RELATIVE_PATH}}/">{{SITE_NAME}}</a></p>
   </header>
   <main>
+    <div class="container">
+      {{ breadcrumbList(name) }}
+    </div>
     <article class="container">
       <h1>{{TITLE}}</h1>
       {if published != '1970-01-01'}