@rhseung/ps-cli 1.7.4 → 1.7.5

package/README.md

@@ -95,7 +95,7 @@ ps test [문제번호] [옵션]
 - `--language`, `-l`: 언어 선택 (지정 시 자동 감지 무시)
   - 지원 언어: python, javascript, typescript, cpp
 - `--watch`, `-w`: watch 모드 (파일 변경 시 자동 재테스트)
-  - solution._, input_.txt, output\*.txt 파일 변경 감지
+  - solution._, testcases/\*\*/_.txt 파일 변경 감지
 
 **예제:**
 
@@ -111,7 +111,7 @@ ps test --language python  # Python으로 테스트
 
 - 현재 디렉토리 또는 지정한 문제 번호의 테스트 실행
 - solution.\* 파일을 자동으로 찾아 언어 감지
-- input*.txt와 output*.txt 파일을 기반으로 테스트
+- testcases/{번호}/input.txt와 testcases/{번호}/output.txt 파일을 기반으로 테스트
 - 문제의 시간 제한을 자동으로 적용
 
 ---
@@ -131,22 +131,25 @@ ps run [문제번호] [옵션]
 - `--language`, `-l`: 언어 선택 (지정 시 자동 감지 무시)
   - 지원 언어: python, javascript, typescript, cpp
 - `--input`, `-i`: 입력 파일 지정
-  - 기본값: input.txt 또는 input1.txt
+  - 숫자만 입력 시 testcases/{숫자}/input.txt로 자동 변환 (예: `--input 1`)
+  - 전체 경로도 지원 (예: testcases/1/input.txt)
 
 **예제:**
 
 ```bash
-ps run                    # 현재 디렉토리에서 실행
-ps run 1000               # 1000번 문제 실행
-ps run --language python  # Python으로 실행
-ps run --input input2.txt # 특정 입력 파일 사용
+ps run                  # 현재 디렉토리에서 표준 입력으로 실행
+ps run 1000             # 1000번 문제 표준 입력으로 실행
+ps run --language python # Python으로 표준 입력으로 실행
+ps run --input 1         # 테스트 케이스 1번 사용
+ps run --input testcases/1/input.txt # 전체 경로로 입력 파일 지정
 ```
 
 **설명:**
 
 - 현재 디렉토리 또는 지정한 문제 번호의 코드 실행
 - solution.\* 파일을 자동으로 찾아 언어 감지
-- input.txt 또는 input1.txt를 표준 입력으로 사용
+- --input 옵션으로 입력 파일 지정 가능 (예: `--input 1` 또는 `--input testcases/1/input.txt`)
+- 옵션 없이 실행 시 표준 입력으로 입력 받기
 - 테스트 케이스 검증 없이 단순 실행
 
 ---
@@ -425,17 +428,6 @@ npm unlink -g @rhseung/ps-cli
 
 **주의:** `npm link`를 사용하면 글로벌 설치된 버전이 링크된 버전으로 대체됩니다.
 
-### 방법 3: 프로젝트 내에서만 테스트
-
-```bash
-# 빌드
-bun run build
-
-# 프로젝트 디렉토리 내에서만
-bun run ps init
-bun run ps fetch 1000
-```
-
 ## 라이선스
 
 MIT

package/dist/{chunk-OJZLQ6FK.js → chunk-VIHXBCOZ.js}

@@ -6,7 +6,23 @@ import {
 // src/services/runner.ts
 import { readFile } from "fs/promises";
 import { join } from "path";
+import { createInterface } from "readline";
 import { execa, execaCommand } from "execa";
+async function readStdin() {
+  return new Promise((resolve) => {
+    const lines = [];
+    const rl = createInterface({
+      input: process.stdin,
+      output: process.stdout
+    });
+    rl.on("line", (line) => {
+      lines.push(line);
+    });
+    rl.on("close", () => {
+      resolve(lines.join("\n"));
+    });
+  });
+}
 async function runSolution({
   problemDir,
   language,
@@ -16,7 +32,15 @@ async function runSolution({
   const langConfig = getLanguageConfig(language);
   const solutionFile = `solution.${langConfig.extension}`;
   const solutionPath = join(problemDir, solutionFile);
-  const input = await readFile(inputPath, "utf-8");
+  let input;
+  let capturedInput;
+  if (inputPath) {
+    input = await readFile(inputPath, "utf-8");
+    capturedInput = input;
+  } else {
+    capturedInput = await readStdin();
+    input = capturedInput;
+  }
   const start = Date.now();
   try {
     if (langConfig.compileCommand) {
@@ -27,7 +51,7 @@ async function runSolution({
     }
     const child = execa(langConfig.runCommand, [solutionPath], {
       cwd: problemDir,
-      input,
+      ...input !== void 0 ? { input } : { stdin: "inherit" },
       timeout: timeoutMs
     });
     const result = await child;
@@ -39,7 +63,8 @@ async function runSolution({
       stderr,
       exitCode,
       timedOut: false,
-      durationMs
+      durationMs,
+      ...capturedInput !== void 0 && { input: capturedInput }
     };
   } catch (error) {
     const durationMs = Date.now() - start;
@@ -50,7 +75,8 @@ async function runSolution({
         stderr: err.stderr ?? err.shortMessage ?? err.message,
         exitCode: err.exitCode ?? null,
         timedOut: Boolean(err.timedOut),
-        durationMs
+        durationMs,
+        ...capturedInput !== void 0 && { input: capturedInput }
       };
     }
     return {

package/dist/commands/fetch.js

@@ -122,10 +122,13 @@ async function generateProblemFiles(problem, language = "python") {
       "utf-8"
     );
   }
+  const testcasesDir = join(problemDir, "testcases");
   for (let i = 0; i < problem.testCases.length; i++) {
     const testCase = problem.testCases[i];
-    const inputPath = join(problemDir, `input${i + 1}.txt`);
-    const outputPath = join(problemDir, `output${i + 1}.txt`);
+    const caseDir = join(testcasesDir, String(i + 1));
+    await mkdir(caseDir, { recursive: true });
+    const inputPath = join(caseDir, "input.txt");
+    const outputPath = join(caseDir, "output.txt");
     await writeFile(inputPath, testCase.input, "utf-8");
     await writeFile(outputPath, testCase.output, "utf-8");
   }

package/dist/commands/run.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runSolution
-} from "../chunk-OJZLQ6FK.js";
+} from "../chunk-VIHXBCOZ.js";
 import {
   Command,
   CommandBuilder,
@@ -15,7 +15,6 @@ import {
 } from "../chunk-7MQMPJ3X.js";
 
 // src/commands/run.tsx
-import { readdir } from "fs/promises";
 import { join } from "path";
 import { StatusMessage, Alert } from "@inkjs/ui";
 import { Spinner } from "@inkjs/ui";
@@ -77,6 +76,17 @@ function RunView({
     onComplete
   });
   if (status === "loading") {
+    if (!inputFile) {
+      return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsx(Box, { marginBottom: 1, children: /* @__PURE__ */ jsx(Text, { color: "cyan", bold: true, children: "\uD45C\uC900 \uC785\uB825 \uB300\uAE30 \uC911" }) }),
+        /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+          /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "\uC785\uB825\uC744 \uC785\uB825\uD55C \uD6C4, \uB9C8\uC9C0\uB9C9 \uC904\uC5D0\uC11C Enter\uB97C \uB204\uB974\uACE0:" }),
+          /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "\u2022 macOS/Linux: Ctrl+D" }),
+          /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "\u2022 Windows: Ctrl+Z (\uADF8\uB9AC\uACE0 Enter)" }),
+          /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: '\uC608: "3 4" \uC785\uB825 \u2192 Enter \u2192 Ctrl+D' })
+        ] })
+      ] });
+    }
     return /* @__PURE__ */ jsx(Box, { flexDirection: "column", children: /* @__PURE__ */ jsx(Spinner, { label: "\uCF54\uB4DC \uC2E4\uD589 \uC911..." }) });
   }
   if (status === "error") {
@@ -87,7 +97,7 @@ function RunView({
   }
   if (result) {
     return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs(Box, { marginBottom: 1, children: [
+      /* @__PURE__ */ jsxs(Box, { children: [
         /* @__PURE__ */ jsx(Text, { color: "cyan", bold: true, children: "\uC2E4\uD589 \uACB0\uACFC" }),
         /* @__PURE__ */ jsxs(Text, { color: "gray", children: [
           problemDir,
@@ -102,9 +112,13 @@ function RunView({
           result.exitCode,
           ")"
         ] }) : /* @__PURE__ */ jsx(StatusMessage, { variant: "success", children: "\uC2E4\uD589 \uC644\uB8CC" }),
+        result.input && /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "\uC785\uB825:" }),
+          /* @__PURE__ */ jsx(Text, { children: result.input.trim() })
+        ] }),
         result.stdout && /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
           /* @__PURE__ */ jsx(Text, { color: "gray", dimColor: true, children: "\uCD9C\uB825:" }),
-          /* @__PURE__ */ jsx(Text, { children: result.stdout })
+          /* @__PURE__ */ jsx(Text, { children: result.stdout.trim() })
         ] }),
         result.stderr && /* @__PURE__ */ jsxs(Box, { marginTop: 1, flexDirection: "column", children: [
           /* @__PURE__ */ jsx(Text, { color: "yellow", dimColor: true, children: "\uC5D0\uB7EC \uCD9C\uB825:" }),
@@ -123,7 +137,20 @@ function RunView({
 var RunCommand = class extends Command {
   async execute(args, flags) {
     const context = await resolveProblemContext(args);
-    const inputPath = flags.input ? join(context.archiveDir, flags.input) : await this.findInputFile(context.archiveDir);
+    let inputPath;
+    if (flags.input) {
+      const inputValue = flags.input;
+      if (/^\d+$/.test(inputValue)) {
+        inputPath = join(
+          context.archiveDir,
+          "testcases",
+          inputValue,
+          "input.txt"
+        );
+      } else {
+        inputPath = join(context.archiveDir, inputValue);
+      }
+    }
     const detectedLanguage = await resolveLanguage(
       context.archiveDir,
       flags.language
@@ -134,15 +161,6 @@ var RunCommand = class extends Command {
       inputFile: inputPath
     });
   }
-  // 입력 파일 찾기: private 메서드
-  async findInputFile(problemDir) {
-    const files = await readdir(problemDir);
-    const inputFile = files.find((f) => f === "input1.txt") || files.find((f) => f === "input.txt");
-    if (!inputFile) {
-      throw new Error("input.txt \uB610\uB294 input1.txt \uD30C\uC77C\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4.");
-    }
-    return join(problemDir, inputFile);
-  }
 };
 RunCommand = __decorateClass([
   CommandDef({
@@ -150,7 +168,8 @@ RunCommand = __decorateClass([
     description: `\uCF54\uB4DC\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4 (\uD14C\uC2A4\uD2B8 \uC5C6\uC774).
 - \uD604\uC7AC \uB514\uB809\uD1A0\uB9AC \uB610\uB294 \uC9C0\uC815\uD55C \uBB38\uC81C \uBC88\uD638\uC758 \uCF54\uB4DC \uC2E4\uD589
 - solution.* \uD30C\uC77C\uC744 \uC790\uB3D9\uC73C\uB85C \uCC3E\uC544 \uC5B8\uC5B4 \uAC10\uC9C0
-- input.txt \uB610\uB294 input1.txt\uB97C \uD45C\uC900 \uC785\uB825\uC73C\uB85C \uC0AC\uC6A9
+- --input \uC635\uC158\uC73C\uB85C \uC785\uB825 \uD30C\uC77C \uC9C0\uC815 \uAC00\uB2A5 (\uC608: testcases/1/input.txt)
+- \uC635\uC158 \uC5C6\uC774 \uC2E4\uD589 \uC2DC \uD45C\uC900 \uC785\uB825\uC73C\uB85C \uC785\uB825 \uBC1B\uAE30
 - \uD14C\uC2A4\uD2B8 \uCF00\uC774\uC2A4 \uAC80\uC99D \uC5C6\uC774 \uB2E8\uC21C \uC2E4\uD589`,
     flags: [
       {
@@ -165,17 +184,18 @@ RunCommand = __decorateClass([
         name: "input",
         options: {
           shortFlag: "i",
-          description: "\uC785\uB825 \uD30C\uC77C \uC9C0\uC815 (\uAE30\uBCF8\uAC12: input.txt \uB610\uB294 input1.txt)"
+          description: "\uC785\uB825 \uD30C\uC77C \uC9C0\uC815 (\uC608: 1 \uB610\uB294 testcases/1/input.txt)"
         }
       }
     ],
     autoDetectProblemId: true,
     autoDetectLanguage: true,
     examples: [
-      "run                    # \uD604\uC7AC \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C \uC2E4\uD589",
-      "run 1000               # 1000\uBC88 \uBB38\uC81C \uC2E4\uD589",
-      "run --language python  # Python\uC73C\uB85C \uC2E4\uD589",
-      "run --input input2.txt # \uD2B9\uC815 \uC785\uB825 \uD30C\uC77C \uC0AC\uC6A9"
+      "run                              # \uD604\uC7AC \uB514\uB809\uD1A0\uB9AC\uC5D0\uC11C \uD45C\uC900 \uC785\uB825\uC73C\uB85C \uC2E4\uD589",
+      "run 1000                          # 1000\uBC88 \uBB38\uC81C \uD45C\uC900 \uC785\uB825\uC73C\uB85C \uC2E4\uD589",
+      "run --language python             # Python\uC73C\uB85C \uD45C\uC900 \uC785\uB825\uC73C\uB85C \uC2E4\uD589",
+      "run --input 1                     # \uD14C\uC2A4\uD2B8 \uCF00\uC774\uC2A4 1\uBC88 \uC0AC\uC6A9",
+      "run --input testcases/1/input.txt # \uC804\uCCB4 \uACBD\uB85C\uB85C \uC785\uB825 \uD30C\uC77C \uC9C0\uC815"
     ]
   })
 ], RunCommand);

package/dist/commands/test.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   runSolution
-} from "../chunk-OJZLQ6FK.js";
+} from "../chunk-VIHXBCOZ.js";
 import {
   Command,
   CommandBuilder,
@@ -122,8 +122,14 @@ async function runAllTests({
   language,
   timeoutMs
 }) {
-  const entries = await readdir(problemDir);
-  const inputFiles = entries.filter((f) => /^input\d+\.txt$/.test(f));
+  const testcasesDir = join(problemDir, "testcases");
+  let caseDirs = [];
+  try {
+    const entries = await readdir(testcasesDir);
+    caseDirs = entries.filter((entry) => /^\d+$/.test(entry)).sort((a, b) => Number(a) - Number(b)).map((entry) => join(testcasesDir, entry));
+  } catch {
+    return { results: [], summary: buildSummary([]) };
+  }
   const results = [];
   let effectiveTimeout = timeoutMs;
   if (effectiveTimeout == null) {
@@ -147,11 +153,10 @@ async function runAllTests({
   if (effectiveTimeout == null) {
     effectiveTimeout = 5e3;
   }
-  for (const inputFile of inputFiles) {
-    const match = inputFile.match(/input(\d+)\.txt$/);
-    const caseId = match ? Number(match[1]) : results.length + 1;
-    const inputPath = join(problemDir, inputFile);
-    const outputPath = join(problemDir, `output${caseId}.txt`);
+  for (const caseDir of caseDirs) {
+    const caseId = Number(join(caseDir).split("/").pop() || "0");
+    const inputPath = join(caseDir, "input.txt");
+    const outputPath = join(caseDir, "output.txt");
     let expected;
     try {
       expected = await readFile(outputPath, "utf-8");
@@ -160,7 +165,7 @@ async function runAllTests({
         caseId,
         inputPath,
         status: "error",
-        error: "\uAE30\uB300 \uCD9C\uB825(output*.txt)\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."
+        error: "\uAE30\uB300 \uCD9C\uB825(output.txt)\uC744 \uCC3E\uC744 \uC218 \uC5C6\uC2B5\uB2C8\uB2E4."
       });
       continue;
     }
@@ -246,8 +251,7 @@ function useTestRunner({
     const watcher = chokidar.watch(
       [
         join2(problemDir, "solution.*"),
-        join2(problemDir, "input*.txt"),
-        join2(problemDir, "output*.txt")
+        join2(problemDir, "testcases", "**", "*.txt")
       ],
       {
         ignoreInitial: true
@@ -335,7 +339,7 @@ TestCommand = __decorateClass([
     description: `\uC608\uC81C \uC785\uCD9C\uB825 \uAE30\uBC18\uC73C\uB85C \uB85C\uCEEC \uD14C\uC2A4\uD2B8\uB97C \uC2E4\uD589\uD569\uB2C8\uB2E4.
 - \uD604\uC7AC \uB514\uB809\uD1A0\uB9AC \uB610\uB294 \uC9C0\uC815\uD55C \uBB38\uC81C \uBC88\uD638\uC758 \uD14C\uC2A4\uD2B8 \uC2E4\uD589
 - solution.* \uD30C\uC77C\uC744 \uC790\uB3D9\uC73C\uB85C \uCC3E\uC544 \uC5B8\uC5B4 \uAC10\uC9C0
-- input*.txt\uC640 output*.txt \uD30C\uC77C\uC744 \uAE30\uBC18\uC73C\uB85C \uD14C\uC2A4\uD2B8
+- testcases/{\uBC88\uD638}/input.txt\uC640 testcases/{\uBC88\uD638}/output.txt \uD30C\uC77C\uC744 \uAE30\uBC18\uC73C\uB85C \uD14C\uC2A4\uD2B8
 - \uBB38\uC81C\uC758 \uC2DC\uAC04 \uC81C\uD55C\uC744 \uC790\uB3D9\uC73C\uB85C \uC801\uC6A9
 - --watch \uC635\uC158\uC73C\uB85C \uD30C\uC77C \uBCC0\uACBD \uC2DC \uC790\uB3D9 \uC7AC\uD14C\uC2A4\uD2B8`,
     flags: [
@@ -352,7 +356,7 @@ TestCommand = __decorateClass([
         options: {
           shortFlag: "w",
           description: `watch \uBAA8\uB4DC (\uD30C\uC77C \uBCC0\uACBD \uC2DC \uC790\uB3D9 \uC7AC\uD14C\uC2A4\uD2B8)
-                        solution.*, input*.txt, output*.txt \uD30C\uC77C \uBCC0\uACBD \uAC10\uC9C0`
+                        solution.*, testcases/**/*.txt \uD30C\uC77C \uBCC0\uACBD \uAC10\uC9C0`
         }
       }
     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rhseung/ps-cli",
-  "version": "1.7.4",
+  "version": "1.7.5",
   "description": "백준(BOJ) 문제 해결을 위한 통합 CLI 도구",
   "type": "module",
   "bin": {