@rhseung/ps-cli 1.5.0 → 1.6.0

package/dist/commands/init.js

@@ -7,8 +7,9 @@ import {
   getDefaultLanguage,
   getEditor,
   getProblemDir,
-  getSolvedAcHandle
-} from "../chunk-7SVCS23X.js";
+  getSolvedAcHandle,
+  getSolvingDir
+} from "../chunk-RVD22OUQ.js";
 import {
   __decorateClass,
   getSupportedLanguages
@@ -35,6 +36,7 @@ function useInit({ onComplete }) {
   const [confirmExit, setConfirmExit] = useState(false);
   const [initialized, setInitialized] = useState(false);
   const [problemDir, setProblemDirValue] = useState(getProblemDir());
+  const [solvingDir, setSolvingDirValue] = useState(getSolvingDir());
   const [language, setLanguage] = useState(getDefaultLanguage());
   const [editor, setEditorValue] = useState(getEditor());
   const [autoOpen, setAutoOpen] = useState(getAutoOpenEditor());
@@ -69,6 +71,8 @@ function useInit({ onComplete }) {
         const projectConfig = JSON.parse(configContent);
         if (projectConfig.problemDir)
           setProblemDirValue(projectConfig.problemDir);
+        if (projectConfig.solvingDir)
+          setSolvingDirValue(projectConfig.solvingDir);
         if (projectConfig.defaultLanguage)
           setLanguage(projectConfig.defaultLanguage);
         if (projectConfig.editor) setEditorValue(projectConfig.editor);
@@ -86,7 +90,9 @@ function useInit({ onComplete }) {
   const getStepLabel = useCallback((step) => {
     switch (step) {
       case "problem-dir":
-        return "\uBB38\uC81C \uB514\uB809\uD1A0\uB9AC \uC124\uC815";
+        return "\uBB38\uC81C \uB514\uB809\uD1A0\uB9AC \uC124\uC815 (\uC544\uCE74\uC774\uBE0C\uB41C \uBB38\uC81C)";
+      case "solving-dir":
+        return "Solving \uB514\uB809\uD1A0\uB9AC \uC124\uC815 (\uD478\uB294 \uC911\uC778 \uBB38\uC81C)";
       case "language":
         return "\uAE30\uBCF8 \uC5B8\uC5B4 \uC124\uC815";
       case "editor":
@@ -104,6 +110,8 @@ function useInit({ onComplete }) {
       switch (step) {
         case "problem-dir":
           return problemDir === "." ? "\uD504\uB85C\uC81D\uD2B8 \uB8E8\uD2B8" : problemDir;
+        case "solving-dir":
+          return solvingDir === "." ? "\uD504\uB85C\uC81D\uD2B8 \uB8E8\uD2B8" : solvingDir;
         case "language":
           return language;
         case "editor":
@@ -116,7 +124,7 @@ function useInit({ onComplete }) {
           return "";
       }
     },
-    [problemDir, language, editor, autoOpen, handle]
+    [problemDir, solvingDir, language, editor, autoOpen, handle]
   );
   const executeInit = useCallback(async () => {
     try {
@@ -124,6 +132,7 @@ function useInit({ onComplete }) {
       const projectConfigPath = join(cwd, ".ps-cli.json");
       const projectConfig = {
         problemDir,
+        solvingDir,
         defaultLanguage: language,
         editor,
         autoOpenEditor: autoOpen,
@@ -146,28 +155,50 @@ function useInit({ onComplete }) {
             throw err;
           }
         }
-        const gitignorePath = join(cwd, ".gitignore");
-        const gitignorePattern = `${problemDir}/`;
+      }
+      if (solvingDir !== "." && solvingDir !== "") {
+        const solvingDirPath = join(cwd, solvingDir);
+        try {
+          await mkdir(solvingDirPath, { recursive: true });
+          setCreated((prev) => [...prev, `${solvingDir}/`]);
+        } catch (err) {
+          const error = err;
+          if (error.code !== "EEXIST") {
+            throw err;
+          }
+        }
+      }
+      const gitignorePath = join(cwd, ".gitignore");
+      const gitignorePatterns = [];
+      if (problemDir !== "." && problemDir !== "") {
+        gitignorePatterns.push(`${problemDir}/`);
+      }
+      if (solvingDir !== "." && solvingDir !== "") {
+        gitignorePatterns.push(`${solvingDir}/`);
+      }
+      if (gitignorePatterns.length > 0) {
         try {
           const gitignoreContent = await readFile(gitignorePath, "utf-8");
-          if (!gitignoreContent.includes(gitignorePattern)) {
-            const updatedContent = gitignoreContent.trim() + (gitignoreContent.trim() ? "\n" : "") + `
-# ps-cli \uBB38\uC81C \uB514\uB809\uD1A0\uB9AC
-${gitignorePattern}
-`;
-            await writeFile(gitignorePath, updatedContent, "utf-8");
+          let updatedContent = gitignoreContent.trim();
+          let hasChanges = false;
+          for (const pattern of gitignorePatterns) {
+            if (!gitignoreContent.includes(pattern)) {
+              updatedContent += (updatedContent ? "\n" : "") + `# ps-cli \uBB38\uC81C \uB514\uB809\uD1A0\uB9AC
+${pattern}`;
+              hasChanges = true;
+            }
+          }
+          if (hasChanges) {
+            await writeFile(gitignorePath, updatedContent + "\n", "utf-8");
             setCreated((prev) => [...prev, ".gitignore \uC5C5\uB370\uC774\uD2B8"]);
           }
         } catch (err) {
           const error = err;
           if (error.code === "ENOENT") {
-            await writeFile(
-              gitignorePath,
-              `# ps-cli \uBB38\uC81C \uB514\uB809\uD1A0\uB9AC
-${gitignorePattern}
-`,
-              "utf-8"
-            );
+            const content = `# ps-cli \uBB38\uC81C \uB514\uB809\uD1A0\uB9AC
+${gitignorePatterns.join("\n")}
+`;
+            await writeFile(gitignorePath, content, "utf-8");
             setCreated((prev) => [...prev, ".gitignore \uC0DD\uC131"]);
           } else {
             console.warn(".gitignore \uC5C5\uB370\uC774\uD2B8 \uC2E4\uD328:", error.message);
@@ -187,9 +218,9 @@ ${gitignorePattern}
           setCreated((prev) => [...prev, "Git \uC800\uC7A5\uC18C \uCD08\uAE30\uD654"]);
         }
         const filesToAdd = [".ps-cli.json"];
-        const gitignorePath = join(cwd, ".gitignore");
+        const gitignorePath2 = join(cwd, ".gitignore");
         try {
-          await access(gitignorePath);
+          await access(gitignorePath2);
           filesToAdd.push(".gitignore");
         } catch {
         }
@@ -222,7 +253,7 @@ ${gitignorePattern}
         onComplete();
       }, 2e3);
     }
-  }, [problemDir, language, editor, autoOpen, handle, onComplete]);
+  }, [problemDir, solvingDir, language, editor, autoOpen, handle, onComplete]);
   const moveToNextStep = useCallback(
     (selectedValue, stepLabel) => {
       setCompletedSteps((prev) => [
@@ -231,6 +262,7 @@ ${gitignorePattern}
       ]);
       const stepOrder = [
         "problem-dir",
+        "solving-dir",
         "language",
         "editor",
         "auto-open",
@@ -254,6 +286,7 @@ ${gitignorePattern}
     confirmExit,
     initialized,
     problemDir,
+    solvingDir,
     language,
     editor,
     autoOpen,
@@ -262,6 +295,7 @@ ${gitignorePattern}
     created,
     cancelled,
     setProblemDirValue,
+    setSolvingDirValue,
     setLanguage,
     setEditorValue,
     setAutoOpen,
@@ -288,6 +322,7 @@ function InitView({ onComplete }) {
     created,
     cancelled,
     setProblemDirValue,
+    setSolvingDirValue,
     setLanguage,
     setEditorValue,
     setAutoOpen,
@@ -352,6 +387,26 @@ function InitView({ onComplete }) {
           )
         );
       }
+      case "solving-dir": {
+        const options = [
+          { label: "solving", value: "solving" },
+          { label: ". (\uD504\uB85C\uC81D\uD2B8 \uB8E8\uD2B8)", value: "." }
+        ];
+        return renderQuestionCard(
+          getStepLabel(currentStep),
+          /* @__PURE__ */ jsx(
+            Select,
+            {
+              options,
+              onChange: (value) => {
+                setSolvingDirValue(value);
+                const displayValue = value === "." ? "\uD504\uB85C\uC81D\uD2B8 \uB8E8\uD2B8" : value;
+                moveToNextStep(displayValue, getStepLabel(currentStep));
+              }
+            }
+          )
+        );
+      }
       case "language": {
         const supportedLanguages = getSupportedLanguages();
         const options = supportedLanguages.map((lang) => ({

package/dist/commands/open.js

@@ -9,7 +9,7 @@ import {
   CommandDef,
   getProblemId,
   resolveProblemContext
-} from "../chunk-7SVCS23X.js";
+} from "../chunk-RVD22OUQ.js";
 import {
   __decorateClass
 } from "../chunk-7MQMPJ3X.js";

package/dist/commands/run.js

@@ -9,7 +9,7 @@ import {
   getProblemId,
   resolveLanguage,
   resolveProblemContext
-} from "../chunk-7SVCS23X.js";
+} from "../chunk-RVD22OUQ.js";
 import {
   __decorateClass,
   getSupportedLanguagesString