lism-cli 0.4.2 → 0.6.0

package/README.md

@@ -27,9 +27,14 @@ pnpm dlx lism-cli create --template minimal-astro ./my-app
 
 # カテゴリ名を指定（stack 以下の選択を対話で続行）
 pnpm dlx lism-cli create --template minimal ./my-app
+
+# 言語を指定（CLI 表示 + 生成テンプレートの言語）
+pnpm dlx lism-cli create --template blog-astro-minimal --lang en ./my-blog
 ```
 
-同じ動作は `pnpm create lism` / `npm create lism@latest` でも呼び出せます（`create-lism` パッケージ経由）。
+同じ動作は `pnpm create lism` / `npm create lism@latest` でも呼び出せます（`create-lism` パッケージ経由）。挙動は両者で共通です。
+
+`--lang <ja|en>` は CLI の表示言語に加えて、**生成されるテンプレート本体の言語**にも反映されます。`--lang` を指定しない場合は、対話端末（TTY）ではほかのどの選択よりも先に言語選択プロンプトが表示され、選んだ言語で以降の表示とテンプレート生成が確定します（非対話環境・CI 等では `en` にフォールバック）。対応言語版を持つテンプレート（`blog-astro-minimal` / `blog-astro-personal` / `blog-astro-techlog` / `lp-astro-corporate` / `lp-astro-interior`）では、指定言語のサイト文言・サンプルコンテンツで生成されます。言語版が無いテンプレートは、指定言語に関わらず既存（ベース）の内容で生成されます。
 
 ### UI コンポーネントの追加
 

package/dist/{chunk-J2T5ZPMR.js → chunk-G4RBP3W6.js}

@@ -1,3 +1,6 @@
+// src/i18n.ts
+import { execFileSync } from "child_process";
+
 // src/messages.ts
 var messages = {
   // ---------------------------------------------------------------------------
@@ -8,8 +11,8 @@ var messages = {
     en: "CLI for Lism CSS / UI"
   },
   "cli.opt.lang": {
-    ja: "CLI \u306E\u8868\u793A\u8A00\u8A9E\u3092\u6307\u5B9A\uFF08ja | en\uFF09",
-    en: "Display language for the CLI (ja | en)"
+    ja: "CLI \u8868\u793A\u3068\u751F\u6210\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u8A00\u8A9E\uFF08ja | en\u3001\u672A\u6307\u5B9A\u306A\u3089\u5BFE\u8A71\u6642\u306B\u9078\u629E\uFF09",
+    en: "Language for the CLI and generated template (ja | en; prompted when omitted)"
   },
   // create
   "cli.create.description": {
@@ -466,10 +469,25 @@ var messages = {
 };
 
 // src/i18n.ts
+function detectAppleLanguage() {
+  if (process.platform !== "darwin") return null;
+  try {
+    const out = execFileSync("/usr/bin/defaults", ["read", "-g", "AppleLanguages"], {
+      encoding: "utf8",
+      timeout: 1e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    });
+    const match = out.match(/"?([A-Za-z]{2,}[-_A-Za-z]*)"?/);
+    return match ? match[1].toLowerCase() : null;
+  } catch {
+    return null;
+  }
+}
 function detectLang(override) {
   if (override === "ja" || override === "en") return override;
   const raw = (process.env.LC_ALL || process.env.LANG || "").toLowerCase();
   if (raw.startsWith("ja")) return "ja";
+  if (detectAppleLanguage()?.startsWith("ja")) return "ja";
   try {
     const locale = Intl.DateTimeFormat().resolvedOptions().locale.toLowerCase();
     if (locale.startsWith("ja")) return "ja";
@@ -547,8 +565,8 @@ var logger = {
 };
 
 // src/version.ts
-var LISM_CSS_VERSION = "0.20.0" ? "0.20.0" : "unknown";
-var CLI_VERSION = "0.4.2" ? "0.4.2" : "unknown";
+var LISM_CSS_VERSION = "0.22.2" ? "0.22.2" : "unknown";
+var CLI_VERSION = "0.6.0" ? "0.6.0" : "unknown";
 
 // src/constants.ts
 var SOURCE_REPO = "lism-css/lism-css";
@@ -563,6 +581,7 @@ var SKILL_SOURCE_PATH = "skills/lism-css-guide";
 var TEMPLATES_PATH = "templates";
 
 // ../../templates/manifest.ts
+var PREVIEW_ORIGIN = "https://templates.lism-css.com";
 var TEMPLATES = [
   {
     slug: "minimal-astro",
@@ -581,7 +600,7 @@ var TEMPLATES = [
     sourcePath: "minimal/vite",
     title: { ja: "Minimal Vite", en: "Minimal Vite" },
     description: { ja: "Vite + React \u30D9\u30FC\u30B9\u306E\u6700\u5C0F\u69CB\u6210", en: "Minimal Vite + React setup" },
-    previewUrl: "https://lism-minimal-vite.pages.dev/"
+    previewUrl: `${PREVIEW_ORIGIN}/minimal-vite/`
   },
   {
     slug: "blog-astro-minimal",
@@ -591,9 +610,17 @@ var TEMPLATES = [
     variantLabel: { ja: "Minimal", en: "Minimal" },
     stack: "astro",
     sourcePath: "blog/astro/minimal",
+    langOverlays: {
+      en: "blog/astro/minimal/.lang/en"
+    },
     title: { ja: "Blog Minimal", en: "Blog Minimal" },
     description: { ja: "\u8A18\u4E8B\u4E00\u89A7 / \u8A73\u7D30 / Tags \u306E\u307F\u306E\u6700\u5C0F\u69CB\u6210\u306E Astro \u30D6\u30ED\u30B0", en: "Minimal Astro blog with posts and tags only" },
-    previewUrl: "https://lism-blog-astro-minimal.pages.dev/"
+    previewUrl: `${PREVIEW_ORIGIN}/blog-astro-minimal/`,
+    previewUrlEn: `${PREVIEW_ORIGIN}/blog-astro-minimal/en/`,
+    features: {
+      ja: ["\u30BF\u30B0", "sitemap"],
+      en: ["Tags", "sitemap"]
+    }
   },
   {
     slug: "blog-astro-personal",
@@ -603,12 +630,20 @@ var TEMPLATES = [
     variantLabel: { ja: "Personal", en: "Personal" },
     stack: "astro",
     sourcePath: "blog/astro/personal",
+    langOverlays: {
+      en: "blog/astro/personal/.lang/en"
+    },
     title: { ja: "Blog Personal", en: "Blog Personal" },
     description: {
       ja: "\u500B\u4EBA\u30D6\u30ED\u30B0\u30FB\u30A8\u30C3\u30BB\u30A4\u5411\u3051\u3002\u5E74\u6708\u30A2\u30FC\u30AB\u30A4\u30D6\u3064\u304D\u306E\u843D\u3061\u7740\u3044\u305F Astro \u30D6\u30ED\u30B0",
       en: "Personal / essay-style Astro blog with monthly archives"
     },
-    previewUrl: "https://lism-blog-astro-personal.pages.dev/"
+    previewUrl: `${PREVIEW_ORIGIN}/blog-astro-personal/`,
+    previewUrlEn: `${PREVIEW_ORIGIN}/blog-astro-personal/en/`,
+    features: {
+      ja: ["\u30BF\u30B0", "\u5E74\u6708\u30A2\u30FC\u30AB\u30A4\u30D6", "\u30B7\u30A7\u30A2\u30DC\u30BF\u30F3", "OGP\u753B\u50CF\u81EA\u52D5\u751F\u6210", "sitemap\uFF08lastmod \u5BFE\u5FDC\uFF09"],
+      en: ["Tags", "Monthly archives", "Share buttons", "Auto-generated OG images", "sitemap (with lastmod)"]
+    }
   },
   {
     slug: "blog-astro-techlog",
@@ -618,36 +653,66 @@ var TEMPLATES = [
     variantLabel: { ja: "Tech Log", en: "Tech Log" },
     stack: "astro",
     sourcePath: "blog/astro/techlog",
+    langOverlays: {
+      en: "blog/astro/techlog/.lang/en"
+    },
     title: { ja: "Blog Tech Log", en: "Blog Tech Log" },
     description: {
       ja: "\u6280\u8853\u30D6\u30ED\u30B0\u5411\u3051\u3002\u30B3\u30FC\u30C9\u30CF\u30A4\u30E9\u30A4\u30C8\u30FB\u30AB\u30C6\u30B4\u30EA\u30FB\u30BF\u30B0\u30FBTOC\u30FB\u5E74\u6708\u30A2\u30FC\u30AB\u30A4\u30D6\u30FB\u691C\u7D22\u3092\u88C5\u5099\u3057\u305F Astro \u30D6\u30ED\u30B0",
       en: "Tech blog with code highlighting, categories, tags, TOC, monthly archives and search"
     },
-    previewUrl: "https://lism-blog-astro-techlog.pages.dev/"
+    previewUrl: `${PREVIEW_ORIGIN}/blog-astro-techlog/`,
+    previewUrlEn: `${PREVIEW_ORIGIN}/blog-astro-techlog/en/`,
+    features: {
+      ja: [
+        "\u30AB\u30C6\u30B4\u30EA / \u30BF\u30B0",
+        "\u5E74\u6708\u30A2\u30FC\u30AB\u30A4\u30D6",
+        "\u691C\u7D22\uFF08Pagefind\uFF09",
+        "\u76EE\u6B21",
+        "\u30B3\u30FC\u30C9\u30CF\u30A4\u30E9\u30A4\u30C8",
+        "\u30C0\u30FC\u30AF\u30E2\u30FC\u30C9",
+        "\u30B7\u30A7\u30A2\u30DC\u30BF\u30F3",
+        "OGP\u753B\u50CF\u81EA\u52D5\u751F\u6210",
+        "sitemap\uFF08lastmod \u5BFE\u5FDC\uFF09"
+      ],
+      en: [
+        "Categories / Tags",
+        "Monthly archives",
+        "Search (Pagefind)",
+        "Table of contents",
+        "Code highlighting",
+        "Dark mode",
+        "Share buttons",
+        "Auto-generated OG images",
+        "sitemap (with lastmod)"
+      ]
+    }
   },
   {
-    slug: "lp-astro-minimal",
+    slug: "lp-astro-corporate",
     kind: "single-project-variant",
     category: "lp",
     stack: "astro",
-    variant: "minimal",
-    variantLabel: { ja: "Minimal", en: "Minimal" },
+    variant: "corporate",
+    variantLabel: { ja: "Corporate", en: "Corporate" },
     sourcePath: "lp/astro",
-    title: { ja: "LP Minimal", en: "LP Minimal" },
-    description: { ja: "\u30DF\u30CB\u30DE\u30EB\u306A Astro \u30E9\u30F3\u30C7\u30A3\u30F3\u30B0\u30DA\u30FC\u30B8", en: "Minimal Astro landing page" },
-    draft: true
+    title: { ja: "LP Corporate", en: "LP Corporate" },
+    description: { ja: "\u30B3\u30FC\u30DD\u30EC\u30FC\u30C8\u30B5\u30A4\u30C8\u5411\u3051\u306E Astro \u30E9\u30F3\u30C7\u30A3\u30F3\u30B0\u30DA\u30FC\u30B8", en: "Astro landing page for corporate sites" },
+    previewUrl: `${PREVIEW_ORIGIN}/lp-astro/corporate/`,
+    previewUrlEn: `${PREVIEW_ORIGIN}/lp-astro/en/corporate/`
   },
   {
-    slug: "lp-astro-natural",
+    slug: "lp-astro-interior",
     kind: "single-project-variant",
     category: "lp",
     stack: "astro",
-    variant: "natural",
-    variantLabel: { ja: "Natural", en: "Natural" },
+    variant: "interior",
+    variantLabel: { ja: "Interior", en: "Interior" },
     sourcePath: "lp/astro",
-    title: { ja: "LP Natural", en: "LP Natural" },
-    description: { ja: "\u30CA\u30C1\u30E5\u30E9\u30EB\u306A\u96F0\u56F2\u6C17\u306E Astro \u30E9\u30F3\u30C7\u30A3\u30F3\u30B0\u30DA\u30FC\u30B8", en: "Natural-themed Astro landing page" },
-    draft: true
+    title: { ja: "LP Interior", en: "LP Interior" },
+    description: { ja: "\u30A4\u30F3\u30C6\u30EA\u30A2\u30FB\u66AE\u3089\u3057\u7CFB\u30B5\u30FC\u30D3\u30B9\u5411\u3051\u306E Astro \u30E9\u30F3\u30C7\u30A3\u30F3\u30B0\u30DA\u30FC\u30B8", en: "Astro landing page for interior / lifestyle services" },
+    previewUrl: `${PREVIEW_ORIGIN}/lp-astro/interior/`,
+    previewUrlEn: `${PREVIEW_ORIGIN}/lp-astro/en/interior/`
   },
   {
     slug: "lp-astro-ryokan",
@@ -682,7 +747,7 @@ var CATEGORIES = [
   },
   {
     id: "lp",
-    label: { ja: "Landing Page", en: "Landing Page" },
+    label: { ja: "LP", en: "LP" },
     variantPromptKey: "create.promptSelectVariant.lp"
   },
   {
@@ -691,10 +756,12 @@ var CATEGORIES = [
     variantPromptKey: "create.promptSelectVariant.web"
   }
 ];
-async function runCreate({ template, targetDir, force = false }) {
-  await runCreateWithTemplates({ template, targetDir, force }, TEMPLATES);
+async function runCreate({ template, targetDir, force = false, lang }) {
+  await runCreateWithTemplates({ template, targetDir, force, lang }, TEMPLATES);
 }
-async function runCreateWithTemplates({ template, targetDir, force = false }, templates) {
+async function runCreateWithTemplates({ template, targetDir, force = false, lang }, templates) {
+  const resolvedLang = await resolveLang(lang);
+  setLang(resolvedLang);
   const availableTemplates = templates.filter((tpl2) => !tpl2.draft);
   const tpl = await resolveTemplate(template, availableTemplates);
   const outDir = path.resolve(process.cwd(), await resolveTargetDir(targetDir, tpl.slug));
@@ -711,13 +778,27 @@ async function runCreateWithTemplates({ template, targetDir, force = false }, te
   const ref = DEFAULT_TEMPLATES_REF;
   logger.info(t("create.fetching", { name: tpl.slug, ref }));
   await downloadTemplateSource(tpl, outDir, ref, force);
+  await applyLangOverlay(tpl, outDir, ref, resolvedLang);
   ensureTemplateDownloaded(outDir, tpl);
-  postProcessTemplate(outDir, tpl);
+  postProcessTemplate(outDir, tpl, resolvedLang);
   logger.success(t("create.created", { dir: outDir }));
   printNextSteps(outDir, tpl);
 }
-async function createCommand(targetDir, options) {
-  await runCreate({ template: options.template, targetDir, force: options.force });
+async function createCommand(targetDir, options, command) {
+  const langOpt = command?.optsWithGlobals().lang;
+  const lang = typeof langOpt === "string" ? langOpt : void 0;
+  await runCreate({ template: options.template, targetDir, force: options.force, lang });
+}
+async function resolveLang(explicit) {
+  if (explicit === "ja" || explicit === "en") return explicit;
+  if (!process.stdin.isTTY) return "en";
+  return select({
+    message: "Select language / \u8A00\u8A9E\u3092\u9078\u629E:",
+    choices: [
+      { name: "English", value: "en" },
+      { name: "\u65E5\u672C\u8A9E", value: "ja" }
+    ]
+  });
 }
 async function resolveTemplate(requested, templates) {
   if (requested) {
@@ -818,13 +899,25 @@ async function downloadTemplatePath(sourcePath, outDir, ref, forceClean) {
     forceClean
   });
 }
-function postProcessTemplate(projectDir, tpl) {
+async function applyLangOverlay(tpl, outDir, ref, lang) {
+  if (tpl.kind !== "project") return;
+  const overlayPath = tpl.langOverlays?.[lang];
+  if (!overlayPath) return;
+  const overlayDir = fs.mkdtempSync(path.join(os.tmpdir(), "lism-template-lang-"));
+  try {
+    await downloadTemplatePath(overlayPath, overlayDir, ref, true);
+    mergeDirectory(overlayDir, outDir);
+  } finally {
+    fs.rmSync(overlayDir, { recursive: true, force: true });
+  }
+}
+function postProcessTemplate(projectDir, tpl, lang) {
   if (tpl.kind === "static-html") return;
   if (tpl.kind === "base-overlay" && tpl.rewritePackageName !== false) {
     rewritePackageName(projectDir, tpl.slug);
   }
   if (tpl.kind === "single-project-variant") {
-    extractVariantPages(projectDir, tpl);
+    extractVariantFiles(projectDir, tpl, lang);
     rewritePackageName(projectDir, tpl.packageName ?? tpl.slug);
   }
   cleanupDevArtifacts(projectDir);
@@ -839,28 +932,93 @@ function cleanupDevArtifacts(projectDir) {
   if (fs.existsSync(screenshotsConfig)) {
     fs.rmSync(screenshotsConfig, { force: true });
   }
+  const langDir = path.join(projectDir, ".lang");
+  if (fs.existsSync(langDir)) {
+    fs.rmSync(langDir, { recursive: true, force: true });
+  }
 }
-function extractVariantPages(projectDir, tpl) {
-  const pagesDir = path.join(projectDir, "src", "pages");
-  const variantDir = path.join(pagesDir, tpl.variant);
-  const variantIndex = path.join(variantDir, "index.astro");
-  const targetIndex = path.join(pagesDir, "index.astro");
-  if (!fs.existsSync(variantIndex)) {
+function resolveVariantDir(srcDir, variant, lang) {
+  const langVariant = `${lang}/${variant}`;
+  const hasLangVariant = fs.existsSync(path.join(srcDir, "pages", langVariant, "index.astro"));
+  return hasLangVariant ? langVariant : variant;
+}
+function extractVariantFiles(projectDir, tpl, lang) {
+  const srcDir = path.join(projectDir, "src");
+  const variant = resolveVariantDir(srcDir, tpl.variant, lang);
+  const pagesVariantIndex = path.join(srcDir, "pages", variant, "index.astro");
+  if (!fs.existsSync(pagesVariantIndex)) {
     throw new Error(
       t("create.variantMissing", {
-        variant: tpl.variant,
-        path: `${formatTemplatePath(tpl.sourcePath)}/src/pages/${tpl.variant}/index.astro`
+        variant,
+        path: `${formatTemplatePath(tpl.sourcePath)}/src/pages/${variant}/index.astro`
       })
     );
   }
-  if (fs.existsSync(targetIndex)) {
-    fs.rmSync(targetIndex, { force: true });
-  }
-  fs.renameSync(variantIndex, targetIndex);
-  for (const entry of fs.readdirSync(pagesDir, { withFileTypes: true })) {
+  if (!fs.existsSync(srcDir) || !fs.statSync(srcDir).isDirectory()) return;
+  for (const entry of fs.readdirSync(srcDir, { withFileTypes: true })) {
     if (!entry.isDirectory()) continue;
-    fs.rmSync(path.join(pagesDir, entry.name), { recursive: true, force: true });
+    const parentDir = path.join(srcDir, entry.name);
+    const variantDirInside = path.join(parentDir, variant);
+    if (!fs.existsSync(variantDirInside)) continue;
+    if (!fs.statSync(variantDirInside).isDirectory()) continue;
+    mergeDirectory(variantDirInside, parentDir);
+    for (const child of fs.readdirSync(parentDir, { withFileTypes: true })) {
+      if (!child.isDirectory()) continue;
+      fs.rmSync(path.join(parentDir, child.name), { recursive: true, force: true });
+    }
   }
+  rewriteVariantAliasImports(srcDir, variant);
+}
+var ALIAS_REWRITE_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".astro",
+  ".ts",
+  ".tsx",
+  ".js",
+  ".jsx",
+  ".mjs",
+  ".cjs",
+  ".css",
+  ".scss",
+  ".sass",
+  ".less",
+  ".md",
+  ".mdx",
+  ".vue",
+  ".svelte",
+  ".html"
+]);
+function rewriteVariantAliasImports(srcDir, variant) {
+  if (!fs.existsSync(srcDir)) return;
+  const pattern = new RegExp(`(@/[^/'"\\s\`]+)/${escapeRegExp(variant)}/`, "g");
+  walkFiles(srcDir, (filePath) => {
+    const ext = path.extname(filePath);
+    if (!ALIAS_REWRITE_EXTENSIONS.has(ext)) return;
+    let original;
+    try {
+      original = fs.readFileSync(filePath, "utf-8");
+    } catch {
+      return;
+    }
+    if (!original.includes(`/${variant}/`)) return;
+    const replaced = original.replace(pattern, "$1/");
+    if (replaced !== original) {
+      fs.writeFileSync(filePath, replaced);
+    }
+  });
+}
+function walkFiles(dir, callback) {
+  if (!fs.existsSync(dir)) return;
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const fp = path.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      walkFiles(fp, callback);
+    } else if (entry.isFile()) {
+      callback(fp);
+    }
+  }
+}
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 function printNextSteps(projectDir, tpl) {
   logger.heading(t("create.nextSteps"));

package/dist/index.js

@@ -13,7 +13,7 @@ import {
   preScanLang,
   setLang,
   t
-} from "./chunk-J2T5ZPMR.js";
+} from "./chunk-G4RBP3W6.js";
 
 // src/createProgram.ts
 import { Command as Command3 } from "commander";

package/dist/lib.d.ts

@@ -2,9 +2,15 @@ interface RunCreateArgs {
     template?: string;
     targetDir?: string;
     force?: boolean;
+    /**
+     * 明示指定された言語（`--lang`）。`ja` / `en` のときその言語で CLI 表示・テンプレ生成を確定する。
+     * 未指定（undefined / 不正値）の場合は、対話端末では最初に言語選択プロンプトを出し、
+     * 非対話端末（CI・パイプ等）では `en` にフォールバックする。
+     */
+    lang?: string;
 }
 /** `lism create` / `create-lism` から共通で使える実体関数 */
-declare function runCreate({ template, targetDir, force }: RunCreateArgs): Promise<void>;
+declare function runCreate({ template, targetDir, force, lang }: RunCreateArgs): Promise<void>;
 
 /**
  * CLI 表示用のメッセージ辞書（ja / en）。
@@ -25,8 +31,8 @@ declare const messages: {
         readonly en: "CLI for Lism CSS / UI";
     };
     readonly 'cli.opt.lang': {
-        readonly ja: "CLI の表示言語を指定（ja | en）";
-        readonly en: "Display language for the CLI (ja | en)";
+        readonly ja: "CLI 表示と生成テンプレートの言語（ja | en、未指定なら対話時に選択）";
+        readonly en: "Language for the CLI and generated template (ja | en; prompted when omitted)";
     };
     readonly 'cli.create.description': {
         readonly ja: "templates から新規プロジェクトを生成する";
@@ -459,14 +465,6 @@ declare const messages: {
 };
 type MessageKey = keyof typeof messages;
 
-/**
- * CLI の i18n（多言語化）基盤。
- *
- * - 既定は英語（`en`）。環境ロケールが `ja*` のときのみ日本語（`ja`）に切り替わる。
- * - `--lang <code>` オプションで明示上書き可能。
- * - メッセージ辞書は `messages.ts` に集約。
- */
-
 type Lang = 'ja' | 'en';
 /** 現在の言語を設定する（未知の値は無視） */
 declare function setLang(lang: string | undefined): void;

package/dist/lib.js

@@ -3,7 +3,7 @@ import {
   setLang,
   t,
   tOf
-} from "./chunk-J2T5ZPMR.js";
+} from "./chunk-G4RBP3W6.js";
 export {
   runCreate,
   setLang,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lism-cli",
-  "version": "0.4.2",
+  "version": "0.6.0",
   "description": "CLI for scaffolding projects and adding UI components for Lism CSS / Lism UI.",
   "author": {
     "name": "ddryo",