@ywal123456/jskim 0.3.1 → 0.5.0

package/scripts/commands/watch-command.js

@@ -14,7 +14,7 @@ const { registerShutdown } = require('./register-shutdown');
 async function runWatchCommand(options = {}) {
   const workspaceRoot = options.workspaceRoot || process.cwd();
   const usageLine =
-    options.usageLine || 'npm run watch -- <project-name>';
+    options.usageLine || 'jskim watch [<project>]';
 
   const runtime = createWatchRuntime({
     mode: 'watch',

package/scripts/dev.js

@@ -1,11 +1,25 @@
 'use strict';
 
+const { parseCommandArgv } = require('./lib/parse-cli-args');
 const { runDevCommand } = require('./commands/dev-command');
 
+let parsed;
+try {
+  parsed = parseCommandArgv('dev', process.argv.slice(2));
+} catch (err) {
+  const message = err && err.message ? err.message : String(err);
+  console.error(message);
+  process.exitCode = 1;
+  return;
+}
+
 runDevCommand({
-  projectName: process.argv[2],
+  projectName: parsed.projectName,
   workspaceRoot: process.cwd(),
-  usageLine: 'npm run dev -- <project-name>',
+  usageLine: 'jskim dev [<project>] [--host <host>] [--port <port>] [--open]',
+  host: parsed.options.host,
+  port: parsed.options.port,
+  open: parsed.options.open,
 }).catch((err) => {
   const message = err && err.message ? err.message : String(err);
   console.error(message);

package/scripts/lib/apply-serve-cli-overrides.js

@@ -0,0 +1,96 @@
+'use strict';
+
+const { formatConfigValidationError } = require('./format-diagnostic');
+
+/**
+ * CLI --host / --port を resolved project に適用した新しいオブジェクトを返します。
+ * 元の project / config は変更しません。
+ *
+ * @param {object} project
+ * @param {{ host?: string, port?: string|number }} [overrides]
+ * @returns {object}
+ */
+function applyServeCliOverrides(project, overrides = {}) {
+  if (!project || typeof project !== 'object') {
+    throw new Error('[JSKim] projectが不正です。');
+  }
+
+  const hasHost = overrides.host !== undefined;
+  const hasPort = overrides.port !== undefined;
+  if (!hasHost && !hasPort) {
+    return project;
+  }
+
+  const nextServe = {
+    ...(project.serve || {}),
+  };
+
+  if (hasHost) {
+    nextServe.host = overrides.host;
+  }
+
+  if (hasPort) {
+    nextServe.port = coercePort(overrides.port, project.name);
+  }
+
+  validateServeOverride(nextServe, project.name);
+  return {
+    ...project,
+    serve: nextServe,
+  };
+}
+
+function coercePort(value, projectName) {
+  if (typeof value === 'number') {
+    return value;
+  }
+  const text = String(value).trim();
+  if (text === '' || !/^-?\d+$/.test(text)) {
+    throw new Error(
+      formatConfigValidationError({
+        projectName,
+        configKey: 'CLI --port',
+        detail: '1から65535までの整数を指定してください。',
+        received: String(value),
+      })
+    );
+  }
+  return Number(text);
+}
+
+function validateServeOverride(serve, projectName) {
+  const host = serve && serve.host;
+  const port = serve && serve.port;
+
+  if (typeof host !== 'string' || host.trim() === '') {
+    throw new Error(
+      formatConfigValidationError({
+        projectName,
+        configKey: 'CLI --host / serve.host',
+        detail: '空でない文字列を指定してください。',
+        received: String(host),
+      })
+    );
+  }
+
+  if (
+    typeof port !== 'number' ||
+    !Number.isInteger(port) ||
+    port < 1 ||
+    port > 65535
+  ) {
+    throw new Error(
+      formatConfigValidationError({
+        projectName,
+        configKey: 'CLI --port / serve.port',
+        detail: '1から65535までの整数を指定してください。',
+        received: String(port),
+      })
+    );
+  }
+}
+
+module.exports = {
+  applyServeCliOverrides,
+  coercePort,
+};

package/scripts/lib/assert-output-dirs-compatible.js

@@ -0,0 +1,88 @@
+'use strict';
+
+const path = require('node:path');
+
+/**
+ * --all 用に、resolve済みprojectのoutputDir衝突を検査します。
+ *
+ * @param {Array<{ name: string, outputDir: string }>} projects
+ */
+function assertCompatibleOutputDirs(projects) {
+  const items = Array.isArray(projects) ? projects : [];
+
+  for (let i = 0; i < items.length; i += 1) {
+    for (let j = i + 1; j < items.length; j += 1) {
+      const a = items[i];
+      const b = items[j];
+      const relation = classifyOutputDirRelation(a.outputDir, b.outputDir);
+      if (!relation) {
+        continue;
+      }
+
+      const label =
+        relation === 'same'
+          ? '同じoutputDir'
+          : '入れ子（祖先/子孫）のoutputDir';
+
+      throw new Error(
+        `[JSKim] --all でbuildできません: project間のoutputDirが衝突しています。\n` +
+          `理由: ${label} のため、clean付きbuildで他projectの成果物を消す恐れがあります。\n\n` +
+          `project: ${a.name}\n` +
+          `outputDir: ${toPosix(a.outputDir)}\n\n` +
+          `project: ${b.name}\n` +
+          `outputDir: ${toPosix(b.outputDir)}\n\n` +
+          `各projectのoutputDirを重複・入れ子にならないよう変更してください。`
+      );
+    }
+  }
+}
+
+/**
+ * @param {string} left
+ * @param {string} right
+ * @returns {'same'|'nested'|null}
+ */
+function classifyOutputDirRelation(left, right) {
+  const a = path.resolve(left);
+  const b = path.resolve(right);
+  if (samePath(a, b)) {
+    return 'same';
+  }
+  if (isStrictAncestor(a, b) || isStrictAncestor(b, a)) {
+    return 'nested';
+  }
+  return null;
+}
+
+function samePath(a, b) {
+  const na = path.resolve(a);
+  const nb = path.resolve(b);
+  if (process.platform === 'win32') {
+    return na.toLowerCase() === nb.toLowerCase();
+  }
+  return na === nb;
+}
+
+function isStrictAncestor(ancestor, descendant) {
+  let a = path.resolve(ancestor);
+  let d = path.resolve(descendant);
+  if (process.platform === 'win32') {
+    a = a.toLowerCase();
+    d = d.toLowerCase();
+  }
+  if (samePath(a, d)) {
+    return false;
+  }
+  const rel = path.relative(a, d);
+  return rel !== '' && !rel.startsWith('..') && !path.isAbsolute(rel);
+}
+
+function toPosix(abs) {
+  return path.resolve(abs).split(path.sep).join('/');
+}
+
+module.exports = {
+  assertCompatibleOutputDirs,
+  classifyOutputDirRelation,
+  samePath,
+};

package/scripts/lib/classify-reload.js

@@ -0,0 +1,131 @@
+'use strict';
+
+const path = require('node:path');
+const fs = require('node:fs');
+
+/**
+ * rebuild 単位の watcher events から browser 更新方法を分類します。
+ * 不確実な場合は必ず full reload にします。
+ *
+ * @param {object} options
+ * @param {Array<{ event?: string, absolutePath?: string, file?: string }>} options.events
+ * @param {string} options.sourceDir
+ * @param {string[]} [options.templates]
+ * @returns {'css'|'reload'}
+ */
+function classifyReload(options) {
+  const events = Array.isArray(options.events) ? options.events : [];
+  if (events.length === 0) {
+    return 'reload';
+  }
+
+  const templateRoots = resolveTemplateRoots(
+    options.sourceDir,
+    options.templates
+  );
+
+  for (const item of events) {
+    if (!item || typeof item !== 'object') {
+      return 'reload';
+    }
+
+    const eventName = item.event;
+    if (eventName !== 'change') {
+      return 'reload';
+    }
+
+    const absolutePath = resolveEventAbsolutePath(item);
+    if (!absolutePath) {
+      return 'reload';
+    }
+
+    if (isInsideAny(templateRoots, absolutePath)) {
+      return 'reload';
+    }
+
+    if (!isCssSourcePath(absolutePath)) {
+      return 'reload';
+    }
+  }
+
+  return 'css';
+}
+
+/**
+ * @param {{ absolutePath?: string, file?: string }} item
+ * @returns {string|null}
+ */
+function resolveEventAbsolutePath(item) {
+  if (item.absolutePath && typeof item.absolutePath === 'string') {
+    const abs = path.resolve(item.absolutePath);
+    if (path.isAbsolute(abs)) {
+      return abs;
+    }
+  }
+  return null;
+}
+
+/**
+ * 末尾が .css または .css.njk のときだけ true（大文字小文字は無視）。
+ * @param {string} absolutePath
+ * @returns {boolean}
+ */
+function isCssSourcePath(absolutePath) {
+  const normalized = absolutePath.split(path.sep).join('/').toLowerCase();
+  return normalized.endsWith('.css.njk') || normalized.endsWith('.css');
+}
+
+function resolveTemplateRoots(sourceDir, templates) {
+  const roots = [];
+  if (!sourceDir) {
+    return roots;
+  }
+  for (const rel of Array.isArray(templates) ? templates : []) {
+    if (!rel) {
+      continue;
+    }
+    const abs = path.resolve(sourceDir, rel);
+    try {
+      if (fs.existsSync(abs) && fs.statSync(abs).isDirectory()) {
+        roots.push(abs);
+      }
+    } catch {
+      // 存在確認失敗は root として扱わない
+    }
+  }
+  return roots;
+}
+
+function isInsideAny(roots, candidate) {
+  for (const root of roots) {
+    if (isInsideOrSame(root, candidate)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isInsideOrSame(parent, child) {
+  const p = path.resolve(parent);
+  const c = path.resolve(child);
+  if (samePath(p, c)) {
+    return true;
+  }
+  const rel = path.relative(p, c);
+  return rel !== '' && !rel.startsWith('..') && !path.isAbsolute(rel);
+}
+
+function samePath(a, b) {
+  const na = path.resolve(a);
+  const nb = path.resolve(b);
+  if (process.platform === 'win32') {
+    return na.toLowerCase() === nb.toLowerCase();
+  }
+  return na === nb;
+}
+
+module.exports = {
+  classifyReload,
+  isCssSourcePath,
+  resolveTemplateRoots,
+};