@tenjuu99/blog 0.2.8 → 0.2.12

package/README.md

@@ -89,7 +89,7 @@ blog.json を開いて、 `site_name` を変更します。
   "src_dir": "src",
   "dist_dir": "dist",
   "distribute_raw": "image",
-  "helper": "helper/index.js"
+  "helper": "index.js"
 }
 ```
 

package/bin/dev-server

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn } from 'child_process'
-import { srcDir, pageDir, serverDir, helperDir } from '../lib/dir.js'
+import { srcDir, watch as watchDir } from '../lib/dir.js'
 import { watchers, watch } from '../lib/watcher.js'
 import generate from '../lib/generate.js'
 import path from 'path'
@@ -14,12 +14,12 @@ const binDir = path.dirname(__filename) + '/../bin/'
 watchers.push({
   paths: srcDir,
   watchOptions: {
-    ignored: [pageDir, serverDir, helperDir],
+    ignored: [watchDir.pageDir, watchDir.serverDir, watchDir.helperDir],
   },
   callback: generate
 })
 watchers.push({
-  paths: pageDir,
+  paths: watchDir.pageDir,
   callback: generate,
   watchOptions: {
     ignoreInitial: true
@@ -27,7 +27,7 @@ watchers.push({
   event: ['change', 'unlink', 'add']
 })
 watchers.push({
-  paths: [serverDir, helperDir, libDir],
+  paths: [watchDir.serverDir, watchDir.helperDir, libDir],
   callback: () => {
     childProcess.kill('SIGINT')
     childProcess = proceed()
@@ -36,6 +36,10 @@ watchers.push({
 })
 watch()
 
+/**
+ * @type { import("child_process").ChildProcess }
+ * @var {ChildProcess} childProcess
+ */
 let childProcess = null
 
 const proceed = () => {
@@ -50,6 +54,7 @@ const proceed = () => {
   })
   child.on('exit', (code, signal) => {
     console.error(`process exit: ${code}, SIGNAL: ${signal}`);
+    child.kill('SIGINT')
   })
 
   return child

package/bin/new

@@ -15,8 +15,9 @@ echo '{
   "src_dir": "src",
   "dist_dir": "dist",
   "distribute_raw": "image,js",
-  "helper": "index.js",
-  "editor_enable": true
+  "helper": "index.js,add.js",
+  "editor_enable": true,
+  "packages": "editor"
 }' > "$(pwd)/blog.json"
 echo "create blog.json"
 

package/lib/applyTemplate.js

@@ -1,7 +1,7 @@
 "use strict"
 import applyCss from './cssGenerator.js'
 import includeFilter from './includeFilter.js'
-import { templateDir, cssDir } from './dir.js'
+import { watch } from './dir.js'
 import { staticFile, staticFiles, warmUp } from './files.js'
 import { watchers } from './watcher.js'
 
@@ -27,7 +27,7 @@ const warmUpTemplate = async () => {
 }
 
 watchers.push({
-  paths: [cssDir, templateDir],
+  paths: [watch.cssDir, watch.templateDir],
   callback: () => { templates = {} }
 })
 

package/lib/config.js

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

package/lib/cssGenerator.js

@@ -4,7 +4,7 @@ import { staticFile } from './files.js'
 import { minifyCss } from './minify.js'
 import { createHash } from 'crypto'
 import path from 'path'
-import { distDir, cssDir } from './dir.js'
+import { distDir, watch } from './dir.js'
 import { watchers } from './watcher.js'
 import { styleText } from 'node:util'
 import config from './config.js'
@@ -63,7 +63,7 @@ const applyCss = async (text) => {
 }
 
 watchers.push({
-  paths: cssDir,
+  paths: watch.cssDir,
   callback: () => { cacheBuster = {} }
 })
 

package/lib/dir.js

@@ -1,15 +1,44 @@
 import config from './config.js'
+import { watchers } from './watcher.js'
+import fs from 'node:fs'
 
 const rootDir = process.cwd()
 const srcDir = `${rootDir}/${config.src_dir}`
 const distDir = `${rootDir}/${config.dist_dir}`
-const pageDir = `${srcDir}/pages`
-const templateDir = `${srcDir}/template`
-const cssDir = `${srcDir}/css`
 const cacheDir = `${rootDir}/.cache`
-const serverDir = `${srcDir}/server`
-const helperDir = `${srcDir}/helper`
+const pageDir = `${cacheDir}/pages`
+const templateDir = `${cacheDir}/template`
+const cssDir = `${cacheDir}/css`
+const serverDir = `${cacheDir}/server`
+const helperDir = `${cacheDir}/helper`
+const packageDir = `${srcDir}/packages`
+const watch = {
+  pageDir: `${srcDir}/pages`,
+  templateDir: `${srcDir}/template`,
+  cssDir: `${srcDir}/css`,
+  serverDir: `${srcDir}/server`,
+  helperDir: `${srcDir}/helper`,
+}
+
+const cache = () => {
+  if (config.packages) {
+    const packages = config.packages.split(',')
+    packages.forEach(dir => {
+      if (!fs.existsSync(`${packageDir}/${dir}`)) {
+        throw new Error(`"${dir}" package does not exist.`)
+      }
+      fs.cpSync(`${packageDir}/${dir}`, cacheDir, { recursive: true })
+    })
+  }
+  fs.cpSync(srcDir, cacheDir, { recursive: true, force: true })
+}
+cache()
 
+watchers.push({
+  paths: [srcDir],
+  event: ['change', 'add', 'unlink'],
+  callback: cache
+})
 export {
   rootDir,
   srcDir,
@@ -19,5 +48,6 @@ export {
   cssDir,
   cacheDir,
   serverDir,
-  helperDir
+  helperDir,
+  watch
 }

package/lib/distribute.js

@@ -38,11 +38,14 @@ const distribute = async (data, srcDir, distDir) => {
   }
   const distributeRaw = config.distribute_raw.split(',')
   distributeRaw.forEach((copyDir) => {
-    fs.readdir(`${srcDir}/${copyDir}/`).then(async files => {
+    if (!existsSync(`${cacheDir}/${copyDir}`)) {
+      return
+    }
+    fs.readdir(`${cacheDir}/${copyDir}/`).then(async files => {
       await fs.stat(`${distDir}/${copyDir}/`).catch(async err => await fs.mkdir(`${distDir}/${copyDir}/`))
       files.forEach(file => {
-        fs.copyFile(`${srcDir}/${copyDir}/${file}`, `${distDir}/${copyDir}/${file}`)
-        console.log(styleText('green', '[copy]'), `${srcDir}/${copyDir}/${file} => ${distDir}/${copyDir}/${file}`)
+        fs.copyFile(`${cacheDir}/${copyDir}/${file}`, `${distDir}/${copyDir}/${file}`)
+        console.log(styleText('green', '[copy]'), `${cacheDir}/${copyDir}/${file} => ${distDir}/${copyDir}/${file}`)
       })
     })
   })
@@ -57,8 +60,10 @@ const distribute = async (data, srcDir, distDir) => {
       fs.writeFile(indexFile, JSON.stringify(newIndex))
       if (deleted) {
         for (const obj of deleted) {
-          console.log(styleText('red', '[unlink]'), `${distDir}${obj.__output}`)
-          fs.unlink(`${distDir}${obj.__output}`)
+          if (existsSync(`${distDir}${obj.__output}`)) {
+            console.log(styleText('red', '[unlink]'), `${distDir}${obj.__output}`)
+            fs.unlink(`${distDir}${obj.__output}`)
+          }
         }
       }
     })

package/lib/files.js

@@ -1,5 +1,5 @@
 import fs from "node:fs/promises";
-import { templateDir, cssDir } from './dir.js'
+import { templateDir, cssDir, watch } from './dir.js'
 import { watchers } from './watcher.js'
 
 let staticFilesContainer = {}
@@ -33,7 +33,7 @@ const staticFiles = () => {
   return Object.entries(staticFilesContainer)
 }
 watchers.push({
-  paths: [cssDir, templateDir],
+  paths: [watch.cssDir, watch.templateDir],
   callback: async () => {
     loaded = false
     await warmUp()

package/lib/filter.js

@@ -1,7 +1,4 @@
 import helper from '../lib/helper.js'
-import { srcDir } from './dir.js'
-import config from './config.js'
-import replaceVariablesFilter from './replaceVariablesFilter.js'
 
 /**
  * @param {string} condition
@@ -84,30 +81,6 @@ const replaceIfFilter = (text, variables) => {
   return text
 }
 
-/**
- * 配列を再帰的に順不同リストに変換する
- * @param {Array|string} arrayOrText
- * @returns {mixed}
- */
-const 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
-}
-
 const replaceScriptFilter = async (text, variables) => {
   let replaced = text
   const scriptRegexp = new RegExp(/({script}|\<script\s.*type="ssg".*>)(?<script>[\s\S]*?)(\{\/script}|\<\/script>)/g)
@@ -127,9 +100,6 @@ const replaceScriptFilter = async (text, variables) => {
       case 'null':
         result = ''
     }
-    if (Array.isArray(result)) {
-      result = helper.arrayToList(result)
-    }
     replaced = replaced.replace(script.replace, result)
   }
   return replaced
@@ -137,6 +107,5 @@ const replaceScriptFilter = async (text, variables) => {
 
 export {
   replaceIfFilter,
-  replaceScriptFilter,
-  replaceVariablesFilter
+  replaceScriptFilter
 }

package/lib/render.js

@@ -1,8 +1,8 @@
 import {
   replaceIfFilter,
-  replaceScriptFilter,
-  replaceVariablesFilter
+  replaceScriptFilter
 } from './filter.js'
+import replaceVariablesFilter from './replaceVariablesFilter.js'
 import includeFilter from './includeFilter.js'
 import { marked } from "marked";
 import { applyTemplate } from './applyTemplate.js'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.8",
+  "version": "0.2.12",
   "description": "blog template",
   "main": "index.js",
   "scripts": {
@@ -34,7 +34,6 @@
   "files": [
     "lib",
     "bin",
-    "helper",
     "src-sample"
   ],
   "publishConfig": {

package/src-sample/helper/add.js

@@ -0,0 +1,3 @@
+export function additionalHelper() {
+  return 'これは追加ヘルパーによって出力されているメッセージです。'
+}

package/src-sample/helper/index.js

@@ -1,5 +1,5 @@
 import { allData } from '@tenjuu99/blog/lib/indexer.js'
-import { replaceVariablesFilter } from "@tenjuu99/blog/lib/filter.js";
+import replaceVariablesFilter from '@tenjuu99/blog/lib/replaceVariablesFilter.js'
 import config from '@tenjuu99/blog/lib/config.js'
 
 export function readIndex (filter = null) {
@@ -115,10 +115,6 @@ export function renderIndex(pages, nodate = 'nodate', headingTag = 'h3') {
   return resultText.join('\n')
 }
 
-export function additionalHelper() {
-  return 'これは追加ヘルパーによって出力されているメッセージです。'
-}
-
 export function isEditorEnabled() {
   return allData.editor && allData.editor.distribute
 }

package/src-sample/{js → packages/editor/js}/editor.js

@@ -5,7 +5,10 @@ const fetchData = (target) => {
     .then(async res => {
       if (!res.ok) {
         document.querySelector('#inputFileName').value = target
-        document.querySelector('#editorTextArea').value = `${target.split('.')[0]}についての記事を作成しましょう`
+        document.querySelector('#editorTextArea').value = `---
+title: ${target.split('.')[0].split('/').pop()}
+---
+${target.split('.')[0].split('/').pop()} についての記事を作成しましょう`
         // submit('/preview', form)
         throw new Error(`${target} does not exist.`)
       } else {

package/src-sample/{js → packages/editor/js}/error.js

@@ -4,5 +4,5 @@ const url = new URL(location)
 if (url.pathname !== '/editor') {
   const link = document.querySelector('.editor_link')
   link.href = `/editor?md=${url.pathname.replace('/', '')}.md`
-  link.innerHTML = `${url.pathname.replace('/', '')}のページを作成する`
+  link.innerHTML = `[${decodeURI(url.pathname).replace('/', '')}]のページを作成する`
 }

package/src-sample/{server → packages/editor/server}/editor.js

@@ -2,7 +2,7 @@ import { IncomingMessage, ServerResponse } from 'http'
 import fs from 'node:fs/promises'
 import { styleText } from 'node:util'
 import config from '@tenjuu99/blog/lib/config.js'
-import { pageDir } from '@tenjuu99/blog/lib/dir.js'
+import { watch } from '@tenjuu99/blog/lib/dir.js'
 
 export const path = '/editor'
 
@@ -24,7 +24,7 @@ export const post = async (req, res) => {
         }))
         return
       }
-      await fs.writeFile(`${pageDir}/${file}`, json.content)
+      await fs.writeFile(`${watch.pageDir}/${file}`, json.content)
       console.log(styleText('blue', '[editor/post] finished'))
 
       const href = file.split('.')[0]

package/src-sample/template/default.html

@@ -12,9 +12,7 @@
   {if og_image}
   <meta property="og:image" content="{{OG_IMAGE}}">
   {/if}
-  {if og_description}
   <meta property="og:description" content="{{OG_DESCRIPTION}}">
-  {/if}
   <meta property="og:type" content="article">
   <meta property="og:site_name" content="{{SITE_NAME}}">
   {script}