pugkit 1.4.0 → 1.6.0

package/cli/build.mjs

@@ -2,12 +2,12 @@ import { createBuilder } from '../index.mjs'
 import { logger } from './logger.mjs'
 
 export async function build(options = {}) {
-  const { root = process.cwd() } = options
+  const { root = process.cwd(), siteUrl } = options
 
   logger.info('pugkit', 'building...')
 
   const startTime = Date.now()
-  const builder = await createBuilder(root, 'production')
+  const builder = await createBuilder(root, 'production', { siteUrl })
   await builder.build()
 
   const elapsed = Date.now() - startTime

package/cli/index.mjs

@@ -33,14 +33,17 @@ cli
     }
   })
 
-cli.command('build [root]', 'Production build').action(async root => {
-  try {
-    await build({ root: root || process.cwd() })
-  } catch (err) {
-    console.error(err)
-    process.exit(1)
-  }
-})
+cli
+  .command('build [root]', 'Production build')
+  .option('--site-url <url>', 'Override siteUrl in config')
+  .action(async (root, options) => {
+    try {
+      await build({ root: root || process.cwd(), siteUrl: options.siteUrl })
+    } catch (err) {
+      console.error(err)
+      process.exit(1)
+    }
+  })
 
 cli.command('sprite [root]', 'Generate SVG sprite').action(async root => {
   try {

package/config/main.mjs

@@ -75,10 +75,13 @@ function validateConfig(config) {
   return config
 }
 
-export async function loadConfig(root = process.cwd()) {
+export async function loadConfig(root = process.cwd(), inlineConfig = {}) {
   const userConfig = await loadUserConfig(root)
   const config = mergeConfig(defaultConfig, userConfig)
   config.root = root
+  if (inlineConfig.siteUrl !== undefined && inlineConfig.siteUrl !== null) {
+    config.siteUrl = inlineConfig.siteUrl
+  }
   validateConfig(config)
   return config
 }

package/core/context.mjs

@@ -11,6 +11,7 @@ export class BuildContext {
     this.graph = new DependencyGraph()
     this.sassGraph = new DependencyGraph()
     this.scriptGraph = new DependencyGraph()
+    this.imageGraph = new DependencyGraph() // Pug -> 画像ファイルの依存グラフ（dev時に構築）
 
     const outDir = config.outDir ?? 'dist'
     const resolvedOutDir = isAbsolute(outDir) ? outDir : resolve(config.root, outDir)

package/core/watcher.mjs

@@ -2,6 +2,7 @@ import chokidar from 'chokidar'
 import { rm } from 'node:fs/promises'
 import { relative, resolve, basename, extname } from 'node:path'
 import { logger } from '../utils/logger.mjs'
+import { clearImageSizeCache } from '../transform/image-size.mjs'
 
 /**
  * ファイル監視タスク
@@ -43,7 +44,7 @@ class FileWatcher {
         ignoreInitial: true,
         ignored: [/(^|[\/\\])\./, /node_modules/, /\.git/],
         persistent: true,
-        awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
+        awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 100 }
       })
       .on('change', filePath => this.handleChange(filePath))
       .on('add', filePath => this.handleAdd(filePath))
@@ -116,10 +117,11 @@ class FileWatcher {
   }
 
   async onPugUnlink(filePath) {
-    const { paths, cache, graph } = this.context
+    const { paths, cache, graph, imageGraph } = this.context
     const relPath = relative(paths.src, filePath)
     cache.invalidatePugTemplate(filePath)
     graph.clearDependencies(filePath)
+    imageGraph.clearDependencies(filePath)
     if (basename(filePath).startsWith('_')) {
       logger.info('unlink', relPath)
       return
@@ -202,12 +204,19 @@ class FileWatcher {
   // ---- Image ----
 
   async onImageChange(filePath, event) {
+    clearImageSizeCache()
     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] })
       }
+      // imageGraph から影響を受ける Pug ファイルのみ再ビルド
+      // グラフ未構築（初回 dev 起動直後など）の場合は全 Pug を再ビルド
+      if (this.context.taskRegistry?.pug) {
+        const affected = this.context.imageGraph.getAffectedParents(filePath)
+        await this.context.taskRegistry.pug(this.context, { files: affected.length > 0 ? affected : undefined })
+      }
       this.reload()
     } catch (error) {
       logger.error('watch', `Image processing failed: ${error.message}`)
@@ -215,6 +224,7 @@ class FileWatcher {
   }
 
   async onImageUnlink(filePath) {
+    clearImageSizeCache()
     const { paths, config } = this.context
     const relPath = relative(paths.src, filePath)
     const optimization = config.build.imageOptimization
@@ -223,6 +233,15 @@ class FileWatcher {
     const destRelPath = relPath.replace(new RegExp(`\\${ext}$`, 'i'), newExt)
     const distPath = resolve(paths.dist, destRelPath)
     await this.deleteDistFile(distPath, relPath)
+    // imageGraph から影響を受ける Pug ファイルのみ再ビルド
+    if (this.context.taskRegistry?.pug) {
+      const affected = this.context.imageGraph.getAffectedParents(filePath)
+      this.context.imageGraph.clearDependencies(filePath)
+      if (affected.length > 0) {
+        await this.context.taskRegistry.pug(this.context, { files: affected })
+        this.reload()
+      }
+    }
   }
 
   // ---- Public ----

package/index.mjs

@@ -10,8 +10,8 @@ import spriteTask from './tasks/svg-sprite.mjs'
 import serverTask from './core/server.mjs'
 import watcherTask from './core/watcher.mjs'
 
-export async function createBuilder(root = process.cwd(), mode = 'development') {
-  const config = await loadConfig(root)
+export async function createBuilder(root = process.cwd(), mode = 'development', inlineConfig = {}) {
+  const config = await loadConfig(root, inlineConfig)
   const builder = new Builder(config, mode)
 
   builder.registerTasks({

package/package.json

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

package/tasks/image.mjs

@@ -5,6 +5,10 @@ import sharp from 'sharp'
 import { logger } from '../utils/logger.mjs'
 import { ensureFileDir } from '../utils/file.mjs'
 
+// libvips の内部キャッシュを制限してメモリ消費を抑える
+sharp.cache({ memory: 50, files: 20, items: 200 })
+sharp.concurrency(1)
+
 /**
  * 画像最適化タスク
  */
@@ -62,7 +66,7 @@ export async function imageTask(context, options = {}) {
 /**
  * 画像を処理（最適化）
  */
-async function processImage(filePath, context, optimization, isProduction) {
+async function processImage(filePath, context, optimization, isProduction, retries = 3, retryDelay = 200) {
   const { paths, config } = context
   const ext = extname(filePath).toLowerCase()
   const relativePath = relative(paths.src, filePath)
@@ -104,6 +108,10 @@ async function processImage(filePath, context, optimization, isProduction) {
     await ensureFileDir(outputPath)
     await outputImage.toFile(outputPath)
   } catch (error) {
+    if (retries > 0 && error.message.includes('unsupported image format')) {
+      await new Promise(resolve => setTimeout(resolve, retryDelay))
+      return processImage(filePath, context, optimization, isProduction, retries - 1, retryDelay * 2)
+    }
     logger.error('image', `Failed to process ${relativePath}: ${error.message}`)
   }
 }

package/tasks/pug.mjs

@@ -24,7 +24,7 @@ export async function pugTask(context, options = {}) {
   }
 
   logger.info('pug', `Building ${changed.length} file(s)`)
-  await Promise.all(changed.map(file => processFile(file, context)))
+  await runWithConcurrency(changed, 8, file => processFile(file, context))
   logger.success('pug', `Built ${changed.length} file(s)`)
 }
 
@@ -48,8 +48,18 @@ async function resolveChangedFiles(files, targetFiles, cache, isProduction) {
   return files
 }
 
+async function runWithConcurrency(items, concurrency, fn) {
+  let i = 0
+  const workers = Array.from({ length: Math.min(concurrency, items.length) }, async () => {
+    while (i < items.length) {
+      await fn(items[i++])
+    }
+  })
+  await Promise.all(workers)
+}
+
 async function processFile(filePath, context) {
-  const { paths, config, cache, graph } = context
+  const { paths, config, cache, graph, imageGraph } = context
 
   try {
     let template = cache.getPugTemplate(filePath)
@@ -65,10 +75,20 @@ async function processFile(filePath, context) {
     }
 
     const builderVars = createBuilderVars(filePath, paths, config)
-    const imageSize = createImageSizeHelper(filePath, paths, logger)
-    const imageInfo = createImageInfoHelper(filePath, paths, logger, config)
+
+    // dev 時のみ: imageGraph に Pug->画像 の依存を記録して画像変更時の最小再ビルドに使う
+    const accessedImages = new Set()
+    const onAccess = context.isDevelopment ? imgPath => accessedImages.add(imgPath) : undefined
+    const imageSize = createImageSizeHelper(filePath, paths, logger, { onAccess })
+    const imageInfo = createImageInfoHelper(filePath, paths, logger, config, { onAccess })
 
     const html = template({ Builder: builderVars, imageSize, imageInfo })
+
+    if (context.isDevelopment && imageGraph) {
+      imageGraph.clearDependencies(filePath)
+      accessedImages.forEach(imgPath => imageGraph.addDependency(filePath, imgPath))
+    }
+
     const formatted = formatHtml(html, config.build.html)
     await generatePage(filePath, formatted, paths)
   } catch (error) {

package/transform/image-size.mjs

@@ -2,7 +2,21 @@ import { readFileSync, existsSync } from 'node:fs'
 import { resolve, relative, dirname, basename, extname } from 'node:path'
 import sizeOf from 'image-size'
 
-export function createImageSizeHelper(filePath, paths, logger) {
+// ビルドセッション内で画像ファイルの内容をキャッシュし、同じファイルの重複読み込みを防ぐ
+const _imageBufferCache = new Map()
+
+function readImageCached(filePath) {
+  if (_imageBufferCache.has(filePath)) return _imageBufferCache.get(filePath)
+  const buf = readFileSync(filePath)
+  _imageBufferCache.set(filePath, buf)
+  return buf
+}
+
+export function clearImageSizeCache() {
+  _imageBufferCache.clear()
+}
+
+export function createImageSizeHelper(filePath, paths, logger, { onAccess } = {}) {
   return src => {
     const resolveImagePath = (imageSrc, baseDir) => {
       if (imageSrc.startsWith('/')) {
@@ -24,7 +38,8 @@ export function createImageSizeHelper(filePath, paths, logger) {
       const foundPath = findImageFile(resolvedPath)
 
       if (foundPath) {
-        const buffer = readFileSync(foundPath)
+        onAccess?.(foundPath)
+        const buffer = readImageCached(foundPath)
         return sizeOf(buffer)
       }
 
@@ -37,7 +52,7 @@ export function createImageSizeHelper(filePath, paths, logger) {
   }
 }
 
-export function createImageInfoHelper(filePath, paths, logger, config) {
+export function createImageInfoHelper(filePath, paths, logger, config, { onAccess } = {}) {
   const optimization = config?.build?.imageOptimization
   const newExt = optimization === 'avif' || optimization === 'webp' ? `.${optimization}` : null
   const artDirectionSuffix = config?.build?.imageInfo?.artDirectionSuffix ?? '_sp'
@@ -75,7 +90,8 @@ export function createImageInfoHelper(filePath, paths, logger, config) {
         return fallback
       }
 
-      const buffer = readFileSync(foundPath)
+      const buffer = readImageCached(foundPath)
+      onAccess?.(foundPath)
       const { width, height, type: format } = sizeOf(buffer)
 
       const ext = extname(src)
@@ -91,7 +107,8 @@ export function createImageInfoHelper(filePath, paths, logger, config) {
         const retinaResolvedPath = resolveImagePath(retinaSrc, pageDir)
         const retinaFoundPath = findImageFile(retinaResolvedPath)
         if (retinaFoundPath) {
-          const retinaBuffer = readFileSync(retinaFoundPath)
+          const retinaBuffer = readImageCached(retinaFoundPath)
+          onAccess?.(retinaFoundPath)
           const { width: rWidth, height: rHeight } = sizeOf(retinaBuffer)
           retina = {
             src: newExt ? `${base}@2x${newExt}` : retinaSrc,
@@ -108,7 +125,8 @@ export function createImageInfoHelper(filePath, paths, logger, config) {
         const variantResolvedPath = resolveImagePath(variantSrc, pageDir)
         const variantFoundPath = findImageFile(variantResolvedPath)
         if (variantFoundPath) {
-          const variantBuffer = readFileSync(variantFoundPath)
+          const variantBuffer = readImageCached(variantFoundPath)
+          onAccess?.(variantFoundPath)
           const { width: vWidth, height: vHeight } = sizeOf(variantBuffer)
           variant = {
             src: newExt ? `${base}${artDirectionSuffix}${newExt}` : variantSrc,