@tenjuu99/blog 0.1.3 → 0.1.4

package/.github/workflows/github-page.yml

@@ -38,7 +38,7 @@ jobs:
         run: npm install --omit=dev
 
       - name: Build
-        run: cp .env.prod.sample .env && npm run generate
+        run: cp blog.json.prod blog.json && npm run generate
 
       - name: Setup Pages
         uses: actions/configure-pages@v4

package/bin/new

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+mkdir -p "$(pwd)/src/pages"
+echo "create src/pages"
+mkdir -p "$(pwd)/src/template"
+echo "create src/template"
+mkdir -p "$(pwd)/src/css"
+echo "create src/css"
+mkdir -p "$(pwd)/src/image"
+echo "create src/image"
+
+mkdir "$(pwd)/.cache"
+echo "{}" > "$(pwd)/.cache/index.json"
+
+echo 'dist/*
+node_modules/
+.env
+.cache
+' >> .gitignore
+
+echo '{
+  "site_name": "rewrite here",
+  "url_base": "http://localhost:8000",
+  "src_dir": "src",
+  "dist_dir": "dist",
+  "distribute_raw": "image"
+}' > "$(pwd)/blog.json"
+echo "create blog.json"

package/blog.json

@@ -0,0 +1,8 @@
+{
+  "site_name": "test",
+  "url_base": "http://localhost:8000",
+  "src_dir": "src-sample",
+  "dist_dir": "dist",
+  "distribute_raw": "image",
+  "helper": "helper/index.js"
+}

package/blog.json.prod

@@ -0,0 +1,9 @@
+{
+  "site_name": "blog/sample",
+  "url_base": "https://amashigeseiji.github.io/tenjuu99-blog",
+  "relative_path": "/tenjuu99-blog",
+  "src_dir": "src-sample",
+  "dist_dir": "dist",
+  "distribute_raw": "image",
+  "helper": "helper/index.js"
+}

package/lib/config.js

@@ -0,0 +1,32 @@
+import { readFileSync, existsSync } from 'node:fs'
+
+const rootDir = process.cwd()
+const config = {
+  "site_name": "default",
+  "url_base": "http://localhost:8000",
+  "src_dir": "src",
+  "dist_dir": "dist",
+  "distribute_raw": "image",
+  "relative_path": "",
+  "helper": ""
+}
+try {
+  const file = rootDir + '/blog.json'
+  if (existsSync(file)) {
+    const configOverride = JSON.parse(readFileSync(file, 'utf8'))
+    for (const item in configOverride) {
+      config[item] = configOverride[item]
+    }
+  }
+  const keys = Object.keys(process.env)
+  for (const item in config) {
+    const upper = item.toUpperCase()
+    if (keys.includes(upper)) {
+      config[item] = process.env[upper]
+    }
+  }
+} catch (e) {
+  console.log(e)
+}
+
+export default config

package/lib/cssGenerator.js

@@ -6,6 +6,7 @@ import path from 'path'
 import { distDir as distRoot, cssDir } from './dir.js'
 import { watchers } from './watcher.js'
 import { styleText } from 'node:util'
+import config from './config.js'
 
 let cacheBuster = {}
 const cacheBusterQuery = 't'
@@ -55,7 +56,7 @@ const applyCss = async (text) => {
   })
   for (const cssDist of target) {
     const cacheBuster = await cssGenerator(cssDist.src, cssDist.dist)
-    text = text.replace(cssDist.matched, `${process.env.RELATIVE_PATH || ''}${cssDist.dist}?${cacheBusterQuery}=${cacheBuster}`)
+    text = text.replace(cssDist.matched, `${config.relative_path}${cssDist.dist}?${cacheBusterQuery}=${cacheBuster}`)
   }
   return text
 }

package/lib/dir.js

@@ -1,6 +1,8 @@
+import config from './config.js'
+
 const rootDir = process.cwd()
-const srcDir = `${rootDir}/${process.env.SRC_DIR}`
-const distDir = `${rootDir}/${process.env.DIST_DIR}`
+const srcDir = `${rootDir}/${config.src_dir}`
+const distDir = `${rootDir}/${config.dist_dir}`
 const pageDir = `${srcDir}/pages`
 const templateDir = `${srcDir}/template`
 const cssDir = `${srcDir}/css`

package/lib/distribute.js

@@ -4,6 +4,7 @@ import path from 'path'
 import { minifyHtml } from './minify.js'
 import render from './render.js'
 import { styleText } from 'node:util'
+import config from './config.js'
 
 const distribute = async (data, deleted, srcDir, distDir) => {
   if (deleted) {
@@ -22,7 +23,7 @@ const distribute = async (data, deleted, srcDir, distDir) => {
       console.log(styleText('green', '[generate]'), writeTo)
     })
   }
-  const distributeRaw = process.env.DISTRIBUTE_RAW.split(',')
+  const distributeRaw = config.distribute_raw.split(',')
   distributeRaw.forEach((copyDir) => {
     fs.readdir(`${srcDir}/${copyDir}/`).then(async files => {
       await fs.stat(`${distDir}/${copyDir}/`).catch(async err => await fs.mkdir(`${distDir}/${copyDir}/`))

package/lib/filter.js

@@ -1,6 +1,8 @@
 import * as helper from '../helper/index.js'
 import includeFilter from './includeFilter.js'
 import { srcDir } from './dir.js'
+import config from './config.js'
+console.log(config)
 
 /**
  * @param {string} text
@@ -129,8 +131,8 @@ const replaceScriptFilter = async (text, variables) => {
   for (const script of scripts) {
     let helperMerged = {...helper}
     // env.HELPER が定義されていれば追加ヘルパーとして扱う
-    if (process.env.HELPER) {
-      const additional = await import(`${srcDir}/${process.env.HELPER}`)
+    if (config.helper) {
+      const additional = await import(`${srcDir}/${config.helper}`)
       helperMerged = Object.assign(helperMerged, additional)
     }
     let result = new Function('helper', 'variables', script.script)(helperMerged, variables)

package/lib/indexer.js

@@ -1,30 +1,42 @@
 "use strict"
-import fs from "node:fs/promises";
+import { writeFile, readFile } from "node:fs/promises";
+import { readdirSync, existsSync, mkdirSync } from "node:fs";
 import { pageDir, cacheDir } from './dir.js'
 import makePageData from './pageData.js'
 
 const indexFile = `${cacheDir}/index.json`
 
+let newIndex = []
 let allData = {}
 let deleted = []
 
-const indexing = async () => {
-  const oldIndex = await fs.readFile(indexFile, 'utf8').then(text => JSON.parse(text)).catch(error => [])
+const collect = (dir, files = {}, namePrefix = '') => {
+  const dirents = readdirSync(dir, { withFileTypes: true })
+  dirents.forEach((dirent) => {
+    if (dirent.isDirectory()) {
+      collect(`${dirent.path}/${dirent.name}`, files, namePrefix + dirent.name + '/')
+    } else {
+      if (dirent.name.match(/\.(md|html)$/)) {
+        const pageData = makePageData(`${namePrefix}${dirent.name}`)
+        allData[pageData.name] = pageData
+        const { name, url, __output } = pageData
+        newIndex.push({ name, url, __output })
+      }
+    }
+  })
+}
 
-  const newIndex = []
+const indexing = async () => {
+  newIndex = []
   allData = {}
   deleted = []
-  await fs.readdir(pageDir).then(files => {
-    files
-      .filter(fileName => fileName.match('\.(md|html)$'))
-      .forEach(file => {
-        const metaData = makePageData(file)
-        allData[metaData.name] = metaData
-        const { name, url, __output } = metaData
-        newIndex.push({ name, url, __output })
-      })
-  })
-  fs.writeFile(indexFile, JSON.stringify(newIndex))
+  if (!existsSync(cacheDir)) {
+    mkdirSync(cacheDir)
+  }
+  const oldIndex = await readFile(indexFile, 'utf8').then(text => JSON.parse(text)).catch(error => [])
+
+  collect(pageDir)
+  writeFile(indexFile, JSON.stringify(newIndex))
 
   // 旧インデックスから差分を計算して削除対象をピックアップする
   deleted = oldIndex.filter(oi => !newIndex.map(ni => ni.__output).includes(oi.__output))

package/lib/pageData.js

@@ -1,6 +1,7 @@
 "use strict"
 import fs from "node:fs";
 import { pageDir } from './dir.js'
+import config from './config.js'
 
 const load = (path) => {
   return fs.readFileSync(path, 'utf8')
@@ -26,11 +27,11 @@ const parse = (content, name, ext) => {
     index: true,
     noindex: false,
     lang: 'ja',
-    site_name: process.env.SITE_NAME,
-    url_base: process.env.URL_BASE,
-    gtag_id: process.env.GTAG_ID,
+    site_name: config.site_name,
+    url_base: config.url_base,
+    gtag_id: config.gtag_id,
     markdown: markdownReplaced,
-    relative_path: process.env.RELATIVE_PATH || '',
+    relative_path: config.relative_path || '',
     template: 'default.html',
     ext: 'html',
     __output: `/${name}.html`,

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "blog template",
   "main": "index.js",
   "scripts": {
-    "dev": "eval $(cat .env | tr \"\n\" \" \") node bin/server",
-    "generate": "eval $(cat .env | tr \"\n\" \" \") node bin/generate",
+    "dev": "node bin/server",
+    "generate": "node bin/generate",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "bin": {
     "generate": "bin/generate",
-    "server": "bin/server"
+    "server": "bin/server",
+    "new": "bin/new"
   },
   "author": "AmashigeSeiji",
   "repository": {

package/src-sample/pages/abc.md

@@ -4,3 +4,8 @@ url: /abc
 published: 2024-08-31
 ---
 hoge
+hoge
+
+
+abc
+dc

package/src-sample/pages/post/2.md

@@ -0,0 +1 @@
+これは [post](/post) 配下にあります