Compare commits

...
3 Commits
Author SHA1 Message Date
LeoVasanko cbce326798 Clean up partial artifacts when create-vue is aborted
ensure_frontend now removes whatever create-vue wrote before failing:
the whole frontend/ dir if it didn't pre-exist, otherwise only the
files it added (pre-existing content is kept). If cmd_setup created the
project directory itself, that is removed too, so an aborted run leaves
no trace.
2026-10-27 22:44:17 +00:00
LeoVasanko 218c9e203b Abort setup when create-vue is interrupted or cancelled
create-vue exits 0 when its prompts are cancelled, so a zero return code
is not proof of success: also require frontend/package.json to exist, and
treat Ctrl-C (KeyboardInterrupt) as failure instead of a traceback. The
caller already exits 1 on failure, so the setup no longer continues with
a missing or partial frontend.
2026-10-27 22:40:35 +00:00
LeoVasanko c9557d4308 Prefer npm over deno/bun and validate Node.js version, matching template buildutil
Auto-detect now tries npm, deno, bun (was deno-first), and npm is only
accepted when the adjacent node is v20+. Same checks apply to JS_RUNTIME,
which maps node to npm as before.
2026-10-27 22:39:56 +00:00
+146 -26
View File
@@ -1305,38 +1305,130 @@ def merge_pyproject(
# =============================================================================
MIN_NODE_VERSION = 20
def _check_node_version(node_path: str) -> None:
"""Check if Node.js version is >= 20.
Raises RuntimeError if version is too old or cannot be determined.
"""
try:
result = subprocess.run( # noqa: S603
[node_path, "--version"],
capture_output=True,
text=True,
check=True,
)
version_str = result.stdout.strip()
# Parse version like "v20.10.0" or "v18.17.1"
match = re.match(r"v(\d+)", version_str)
if match:
major_version = int(match.group(1))
if major_version >= MIN_NODE_VERSION:
return
msg = f"Node.js {version_str} found, but v{MIN_NODE_VERSION}+ required"
raise RuntimeError(msg)
except (subprocess.CalledProcessError, FileNotFoundError, ValueError):
pass
msg = "Could not determine Node.js version"
raise RuntimeError(msg)
def _validate_npm_runtime(tool: str) -> bool:
"""Validate npm runtime by checking Node.js version. Returns True if valid."""
node_path = shutil.which("node", path=str(Path(tool).parent))
if node_path is None:
return False
try:
_check_node_version(node_path)
except RuntimeError:
return False
return True
def _find_runtime_from_env(options: list[str]) -> tuple[str, str] | None:
"""Find runtime specified by JS_RUNTIME environment variable."""
js_runtime_env = os.environ.get("JS_RUNTIME")
if not js_runtime_env:
return None
js_runtime = js_runtime_env
js_path = Path(js_runtime)
runtime_name = js_path.name
# Map node to npm
if runtime_name == "node":
runtime_name = "npm"
js_runtime = str(js_path.parent / "npm") if js_path.parent.name else "npm"
for option in options:
if option != runtime_name and not runtime_name.startswith(option):
continue
tool = shutil.which(js_runtime)
if tool is None:
print(f"⚠️ JS_RUNTIME={js_runtime_env}: {option} not found")
return None
if option == "npm":
node_path = shutil.which("node", path=str(Path(tool).parent))
if node_path is None:
print(f"⚠️ JS_RUNTIME={js_runtime_env}: node not found")
return None
try:
_check_node_version(node_path)
except RuntimeError as e:
print(f"⚠️ JS_RUNTIME={js_runtime_env}: {e}")
return None
return tool, option
print(f"⚠️ JS_RUNTIME={js_runtime_env} not recognized")
return None
def _auto_detect_runtime(options: list[str]) -> tuple[str, str] | None:
"""Auto-detect JavaScript runtime from available options."""
node_version_error: RuntimeError | None = None
for option in options:
tool = shutil.which(option)
if not tool:
continue
if option == "npm" and not _validate_npm_runtime(tool):
try:
node_path = shutil.which("node", path=str(Path(tool).parent))
if node_path:
_check_node_version(node_path)
except RuntimeError as e:
node_version_error = e
continue
return tool, option
if node_version_error:
print(f"⚠️ {node_version_error}")
return None
def find_js_runtime() -> tuple[str, str] | None:
"""Find a JavaScript runtime from JS_RUNTIME env or auto-detect.
Returns (tool_path, tool_name) where tool_name is "deno", "npm", or "bun".
Returns (tool_path, tool_name) where tool_name is "npm", "deno", or "bun".
Returns None if no runtime is found.
"""
options = ["deno", "npm", "bun"]
options = ["npm", "deno", "bun"]
# Check for JS_RUNTIME environment variable
if js_runtime_env := os.environ.get("JS_RUNTIME"):
js_runtime = js_runtime_env
js_path = Path(js_runtime)
runtime_name = js_path.name
# Map node to npm
if runtime_name == "node":
runtime_name = "npm"
js_runtime = str(js_path.parent / "npm") if js_path.parent.name else "npm"
for option in options:
if option == runtime_name or runtime_name.startswith(option):
tool = shutil.which(js_runtime)
if tool is None:
print(f"⚠️ JS_RUNTIME={js_runtime_env} not found")
return None
return tool, option
print(f"⚠️ JS_RUNTIME={js_runtime_env} not recognized")
if result := _find_runtime_from_env(options):
return result
if os.environ.get("JS_RUNTIME"):
return None
# Auto-detect
for option in options:
if tool := shutil.which(option):
return tool, option
return None
return _auto_detect_runtime(options)
def ensure_python_project(project_dir: Path, *, dry: bool = False) -> bool:
@@ -1382,7 +1474,7 @@ def ensure_frontend(
# Find JS runtime
runtime = find_js_runtime()
if runtime is None:
print("❌ No JavaScript runtime found (need deno, npm, or bun)")
print("❌ No JavaScript runtime found (need Node.js v20+/npm, deno, or bun)")
return False
js_tool, js_name = runtime
@@ -1402,14 +1494,37 @@ def ensure_frontend(
print(f"🎨 Would run: {' '.join(create_cmd)}")
return True
# Remember pre-existing content so a failed create-vue can be cleaned up
pre_existing = set(frontend_dir.iterdir()) if frontend_dir.exists() else set()
print("🎨 No frontend/ found, creating Vue project...")
print(f">>> {' '.join(create_cmd)}")
if not vue_args:
print("(Follow the prompts to configure your Vue app)")
print()
result = subprocess.run(create_cmd, cwd=project_dir, check=False) # noqa: S603
if result.returncode != 0:
print("❌ create-vue failed")
try:
result = subprocess.run(create_cmd, cwd=project_dir, check=False) # noqa: S603
except KeyboardInterrupt:
result = None
# create-vue exits 0 when its prompts are cancelled, so a zero return
# code alone doesn't mean a project was created.
if result is None or result.returncode != 0 or not package_json.exists():
reason = "interrupted" if result is None else "failed or was cancelled"
print(f"❌ create-vue {reason}")
leftovers = (
set(frontend_dir.iterdir()) - pre_existing if frontend_dir.exists() else set()
)
if leftovers:
if pre_existing:
for path in leftovers:
if path.is_dir():
shutil.rmtree(path, ignore_errors=True)
else:
path.unlink(missing_ok=True)
print("🧹 Removed partial files created by create-vue")
else:
shutil.rmtree(frontend_dir, ignore_errors=True)
print("🧹 Removed partial frontend/")
return False
return True
@@ -1439,17 +1554,22 @@ def cmd_setup(args: argparse.Namespace) -> int:
print("🏃 DRY RUN MODE - no changes will be made\n")
# Create project directory if it doesn't exist
created_project_dir = False
if not project_dir.exists():
if dry:
print(f"✅ Would create directory: {project_dir}")
else:
project_dir.mkdir(parents=True)
created_project_dir = True
print(f"✅ Created {project_dir}")
print(f"🔧 Setting up project: {project_dir}")
# Step 1: Ensure frontend exists (do this first so cancellation doesn't leave partial setup)
if not ensure_frontend(project_dir, vue_args=args.vue_args, dry=dry):
if created_project_dir:
shutil.rmtree(project_dir, ignore_errors=True)
print(f"🧹 Removed {project_dir}")
return 1
# Step 2: Ensure Python project exists