refactor: several code simplifications

Author: dialvarezs

src/typvend/cli.py

@@ -20,6 +20,7 @@
 
 logger = logging.getLogger("typvend")
 VENDORING_ERRORS = (ValueError, TypeError, niquests.RequestException, OSError)
+PACKAGE_NAME_PATTERN = r"[a-zA-Z0-9_-]+"
 
 
 def main() -> None:
@@ -101,15 +102,11 @@ def parse_package_arg(pkg: str) -> tuple[str, str]:
     Raises:
         ValueError: If the package name is empty or contains invalid characters.
     """
-    if "@" in pkg:
-        parts = pkg.split("@", 1)
-        name = parts[0]
-        version = parts[1] or "latest"
-    else:
-        name = pkg
+    name, separator, version = pkg.partition("@")
+    if not separator or not version:
         version = "latest"
 
-    if not name or not re.fullmatch(r"[a-zA-Z0-9_-]+", name):
+    if not name or not re.fullmatch(PACKAGE_NAME_PATTERN, name):
         msg = f"Invalid package name: '{name}'. Only alphanumeric, hyphens, underscores allowed."
         raise ValueError(msg)
 

src/typvend/downloader.py

@@ -25,7 +25,7 @@ def download_package(
     namespace: str = "preview",
     *,
     force: bool = False,
-) -> bool:
+) -> None:
     """Downloads and extracts a Typst package to the local directory.
 
     Args:
@@ -35,10 +35,6 @@ def download_package(
         namespace: The namespace of the package (e.g. "preview").
         force: If True, overwrite the package even if it already exists.
 
-    Returns:
-        True if the package was downloaded and extracted, False if it was
-        skipped because it already exists and force was False.
-
     Raises:
         ValueError: If a directory traversal is detected in the tarball.
         niquests.RequestException: If the package download fails.
@@ -51,25 +47,28 @@ def download_package(
             version,
             dest_dir,
         )
-        return False
+        return
 
     url = f"https://packages.typst.org/{namespace}/{name}-{version}.tar.gz"
     logger.info("Downloading %s...", url)
     headers = {"User-Agent": f"typvend/{__version__}"}
 
-    try:
-        response = niquests.get(url, headers=headers, timeout=30)
-        response.raise_for_status()
-        content = response.content
-        if not content:
-            msg = f"Failed to download package: no content received from {url}"
-            raise ValueError(msg)
-    except niquests.RequestException as e:
-        logger.error("Failed to download package %s:%s: %s", name, version, e)
-        raise
+    response = niquests.get(url, headers=headers, timeout=30)
+    response.raise_for_status()
+    content = response.content
+    if not content:
+        msg = f"Failed to download package: no content received from {url}"
+        raise ValueError(msg)
 
     logger.info("Extracting %s to %s...", name, dest_dir)
     dest_dir.mkdir(parents=True, exist_ok=True)
+    _extract_tar(content, dest_dir)
+
+    logger.info("Successfully vendored %s:%s", name, version)
+
+
+def _extract_tar(content: bytes, dest_dir: Path) -> None:
+    """Extract a gzipped tarball while preventing directory traversal."""
     dest_abs = dest_dir.resolve()
 
     tar_data = io.BytesIO(content)
@@ -83,6 +82,3 @@ def download_package(
                     msg = f"Attempted directory traversal in tarball: {member.name}"
                     raise ValueError(msg)
             tar.extractall(path=dest_dir)
-
-    logger.info("Successfully vendored %s:%s", name, version)
-    return True

src/typvend/index.py

@@ -94,5 +94,4 @@ def resolve_latest_version(pkg_name: str, namespace: str = "preview") -> str:
         msg = f"Package '{pkg_name}' not found in namespace '{namespace}'"
         raise ValueError(msg)
 
-    versions.sort(key=lambda v: v[0])
-    return versions[-1][1]
+    return max(versions, key=lambda v: v[0])[1]

src/typvend/scanner.py

@@ -9,6 +9,7 @@
 from pathlib import Path
 
 logger = logging.getLogger(__name__)
+PACKAGE_NAME_PATTERN = r"[a-zA-Z0-9_-]+"
 
 
 def scan_file(file_path: Path, namespace: str = "preview") -> set[tuple[str, str]]:
@@ -23,21 +24,15 @@ def scan_file(file_path: Path, namespace: str = "preview") -> set[tuple[str, str
     Returns:
         A set of tuples (package_name, version).
     """
-    found: set[tuple[str, str]] = set()
-    pattern = re.compile(rf"@{re.escape(namespace)}/([a-zA-Z0-9_-]+):(\d+\.\d+\.\d+)")
+    pattern = re.compile(rf"@{re.escape(namespace)}/({PACKAGE_NAME_PATTERN}):(\d+\.\d+\.\d+)")
 
     try:
         content = file_path.read_text(encoding="utf-8", errors="ignore")
     except OSError as e:
         logger.warning("Could not read file %s: %s", file_path, e)
-        return found
-
-    for match in pattern.finditer(content):
-        pkg_name = match.group(1)
-        version = match.group(2)
-        found.add((pkg_name, version))
+        return set()
 
-    return found
+    return {(match.group(1), match.group(2)) for match in pattern.finditer(content)}
 
 
 def scan_path(path: Path, namespace: str = "preview") -> set[tuple[str, str]]:

tests/test_downloader.py

@@ -31,6 +31,7 @@ def create_mock_tarball(files: dict[str, bytes]) -> bytes:
 @patch("niquests.get")
 def test_download_package(mock_get: MagicMock, tmp_path: Path) -> None:
     """Tests successful package download, extraction, and override behavior."""
+    expected_forced_download_count = 2
     mock_tar = create_mock_tarball({"lib.typ": b"// lib content", "typst.toml": b"name = 'pkg'"})
     mock_response = MagicMock()
     mock_response.content = mock_tar
@@ -39,20 +40,20 @@ def test_download_package(mock_get: MagicMock, tmp_path: Path) -> None:
     output_dir = tmp_path / "vendor"
 
     # Download first time
-    downloaded = download_package("pkg", "0.1.0", output_dir=output_dir, force=False)
-    assert downloaded is True
+    download_package("pkg", "0.1.0", output_dir=output_dir, force=False)
 
     pkg_dir = output_dir / "preview" / "pkg" / "0.1.0"
     assert (pkg_dir / "lib.typ").read_text(encoding="utf-8") == "// lib content"
     assert (pkg_dir / "typst.toml").read_text(encoding="utf-8") == "name = 'pkg'"
+    assert mock_get.call_count == 1
 
     # Try downloading again without force (should skip)
-    downloaded_again = download_package("pkg", "0.1.0", output_dir=output_dir, force=False)
-    assert downloaded_again is False
+    download_package("pkg", "0.1.0", output_dir=output_dir, force=False)
+    assert mock_get.call_count == 1
 
     # Try downloading again with force
-    downloaded_force = download_package("pkg", "0.1.0", output_dir=output_dir, force=True)
-    assert downloaded_force is True
+    download_package("pkg", "0.1.0", output_dir=output_dir, force=True)
+    assert mock_get.call_count == expected_forced_download_count
 
 
 @patch("niquests.get")