noshift.js 0.2.0 → 0.3.0

package/README-ja.md

@@ -54,7 +54,7 @@ nsc --init
 {
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "build"
+    "outDir": "dist"
   }
 }
 ```
@@ -62,7 +62,7 @@ nsc --init
 | オプション | デフォルト | 説明 |
 |---|---|---|
 | `compilerOptions.rootDir` | `"src"` | ソースディレクトリ |
-| `compilerOptions.outDir` | `"build"` | 出力ディレクトリ |
+| `compilerOptions.outDir` | `"dist"` | 出力ディレクトリ |
 
 ---
 

package/README.md

@@ -54,7 +54,7 @@ Generated automatically by `nsc --init` or `nsc create`.
 {
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "build"
+    "outDir": "dist"
   }
 }
 ```
@@ -62,7 +62,7 @@ Generated automatically by `nsc --init` or `nsc create`.
 | Option | Default | Description |
 |---|---|---|
 | `compilerOptions.rootDir` | `"src"` | Source directory |
-| `compilerOptions.outDir` | `"build"` | Output directory |
+| `compilerOptions.outDir` | `"dist"` | Output directory |
 
 ---
 

package/bin/cli.js

@@ -16,7 +16,7 @@ const program = new Command();
 program
   .name("nsc")
   .description("NoShift.js compiler")
-  .version(pkg.version)
+  .version(pkg.version, '-v, --version', 'output the version number')
   .option("-w, --watch", "Watch for file changes and recompile")
   .option("--init", "Create a nsjsconfig.json in the current directory")
   .option("--clean", "Delete the output directory (outDir)")

package/commands/clean.js

@@ -1,15 +1,19 @@
 import { rm, access } from "fs/promises";
 import path from "path";
 import { loadConfig } from "../src/config.js";
+import { handleSigint } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 export default async function clean() {
+  handleSigint();
+
   const cwd = process.cwd();
 
   let config;
   try {
     config = await loadConfig(cwd);
   } catch (e) {
-    console.error(`error NS0: ${e.message}`);
+    logger.errorCode("NS0", e.message);
     process.exit(1);
   }
 
@@ -18,12 +22,12 @@ export default async function clean() {
   try {
     await access(outDir);
   } catch {
-    console.log(
-      `Nothing to clean ('${config.compilerOptions.outDir}' does not exist).`,
+    logger.info(
+      `Nothing to clean (${logger.highlight(config.compilerOptions.outDir)} does not exist).`,
     );
     return;
   }
 
   await rm(outDir, { recursive: true, force: true });
-  console.log(`Deleted '${config.compilerOptions.outDir}'.`);
+  logger.success(`Deleted ${logger.highlight(config.compilerOptions.outDir)}`);
 }

package/commands/compile.js

@@ -2,6 +2,8 @@ import { promises as fs } from "fs";
 import path from "path";
 import convert from "../src/convert.js";
 import { loadConfig } from "../src/config.js";
+import { handleSigint } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 async function findNsjsFiles(dir) {
   let entries;
@@ -25,13 +27,15 @@ async function findNsjsFiles(dir) {
 }
 
 export default async function compile() {
+  handleSigint();
+
   const cwd = process.cwd();
 
   let config;
   try {
     config = await loadConfig(cwd);
   } catch (e) {
-    console.error(`error TS0: ${e.message}`);
+    logger.errorCode("NS0", e.message);
     process.exit(1);
   }
 
@@ -41,14 +45,15 @@ export default async function compile() {
   const files = await findNsjsFiles(rootDir);
 
   if (files === null) {
-    console.error(
-      `error NS0: rootDir '${config.compilerOptions.rootDir}' not found.`,
+    logger.errorCode(
+      "NS0",
+      `rootDir '${config.compilerOptions.rootDir}' not found.`,
     );
     process.exit(1);
   }
 
   if (files.length === 0) {
-    console.log("No .nsjs files found.");
+    logger.info("No .nsjs files found.");
     return;
   }
 
@@ -68,22 +73,24 @@ export default async function compile() {
       await fs.mkdir(path.dirname(destPath), { recursive: true });
       await fs.writeFile(destPath, js, "utf-8");
 
-      console.log(
+      logger.dim(
         `  ${relative.replace(/\\/g, "/")} → ${path.relative(cwd, destPath).replace(/\\/g, "/")}`,
       );
       compiled++;
     } catch (e) {
-      console.error(
-        `  error NS1: ${relative.replace(/\\/g, "/")}: ${e.message}`,
+      logger.errorCode(
+        "NS1",
+        `${relative.replace(/\\/g, "/")}: ${e.message}`,
       );
       errors++;
     }
   }
 
+  console.log("");
   if (errors > 0) {
-    console.error(`\nFound ${errors} error(s). Compiled ${compiled} file(s).`);
+    logger.error(`Found ${errors} error(s). Compiled ${compiled} file(s).`);
     process.exit(1);
   } else {
-    console.log(`\nSuccessfully compiled ${compiled} file(s).`);
+    logger.success(`Compiled ${compiled} file(s).`);
   }
 }

package/commands/create.js

@@ -2,154 +2,101 @@ import { execSync } from "child_process";
 import fs from "fs/promises";
 import path from "path";
 import inquirer from "inquirer";
+import { handleSigint, isUserCancelled } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 export default async function create(projectNameArg) {
+  handleSigint();
+
   const cwd = process.cwd();
 
-  // 言語選択
-  const { lang } = await inquirer.prompt([
-    {
-      type: "list",
-      name: "lang",
-      message: "Select language / 言語を選んでください",
-      choices: [
-        { name: "English", value: "en" },
-        { name: "日本語", value: "ja" },
-      ],
-    },
-  ]);
-
-  const t = (key) =>
-    ({
-      projectName: { en: "Project name:", ja: "プロジェクト名:" },
-      creatingDir: {
-        en: "Creating project directory:",
-        ja: "プロジェクトディレクトリを作成:",
-      },
-      initializingNpm: { en: "Initializing npm...", ja: "npm を初期化中..." },
-      creatingConfig: {
-        en: "Created nsjsconfig.json",
-        ja: "nsjsconfig.json を作成しました",
-      },
-      usePrettier: {
-        en: "Format compiled output with Prettier?",
-        ja: "コンパイル後のコードを Prettier で整形しますか?",
-      },
-      installingPrettier: {
-        en: "Installing Prettier...",
-        ja: "Prettier をインストール中...",
-      },
-      installingNoshift: {
-        en: "Installing noshift.js...",
-        ja: "noshift.js をインストール中...",
-      },
-      success: {
-        en: "Project created successfully!",
-        ja: "プロジェクトの作成が完了しました!",
-      },
-      nextSteps: {
-        en: "Next: cd {name} && nsc compile",
-        ja: "次のステップ: cd {name} && nsc compile",
+  try {
+    // Project name
+    let projectName = projectNameArg;
+    if (!projectName) {
+      const answer = await inquirer.prompt([
+        {
+          type: "input",
+          name: "projectName",
+          message: "Project name:",
+          default: "my-noshift-app",
+        },
+      ]);
+      projectName = answer.projectName;
+    }
+
+    const projectPath = path.join(cwd, projectName);
+
+    // Create project directory
+    logger.step("Creating project directory...");
+    await fs.mkdir(projectPath, { recursive: true });
+    logger.dim(`  ${projectPath}`);
+
+    process.chdir(projectPath);
+
+    // npm init
+    logger.step("Initializing npm...");
+    execSync("npm init -y", { stdio: "ignore" });
+
+    // Add scripts to package.json
+    const pkgPath = path.join(projectPath, "package.json");
+    const pkg = JSON.parse(await fs.readFile(pkgPath, "utf-8"));
+    pkg.scripts = pkg.scripts ?? {};
+    pkg.scripts.compile = "nsc compile";
+    pkg.scripts.dev = "nsc dev";
+    await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
+
+    // Create nsjsconfig.json
+    const nsjsconfig = {
+      compilerOptions: {
+        rootDir: "src",
+        outDir: "dist",
       },
-    })[key][lang];
+    };
+    await fs.writeFile(
+      "nsjsconfig.json",
+      JSON.stringify(nsjsconfig, null, 2) + "\n",
+    );
+    logger.success("Created nsjsconfig.json");
 
-  // プロジェクト名
-  let projectName = projectNameArg;
-  if (!projectName) {
-    const answer = await inquirer.prompt([
+    // Prettier
+    const { usePrettier } = await inquirer.prompt([
       {
-        type: "input",
-        name: "projectName",
-        message: t("projectName"),
-        default: "my-noshift-app",
+        type: "confirm",
+        name: "usePrettier",
+        message: "Format compiled output with Prettier?",
+        default: true,
       },
     ]);
-    projectName = answer.projectName;
-  }
 
-  const projectPath = path.join(cwd, projectName);
-  await fs.mkdir(projectPath, { recursive: true });
-  console.log(`\n${t("creatingDir")} ${projectPath}`);
-
-  process.chdir(projectPath);
-
-  // npm init
-  console.log(t("initializingNpm"));
-  execSync("npm init -y", { stdio: "inherit" });
-
-  // package.json に scripts を追加
-  const pkgPath = path.join(projectPath, "package.json");
-  const pkg = JSON.parse(await fs.readFile(pkgPath, "utf-8"));
-  pkg.scripts = pkg.scripts ?? {};
-  pkg.scripts.compile = "nsc compile";
-  pkg.scripts.dev = "nsc dev";
-  await fs.writeFile(pkgPath, JSON.stringify(pkg, null, 2) + "\n");
-
-  // nsjsconfig.json を作成
-  const nsjsconfig = {
-    compilerOptions: {
-      rootDir: "src",
-      outDir: "build",
-    },
-  };
-  await fs.writeFile(
-    "nsjsconfig.json",
-    JSON.stringify(nsjsconfig, null, 2) + "\n",
-  );
-  console.log(t("creatingConfig"));
-
-  // Prettier
-  const { usePrettier } = await inquirer.prompt([
-    {
-      type: "confirm",
-      name: "usePrettier",
-      message: t("usePrettier"),
-      default: true,
-    },
-  ]);
-
-  if (usePrettier) {
-    console.log(t("installingPrettier"));
-    execSync("npm install --save-dev prettier", { stdio: "inherit" });
-    await fs.writeFile(".prettierignore", "build/\nnode_modules/\n");
+    if (usePrettier) {
+      logger.step("Installing Prettier...");
+      execSync("npm install --save-dev prettier", { stdio: "ignore" });
+      await fs.writeFile(".prettierignore", "dist/\nnode_modules/\n");
+      await fs.writeFile(
+        ".prettierrc",
+        JSON.stringify(
+          { semi: true, singleQuote: false, trailingComma: "es5" },
+          null,
+          2,
+        ) + "\n",
+      );
+    }
+
+    // Install noshift.js
+    logger.step("Installing noshift.js...");
+    execSync("npm install noshift.js", { stdio: "ignore" });
+
+    // Create project files
+    logger.step("Creating project files...");
+    await fs.mkdir("src", { recursive: true });
     await fs.writeFile(
-      ".prettierrc",
-      JSON.stringify(
-        { semi: true, singleQuote: false, trailingComma: "es5" },
-        null,
-        2,
-      ) + "\n",
+      "src/index.nsjs",
+      "console.log^8^2Hello, World!^2^9;\n",
     );
-  }
-
-  // noshift.js をインストール
-  console.log(t("installingNoshift"));
-  execSync("npm install noshift.js", { stdio: "inherit" });
-
-  // src/index.nsjs
-  await fs.mkdir("src", { recursive: true });
-  await fs.writeFile("src/index.nsjs", "console.log^8^2Hello, World!^2^9;\n");
 
-  // README.md
-  const readme =
-    lang === "ja"
-      ? `# ${projectName}
-
-[NoShift.js](https://github.com/otoneko1102/NoShift.js) プロジェクトです。
-
-## コンパイル
-
-\`\`\`bash
-npm run compile
-\`\`\`
-
-## 開発 (出力確認)
-
-\`\`\`bash
-npm run dev
-\`\`\`
-`
-      : `# ${projectName}
+    // README.md
+    const readme = `# ${projectName}
 
 A [NoShift.js](https://github.com/otoneko1102/NoShift.js) project.
 
@@ -159,15 +106,27 @@ A [NoShift.js](https://github.com/otoneko1102/NoShift.js) project.
 npm run compile
 \`\`\`
 
-## Dev (preview output)
+## Dev (watch mode)
 
 \`\`\`bash
 npm run dev
 \`\`\`
 `;
 
-  await fs.writeFile("README.md", readme);
-
-  console.log(`\n${t("success")}`);
-  console.log(t("nextSteps").replace("{name}", projectName));
+    await fs.writeFile("README.md", readme);
+
+    // Success message
+    console.log("");
+    logger.success("Project created successfully!");
+    console.log("");
+    logger.info("Next steps:");
+    console.log(`  ${logger.highlight(`cd ${projectName}`)}`);
+    console.log(`  ${logger.highlight("npm run compile")}`);
+    console.log("");
+  } catch (error) {
+    if (isUserCancelled(error)) {
+      process.exit(0);
+    }
+    throw error;
+  }
 }

package/commands/dev.js

@@ -2,6 +2,8 @@ import { promises as fs, watch } from "fs";
 import path from "path";
 import convert from "../src/convert.js";
 import { loadConfig } from "../src/config.js";
+import { handleSigint } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 function timestamp() {
   return new Date().toLocaleTimeString("en-GB"); // HH:MM:SS
@@ -36,7 +38,7 @@ async function compileFile(file, rootDir, outDir, cwd) {
   const js = convert(code);
   await fs.mkdir(path.dirname(destPath), { recursive: true });
   await fs.writeFile(destPath, js, "utf-8");
-  console.log(
+  logger.dim(
     `[${timestamp()}] ${relative} → ${path.relative(cwd, destPath).replace(/\\/g, "/")}`,
   );
 }
@@ -48,7 +50,7 @@ export default async function dev() {
   try {
     config = await loadConfig(cwd);
   } catch (e) {
-    console.error(`error NS0: ${e.message}`);
+    logger.errorCode("NS0", e.message);
     process.exit(1);
   }
 
@@ -58,13 +60,14 @@ export default async function dev() {
   // 初回フルコンパイル
   const files = await findNsjsFiles(rootDir);
   if (files === null) {
-    console.error(
-      `error NS0: rootDir '${config.compilerOptions.rootDir}' not found.`,
+    logger.errorCode(
+      "NS0",
+      `rootDir '${config.compilerOptions.rootDir}' not found.`,
     );
     process.exit(1);
   }
 
-  console.log(`[${timestamp()}] Starting compilation in watch mode...`);
+  logger.info(`Starting compilation in watch mode...`);
 
   await fs.mkdir(outDir, { recursive: true });
 
@@ -73,13 +76,19 @@ export default async function dev() {
       await compileFile(file, rootDir, outDir, cwd);
     } catch (e) {
       const rel = path.relative(rootDir, file).replace(/\\/g, "/");
-      console.error(`[${timestamp()}] error: ${rel}: ${e.message}`);
+      logger.errorCode("NS1", `${rel}: ${e.message}`);
     }
   }
 
-  console.log(
-    `[${timestamp()}] Watching for file changes in '${config.compilerOptions.rootDir}'...\n`,
+  logger.info(
+    `Watching for file changes in '${logger.highlight(config.compilerOptions.rootDir)}'... (Press Ctrl+C to stop)`,
   );
+  console.log("");
+
+  // Ctrl+C で終了
+  handleSigint(() => {
+    logger.info("Stopped watching.");
+  });
 
   // デバウンス用マップ (ファイルパス → タイマーID)
   const debounceMap = new Map();
@@ -105,8 +114,9 @@ export default async function dev() {
           if (e.code === "ENOENT") {
             // ファイルが削除された場合はスキップ
           } else {
-            console.error(
-              `[${timestamp()}] error: ${filename.replace(/\\/g, "/")}: ${e.message}`,
+            logger.errorCode(
+              "NS1",
+              `${filename.replace(/\\/g, "/")}: ${e.message}`,
             );
           }
         }

package/commands/init.js

@@ -1,20 +1,25 @@
 import { writeFile, access } from "fs/promises";
 import path from "path";
+import { handleSigint } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 const DEFAULT_CONFIG = {
   compilerOptions: {
     rootDir: "src",
-    outDir: "build",
+    outDir: "dist",
   },
 };
 
 export default async function init() {
+  handleSigint();
+
   const configPath = path.join(process.cwd(), "nsjsconfig.json");
 
   try {
     await access(configPath);
-    console.error(
-      "error NS4: nsjsconfig.json already exists in the current directory.",
+    logger.errorCode(
+      "NS4",
+      "nsjsconfig.json already exists in the current directory.",
     );
     process.exit(1);
   } catch {
@@ -22,7 +27,8 @@ export default async function init() {
   }
 
   await writeFile(configPath, JSON.stringify(DEFAULT_CONFIG, null, 2) + "\n");
-  console.log("Created nsjsconfig.json.");
-  console.log("\n  compilerOptions.rootDir : src");
-  console.log("  compilerOptions.outDir  : build\n");
+  logger.success("Created nsjsconfig.json");
+  logger.dim(`  compilerOptions.rootDir : ${DEFAULT_CONFIG.compilerOptions.rootDir}`);
+  logger.dim(`  compilerOptions.outDir  : ${DEFAULT_CONFIG.compilerOptions.outDir}`);
+  console.log("");
 }

package/commands/run.js

@@ -2,15 +2,19 @@ import { promises as fs } from "fs";
 import path from "path";
 import { spawn } from "child_process";
 import convert from "../src/convert.js";
+import { handleSigint } from "../src/signal-handler.js";
+import * as logger from "../src/logger.js";
 
 export default async function run(file) {
+  handleSigint();
+
   const filePath = path.resolve(process.cwd(), file);
 
   let code;
   try {
     code = await fs.readFile(filePath, "utf-8");
   } catch {
-    console.error(`error NS2: File not found: ${filePath}`);
+    logger.errorCode("NS2", `File not found: ${filePath}`);
     process.exit(1);
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "noshift.js",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Joke language.",
   "bin": {
     "nsc": "./bin/cli.js"

package/src/logger.js

@@ -0,0 +1,52 @@
+// シンプルなロガーユーティリティ（ANSI エスケープコードを使用）
+
+const colors = {
+  reset: "\x1b[0m",
+  bright: "\x1b[1m",
+  dim: "\x1b[2m",
+  red: "\x1b[31m",
+  green: "\x1b[32m",
+  yellow: "\x1b[33m",
+  blue: "\x1b[34m",
+  magenta: "\x1b[35m",
+  cyan: "\x1b[36m",
+  gray: "\x1b[90m",
+};
+
+export function success(message) {
+  console.log(`${colors.green}✓${colors.reset} ${message}`);
+}
+
+export function error(message) {
+  console.error(`${colors.red}✗${colors.reset} ${message}`);
+}
+
+export function info(message) {
+  console.log(`${colors.blue}ℹ${colors.reset} ${message}`);
+}
+
+export function warn(message) {
+  console.log(`${colors.yellow}⚠${colors.reset} ${message}`);
+}
+
+export function step(message) {
+  console.log(`${colors.cyan}→${colors.reset} ${message}`);
+}
+
+export function dim(message) {
+  console.log(`${colors.dim}${message}${colors.reset}`);
+}
+
+export function bold(text) {
+  return `${colors.bright}${text}${colors.reset}`;
+}
+
+export function highlight(text) {
+  return `${colors.cyan}${text}${colors.reset}`;
+}
+
+export function errorCode(code, message) {
+  console.error(
+    `${colors.red}error ${code}:${colors.reset} ${message}`,
+  );
+}

package/src/signal-handler.js

@@ -0,0 +1,46 @@
+// シグナルハンドリングユーティリティ
+
+let isHandlerRegistered = false;
+let cleanupCallbacks = [];
+
+/**
+ * Ctrl+C (SIGINT) を適切にハンドリングする
+ * @param {Function} cleanup - クリーンアップ時に実行する関数（オプション）
+ */
+export function handleSigint(cleanup) {
+  if (cleanup) {
+    cleanupCallbacks.push(cleanup);
+  }
+
+  if (!isHandlerRegistered) {
+    isHandlerRegistered = true;
+
+    process.on("SIGINT", async () => {
+      console.log("\n"); // 改行を追加してきれいに終了
+
+      // すべてのクリーンアップコールバックを実行
+      for (const cb of cleanupCallbacks) {
+        try {
+          await cb();
+        } catch (e) {
+          // エラーは無視
+        }
+      }
+
+      process.exit(0);
+    });
+  }
+}
+
+/**
+ * inquirer のキャンセルエラーをチェック
+ * @param {Error} error
+ * @returns {boolean}
+ */
+export function isUserCancelled(error) {
+  return (
+    error &&
+    (error.name === "ExitPromptError" ||
+      error.message === "User force closed the prompt")
+  );
+}