pugkit 1.0.2 → 1.1.0

package/cli/develop.mjs

@@ -2,7 +2,7 @@ import { createBuilder } from '../index.mjs'
 import { logger } from './logger.mjs'
 
 export async function develop(options = {}) {
-  const { root = process.cwd(), port, host, open } = options
+  const { root = process.cwd(), port, host } = options
 
   logger.info('pugkit', 'starting dev server...')
 
@@ -10,7 +10,6 @@ export async function develop(options = {}) {
 
   if (port) builder.context.config.server.port = port
   if (host) builder.context.config.server.host = host
-  if (open) builder.context.config.server.open = open
 
   await builder.watch()
 }

package/cli/logger.mjs

@@ -6,26 +6,22 @@ import path from 'node:path'
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
-function getVersion() {
-  const pkgPath = path.join(__dirname, '../package.json')
-  const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'))
-  return pkg.version
-}
+const version = JSON.parse(readFileSync(path.join(__dirname, '../package.json'), 'utf8')).version
 
 export const logger = {
   info(name, message) {
-    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${getVersion()}`)} ${message}`)
+    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${version}`)} ${message}`)
   },
 
   success(name, message) {
-    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${getVersion()}`)} ${message}`)
+    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${version}`)} ${message}`)
   },
 
   warn(name, message) {
-    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${getVersion()}`)} ${message}`)
+    console.log(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${version}`)} ${message}`)
   },
 
   error(name, message) {
-    console.error(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${getVersion()}`)} ${message}`)
+    console.error(`${pc.cyan(pc.bold(name.toUpperCase()))} ${pc.dim(`v${version}`)} ${message}`)
   }
 }

package/config/defaults.mjs

@@ -5,8 +5,7 @@ export const defaultConfig = {
   server: {
     port: 5555,
     host: 'localhost',
-    startPath: '/',
-    open: false
+    startPath: '/'
   },
   build: {
     imageOptimization: 'webp',

package/core/cache.mjs

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto'
-import { stat, readFile } from 'node:fs/promises'
+import { readFile } from 'node:fs/promises'
 import { existsSync } from 'node:fs'
 
 /**
@@ -76,13 +76,12 @@ export class CacheManager {
   }
 
   /**
-   * ハッシュ計算（ファイル内容 + 更新日時）
+   * ハッシュ計算（ファイル内容のみ）
    */
   async computeHash(filePath) {
     try {
-      const [stats, content] = await Promise.all([stat(filePath), readFile(filePath)])
-
-      return createHash('md5').update(content).update(stats.mtime.toISOString()).digest('hex')
+      const content = await readFile(filePath)
+      return createHash('md5').update(content).digest('hex')
     } catch {
       return `error-${Math.random()}`
     }

package/core/watcher.mjs

@@ -17,7 +17,7 @@ export async function watcherTask(context, options = {}) {
 class FileWatcher {
   constructor(context) {
     this.context = context
-    this.watchers = []
+    this.watcher = null
   }
 
   async start() {
@@ -29,327 +29,208 @@ class FileWatcher {
       await this.context.taskRegistry.pug(this.context)
     }
 
-    // Pug監視
-    this.watchPug(paths.src)
+    this.watcher = chokidar
+      .watch([paths.src, paths.public], {
+        ignoreInitial: true,
+        ignored: [/(^|[\/\\])\./, /node_modules/, /\.git/],
+        persistent: true,
+        awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
+      })
+      .on('change', filePath => this.handleChange(filePath))
+      .on('add', filePath => this.handleAdd(filePath))
+      .on('unlink', filePath => this.handleUnlink(filePath))
 
-    // Sass監視
-    this.watchSass(paths.src)
+    logger.info('watch', 'File watching started')
+  }
 
-    // Script監視
-    this.watchScript(paths.src)
+  // ---- ルーティング ----
+  handleChange(filePath) {
+    if (this.isPublic(filePath)) return this.onPublicChange(filePath, 'change')
+    if (filePath.endsWith('.pug')) return this.onPugChange(filePath)
+    if (filePath.endsWith('.scss')) return this.onSassChange(filePath)
+    if (this.isScript(filePath)) return this.onScriptChange(filePath)
+    if (filePath.endsWith('.svg') && !this.isIcons(filePath)) return this.onSvgChange(filePath, 'change')
+    if (/\.(jpg|jpeg|png|gif)$/i.test(filePath)) return this.onImageChange(filePath, 'change')
+  }
 
-    // SVG監視
-    this.watchSvg(paths.src)
+  handleAdd(filePath) {
+    if (this.isPublic(filePath)) return this.onPublicChange(filePath, 'add')
+    if (filePath.endsWith('.svg') && !this.isIcons(filePath)) return this.onSvgChange(filePath, 'add')
+    if (/\.(jpg|jpeg|png|gif)$/i.test(filePath)) return this.onImageChange(filePath, 'add')
+  }
 
-    // 画像監視
-    this.watchImages(paths.src)
+  handleUnlink(filePath) {
+    if (this.isPublic(filePath)) return this.onPublicUnlink(filePath)
+    if (filePath.endsWith('.pug')) return this.onPugUnlink(filePath)
+    if (filePath.endsWith('.scss')) return this.onSassUnlink(filePath)
+    if (this.isScript(filePath)) return this.onScriptUnlink(filePath)
+    if (filePath.endsWith('.svg') && !this.isIcons(filePath)) return this.onSvgUnlink(filePath)
+    if (/\.(jpg|jpeg|png|gif)$/i.test(filePath)) return this.onImageUnlink(filePath)
+  }
 
-    // Public監視
-    this.watchPublic(paths.public)
+  // ---- 判定ヘルパー ----
 
-    logger.info('watch', 'File watching started')
+  isPublic(filePath) {
+    return filePath.startsWith(this.context.paths.public)
   }
 
-  /**
-   * Pug監視（依存関係を考慮）
-   */
-  watchPug(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [
-        /(^|[\/\\])\../, // 隠しファイル
-        /node_modules/,
-        /\.git/
-      ],
-      persistent: true,
-      awaitWriteFinish: {
-        stabilityThreshold: 100,
-        pollInterval: 50
-      }
-    })
-
-    watcher.on('change', async path => {
-      // .pugファイルのみ処理
-      if (!path.endsWith('.pug')) {
-        return
-      }
-      const relPath = relative(basePath, path)
-      logger.info('change', `pug: ${relPath}`)
-
-      try {
-        // パーシャルの場合、依存する親ファイルも再ビルド
-        const affectedFiles = this.context.graph.getAffectedParents(path)
-
-        if (affectedFiles.length > 0) {
-          logger.info('pug', `Rebuilding ${affectedFiles.length} affected file(s)`)
-        }
-
-        // キャッシュ無効化
-        this.context.cache.invalidatePugTemplate(path)
-        affectedFiles.forEach(f => this.context.cache.invalidatePugTemplate(f))
-
-        // Pugタスクを実行（変更されたファイルのみ）
-        if (this.context.taskRegistry?.pug) {
-          await this.context.taskRegistry.pug(this.context, {
-            files: [path, ...affectedFiles]
-          })
-        }
-
-        this.reload()
-      } catch (error) {
-        logger.error('watch', `Pug build failed: ${error.message}`)
-      }
-    })
+  isScript(filePath) {
+    return (filePath.endsWith('.ts') || filePath.endsWith('.js')) && !filePath.endsWith('.d.ts')
+  }
 
-    watcher.on('unlink', async path => {
-      if (!path.endsWith('.pug')) return
-      const relPath = relative(basePath, path)
+  isIcons(filePath) {
+    // Windows 対応: セパレータを正規化
+    return filePath.replace(/\\/g, '/').includes('/icons/')
+  }
 
-      // キャッシュとグラフをクリア
-      this.context.cache.invalidatePugTemplate(path)
-      this.context.graph.clearDependencies(path)
+  // ---- Pug ----
 
-      if (basename(path).startsWith('_')) {
-        logger.info('unlink', relPath)
-        return
+  async onPugChange(filePath) {
+    const { paths, graph, cache, taskRegistry } = this.context
+    const relPath = relative(paths.src, filePath)
+    logger.info('change', `pug: ${relPath}`)
+    try {
+      const affectedFiles = graph.getAffectedParents(filePath)
+      if (affectedFiles.length > 0) logger.info('pug', `Rebuilding ${affectedFiles.length} affected file(s)`)
+      cache.invalidatePugTemplate(filePath)
+      affectedFiles.forEach(f => cache.invalidatePugTemplate(f))
+      if (taskRegistry?.pug) {
+        await taskRegistry.pug(this.context, { files: [filePath, ...affectedFiles] })
       }
-      const distPath = resolve(this.context.paths.dist, relPath.replace(/\.pug$/, '.html'))
-      await this.deleteDistFile(distPath, relPath)
-    })
-
-    this.watchers.push(watcher)
+      this.reload()
+    } catch (error) {
+      logger.error('watch', `Pug build failed: ${error.message}`)
+    }
   }
 
-  /**
-   * Sass監視
-   */
-  watchSass(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [/(^|[\/\\])\../, /node_modules/, /\.git/],
-      persistent: true,
-      awaitWriteFinish: { stabilityThreshold: 50, pollInterval: 25 }
-    })
-
-    watcher.on('change', async path => {
-      // .scssファイルのみ処理
-      if (!path.endsWith('.scss')) {
-        return
-      }
-      const relPath = relative(basePath, path)
-      logger.info('change', `sass: ${relPath}`)
-
-      try {
-        // Sassタスクを実行
-        if (this.context.taskRegistry?.sass) {
-          await this.context.taskRegistry.sass(this.context)
-        }
-
-        this.injectCSS()
-      } catch (error) {
-        logger.error('watch', `Sass build failed: ${error.message}`)
-      }
-    })
-
-    watcher.on('unlink', async path => {
-      if (!path.endsWith('.scss')) return
-      const relPath = relative(basePath, path)
-      if (basename(path).startsWith('_')) {
-        logger.info('unlink', relPath)
-        return
-      }
-      const distPath = resolve(this.context.paths.dist, relPath.replace(/\.scss$/, '.css'))
-      await this.deleteDistFile(distPath, relPath)
-    })
-
-    this.watchers.push(watcher)
+  async onPugUnlink(filePath) {
+    const { paths, cache, graph } = this.context
+    const relPath = relative(paths.src, filePath)
+    cache.invalidatePugTemplate(filePath)
+    graph.clearDependencies(filePath)
+    if (basename(filePath).startsWith('_')) {
+      logger.info('unlink', relPath)
+      return
+    }
+    const distPath = resolve(paths.dist, relPath.replace(/\.pug$/, '.html'))
+    await this.deleteDistFile(distPath, relPath)
   }
 
-  /**
-   * Script監視
-   */
-  watchScript(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [/(^|[\/\\])\../, /node_modules/, /\.git/, /\.d\.ts$/],
-      persistent: true,
-      awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
-    })
-
-    watcher.on('change', async path => {
-      // .ts/.jsファイルのみ処理（.d.tsを除く）
-      if (!(path.endsWith('.ts') || path.endsWith('.js')) || path.endsWith('.d.ts')) {
-        return
-      }
-      const relPath = relative(basePath, path)
-      logger.info('change', `script: ${relPath}`)
-
-      try {
-        // Scriptタスクを実行
-        if (this.context.taskRegistry?.script) {
-          await this.context.taskRegistry.script(this.context)
-        }
-
-        this.reload()
-      } catch (error) {
-        logger.error('watch', `Script build failed: ${error.message}`)
-      }
-    })
-
-    watcher.on('unlink', async path => {
-      if (!(path.endsWith('.ts') || path.endsWith('.js')) || path.endsWith('.d.ts')) return
-      const relPath = relative(basePath, path)
-      if (basename(path).startsWith('_')) {
-        logger.info('unlink', relPath)
-        return
-      }
-      const distPath = resolve(this.context.paths.dist, relPath.replace(/\.ts$/, '.js'))
-      await this.deleteDistFile(distPath, relPath)
-    })
+  // ---- Sass ----
 
-    this.watchers.push(watcher)
+  async onSassChange(filePath) {
+    const relPath = relative(this.context.paths.src, filePath)
+    logger.info('change', `sass: ${relPath}`)
+    try {
+      if (this.context.taskRegistry?.sass) await this.context.taskRegistry.sass(this.context)
+      this.injectCSS()
+    } catch (error) {
+      logger.error('watch', `Sass build failed: ${error.message}`)
+    }
   }
 
-  /**
-   * SVG監視
-   */
-  watchSvg(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [/(^|[\/\\])\../, /node_modules/, /\.git/, /icons/], // iconsはスプライト用なので除外
-      persistent: true,
-      awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
-    })
-
-    const handleSvgChange = async (path, event) => {
-      // .svgファイルのみ処理（iconsディレクトリは除外）
-      // Windows対応: パスセパレータを正規化
-      const normalizedPath = path.replace(/\\/g, '/')
-      if (!path.endsWith('.svg') || normalizedPath.includes('/icons/')) {
-        return
-      }
-      const relPath = relative(basePath, path)
-      logger.info(event, `svg: ${relPath}`)
-
-      try {
-        // SVGタスクを実行（変更されたファイルのみ）
-        if (this.context.taskRegistry?.svg) {
-          await this.context.taskRegistry.svg(this.context, {
-            files: [path]
-          })
-        }
-
-        this.reload()
-      } catch (error) {
-        logger.error('watch', `SVG processing failed: ${error.message}`)
-      }
+  async onSassUnlink(filePath) {
+    const { paths } = this.context
+    const relPath = relative(paths.src, filePath)
+    if (basename(filePath).startsWith('_')) {
+      logger.info('unlink', relPath)
+      return
     }
+    const distPath = resolve(paths.dist, relPath.replace(/\.scss$/, '.css'))
+    await this.deleteDistFile(distPath, relPath)
+  }
 
-    watcher.on('change', path => handleSvgChange(path, 'change'))
-    watcher.on('add', path => handleSvgChange(path, 'add'))
-
-    watcher.on('unlink', async path => {
-      const normalizedPath = path.replace(/\\/g, '/')
-      if (!path.endsWith('.svg') || normalizedPath.includes('/icons/')) return
-      const relPath = relative(basePath, path)
-      const distPath = resolve(this.context.paths.dist, relPath)
-      await this.deleteDistFile(distPath, relPath)
-    })
+  // ---- Script ----
 
-    this.watchers.push(watcher)
+  async onScriptChange(filePath) {
+    const relPath = relative(this.context.paths.src, filePath)
+    logger.info('change', `script: ${relPath}`)
+    try {
+      if (this.context.taskRegistry?.script) await this.context.taskRegistry.script(this.context)
+      this.reload()
+    } catch (error) {
+      logger.error('watch', `Script build failed: ${error.message}`)
+    }
   }
 
-  /**
-   * 画像監視
-   */
-  watchImages(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [/(^|[\/\\])\../, /node_modules/, /\.git/],
-      persistent: true,
-      awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
-    })
-
-    const handleImageChange = async (path, event) => {
-      // 画像ファイルのみ処理
-      if (!/\.(jpg|jpeg|png|gif)$/i.test(path)) {
-        return
-      }
-      const relPath = relative(basePath, path)
-      logger.info(event, `image: ${relPath}`)
-
-      try {
-        // 追加・変更時: 画像を処理
-        if (this.context.taskRegistry?.image) {
-          await this.context.taskRegistry.image(this.context, {
-            files: [path]
-          })
-        }
-
-        this.reload()
-      } catch (error) {
-        logger.error('watch', `Image processing failed: ${error.message}`)
-      }
+  async onScriptUnlink(filePath) {
+    const { paths } = this.context
+    const relPath = relative(paths.src, filePath)
+    if (basename(filePath).startsWith('_')) {
+      logger.info('unlink', relPath)
+      return
     }
+    const distPath = resolve(paths.dist, relPath.replace(/\.ts$/, '.js'))
+    await this.deleteDistFile(distPath, relPath)
+  }
 
-    watcher.on('change', path => handleImageChange(path, 'change'))
-    watcher.on('add', path => handleImageChange(path, 'add'))
+  // ---- SVG ----
 
-    watcher.on('unlink', async path => {
-      if (!/\.(jpg|jpeg|png|gif)$/i.test(path)) return
-      const relPath = relative(basePath, path)
-      const useWebp = this.context.config.build.imageOptimization === 'webp'
-      const ext = extname(path)
-      const destRelPath = useWebp ? relPath.replace(new RegExp(`\\${ext}$`, 'i'), '.webp') : relPath
-      const distPath = resolve(this.context.paths.dist, destRelPath)
-      await this.deleteDistFile(distPath, relPath)
-    })
+  async onSvgChange(filePath, event) {
+    const relPath = relative(this.context.paths.src, filePath)
+    logger.info(event, `svg: ${relPath}`)
+    try {
+      if (this.context.taskRegistry?.svg) {
+        await this.context.taskRegistry.svg(this.context, { files: [filePath] })
+      }
+      this.reload()
+    } catch (error) {
+      logger.error('watch', `SVG processing failed: ${error.message}`)
+    }
+  }
 
-    this.watchers.push(watcher)
+  async onSvgUnlink(filePath) {
+    const relPath = relative(this.context.paths.src, filePath)
+    const distPath = resolve(this.context.paths.dist, relPath)
+    await this.deleteDistFile(distPath, relPath)
   }
 
-  /**
-   * Public監視
-   */
-  watchPublic(basePath) {
-    const watcher = chokidar.watch(basePath, {
-      ignoreInitial: true,
-      ignored: [/(^|[\/\\])\../, /node_modules/, /\.git/],
-      persistent: true,
-      awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
-    })
-
-    const handlePublicChange = async (path, event) => {
-      const relPath = relative(basePath, path)
-      logger.info(event, `public: ${relPath}`)
-
-      try {
-        // Copyタスクを実行
-        if (this.context.taskRegistry?.copy) {
-          await this.context.taskRegistry.copy(this.context)
-        }
-
-        this.reload()
-      } catch (error) {
-        logger.error('watch', `Copy failed: ${error.message}`)
+  // ---- Image ----
+
+  async onImageChange(filePath, event) {
+    const relPath = relative(this.context.paths.src, filePath)
+    logger.info(event, `image: ${relPath}`)
+    try {
+      if (this.context.taskRegistry?.image) {
+        await this.context.taskRegistry.image(this.context, { files: [filePath] })
       }
+      this.reload()
+    } catch (error) {
+      logger.error('watch', `Image processing failed: ${error.message}`)
     }
+  }
 
-    watcher.on('change', path => handlePublicChange(path, 'change'))
-    watcher.on('add', path => handlePublicChange(path, 'add'))
+  async onImageUnlink(filePath) {
+    const { paths, config } = this.context
+    const relPath = relative(paths.src, filePath)
+    const useWebp = config.build.imageOptimization === 'webp'
+    const ext = extname(filePath)
+    const destRelPath = useWebp ? relPath.replace(new RegExp(`\\${ext}$`, 'i'), '.webp') : relPath
+    const distPath = resolve(paths.dist, destRelPath)
+    await this.deleteDistFile(distPath, relPath)
+  }
 
-    watcher.on('unlink', async path => {
-      const relPath = relative(basePath, path)
-      const distPath = resolve(this.context.paths.dist, relPath)
-      await this.deleteDistFile(distPath, relPath)
-    })
+  // ---- Public ----
 
-    this.watchers.push(watcher)
+  async onPublicChange(filePath, event) {
+    const relPath = relative(this.context.paths.public, filePath)
+    logger.info(event, `public: ${relPath}`)
+    try {
+      if (this.context.taskRegistry?.copy) await this.context.taskRegistry.copy(this.context, { files: [filePath] })
+      this.reload()
+    } catch (error) {
+      logger.error('watch', `Copy failed: ${error.message}`)
+    }
   }
 
-  /**
-   * ブラウザリロード
-   */
+  async onPublicUnlink(filePath) {
+    const relPath = relative(this.context.paths.public, filePath)
+    const distPath = resolve(this.context.paths.dist, relPath)
+    await this.deleteDistFile(distPath, relPath)
+  }
+
+  // ---- 共通ヘルパー ----
+
   reload() {
     if (this.context.server) {
       setTimeout(() => {
@@ -358,9 +239,6 @@ class FileWatcher {
     }
   }
 
-  /**
-   * dist内のファイルを削除してブラウザをリロード
-   */
   async deleteDistFile(distPath, relPath) {
     try {
       await rm(distPath, { force: true })
@@ -371,20 +249,14 @@ class FileWatcher {
     }
   }
 
-  /**
-   * CSSインジェクション
-   */
   injectCSS() {
     if (this.context.server) {
       this.context.server.reloadCSS()
     }
   }
 
-  /**
-   * 監視停止
-   */
   async stop() {
-    await Promise.all(this.watchers.map(w => w.close()))
+    if (this.watcher) await this.watcher.close()
     logger.info('watch', 'File watching stopped')
   }
 }

package/generate/page.mjs

@@ -4,7 +4,7 @@ import { ensureFileDir } from '../utils/file.mjs'
 
 export async function generatePage(filePath, html, paths) {
   const relativePath = relative(paths.src, filePath)
-  const outputPath = resolve(paths.dist, relativePath.replace('.pug', '.html'))
+  const outputPath = resolve(paths.dist, relativePath.replace(/\.pug$/, '.html'))
 
   await ensureFileDir(outputPath)
   await writeFile(outputPath, html, 'utf8')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pugkit",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "A build tool for Pug-based projects",
   "type": "module",
   "license": "MIT",

package/tasks/copy.mjs

@@ -10,6 +10,21 @@ import { ensureFileDir } from '../utils/file.mjs'
 export async function copyTask(context, options = {}) {
   const { paths } = context
 
+  // 特定のファイルが指定されている場合（watch時）
+  if (options.files && Array.isArray(options.files)) {
+    logger.info('copy', `Copying ${options.files.length} file(s)`)
+    await Promise.all(
+      options.files.map(async file => {
+        const relativePath = relative(paths.public, file)
+        const outputPath = resolve(paths.dist, relativePath)
+        await ensureFileDir(outputPath)
+        await copyFile(file, outputPath)
+      })
+    )
+    logger.success('copy', `Copied ${options.files.length} file(s)`)
+    return
+  }
+
   const files = await glob('**/*', {
     cwd: paths.public,
     absolute: true,

package/tasks/sass.mjs

@@ -78,7 +78,7 @@ async function compileSassFile(filePath, context, isDebugMode) {
       )
     }
 
-    const outputRelativePath = relative(paths.src, filePath).replace('.scss', '.css')
+    const outputRelativePath = relative(paths.src, filePath).replace(/\.scss$/, '.css')
     const outputPath = resolve(paths.dist, outputRelativePath)
 
     const postcssResult = await postcss(postcssPlugins).process(css, {