@ywal123456/jskim 0.1.1 → 0.3.0

package/scripts/commands/dev-command.js

@@ -1,13 +1,7 @@
 'use strict';
 
-const { loadConfig } = require('../lib/load-config');
-const { resolveProject } = require('../lib/resolve-project');
-const { createProjectWatcher } = require('../lib/create-project-watcher');
-const { createStaticServer } = require('../lib/create-static-server');
-const { createLiveReload } = require('../lib/create-live-reload');
+const { createWatchRuntime } = require('../lib/create-watch-runtime');
 const { registerShutdown } = require('./register-shutdown');
-const { toDisplayPath } = require('./path-display');
-const { formatListenError } = require('./serve-errors');
 
 /**
  * dev コマンドを実行します。
@@ -22,51 +16,15 @@ async function runDevCommand(options = {}) {
   const usageLine =
     options.usageLine || 'npm run dev -- <project-name>';
 
-  const { config } = loadConfig(workspaceRoot);
-  const project = resolveProject({
-    config,
+  const runtime = createWatchRuntime({
+    mode: 'dev',
     workspaceRoot,
     projectName: options.projectName,
     commandName: 'dev',
     usageLine,
   });
 
-  const host = project.serve.host.trim();
-  const port = project.serve.port;
-  const liveReloadEnabled = project.dev.liveReload;
-  const outputDisplay = toDisplayPath(project.outputDir, workspaceRoot);
-
-  const liveReload = createLiveReload({
-    projectName: project.name,
-    enabled: liveReloadEnabled,
-  });
-
-  const staticServer = createStaticServer({
-    rootDir: project.outputDir,
-    host,
-    port,
-    projectName: project.name,
-    handleInternalRequest: (req, res, meta) =>
-      liveReload.handleRequest(req, res, meta),
-    transformHtml: liveReloadEnabled
-      ? (html) => liveReload.injectHtml(html)
-      : undefined,
-  });
-
-  const projectWatcher = createProjectWatcher(project, {
-    runInitialBuild: true,
-    logChanges: true,
-  });
-
-  // 成功した再ビルドのあとだけ reload（初回はクライアント未接続のため不要）
-  projectWatcher.on('build:success', ({ initial }) => {
-    if (!initial && liveReloadEnabled) {
-      liveReload.broadcastReload();
-    }
-  });
-
   let stopping = false;
-  let watcherStarted = false;
 
   async function shutdown() {
     if (stopping) {
@@ -75,21 +33,7 @@ async function runDevCommand(options = {}) {
     stopping = true;
 
     try {
-      if (watcherStarted) {
-        await projectWatcher.close();
-      }
-    } catch {
-      // 終了時エラーは無視
-    }
-
-    try {
-      liveReload.close();
-    } catch {
-      // 終了時エラーは無視
-    }
-
-    try {
-      await staticServer.stop();
+      await runtime.close();
     } catch {
       // 終了時エラーは無視
     }
@@ -98,65 +42,22 @@ async function runDevCommand(options = {}) {
     process.exit(0);
   }
 
-  async function failStartup(err) {
+  registerShutdown(shutdown);
+
+  try {
+    await runtime.start();
+  } catch (err) {
     const message = err && err.message ? err.message : String(err);
     console.error(message);
-
-    try {
-      if (watcherStarted) {
-        await projectWatcher.close();
-      }
-    } catch {
-      // ignore
-    }
-
-    try {
-      liveReload.close();
-    } catch {
-      // ignore
-    }
-
     try {
-      await staticServer.stop();
+      await runtime.close();
     } catch {
       // ignore
     }
-
     // cleanup 完了後に終了する。
     // IPC 接続があると exitCode だけではプロセスが残るため明示終了する。
     process.exit(1);
   }
-
-  registerShutdown(shutdown);
-
-  // 初回 build → server → watcher
-  await projectWatcher.start({ watchFiles: false });
-  watcherStarted = true;
-
-  try {
-    await staticServer.start();
-  } catch (err) {
-    await failStartup(
-      formatListenError(err, {
-        projectName: project.name,
-        host,
-        port,
-        kind: '開発',
-      })
-    );
-    return;
-  }
-
-  await projectWatcher.startWatching();
-
-  console.log('[JSKim] 開発サーバーを起動しました。');
-  console.log(`プロジェクト: ${project.name}`);
-  console.log(`ルート: ${outputDisplay}`);
-  console.log(`URL: ${staticServer.url}`);
-  console.log(
-    `ライブリロード: ${liveReloadEnabled ? '有効' : '無効'}`
-  );
-  console.log('終了するには Ctrl+C を押してください。');
 }
 
 module.exports = {

package/scripts/commands/watch-command.js

@@ -1,8 +1,6 @@
 'use strict';
 
-const { loadConfig } = require('../lib/load-config');
-const { resolveProject } = require('../lib/resolve-project');
-const { createProjectWatcher } = require('../lib/create-project-watcher');
+const { createWatchRuntime } = require('../lib/create-watch-runtime');
 const { registerShutdown } = require('./register-shutdown');
 
 /**
@@ -18,33 +16,14 @@ async function runWatchCommand(options = {}) {
   const usageLine =
     options.usageLine || 'npm run watch -- <project-name>';
 
-  const { config } = loadConfig(workspaceRoot);
-  const project = resolveProject({
-    config,
+  const runtime = createWatchRuntime({
+    mode: 'watch',
     workspaceRoot,
     projectName: options.projectName,
     commandName: 'watch',
     usageLine,
   });
 
-  const projectWatcher = createProjectWatcher(project, {
-    runInitialBuild: true,
-    logChanges: true,
-  });
-
-  projectWatcher.on('ready', ({ displayPaths, debounceMs }) => {
-    console.log(`[JSKim] プロジェクトを監視しています: ${project.name}`);
-    console.log('パス:');
-    for (const display of displayPaths) {
-      console.log(`- ${display}`);
-    }
-    console.log('');
-    console.log(`Debounce: ${debounceMs}ms`);
-    console.log('終了するには Ctrl+C を押してください。');
-  });
-
-  await projectWatcher.start();
-
   let stopping = false;
 
   async function shutdown() {
@@ -54,7 +33,7 @@ async function runWatchCommand(options = {}) {
     stopping = true;
 
     try {
-      await projectWatcher.close();
+      await runtime.close();
     } catch {
       // 終了時エラーは無視
     }
@@ -64,6 +43,17 @@ async function runWatchCommand(options = {}) {
   }
 
   registerShutdown(shutdown);
+
+  try {
+    await runtime.start();
+  } catch (err) {
+    try {
+      await runtime.close();
+    } catch {
+      // ignore
+    }
+    throw err;
+  }
 }
 
 module.exports = {

package/scripts/lib/build-project.js

@@ -7,23 +7,17 @@ const { createNunjucksEnv } = require('./create-nunjucks-env');
 const { cleanOutput } = require('./clean-output');
 const { renderPages } = require('./render-pages');
 const { copyFiles } = require('./copy-files');
+const { processFiles } = require('./process-files');
 
 /**
  * 設定を読み込み、プロジェクトを解決してフルビルドを実行します。
  *
  * @param {string|undefined} projectName
  * @param {object} [options]
- * @param {string} [options.workspaceRoot]
- * @param {string} [options.commandName='build']
- * @param {string} [options.usageLine]
- * @param {string} [options.logTitle='ビルドが完了しました']
- * @param {boolean} [options.includeOutput=true]
- * @param {boolean} [options.log=true]
  * @returns {Promise<object>}
  */
 async function buildProject(projectName, options = {}) {
-  const workspaceRoot =
-    options.workspaceRoot || process.cwd();
+  const workspaceRoot = options.workspaceRoot || process.cwd();
   const commandName = options.commandName || 'build';
 
   const { config } = loadConfig(workspaceRoot);
@@ -39,7 +33,7 @@ async function buildProject(projectName, options = {}) {
 }
 
 /**
- * 解決済みプロジェクトに対して clean → render → copy を実行します。
+ * 解決済みプロジェクトに対して clean → pipeline を実行します。
  *
  * @param {object} project
  * @param {object} [options]
@@ -62,10 +56,22 @@ async function runBuild(project, options = {}) {
   const env = createNunjucksEnv({
     sourceDir: project.sourceDir,
     templates: project.templates,
+    nunjucks: project.nunjucks,
   });
 
-  const { renderedCount } = await renderPages({ env, project });
-  const { copiedCount } = await copyFiles({ project });
+  let renderedCount = 0;
+  let copiedCount = 0;
+
+  if (project.pipelineMode === 'files') {
+    const result = await processFiles({ env, project });
+    renderedCount = result.renderedCount;
+    copiedCount = result.copiedCount;
+  } else {
+    const rendered = await renderPages({ env, project });
+    const copied = await copyFiles({ project });
+    renderedCount = rendered.renderedCount;
+    copiedCount = copied.copiedCount;
+  }
 
   const outputDisplay = path
     .relative(project.workspaceRoot, project.outputDir)
@@ -92,7 +98,7 @@ function printBuildResult(result, options = {}) {
 
   console.log(`[JSKim] ${logTitle}`);
   console.log(`プロジェクト: ${result.project.name}`);
-  console.log(`レンダリングしたページ数: ${result.renderedCount}`);
+  console.log(`レンダリングしたファイル数: ${result.renderedCount}`);
   console.log(`コピーしたファイル数: ${result.copiedCount}`);
   if (includeOutput) {
     console.log(`出力先: ${result.outputDisplay}`);

package/scripts/lib/create-nunjucks-env.js

@@ -7,13 +7,15 @@ const nunjucks = require('nunjucks');
 /**
  * プロジェクト用の Nunjucks 環境を作成します。
  * loader ルート: sourceDir + templates[]（重複除去）。
+ * filters / globals を登録します。
  *
  * @param {object} options
  * @param {string} options.sourceDir
  * @param {string[]} options.templates
+ * @param {object} [options.nunjucks]
  * @returns {nunjucks.Environment}
  */
-function createNunjucksEnv({ sourceDir, templates }) {
+function createNunjucksEnv({ sourceDir, templates, nunjucks: nunjucksConfig }) {
   const roots = [];
   const seen = new Set();
 
@@ -48,14 +50,50 @@ function createNunjucksEnv({ sourceDir, templates }) {
     noCache: true,
   });
 
+  // HTML 互換のため autoescape は維持する。
+  // JSON/JS 出力が必要な filter は SafeString を返すこと。
   const env = new nunjucks.Environment(loader, {
     autoescape: true,
     noCache: true,
   });
 
+  const config =
+    nunjucksConfig && typeof nunjucksConfig === 'object' ? nunjucksConfig : {};
+  registerFilters(env, config.filters || {});
+  registerGlobals(env, config.globals || {});
+
   return env;
 }
 
+function registerFilters(env, filters) {
+  for (const [name, fn] of Object.entries(filters)) {
+    env.addFilter(name, wrapSyncCallable(fn, `filter:${name}`));
+  }
+}
+
+function registerGlobals(env, globals) {
+  for (const [name, value] of Object.entries(globals)) {
+    if (typeof value === 'function') {
+      env.addGlobal(name, wrapSyncCallable(value, `global:${name}`));
+    } else {
+      env.addGlobal(name, value);
+    }
+  }
+}
+
+function wrapSyncCallable(fn, label) {
+  return function wrapped(...args) {
+    const result = fn.apply(this, args);
+    if (result && typeof result.then === 'function') {
+      throw new Error(
+        `[JSKim] 非同期${label.startsWith('filter') ? 'filter' : 'global'}は現在サポートされていません。\n` +
+          `対象: ${label}`
+      );
+    }
+    return result;
+  };
+}
+
 module.exports = {
   createNunjucksEnv,
 };