@tenjuu99/blog 0.2.16 → 0.2.18

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()

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,11 +58,37 @@ 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}`
     }
   }
@@ -88,7 +114,8 @@ watchers.push({
   },
   watchOptions: {
     ignoreInitial: true
-  }
+  },
+  prior: true,
 })
 export {
   rootDir,
@@ -101,5 +128,7 @@ export {
   serverDir,
   helperDir,
   watch,
-  cache
+  cache,
+  packageDir,
+  packageDirCore
 }

package/lib/watcher.js

@@ -1,18 +1,23 @@
 import chokidar from 'chokidar'
 
 const container = []
+const containerPrior = []
 
 const watchers = {
-  push({ paths, event = 'change', callback, watchOptions }) {
+  push({ paths, event = 'change', callback, watchOptions, prior = false }) {
     if (!paths || !callback || typeof callback !== 'function') {
       throw new Error('Invalid object type for watcher.')
     }
-    container.push({ paths, event, callback, watchOptions })
+    if (prior) {
+      containerPrior.push({ paths, event, callback, watchOptions })
+    } else {
+      container.push({ paths, event, callback, watchOptions })
+    }
   }
 }
 
 const watch = () => {
-  container.forEach((watcher) => {
+  const callback = (watcher) => {
     const { paths, event, callback, watchOptions } = watcher
     const cwatcher = chokidar.watch(paths, watchOptions)
     if (Array.isArray(event)) {
@@ -22,7 +27,9 @@ const watch = () => {
     } else {
       throw new Error('Invalid event for watcher.')
     }
-  })
+  }
+  containerPrior.forEach(callback)
+  container.forEach(callback)
 }
 
 export { watchers , watch }

package/package.json

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

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