flet-cli 0.85.3.dev1__py3-none-any.whl → 0.86.0.dev1__py3-none-any.whl

flet_cli/cli.py

@@ -1,8 +1,10 @@
 import argparse
+import json
 import sys
 
 import flet.version
 import flet_cli.commands.build
+import flet_cli.commands.clean
 import flet_cli.commands.create
 import flet_cli.commands.debug
 import flet_cli.commands.devices
@@ -12,6 +14,29 @@ import flet_cli.commands.pack
 import flet_cli.commands.publish
 import flet_cli.commands.run
 import flet_cli.commands.serve
+import flet_cli.commands.test
+from flet_cli.utils.linux_deps import linux_dependencies
+
+
+def _version_info() -> dict:
+    """Build the machine-readable `flet --version --json` document.
+
+    Exposes Flet/Flutter versions and the Linux build dependencies. The
+    supported Python/Pyodide set is no longer surfaced here — it now comes from
+    python-build's manifest (see `flet_cli.utils.python_versions`).
+    """
+    return {
+        "flet": flet.version.flet_version,
+        "flutter": flet.version.flutter_version,
+        "linux_dependencies": list(linux_dependencies),
+    }
+
+
+def _render_version(as_json: bool) -> str:
+    """Render `flet --version` output as JSON or the human-readable text block."""
+    if as_json:
+        return json.dumps(_version_info(), indent=2)
+    return f"Flet: {flet.version.flet_version}\nFlutter: {flet.version.flutter_version}"
 
 
 # Source https://stackoverflow.com/a/26379693
@@ -68,16 +93,17 @@ def get_parser() -> argparse.ArgumentParser:
         formatter_class=argparse.RawDescriptionHelpFormatter
     )
 
-    # add version flag
+    # add version flags
     parser.add_argument(
         "--version",
         "-V",
-        action="version",
-        version=(
-            f"Flet: {flet.version.flet_version}\n"
-            f"Flutter: {flet.version.flutter_version}\n"
-            f"Pyodide: {flet.version.pyodide_version}"
-        ),
+        action="store_true",
+        help="show version information and exit",
+    )
+    parser.add_argument(
+        "--json",
+        action="store_true",
+        help="with --version, output version information as JSON",
     )
 
     sp = parser.add_subparsers(dest="command")
@@ -86,7 +112,9 @@ def get_parser() -> argparse.ArgumentParser:
     flet_cli.commands.create.Command.register_to(sp, "create")
     flet_cli.commands.run.Command.register_to(sp, "run")
     flet_cli.commands.build.Command.register_to(sp, "build")
+    flet_cli.commands.clean.Command.register_to(sp, "clean")
     flet_cli.commands.debug.Command.register_to(sp, "debug")
+    flet_cli.commands.test.Command.register_to(sp, "test")
     flet_cli.commands.pack.Command.register_to(sp, "pack")
     flet_cli.commands.publish.Command.register_to(sp, "publish")
     flet_cli.commands.serve.Command.register_to(sp, "serve")
@@ -94,6 +122,16 @@ def get_parser() -> argparse.ArgumentParser:
     flet_cli.commands.devices.Command.register_to(sp, "devices")
     flet_cli.commands.doctor.Command.register_to(sp, "doctor")
 
+    # Register MCP command only if flet-mcp is installed
+    try:
+        from importlib import import_module
+
+        import_module("flet_mcp")
+        mcp_cmd = import_module("flet_cli.commands.mcp")
+        mcp_cmd.Command.register_to(sp, "mcp")
+    except ImportError:
+        pass
+
     # set "run" as the default subparser
     set_default_subparser(parser, name="run", index=1)
 
@@ -111,6 +149,11 @@ def main():
     # parse arguments
     args = parser.parse_args()
 
+    # handle `flet --version [--json]` (no subcommand/handler is set)
+    if getattr(args, "version", False):
+        print(_render_version(args.json))
+        sys.exit(0)
+
     # execute command
     args.handler(args)
 

flet_cli/commands/build.py

@@ -1,9 +1,13 @@
 import argparse
+import os
+import shutil
+from pathlib import Path
 
 from rich.console import Group
 from rich.live import Live
 
 from flet_cli.commands.build_base import BaseBuildCommand, console
+from flet_cli.utils.android import flutter_target_platforms
 
 
 class Command(BaseBuildCommand):
@@ -116,9 +120,24 @@ class Command(BaseBuildCommand):
             ["build", self.platforms[self.target_platform]["flutter_build_command"]]
         )
 
-        if self.target_platform in "apk" and self.template_data["split_per_abi"]:
+        if self.target_platform == "apk" and self.template_data["split_per_abi"]:
             args.append("--split-per-abi")
 
+        if (
+            self.target_platform in ("apk", "aab")
+            and self.template_data["options"]["target_arch"]
+        ):
+            args.extend(
+                [
+                    "--target-platform",
+                    ",".join(
+                        flutter_target_platforms(
+                            self.template_data["options"]["target_arch"]
+                        )
+                    ),
+                ]
+            )
+
         if self.target_platform in ["ipa"]:
             if self.template_data["ios_provisioning_profile"]:
                 args.extend(
@@ -166,6 +185,22 @@ class Command(BaseBuildCommand):
             f"{self.platforms[self.target_platform]['status_text']}[/cyan]..."
         )
 
+        # Clear the build output directories of artifacts from previous runs. Flutter
+        # only ever adds files to them, and copy_build_output harvests them wholesale —
+        # so without this, a previous build with different options (e.g. --arch,
+        # --split-per-abi, or a renamed product) would leak its artifacts into the
+        # user's output directory.
+        assert self.flutter_dir
+        flutter_dir = self.flutter_dir.resolve()
+        for output in self.platforms[self.target_platform]["outputs"]:
+            output_dir = Path(
+                os.path.dirname(self.resolve_output_path(output))
+            ).resolve()
+            # only delete directories that are strictly inside the generated Flutter
+            # project (and never the project directory itself).
+            if output_dir != flutter_dir and output_dir.is_relative_to(flutter_dir):
+                shutil.rmtree(output_dir, ignore_errors=True)
+
         self._run_flutter_command()
 
         console.log(