default cmd bug fix, how to work

Author: bckohan

django_typer/__init__.py

@@ -3030,8 +3030,13 @@ def handle(self, option1: bool, option2: bool):
         :param kwargs: the options to directly pass to handle()
         """
         with self:
-            if getattr(self, "_handle", None) and callable(self._handle):
-                return self._handle(*args, **kwargs)
+            handle = getattr(self, "_handle", None) or getattr(
+                self.typer_app,
+                "handle",
+                None,  # registered dynamically
+            )
+            if callable(handle):
+                return handle(*args, **kwargs)
             raise NotImplementedError(
                 _(
                     "{cls} does not implement handle(), you must call the other command "

django_typer/tests/apps/test_app/management/commands/howto2.py

@@ -3,10 +3,13 @@
 
 class Command(TyperCommand):
     @command(name="subcommand1")
-    def handle(self): ...
+    def handle(self):
+        return "handle"
 
     @command()
-    def subcommand2(self): ...
+    def subcommand2(self):
+        return "subcommand2"
 
     @command()
-    def subcommand3(self): ...
+    def subcommand3(self):
+        return "subcommand3"

django_typer/tests/apps/test_app/management/commands/howto2_typer.py

@@ -0,0 +1,18 @@
+from django_typer import Typer
+
+app = Typer()
+
+
+@app.command(name="subcommand1")
+def handle():
+    return "handle"
+
+
+@app.command()
+def subcommand2():
+    return "subcommand2"
+
+
+@app.command()
+def subcommand3():
+    return "subcommand3"

django_typer/tests/test_howto.py

@@ -0,0 +1,23 @@
+from django.test import TestCase
+from django_typer import get_command
+
+
+class TestDefaultCmdHowto(TestCase):
+    cmd = "howto2"
+
+    def test_default_howto(self):
+        from django_typer.tests.apps.test_app.management.commands.howto2 import Command
+
+        command = get_command(self.cmd, Command)
+        self.assertEqual(command(), "handle")
+        self.assertEqual(command.subcommand2(), "subcommand2")
+        self.assertEqual(command.subcommand3(), "subcommand3")
+
+        with self.assertRaises(Exception):
+            command.handle()
+
+        self.assertEqual(command.subcommand1(), "handle")
+
+
+class TestDefaultCmdTyperHowto(TestDefaultCmdHowto):
+    cmd = "howto2_typer"

doc/source/howto.rst

@@ -91,21 +91,41 @@ Define Multiple Subcommands
 
 Commands with a single executable function should simply implement handle(), but if you would
 like have multiple subcommands you can define any number of functions decorated with
-:func:`~django_typer.command`:
+:func:`~django_typer.command` or :func:`~django_typer.Typer.command`:
 
-.. code-block:: python
+.. tabs::
 
-    from django_Typer import TyperCommand, command
+    .. tab:: Django-style
 
-    class Command(TyperCommand):
+        .. code-block:: python
 
-        @command()
-        def subcommand1(self):
-            ...
+            from django_typer import TyperCommand, command
 
-        @command()
-        def subcommand2(self):
-            ...
+            class Command(TyperCommand):
+
+                @command()
+                def subcommand1(self):
+                    ...
+
+                @command()
+                def subcommand2(self):
+                    ...
+
+    .. tab:: Typer-style
+
+        .. code-block:: python
+
+            from django_typer import Typer
+
+            app = Typer()
+
+            @app.command()
+            def subcommand1():
+                ...
+
+            @app.command()
+            def subcommand2():
+                ...
 
 .. note::
 
@@ -133,23 +153,47 @@ whatever we want the command to be. For example to define three subcommands but
 default we can do this:
 
 
-.. code-block:: python
+.. tabs::
 
-    from django_typer import TyperCommand, command
+    .. tab:: Django-style
 
-    class Command(TyperCommand):
+        .. code-block:: python
 
-        @command(name='subcommand1')
-        def handle(self):
-            ...
+            from django_typer import TyperCommand, command
 
-        @command()
-        def subcommand2(self):
-            ...
+            class Command(TyperCommand):
 
-        @command()
-        def subcommand3(self):
-            ...
+                @command(name='subcommand1')
+                def handle(self):
+                    ...
+
+                @command()
+                def subcommand2(self):
+                    ...
+
+                @command()
+                def subcommand3(self):
+                    ...
+
+    .. tab:: Typer-style
+
+        .. code-block:: python
+
+            from django_typer import Typer
+
+            app = Typer()
+
+            @app.command(name='subcommand1')
+            def handle():
+                ...
+
+            @app.command()
+            def subcommand2():
+                ...
+
+            @app.command()
+            def subcommand3():
+                ...
 
 
 .. code-block:: python