create-einja-app 0.3.1 → 0.3.3

package/README.md

@@ -129,7 +129,7 @@ $ npx create-einja-app add
 
 ファイルの競合は以下のマーカーベースで処理されます：
 - `@einja:managed` - テンプレートで上書き
-- `@einja:seed` - ローカル優先（初回のみコピー）
+- `@einja:project-private` - ローカル優先（初回のみコピー）
 - マーカーなし - 既存ファイル優先
 
 **JSONマージ設定 (.einja-sync.json):**
@@ -331,6 +331,39 @@ Gitがインストールされていません
 - Gitをインストールしてください: https://git-scm.com/downloads
 - または `--skip-git` オプションを使用してください
 
+### scripts/init.sh が Permission Denied
+
+**エラーメッセージ:**
+```
+Permission denied: ./scripts/init.sh
+```
+
+**解決方法:**
+```bash
+# 方法1: bashコマンドで実行
+bash scripts/init.sh
+
+# 方法2: 実行権限を付与してから実行
+chmod +x scripts/*.sh
+./scripts/init.sh
+```
+
+### Volta環境でpnpmが見つからない
+
+**エラーメッセージ:**
+```
+pnpm: command not found
+```
+
+**解決方法:**
+```bash
+# pnpmを手動でインストール
+npm install -g pnpm@latest-10
+
+# またはターミナルを再起動してVoltaのPATHを反映
+exec $SHELL
+```
+
 ---
 
 ## テンプレート更新

package/dist/cli.js

@@ -161,6 +161,7 @@ async function promptProjectConfig(defaultProjectName) {
 // src/generators/template.ts
 import fsExtra from "fs-extra";
 import { glob } from "glob";
+import { chmodSync } from "fs";
 import { dirname as dirname2, join as join2, relative } from "path";
 import { fileURLToPath } from "url";
 
@@ -335,48 +336,23 @@ async function generateTemplate(config, targetPath) {
   for (const file of allFiles) {
     processFileVariables(file, variables);
   }
+  const shFiles = glob.sync("**/*.sh", {
+    cwd: targetPath,
+    absolute: true,
+    dot: true
+  });
+  for (const file of shFiles) {
+    chmodSync(file, 493);
+  }
   success("\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u5C55\u958B\u5B8C\u4E86");
 }
 
 // src/generators/post-setup.ts
-import { execa, execaSync } from "execa";
+import path from "path";
+import os from "os";
+import { execa } from "execa";
 import chalk2 from "chalk";
-import inquirer2 from "inquirer";
 import ora from "ora";
-function isDirenvAvailable() {
-  try {
-    execaSync("which", ["direnv"]);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function promptAndExecuteDirenvAllow(targetPath) {
-  try {
-    const { shouldAllow } = await inquirer2.prompt([
-      {
-        type: "confirm",
-        name: "shouldAllow",
-        message: "direnv allow \u3092\u5B9F\u884C\u3057\u307E\u3059\u304B\uFF1F\uFF08\u74B0\u5883\u5909\u6570\u3092\u6709\u52B9\u5316\u3057\u307E\u3059\uFF09",
-        default: true
-      }
-    ]);
-    if (shouldAllow) {
-      try {
-        await execa("direnv", ["allow"], { cwd: targetPath });
-        success("direnv allow \u3092\u5B9F\u884C\u3057\u307E\u3057\u305F");
-      } catch (error2) {
-        warn("direnv allow \u306E\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
-        info("\u5F8C\u3067\u624B\u52D5\u3067 'direnv allow' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
-      }
-    } else {
-      info("direnv allow \u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3057\u305F");
-      info("\u5F8C\u3067\u624B\u52D5\u3067 'direnv allow' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
-    }
-  } catch (error2) {
-    info("direnv allow \u3092\u30B9\u30AD\u30C3\u30D7\u3057\u307E\u3057\u305F");
-  }
-}
 function printCompletionMessage(config) {
   console.log();
   success("\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F\uFF01");
@@ -388,10 +364,10 @@ function printCompletionMessage(config) {
   console.log(chalk2.cyan("  pnpm dev                 # PostgreSQL\u8D77\u52D5 + \u958B\u767A\u30B5\u30FC\u30D0\u30FC\u8D77\u52D5"));
   console.log();
   console.log(
-    chalk2.yellow("\u26A0 \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3: \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u79D8\u5BC6\u9375\u3092\u305D\u306E\u307E\u307E\u4F7F\u7528\u3057\u306A\u3044\u3067\u304F\u3060\u3055\u3044")
+    chalk2.green("\u2713 \u30BB\u30AD\u30E5\u30EA\u30C6\u30A3: \u79D8\u5BC6\u9375\u306F\u81EA\u52D5\u30ED\u30FC\u30C6\u30FC\u30B7\u30E7\u30F3\u6E08\u307F\u3067\u3059")
   );
   console.log(
-    chalk2.gray("  pnpm env:rotate-secrets  # \u79D8\u5BC6\u9375\u3092\u81EA\u5206\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u7528\u306B\u518D\u751F\u6210")
+    chalk2.gray("  pnpm env:rotate-secrets  # \u624B\u52D5\u3067\u518D\u30ED\u30FC\u30C6\u30FC\u30B7\u30E7\u30F3\u3059\u308B\u5834\u5408")
   );
   console.log();
   console.log(chalk2.gray("\u958B\u767A\u30B5\u30FC\u30D0\u30FC: \u30BF\u30FC\u30DF\u30CA\u30EB\u306B\u8868\u793A\u3055\u308C\u308BURL\u3092\u78BA\u8A8D"));
@@ -401,16 +377,17 @@ function printCompletionMessage(config) {
 }
 async function execPostSetup(config, targetPath, options) {
   const { skipGit, skipInstall } = options;
-  if (!skipGit) {
-    const gitSpinner = ora("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u521D\u671F\u5316\u4E2D...").start();
+  if (!skipInstall) {
+    info("\u521D\u56DE\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3092\u5B9F\u884C\u4E2D...");
     try {
-      await execa("git", ["init"], { cwd: targetPath });
-      await execa("git", ["add", "."], { cwd: targetPath });
-      await execa("git", ["commit", "-m", "Initial commit"], { cwd: targetPath });
-      gitSpinner.succeed("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u521D\u671F\u5316\u3057\u307E\u3057\u305F");
+      await execa("bash", ["scripts/init.sh"], { cwd: targetPath, stdio: "inherit" });
+      const voltaBin = path.join(os.homedir(), ".volta", "bin");
+      if (!process.env.PATH?.includes(voltaBin)) {
+        process.env.PATH = `${voltaBin}:${process.env.PATH}`;
+      }
     } catch (error2) {
-      gitSpinner.fail("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u306E\u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
-      warn("\u5F8C\u3067\u624B\u52D5\u3067 'git init' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
+      warn("\u521D\u56DE\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306E\u81EA\u52D5\u5B9F\u884C\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
+      info("\u5F8C\u3067\u624B\u52D5\u3067 './scripts/init.sh' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
     }
   }
   if (!skipInstall) {
@@ -431,17 +408,36 @@ async function execPostSetup(config, targetPath, options) {
       warn("\u5F8C\u3067\u624B\u52D5\u3067 'pnpm install' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
     }
   }
-  if (config.tools.direnv && isDirenvAvailable()) {
-    await promptAndExecuteDirenvAllow(targetPath);
+  if (!skipInstall) {
+    const rotateSpinner = ora("\u79D8\u5BC6\u9375\u3092\u30ED\u30FC\u30C6\u30FC\u30B7\u30E7\u30F3\u4E2D...").start();
+    try {
+      await execa("pnpm", ["env:rotate-secrets", "--all", "--non-interactive"], { cwd: targetPath });
+      rotateSpinner.succeed("\u79D8\u5BC6\u9375\u3092\u30ED\u30FC\u30C6\u30FC\u30B7\u30E7\u30F3\u3057\u307E\u3057\u305F");
+    } catch (error2) {
+      rotateSpinner.warn("\u79D8\u5BC6\u9375\u306E\u81EA\u52D5\u30ED\u30FC\u30C6\u30FC\u30B7\u30E7\u30F3\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
+      info("\u5F8C\u3067\u624B\u52D5\u3067 'pnpm env:rotate-secrets' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
+    }
+  }
+  if (!skipGit) {
+    const gitSpinner = ora("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u521D\u671F\u5316\u4E2D...").start();
+    try {
+      await execa("git", ["init"], { cwd: targetPath });
+      await execa("git", ["add", "."], { cwd: targetPath });
+      await execa("git", ["commit", "-m", "Initial commit"], { cwd: targetPath });
+      gitSpinner.succeed("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u3092\u521D\u671F\u5316\u3057\u307E\u3057\u305F");
+    } catch (error2) {
+      gitSpinner.fail("Git\u30EA\u30DD\u30B8\u30C8\u30EA\u306E\u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
+      warn("\u5F8C\u3067\u624B\u52D5\u3067 'git init' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
+    }
   }
   if (config.setupEinjaCli) {
     const einjaSpinner = ora("@einja/dev-cli \u3092\u521D\u671F\u5316\u4E2D...").start();
     try {
-      await execa("npx", ["@einja/dev-cli", "init", "--force", "--no-backup"], { cwd: targetPath });
+      await execa("npx", ["--yes", "@einja/dev-cli@latest", "init", "--force", "--no-backup"], { cwd: targetPath });
       einjaSpinner.succeed("@einja/dev-cli \u3092\u521D\u671F\u5316\u3057\u307E\u3057\u305F");
     } catch (error2) {
       einjaSpinner.fail("@einja/dev-cli \u306E\u521D\u671F\u5316\u306B\u5931\u6557\u3057\u307E\u3057\u305F");
-      warn("\u5F8C\u3067\u624B\u52D5\u3067 'npx @einja/dev-cli init' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
+      warn("\u5F8C\u3067\u624B\u52D5\u3067 'npx --yes @einja/dev-cli@latest init' \u3092\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044");
     }
   }
   printCompletionMessage(config);
@@ -540,7 +536,7 @@ async function createCommand(projectName, options) {
 import { dirname as dirname5, join as join7 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import fsExtra3 from "fs-extra";
-import inquirer5 from "inquirer";
+import inquirer4 from "inquirer";
 
 // src/generators/sync.ts
 import { glob as glob2 } from "glob";
@@ -679,9 +675,9 @@ async function collectSyncFiles(templateDir, categories, appsDetail, packagesDet
 }
 
 // src/prompts/sync.ts
-import inquirer3 from "inquirer";
+import inquirer2 from "inquirer";
 import * as fs from "fs";
-import * as path from "path";
+import * as path2 from "path";
 var CATEGORY_CONFIGS = {
   env: {
     name: "\u74B0\u5883\u8A2D\u5B9A",
@@ -767,7 +763,7 @@ var CATEGORY_CONFIGS = {
   }
 };
 function getAvailableApps(templateDir) {
-  const appsDir = path.join(templateDir, "apps");
+  const appsDir = path2.join(templateDir, "apps");
   try {
     if (!fs.existsSync(appsDir)) {
       return [];
@@ -779,7 +775,7 @@ function getAvailableApps(templateDir) {
   }
 }
 function getAvailablePackages(templateDir) {
-  const packagesDir = path.join(templateDir, "packages");
+  const packagesDir = path2.join(templateDir, "packages");
   try {
     if (!fs.existsSync(packagesDir)) {
       return [];
@@ -791,7 +787,7 @@ function getAvailablePackages(templateDir) {
   }
 }
 async function promptSyncCategories(templateDir, isFirstRun = false) {
-  const categoryAnswers = await inquirer3.prompt([
+  const categoryAnswers = await inquirer2.prompt([
     {
       type: "checkbox",
       name: "categories",
@@ -814,7 +810,7 @@ async function promptSyncCategories(templateDir, isFirstRun = false) {
   if (hasApps) {
     const availableApps = getAvailableApps(templateDir);
     if (availableApps.length > 0) {
-      const appsAnswers = await inquirer3.prompt([
+      const appsAnswers = await inquirer2.prompt([
         {
           type: "checkbox",
           name: "apps",
@@ -841,7 +837,7 @@ async function promptSyncCategories(templateDir, isFirstRun = false) {
   if (hasPackages) {
     const availablePackages = getAvailablePackages(templateDir);
     if (availablePackages.length > 0) {
-      const packagesAnswers = await inquirer3.prompt([
+      const packagesAnswers = await inquirer2.prompt([
         {
           type: "checkbox",
           name: "packages",
@@ -866,7 +862,7 @@ async function promptSyncCategories(templateDir, isFirstRun = false) {
     }
   }
   if (hasRootConfig) {
-    const packageJsonAnswers = await inquirer3.prompt([
+    const packageJsonAnswers = await inquirer2.prompt([
       {
         type: "checkbox",
         name: "sections",
@@ -882,7 +878,7 @@ async function promptSyncCategories(templateDir, isFirstRun = false) {
     ]);
     packageJsonSections = packageJsonAnswers.sections;
   }
-  const strategyAnswers = await inquirer3.prompt([
+  const strategyAnswers = await inquirer2.prompt([
     {
       type: "list",
       name: "conflictStrategy",
@@ -1093,7 +1089,7 @@ import { readFileSync as readFileSync3, writeFileSync as writeFileSync3, existsS
 import { dirname as dirname4, basename } from "path";
 
 // src/utils/package-json-merger.ts
-import inquirer4 from "inquirer";
+import inquirer3 from "inquirer";
 function hasVersionConflict(existingVersion, templateVersion) {
   if (existingVersion === templateVersion) {
     return false;
@@ -1132,7 +1128,7 @@ async function resolveVersionConflicts(conflicts) {
     warn(`  \u65E2\u5B58: ${conflict.existingVersion}`);
     warn(`  \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8: ${conflict.templateVersion}
 `);
-    const answer = await inquirer4.prompt([
+    const answer = await inquirer3.prompt([
       {
         type: "list",
         name: "version",
@@ -1190,13 +1186,13 @@ function mergeTextWithMarkers(templateContent, existingContent) {
   const templateSections = parseMarkers(templateContent);
   const localSections = parseMarkers(existingContent);
   const hasMarkers = templateSections.some(
-    (s) => s.type === "managed" || s.type === "seed"
+    (s) => s.type === "managed" || s.type === "project-private"
   );
   if (!hasMarkers) {
     return existingContent;
   }
   const templateManagedById = /* @__PURE__ */ new Map();
-  const templateSeedById = /* @__PURE__ */ new Map();
+  const templateProjectPrivateById = /* @__PURE__ */ new Map();
   const templateManagedWithoutId = [];
   const processedTemplateIds = /* @__PURE__ */ new Set();
   for (const section of templateSections) {
@@ -1204,8 +1200,8 @@ function mergeTextWithMarkers(templateContent, existingContent) {
       templateManagedById.set(section.id, section);
     } else if (section.type === "managed") {
       templateManagedWithoutId.push(section);
-    } else if (section.type === "seed" && section.id) {
-      templateSeedById.set(section.id, section);
+    } else if (section.type === "project-private" && section.id) {
+      templateProjectPrivateById.set(section.id, section);
     }
   }
   const result = [];
@@ -1225,7 +1221,7 @@ function mergeTextWithMarkers(templateContent, existingContent) {
           result.push(localSection.content);
         }
       }
-    } else if (localSection.type === "seed") {
+    } else if (localSection.type === "project-private") {
       if (localSection.id) {
         processedTemplateIds.add(localSection.id);
       }
@@ -1242,7 +1238,7 @@ function mergeTextWithMarkers(templateContent, existingContent) {
   for (const section of templateManagedWithoutId.slice(managedWithoutIdIndex)) {
     result.push(section.content);
   }
-  for (const [id, section] of templateSeedById) {
+  for (const [id, section] of templateProjectPrivateById) {
     if (!processedTemplateIds.has(id)) {
       result.push(section.content);
     }
@@ -1272,7 +1268,7 @@ function deepMergeWithPaths(template, existing, jsonPaths, filePath, currentPath
     const existingValue = existing[key];
     if (isPathManaged(filePath, keyPath, jsonPaths)) {
       result[key] = deepClone(templateValue);
-    } else if (isPathSeed(filePath, keyPath, jsonPaths)) {
+    } else if (isPathProjectPrivate(filePath, keyPath, jsonPaths)) {
       if (typeof templateValue === "object" && templateValue !== null && !Array.isArray(templateValue) && typeof existingValue === "object" && existingValue !== null && !Array.isArray(existingValue)) {
         result[key] = deepMergeWithPaths(
           templateValue,
@@ -1373,7 +1369,7 @@ async function mergeAndWriteFile(templatePath, targetPath, syncMetadata, package
     try {
       const templateJson = JSON.parse(templateContent);
       const existingJson = existingContent ? JSON.parse(existingContent) : null;
-      const jsonPaths = syncMetadata.jsonPaths || { managed: {}, seed: {} };
+      const jsonPaths = syncMetadata.jsonPaths || { managed: {}, "project-private": {} };
       const fileName = targetPath.split("/").pop() || "package.json";
       const mergedJson = mergeJson(templateJson, existingJson, jsonPaths, fileName);
       mergedContent = JSON.stringify(mergedJson, null, 2);
@@ -1462,20 +1458,30 @@ function parseStartMarker(line) {
   if (match) {
     return { type: "managed", id: match[1] || void 0 };
   }
+  const markdownProjectPrivatePattern = /^<!--\s*@einja:project-private:start(?:\s+id="([^"]+)")?\s*-->$/;
+  match = line.match(markdownProjectPrivatePattern);
+  if (match) {
+    return { type: "project-private", id: match[1] || void 0 };
+  }
   const markdownSeedPattern = /^<!--\s*@einja:seed:start(?:\s+id="([^"]+)")?\s*-->$/;
   match = line.match(markdownSeedPattern);
   if (match) {
-    return { type: "seed", id: match[1] || void 0 };
+    return { type: "project-private", id: match[1] || void 0 };
   }
   const yamlManagedPattern = /^\s*#\s*@einja:managed:start(?:\s+id="([^"]+)")?\s*$/;
   match = line.match(yamlManagedPattern);
   if (match) {
     return { type: "managed", id: match[1] || void 0 };
   }
+  const yamlProjectPrivatePattern = /^\s*#\s*@einja:project-private:start(?:\s+id="([^"]+)")?\s*$/;
+  match = line.match(yamlProjectPrivatePattern);
+  if (match) {
+    return { type: "project-private", id: match[1] || void 0 };
+  }
   const yamlSeedPattern = /^\s*#\s*@einja:seed:start(?:\s+id="([^"]+)")?\s*$/;
   match = line.match(yamlSeedPattern);
   if (match) {
-    return { type: "seed", id: match[1] || void 0 };
+    return { type: "project-private", id: match[1] || void 0 };
   }
   return null;
 }
@@ -1483,14 +1489,20 @@ function parseEndMarker(line) {
   if (/^<!--\s*@einja:managed:end\s*-->$/.test(line)) {
     return "managed";
   }
+  if (/^<!--\s*@einja:project-private:end\s*-->$/.test(line)) {
+    return "project-private";
+  }
   if (/^<!--\s*@einja:seed:end\s*-->$/.test(line)) {
-    return "seed";
+    return "project-private";
   }
   if (/^\s*#\s*@einja:managed:end\s*$/.test(line)) {
     return "managed";
   }
+  if (/^\s*#\s*@einja:project-private:end\s*$/.test(line)) {
+    return "project-private";
+  }
   if (/^\s*#\s*@einja:seed:end\s*$/.test(line)) {
-    return "seed";
+    return "project-private";
   }
   return null;
 }
@@ -1500,9 +1512,9 @@ function isPathManaged(filePath, keyPath, jsonPaths) {
     (p) => keyPath === p || keyPath.startsWith(`${p}.`)
   );
 }
-function isPathSeed(filePath, keyPath, jsonPaths) {
-  const seedPaths = jsonPaths.seed[filePath] || [];
-  return seedPaths.some((p) => keyPath === p || keyPath.startsWith(`${p}.`));
+function isPathProjectPrivate(filePath, keyPath, jsonPaths) {
+  const projectPrivatePaths = jsonPaths["project-private"][filePath] || [];
+  return projectPrivatePaths.some((p) => keyPath === p || keyPath.startsWith(`${p}.`));
 }
 
 // src/utils/placeholder-validator.ts
@@ -1650,7 +1662,7 @@ async function handleInterrupt() {
     info("\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u304C\u4F5C\u6210\u3055\u308C\u3066\u3044\u306A\u3044\u305F\u3081\u3001\u30AF\u30EA\u30FC\u30F3\u30A2\u30C3\u30D7\u306F\u4E0D\u8981\u3067\u3059");
     process.exit(0);
   }
-  const answer = await inquirer5.prompt([
+  const answer = await inquirer4.prompt([
     {
       type: "confirm",
       name: "rollback",
@@ -1776,7 +1788,7 @@ async function syncCommand(options) {
       info(`  \u2713 \u30D1\u30C3\u30B1\u30FC\u30B8\u30B9\u30B3\u30FC\u30D7: ${detectedConfig.packageScope}`);
     } else {
       warn("\u26A0\uFE0F \u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u8A2D\u5B9A\u3092\u81EA\u52D5\u691C\u51FA\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F");
-      const inputAnswers = await inquirer5.prompt([
+      const inputAnswers = await inquirer4.prompt([
         {
           type: "input",
           name: "projectName",
@@ -1839,7 +1851,7 @@ async function syncCommand(options) {
       files: {},
       jsonPaths: {
         managed: {},
-        seed: {}
+        "project-private": {}
       }
     };
     const result = {