fix windows (p)npm cmd

Author: daveberrys

AGENTS.md

@@ -15,20 +15,19 @@ This project is a cross-desktop platform to making webapps with python as the ba
     - Selecting between GTK or Qt.
       - This app is built with the intention to make it cross-desktop platform. For Windows, Linux and macOS. GTK and Qt is a option for Linux, as this is required for picking the correct renderer. And this options is only meant for Linux and will be asked in all platform.
     - Selecting frameworks.
-      - The user currently has 4 different options to pick for their project: That being:
+      - The user currently has 4 different options to pick for their project:
         - Vanilla
         - Svelte
         - React
         - Vue
     - Selecting variant.
       - This being able to use JavaScript or TypeScript.
     - Selecting their NodeJS Package Manager
-      - The user has 2 different options to pick for their project: That being:
+      - The user has 2 different options to pick for their project:
         - npm : NodeJS's default package manager.
         - pnpm : A faster alternative to npm.
-        - 
 - [@src/initialize.py](src/initialize.py)
-  - This is where when the user confirms that it's ready to be initialized, it starts here. This includes:
+  - When the user confirms that it's ready to be initialized, it starts here. This includes:
     - Copying icons.
       - From `{pyderProjectRoot}/icon/*` to `{userProject}/icon/`
     - Creating file structure.
@@ -42,7 +41,7 @@ This project is a cross-desktop platform to making webapps with python as the ba
           - Dev mode being, running the page at `http://localhost:5173`.
           - Compiled mode being, running the page at `src/frontend/dist/index.html`.
       - `run.py`
-        - This is where the user can run the flags like `dev`, `compile`, `test`.
+        - The user can run the flags like `dev`, `compile`, `test`.
           - `dev` flag:
             - This will run the development server in `src/frontend/` from `subprocess.Popen`, which will open the server in a thread.
             - And after a second, it will run pywebview and opening a page at `http://localhost:5173`.
@@ -54,7 +53,7 @@ This project is a cross-desktop platform to making webapps with python as the ba
           - It first builds the app in `src/frontend/` with nothing special. Just doing `npm/pnpm run build`.
           - Then, instead of building for python, it will open the window. That's it.
       - `src/backend/api.py`
-        - This is where the user can do all their Python contacting things. There's only one function and that's getting the user's operating system, and then returning their config path.
+        - The user can do all their Python contacting things. There's only one function and that's getting the user's operating system, and then returning their config path.
       - `.gitignore`
         - This just has the ignores for pnpm, python and other things. Mainly used when the user wants to put their project to GitHub, GitLab, GitBucket, etc...
       - `pyder.py`
@@ -104,7 +103,9 @@ Instead of using [@main.py](main.py), you should use [@tests.py](tests.py) and c
 
 You should NOT touch [@CONTRIBUTING.md](CONTRIBUTING.md), [@README.md](README.md), [@LICENSE](LICENSE), and [@CHANGELOG.md](CHANGELOG.md). These files are not meant to touch by a LLM. Same thing applies to `git` commands too. Except for `git diff`, `git status` and other commands that doesn't change anything.
 
-This project prefers to have every variable and functions to be `camelCase`, as it it widely used around the whole project. Please do NOT use anything other than `camelCase`.
+This project prefers to have every variable and functions to be `camelCase`, as it it widely used around the whole project. Please do NOT use anything other than `camelCase`. Always keep the code readable, simple, and follow my exact coding style I made.
+
+If something isn't clear. Please refer to asking me instead of hallucinating.
 
 ---
 

requirements.txt

@@ -1,4 +1,3 @@
-requests
 InquirerPy
 termcolor
 pyinstaller

src/initialize.py

@@ -17,7 +17,7 @@ def __init__(
         variant,
         packageManager,
     ):
-        
+
         self.projectName = projectName
         self.projectID = projectID
         self.domainSystem = domainSystem
@@ -26,6 +26,18 @@ def __init__(
         self.packageManager = packageManager
         self.qtorgtk = qtorgtk
 
+    def resolveCommand(self, command):
+        commandPath = shutil.which(command)
+        if commandPath:
+            return commandPath
+
+        if os.name == "nt":
+            commandPath = shutil.which(f"{command}.cmd")
+            if commandPath:
+                return commandPath
+
+        return command
+
     def getPythonExecutable(self):
         if not getattr(sys, "frozen", False):
             return sys.executable
@@ -76,7 +88,7 @@ def startPackageManager(self):
 
         if self.packageManager == "npm":
             command = [
-                "npm",
+                self.resolveCommand("npm"),
                 "create",
                 "vite@latest",
                 "src/frontend",
@@ -87,7 +99,7 @@ def startPackageManager(self):
             ]
         else:
             command = [
-                self.packageManager,
+                self.resolveCommand(self.packageManager),
                 "create",
                 "vite@latest",
                 "src/frontend",
@@ -117,6 +129,7 @@ def mainScript():
 import argparse
 import subprocess
 import sys
+import shutil
 from pathlib import Path
 import window as w
 import time
@@ -126,8 +139,20 @@ def mainScript():
 frontendDir = projectRoot / "src" / "frontend"
 packageManager = "{self.packageManager}"
 
+def resolveCommand(command):
+    commandPath = shutil.which(command)
+    if commandPath:
+        return commandPath
+
+    if sys.platform == "win32":
+        commandPath = shutil.which(f"{{command}}.cmd")
+        if commandPath:
+            return commandPath
+
+    return command
+
 def buildFrontend():
-    subprocess.run([packageManager, "run", "build"], cwd=frontendDir, check=True)
+    subprocess.run([resolveCommand(packageManager), "run", "build"], cwd=frontendDir, check=True)
 
 def compileApp():
     buildFrontend()
@@ -171,7 +196,7 @@ def main():
     if args.command == "compile":
         compileApp()
     if args.command == "dev":
-        devServer = subprocess.Popen([packageManager, "run", "dev"], cwd=frontendDir)
+        devServer = subprocess.Popen([resolveCommand(packageManager), "run", "dev"], cwd=frontendDir)
         print("Starting dev server...")
         try:
             time.sleep(1)
@@ -329,14 +354,14 @@ def startWindow(dev):
         subprocess.run([pythonExecutable, "-m", "venv", "venv"], cwd=self.projectID, check=True)
 
         if sys.platform == "win32":
-            venvPython = ".\\venv\\Scripts\\python"
+            venvPython = f".\\{self.projectID}\\venv\\Scripts\\python"
             subprocess.run(
                 [venvPython, "-m", "pip", "install", "-r", "requirements.txt"],
                 cwd=self.projectID,
                 check=True,
             )
         else:
-            venvPython = "./venv/bin/python"
+            venvPython = f"./{self.projectID}/venv/bin/python"
             subprocess.run(
                 [venvPython, "-m", "pip", "install", "-r", "requirements.txt"],
                 cwd=self.projectID,
@@ -380,8 +405,10 @@ def start(
 
     print.log("If you're lazy (like me), just copy this code below. This for macOS/Linux.")
     print.log(f"  cd {projectID}/src/frontend/ && {packageManager} install && cd ../.. && venv/bin/python run.py dev")
-    print.log("For windows powershell.")
-    print.log(f"  cd {projectID}\\src\\frontend\\ && {packageManager} install && cd ..\\.. && venv\\Scripts\\python run.py dev")
+    print.log("For windows powershell <7.")
+    print.log(f"  cd project-test\\src\\frontend; if ($?) {{ {packageManager} install }}; if ($?) {{ cd ..\\.. }}; if ($?) {{ venv\\Scripts\\python run.py dev }}")
+    print.log("For windows powershell 7+.")
+    print.log(f"  cd {projectID}\\src\\frontend && {packageManager} install && cd ..\\.. && venv\\Scripts\\python run.py dev")
     print.empty()
 
     print.log("To compile after installing the frontend dependencies, run:")

src/interactive.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 import subprocess
 import time
 
@@ -93,22 +94,34 @@ def packageManager(self):
 class Checks:
     def __init__(self):
         pass
+
+    def resolveCommand(self, command):
+        commandPath = shutil.which(command)
+        if commandPath:
+            return commandPath
+
+        if os.name == "nt":
+            commandPath = shutil.which(f"{command}.cmd")
+            if commandPath:
+                return commandPath
+
+        return command
 
     def npm(self):
         try:
-            subprocess.run(["npm", "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run([self.resolveCommand("npm"), "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             print.success("npm is installed.")
             return True
-        except subprocess.CalledProcessError:
+        except (subprocess.CalledProcessError, FileNotFoundError):
             print.error("npm is not installed.")
             return False
 
     def pnpm(self):
         try:
-            subprocess.run(["pnpm", "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+            subprocess.run([self.resolveCommand("pnpm"), "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             print.success("pnpm is installed.")
             return True
-        except subprocess.CalledProcessError:
+        except (subprocess.CalledProcessError, FileNotFoundError):
             print.error("pnpm is not installed.")
             return False
 
@@ -117,7 +130,7 @@ def python(self):
             subprocess.run(["python", "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             print.success("Python is installed.")
             return True
-        except subprocess.CalledProcessError:
+        except (subprocess.CalledProcessError, FileNotFoundError):
             print.error("Python is not installed.")
             return False
 
@@ -157,4 +170,4 @@ def start():
     if _continue:
         initialize.start(projectName, projectID, domainSystem, qtorgtk, framework, variant, packageManager)
     else:
-        print.log("Pyder selection cancelled.")
+        print.log("Pyder selection cancelled.")

src/print.py

@@ -1,27 +1,27 @@
 from termcolor import colored
 
-def success(m):
-    s = "✓"
-    c = "green"
-    pta(s, c, m)
-def error(m):
-    s = "✗"
-    c = "light_red"
-    pta(s, c, m)
-def log(m):
-    s = "⋯"
-    c = "dark_grey"
-    pta(s, c, m)
-def warning(m):
-    s = "!"
-    c = "yellow"
-    pta(s, c, m)
+def success(message):
+    symbol = "✓"
+    color = "green"
+    pta(symbol, color, message)
+def error(message):
+    symbol = "✗"
+    color = "light_red"
+    pta(symbol, color, message)
+def log(message):
+    symbol = "⋯"
+    color = "dark_grey"
+    pta(symbol, color, message)
+def warning(message):
+    symbol = "!"
+    color = "yellow"
+    pta(symbol, color, message)
 
-def pta(t, c, m):
+def pta(tag, color, message):
     print(
-        colored(f"{t}", c, force_color=True)
+        colored(f"{tag}", color, force_color=True)
         + " " +
-        m
+        message
     )
 
 def empty():