fast-dev-cli 0.20.1__tar.gz → 0.21.1__tar.gz

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fast-dev-cli
-Version: 0.20.1
+Version: 0.21.1
 Summary: Python project development tool.
 Author-Email: Waket Zheng <waketzheng@gmail.com>>
 Classifier: Development Status :: 4 - Beta
@@ -21,10 +21,8 @@ Classifier: Typing :: Typed
 Classifier: License :: OSI Approved :: MIT License
 Project-URL: Homepage, https://github.com/waketzheng/fast-dev-cli
 Requires-Python: >=3.10
-Requires-Dist: typer-slim<1,>=0.12.3
+Requires-Dist: typer<1,>=0.24.0
 Requires-Dist: tomli<3,>=2.0.1; python_version < "3.11"
-Requires-Dist: emoji>=2.12.1
-Requires-Dist: packaging>=20.5
 Requires-Dist: coverage>=7.5.1
 Requires-Dist: pytest>=8.2.0
 Provides-Extra: include-optional-dependencies
@@ -53,6 +51,12 @@ Description-Content-Type: text/markdown
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-brightgreen.svg" alt="Mypy Coverage">
 </a>
+<a href="https://github.com/microsoft/pyright" target="_blank">
+    <img src="https://img.shields.io/badge/pyright-checked-brightgreen.svg" alt="Pyright Checked">
+</a>
+<a href="https://github.com/astral-sh/ty" target="_blank">
+    <img src="https://img.shields.io/badge/ty-checked-brightgreen.svg" alt="ty Checked">
+</a>
 <a href="https://github.com/astral-sh/ruff" target="_blank">
     <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
 </a>
@@ -76,7 +80,7 @@ Python 3.10+
 
 ## Features
 
-- Support uv/pd/mpoetry
+- Support uv/pdm/poetry
 - Support MacOS/Linux/Windows
 
 ## Installation
@@ -100,7 +104,7 @@ uv tool install --python 3.14 fastdevcli-slim
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer-slim pytest coverage*
+*Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
 </div>
 

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/README.md

@@ -20,6 +20,12 @@
 <a href="https://github.com/python/mypy" target="_blank">
     <img src="https://img.shields.io/badge/mypy-100%25-brightgreen.svg" alt="Mypy Coverage">
 </a>
+<a href="https://github.com/microsoft/pyright" target="_blank">
+    <img src="https://img.shields.io/badge/pyright-checked-brightgreen.svg" alt="Pyright Checked">
+</a>
+<a href="https://github.com/astral-sh/ty" target="_blank">
+    <img src="https://img.shields.io/badge/ty-checked-brightgreen.svg" alt="ty Checked">
+</a>
 <a href="https://github.com/astral-sh/ruff" target="_blank">
     <img src="https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json" alt="Ruff">
 </a>
@@ -43,7 +49,7 @@ Python 3.10+
 
 ## Features
 
-- Support uv/pd/mpoetry
+- Support uv/pdm/poetry
 - Support MacOS/Linux/Windows
 
 ## Installation
@@ -67,7 +73,7 @@ uv tool install --python 3.14 fastdevcli-slim
 ```bash
 pip install fast-dev-cli
 ```
-*Will install: fast-dev-cli emoji typer-slim pytest coverage*
+*Will install: fast-dev-cli emoji typer packaging pytest coverage*
 
 </div>
 

fast_dev_cli-0.21.1/fast_dev_cli/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.21.1"

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/fast_dev_cli/cli.py

@@ -75,11 +75,10 @@ def poetry_module_name(name: str) -> str:
     try:
         from packaging.utils import canonicalize_name
     except ImportError:
-
-        def canonicalize_name(s: str) -> str:  # type:ignore[misc]
-            return re.sub(r"[-_.]+", "-", s)
-
-    return canonicalize_name(name).replace("-", "_").replace(" ", "_")
+        module_name = re.sub(r"[-_.]+", "-", name)
+    else:
+        module_name = canonicalize_name(name)
+    return module_name.replace("-", "_").replace(" ", "_")
 
 
 def is_emoji(char: str) -> bool:
@@ -272,6 +271,26 @@ def read_version_from_file(
     return "0.0.0"
 
 
+def _get_frontend_version() -> tuple[Path, str] | None:
+    try:
+        frontend_version_file = Project.get_work_dir("package.json", be_file=True)
+    except EnvError:
+        return None
+    try:
+        from asynctor.jsons import json_loads
+    except ImportError:
+        from json import loads as json_loads  # type:ignore[assignment]
+    content = frontend_version_file.read_bytes()
+    metadata: dict[str, str] = json_loads(content)  # type:ignore[assignment]
+    try:
+        current_version = metadata["version"]
+    except (KeyError, TypeError):
+        return None
+    with contextlib.suppress(ValueError):
+        frontend_version_file = frontend_version_file.relative_to(Path.cwd())
+    return frontend_version_file, current_version
+
+
 @overload
 def get_current_version(
     verbose: bool = False,
@@ -288,7 +307,7 @@ def get_current_version(
     is_poetry: bool | None = None,
     package_name: str | None = None,
     *,
-    check_version: Literal[True] = True,
+    check_version: Literal[True],
 ) -> tuple[bool, str]: ...
 
 
@@ -310,11 +329,20 @@ def get_current_version(
         return out
     toml_text = work_dir = None
     if package_name is None:
-        work_dir = Project.get_work_dir()
-        toml_text = Project.load_toml_text()
-        doc = tomllib.loads(toml_text)
-        project_name = doc.get("project", {}).get("name", work_dir.name)
-        package_name = re.sub(r"[- ]", "_", project_name)
+        try:
+            work_dir = Project.get_work_dir()
+        except EnvError as e:
+            if (res := _get_frontend_version()) is None:
+                raise e
+            current_version = res[1]
+            if check_version:
+                return False, current_version
+            return current_version
+        else:
+            toml_text = Project.load_toml_text()
+            doc = tomllib.loads(toml_text)
+            project_name = doc.get("project", {}).get("name", work_dir.name)
+            package_name = re.sub(r"[- ]", "_", project_name)
     local_version = read_version_from_file(package_name, work_dir, toml_text)
     try:
         installed_version = importlib_metadata.version(package_name)
@@ -330,15 +358,15 @@ def get_current_version(
 
 
 def _ensure_bool(value: bool | OptionInfo) -> bool:
-    if not isinstance(value, bool):
-        value = getattr(value, "default", False)
-    return value
+    if isinstance(value, bool):
+        return value
+    return bool(getattr(value, "default", False))
 
 
-def _ensure_str(value: str | OptionInfo | None) -> str:
-    if not isinstance(value, str):
-        value = getattr(value, "default", "")
-    return value
+def _ensure_str(value: str | OptionInfo | None) -> str | None:
+    if isinstance(value, str) or value is None:
+        return value
+    return getattr(value, "default", "")
 
 
 class DryRun:
@@ -371,7 +399,13 @@ class BumpUp(DryRun):
         self.commit = commit
         self.part = part
         if filename is None:
-            filename = self.parse_filename()
+            try:
+                filename = self.parse_filename()
+            except EnvError:
+                if (res := _get_frontend_version()) is not None:
+                    filename = res[0].name
+                else:
+                    raise
         self.filename = filename
         self._no_sync = no_sync
         self._emoji = emoji
@@ -467,7 +501,7 @@ class BumpUp(DryRun):
             try:
                 project_name = context["project"]["name"]
             except KeyError:
-                packages = []
+                packages: list[tuple[str, str]] = []
             else:
                 packages = [(poetry_module_name(project_name), "")]
         else:
@@ -549,12 +583,23 @@ class BumpUp(DryRun):
                 echo("You may want to pin tag by `fast tag`")
 
 
+def _echo_version(version_file: Any, value: str) -> None:
+    styled = typer.style(value, bold=True)
+    echo(f"Version value in {version_file}: " + styled)
+
+
 @cli.command()
 def version() -> None:
     """Show the version of this tool"""
     echo("Fast Dev Cli Version: " + typer.style(__version__, fg=typer.colors.BLUE))
     with contextlib.suppress(FileNotFoundError, KeyError):
-        toml_text = Project.load_toml_text()
+        try:
+            toml_text = Project.load_toml_text()
+        except EnvError:
+            if (res := _get_frontend_version()) is not None:
+                _echo_version(*res)
+                return
+            raise
         doc = tomllib.loads(toml_text)
         if value := doc.get("project", {}).get("version", ""):
             styled = typer.style(value, bold=True, fg=typer.colors.CYAN)
@@ -569,8 +614,7 @@ def version() -> None:
         for line in text.splitlines():
             if line.strip().startswith(varname):
                 value = line.split("=", 1)[-1].strip().strip('"').strip("'")
-                styled = typer.style(value, bold=True)
-                echo(f"Version value in {version_file}: " + styled)
+                _echo_version(version_file, value)
                 break
 
 
@@ -985,7 +1029,7 @@ def upgrade(
     dry: bool = DryOption,
 ) -> None:
     """Upgrade dependencies in pyproject.toml to latest versions"""
-    if not (tool := _ensure_str(tool)) or tool == ToolOption.default:
+    if not (tool := _ensure_str(tool) or "") or tool == ToolOption.default:
         tool = Project.get_manage_tool() or "uv"
     if tool in get_args(ToolName):
         UpgradeDependencies(dry=dry, tool=cast(ToolName, tool)).run()
@@ -1065,6 +1109,7 @@ class LintCode(DryRun):
         sim: bool = True,
         strict: bool = False,
         ty: bool = False,
+        fix: bool = True,
     ) -> None:
         self.args = args
         self.check_only = check_only
@@ -1077,6 +1122,7 @@ class LintCode(DryRun):
         self._sim = sim
         self._strict = strict
         self._ty = _ensure_bool(ty)
+        self._fix = _ensure_bool(fix)
         super().__init__(_exit, dry)
 
     @staticmethod
@@ -1123,11 +1169,13 @@ class LintCode(DryRun):
         ruff_check_sim: bool = True,
         mypy_strict: bool = False,
         prefer_ty: bool = False,
+        ruff_check_fix: bool = True,
     ) -> str:
         if paths != "." and all(i.endswith(".html") for i in paths.split()):
             return f"prettier -w {paths}"
         cmd = ""
-        tools = ["ruff format", "ruff check --extend-select=I,B,SIM --fix", "mypy"]
+        ruff_check = "ruff check --extend-select=I,B,SIM" + " --fix" * ruff_check_fix
+        tools = ["ruff format", ruff_check, "mypy"]
         if check_only:
             tools[0] += " --check"
         if check_only or load_bool("NO_FIX"):
@@ -1256,6 +1304,7 @@ class LintCode(DryRun):
             ruff_check_sim=self._sim,
             mypy_strict=self._strict,
             prefer_ty=self._ty,
+            ruff_check_fix=self._fix,
         )
 
 
@@ -1275,6 +1324,7 @@ def lint(
     sim: bool = True,
     strict: bool = False,
     ty: bool = False,
+    fix: bool = True,
 ) -> None:
     if files is None:
         files = parse_files(sys.argv[1:])
@@ -1292,6 +1342,7 @@ def lint(
         sim=sim,
         strict=strict,
         ty=ty,
+        fix=fix,
     ).run()
 
 
@@ -1343,6 +1394,7 @@ def make_style(
     sim: bool = Option(True, help="Whether ruff check with --extend-select=SIM"),
     strict: bool = Option(False, help="Whether run mypy with --strict"),
     ty: bool = Option(False, help="Whether use ty instead of mypy"),
+    fix: bool | None = Option(None, help="Whether ruff check with --fix"),
 ) -> None:
     """Run: ruff check/format to reformat code and then mypy to check"""
     if getattr(files, "default", files) is None:
@@ -1352,13 +1404,18 @@ def make_style(
     skip = _ensure_bool(skip_mypy)
     dmypy = _ensure_bool(use_dmypy)
     bandit = _ensure_bool(bandit)
-    prefix = _ensure_bool(prefix)
-    tool = _ensure_str(tool)
+    tool = _ensure_str(tool) or ""
     up = _ensure_bool(up)
     sim = _ensure_bool(sim)
     strict = _ensure_bool(strict)
     kwargs = {"dry": dry, "skip_mypy": skip, "dmypy": dmypy, "bandit": bandit}
-    run = check if _ensure_bool(check_only) else functools.partial(lint, prefix=prefix)
+    if _ensure_bool(check_only):
+        run = check
+    else:
+        prefix = _ensure_bool(prefix)
+        if fix is None or not isinstance(fix, bool):
+            fix = load_bool("FASTDEVCLI_FIX", True)
+        run = functools.partial(lint, prefix=prefix, fix=fix)
     run(files, tool=tool, up=up, sim=sim, strict=strict, ty=ty, **kwargs)
 
 
@@ -1398,7 +1455,7 @@ class Sync(DryRun):
             return f"python -m pip install -r {self.filename}"
         prefix = "" if is_venv() else f"{tool} run "
         ensure_pip = " {1}python -m ensurepip && {1}python -m pip install -U pip &&"
-        export_cmd = "uv export --no-hashes --all-extras --frozen"
+        export_cmd = "uv export --no-hashes --all-extras --all-groups --frozen"
         if tool in ("poetry", "pdm"):
             export_cmd = f"{tool} export --without-hashes --with=dev"
             if tool == "poetry":

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/pyproject.toml

@@ -32,14 +32,12 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
 ]
 dependencies = [
-    "typer-slim >=0.12.3,<1",
+    "typer>=0.24.0,<1",
     "tomli >=2.0.1,<3; python_version < '3.11'",
-    "emoji >=2.12.1",
-    "packaging >=20.5",
     "coverage >=7.5.1",
     "pytest >=8.2.0",
 ]
-version = "0.20.1"
+version = "0.21.1"
 
 [project.urls]
 Homepage = "https://github.com/waketzheng/fast-dev-cli"
@@ -141,9 +139,8 @@ source = [
     "fast_dev_cli",
 ]
 omit = [
-    "__pypackages__/*",
     ".venv/*",
-    "venv*.bak/*",
+    "*.bak/*",
 ]
 context = "${CONTEXT}"
 
@@ -167,6 +164,7 @@ exclude = [
 [tool.ty.rules]
 unresolved-import = "ignore"
 unused-ignore-comment = "ignore"
+unused-type-ignore-comment = "ignore"
 
 [tool.ty.environment]
 python-version = "3.10"

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/tests/test_bump.py

@@ -402,3 +402,23 @@ build-backend = "pdm.backend"
         out = capture_cmd_output("fast bump patch")
         assert version_file.as_posix() in out
         assert "0.3.1" in version_file.read_text()
+
+
+def test_package_dot_json(tmp_work_dir):
+    p = Path("package.json")
+    p.write_text('{"version":"0.1.0"}', encoding="utf-8")
+    out = capture_cmd_output("fast bump patch")
+    assert p.name in out
+    assert "0.1.1" in p.read_text()
+    out = capture_cmd_output("fast bump patch --commit --dry")
+    assert (
+        'bumpversion --parse "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)" --current-version="0.1.1" patch package.json --commit'
+        in out
+    )
+    run_and_echo("git init")
+    run_and_echo("git add .")
+    run_and_echo("git config user.name xxx")
+    run_and_echo("git config user.email xxx@a.com")
+    run_and_echo('git commit -m "xxx"')
+    out = capture_cmd_output("fast tag --dry")
+    assert "git tag -a 0.1.1 -m '' && git push --tags" in out

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/tests/test_exec.py

@@ -35,7 +35,7 @@ def test_exec():
     assert "success" not in out
     out = capture_cmd_output('fast exec "ls -a ~/"')
     assert "--> ls -a ~" in out
-    assert ".bashrc" in out
+    assert ".bash" in out
     home = os.path.expanduser("~")
     expected = capture_cmd_output(f"ls {home}")
     assert not (set(expected.splitlines()) - set(out.splitlines()))

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/tests/test_sync.py

@@ -210,12 +210,12 @@ def test_sync_uv(mocker, tmp_path):
         toml.with_name("uv.lock").write_text(UV_LOCK_EXAMPLE)
         assert (
             Sync("req.txt", "", True, dry=True).gen()
-            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m ensurepip && uv run python -m pip install -U pip && uv run python -m pip install -r req.txt"
+            == "uv export --no-hashes --all-extras --all-groups --frozen -o req.txt && uv run python -m ensurepip && uv run python -m pip install -U pip && uv run python -m pip install -r req.txt"
         )
         run_and_echo("uv run python -m ensurepip")
         assert (
             Sync("req.txt", "", True, dry=True).gen()
-            == "uv export --no-hashes --all-extras --frozen -o req.txt && uv run python -m pip install -r req.txt"
+            == "uv export --no-hashes --all-extras --all-groups --frozen -o req.txt && uv run python -m pip install -r req.txt"
         )
 
 

{fast_dev_cli-0.20.1 → fast_dev_cli-0.21.1}/tests/test_upgrade.py

@@ -58,7 +58,7 @@ anyio = {version = ">=3.7.1", optional = true}
 typer = {extras = ["all"], version = "^0.9.0", optional = true}
 uvicorn = {version = "^0.23.2", platform = "linux", optional = true}
     """
-    lines = [str(i) for i in segment.splitlines()]
+    lines: list[str] = [str(i) for i in segment.splitlines()]
     assert UpgradeDependencies.build_args(lines) == (
         [
             '"ipython@latest"',

fast_dev_cli-0.20.1/fast_dev_cli/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.20.1"