@rhseung/ps-cli 1.7.3 → 1.7.5

package/dist/commands/run.js

@@ -1,22 +1,20 @@
 #!/usr/bin/env node
 import {
   runSolution
-} from "../chunk-OJZLQ6FK.js";
+} from "../chunk-VIHXBCOZ.js";
 import {
   Command,
   CommandBuilder,
   CommandDef,
-  getProblemId,
   resolveLanguage,
   resolveProblemContext
-} from "../chunk-TNGUME4H.js";
+} from "../chunk-F4LZ6ENP.js";
 import {
   __decorateClass,
   getSupportedLanguagesString
 } 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";
@@ -78,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") {
@@ -88,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,
@@ -103,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,30 +136,31 @@ function RunView({
 }
 var RunCommand = class extends Command {
   async execute(args, flags) {
-    const problemId = getProblemId(args);
-    const context = await resolveProblemContext(
-      problemId !== null ? [problemId.toString()] : []
-    );
-    const inputPath = flags.input ? join(context.problemDir, flags.input) : await this.findInputFile(context.problemDir);
+    const context = await resolveProblemContext(args);
+    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.problemDir,
+      context.archiveDir,
       flags.language
     );
     await this.renderView(RunView, {
-      problemDir: context.problemDir,
+      problemDir: context.archiveDir,
       language: detectedLanguage,
       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({
@@ -154,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: [
       {
@@ -169,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/search.js

@@ -16,10 +16,10 @@ import {
   Command,
   CommandBuilder,
   CommandDef,
-  getProblemDirPath,
+  getArchiveDirPath,
   getTierColor,
   getTierName
-} from "../chunk-TNGUME4H.js";
+} from "../chunk-F4LZ6ENP.js";
 import {
   __decorateClass
 } from "../chunk-7MQMPJ3X.js";
@@ -270,7 +270,7 @@ function WorkbookSearchView({
     ] });
   }
   const problemsWithSolvedStatus = problems.map((problem) => {
-    const problemDirPath = getProblemDirPath(problem.problemId);
+    const problemDirPath = getArchiveDirPath(problem.problemId);
     const isSolved = existsSync(problemDirPath);
     return {
       problemId: problem.problemId,
@@ -362,7 +362,7 @@ function SearchView({ query, onComplete }) {
         const searchResults = await searchProblems(query, currentPage);
         const resultsWithSolvedStatus = searchResults.problems.map(
           (problem) => {
-            const problemDirPath = getProblemDirPath(problem.problemId);
+            const problemDirPath = getArchiveDirPath(problem.problemId);
             const isSolved = existsSync(problemDirPath);
             return {
               ...problem,

package/dist/commands/stats.js

@@ -14,7 +14,7 @@ import {
   getSolvedAcHandle,
   getTierColor,
   getTierName
-} from "../chunk-TNGUME4H.js";
+} from "../chunk-F4LZ6ENP.js";
 import {
   __decorateClass
 } from "../chunk-7MQMPJ3X.js";

package/dist/commands/submit.js

@@ -8,10 +8,9 @@ import {
   CommandDef,
   detectProblemIdFromPath,
   findSolutionFile,
-  getProblemId,
   resolveLanguage,
   resolveProblemContext
-} from "../chunk-TNGUME4H.js";
+} from "../chunk-F4LZ6ENP.js";
 import {
   __decorateClass,
   getSupportedLanguagesString
@@ -195,19 +194,15 @@ function SubmitView({
 }
 var SubmitCommand = class extends Command {
   async execute(args, flags) {
-    const problemId = getProblemId(args);
-    const context = await resolveProblemContext(
-      problemId !== null ? [problemId.toString()] : [],
-      { requireId: true }
-    );
-    const sourcePath = await findSolutionFile(context.problemDir);
+    const context = await resolveProblemContext(args, { requireId: true });
+    const sourcePath = await findSolutionFile(context.archiveDir);
     const detectedLanguage = await resolveLanguage(
-      context.problemDir,
+      context.archiveDir,
       flags.language
     );
     let finalProblemId = context.problemId;
     if (finalProblemId === null) {
-      finalProblemId = detectProblemIdFromPath(context.problemDir);
+      finalProblemId = detectProblemIdFromPath(context.archiveDir);
     }
     if (finalProblemId === null) {
       throw new Error(

package/dist/commands/test.js

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
 import {
   runSolution
-} from "../chunk-OJZLQ6FK.js";
+} from "../chunk-VIHXBCOZ.js";
 import {
   Command,
   CommandBuilder,
   CommandDef,
-  getProblemId,
   resolveLanguage,
   resolveProblemContext
-} from "../chunk-TNGUME4H.js";
+} from "../chunk-F4LZ6ENP.js";
 import {
   __decorateClass,
   getSupportedLanguagesString
@@ -123,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) {
@@ -148,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");
@@ -161,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;
     }
@@ -247,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
@@ -317,16 +320,13 @@ function TestView({
 }
 var TestCommand = class extends Command {
   async execute(args, flags) {
-    const problemId = getProblemId(args);
-    const context = await resolveProblemContext(
-      problemId !== null && problemId !== void 0 ? [problemId.toString()] : []
-    );
+    const context = await resolveProblemContext(args);
     const language = await resolveLanguage(
-      context.problemDir,
+      context.archiveDir,
       flags.language
     );
     await this.renderView(TestView, {
-      problemDir: context.problemDir,
+      problemDir: context.archiveDir,
       language,
       watch: Boolean(flags.watch),
       timeoutMs: flags.timeoutMs
@@ -339,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: [
@@ -356,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.3",
+  "version": "1.7.5",
   "description": "백준(BOJ) 문제 해결을 위한 통합 CLI 도구",
   "type": "module",
   "bin": {
@@ -15,6 +15,7 @@
     "build": "tsup && node scripts/add-shebang.js",
     "prepublishOnly": "npm run build",
     "dev": "tsup --watch",
+    "ps": "node dist/index.js",
     "typecheck": "tsc --noEmit",
     "lint": "eslint",
     "format": "prettier --check .",