@tenjuu99/blog 0.2.12 → 0.2.13

package/lib/dir.js

@@ -1,6 +1,7 @@
 import config from './config.js'
 import { watchers } from './watcher.js'
 import fs from 'node:fs'
+import { styleText } from 'node:util'
 
 const rootDir = process.cwd()
 const srcDir = `${rootDir}/${config.src_dir}`
@@ -18,26 +19,63 @@ const watch = {
   cssDir: `${srcDir}/css`,
   serverDir: `${srcDir}/server`,
   helperDir: `${srcDir}/helper`,
+  jsDir: `${srcDir}/js`,
 }
 
+let alreadyCached = false
+
 const cache = () => {
+  if (alreadyCached) {
+    return
+  }
   if (config.packages) {
     const packages = config.packages.split(',')
     packages.forEach(dir => {
       if (!fs.existsSync(`${packageDir}/${dir}`)) {
         throw new Error(`"${dir}" package does not exist.`)
       }
+      console.log(styleText('blue', `[cache] enable package: ${dir}`))
       fs.cpSync(`${packageDir}/${dir}`, cacheDir, { recursive: true })
     })
   }
-  fs.cpSync(srcDir, cacheDir, { recursive: true, force: true })
+  fs.cpSync(srcDir, cacheDir, {
+    recursive: true,
+    force: true,
+    filter: (src, dist) => !src.startsWith(packageDir)
+  })
+  console.log(styleText('blue', '[cache] finish copy'))
+  alreadyCached = true
 }
+// import パスの解決の関係上、関数コールより前にファイルが読まれることがあるためここで呼んでおく
+// 子プロセスで起動する場合は二度呼ばれることになる
+// generate の中でもコールしているが、同一プロセスであれば alreadyCached 変数で制御される
 cache()
 
+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], '')}`
+      return `${cacheDir}/${srcFile}`
+    }
+  }
+}
 watchers.push({
   paths: [srcDir],
   event: ['change', 'add', 'unlink'],
-  callback: cache
+  callback: ( path ) => {
+    const dest = resolveDestinationPath(path)
+    if (fs.existsSync(path)) {
+      fs.cpSync(path, dest, { force: true })
+      console.log(styleText('blue', `update ${path} => ${dest}`))
+    } else {
+      fs.unlinkSync(dest)
+      console.log(styleText('red', `unlink ${dest}`))
+    }
+  },
+  watchOptions: {
+    ignoreInitial: true
+  }
 })
 export {
   rootDir,
@@ -49,5 +87,6 @@ export {
   cacheDir,
   serverDir,
   helperDir,
-  watch
+  watch,
+  cache
 }

package/lib/distribute.js

@@ -53,24 +53,28 @@ const distribute = async (data, srcDir, distDir) => {
   if (!existsSync(cacheDir)) {
     mkdirSync(cacheDir)
   }
-  fs.readFile(indexFile, 'utf8')
-    .then(text => {
-      const oldIndex = JSON.parse(text)
-      let deleted = oldIndex.filter(oi => !newIndex.map(ni => ni.__output).includes(oi.__output))
-      fs.writeFile(indexFile, JSON.stringify(newIndex))
-      if (deleted) {
-        for (const obj of deleted) {
-          if (existsSync(`${distDir}${obj.__output}`)) {
-            console.log(styleText('red', '[unlink]'), `${distDir}${obj.__output}`)
-            fs.unlink(`${distDir}${obj.__output}`)
+  if (existsSync(indexFile)) {
+    fs.readFile(indexFile, 'utf8')
+      .then(text => {
+        const oldIndex = JSON.parse(text)
+        let deleted = oldIndex.filter(oi => !newIndex.map(ni => ni.__output).includes(oi.__output))
+        fs.writeFile(indexFile, JSON.stringify(newIndex))
+        if (deleted) {
+          for (const obj of deleted) {
+            if (existsSync(`${distDir}${obj.__output}`)) {
+              console.log(styleText('red', '[unlink]'), `${distDir}${obj.__output}`)
+              fs.unlink(`${distDir}${obj.__output}`)
+            }
           }
         }
-      }
-    })
-    .catch(error => {
-      console.log(error)
-      fs.writeFile(indexFile, JSON.stringify(newIndex))
-    })
+      })
+      .catch(error => {
+        console.log(error)
+        fs.writeFile(indexFile, JSON.stringify(newIndex))
+      })
+  } else {
+    fs.writeFile(indexFile, JSON.stringify(newIndex))
+  }
 }
 
 export default distribute

package/lib/generate.js

@@ -1,11 +1,12 @@
 "use strict"
 import distribute from './distribute.js'
 import { indexing, allData } from './indexer.js'
-import { srcDir, distDir } from './dir.js'
+import { srcDir, distDir, cache } from './dir.js'
 import { styleText } from 'node:util'
 
 const generate = async () => {
   let start = performance.now()
+  cache()
   await indexing()
   let end = performance.now()
   console.log(styleText('blue', '[indexing: ' + (end - start) + "ms]"))

package/package.json

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