scaffold-ca-python 0.3.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

scaffold_ca_python/commands/generate_use_case.py

@@ -10,43 +10,53 @@ from scaffold_ca_python.commands._shared import (
     build_and_persist,
     console,
     ensure_absent,
+    fail,
     print_dry_run_tree,
     require_project_root,
     validate_name_or_exit,
 )
 from scaffold_ca_python.core.module_builder import ModuleBuilder
-from scaffold_ca_python.core.name_utils import to_snake_case, validate_module_name
-from scaffold_ca_python.core.project_detector import load_project_context
+from scaffold_ca_python.core.name_utils import strip_usecase_suffix, to_snake_case, validate_module_name
+from scaffold_ca_python.core.project_detector import load_project_context, resolve_tests_root
 from scaffold_ca_python.factory.simple.use_case_factory import UseCaseFactory
 from scaffold_ca_python.models.context import ModuleContext
 from scaffold_ca_python.models.layer import Layer
 
 _GUC_HELP = "Scaffold a use case in domain/usecase/. Alias 'guc'."
 _GUC_EPILOG = (
-    "Example:\n\n  * scaffold guc --name create_order\n\n  * scaffold generate-use-case --name create_order\n\n"
+    "Example:\n\n  * scaffold guc --name create_order   (creates domain/usecase/create_order_usecase.py)\n\n"
+    "  * scaffold generate-use-case --name create_order\n\n"
 )
 
 
 def _generate_use_case_impl(name: str, dry_run: bool) -> None:
     validate_name_or_exit(name, validate_module_name)
+    base = strip_usecase_suffix(to_snake_case(name))
+    if not base:
+        fail(
+            f"Use case name '{name}' is only the 'usecase' suffix.",
+            hint="Use a descriptive name such as 'create_order'.",
+        )
     project_root = require_project_root()
     project_ctx = load_project_context(project_root)
-    module_ctx = ModuleContext(name=name, layer=Layer.DOMAIN_USECASE, project=project_ctx)
+    module_ctx = ModuleContext(name=base, layer=Layer.DOMAIN_USECASE, project=project_ctx)
 
-    snake = to_snake_case(name)
-    src_path = project_root / "src" / project_ctx.python_package / "domain" / "usecase" / f"{snake}.py"
-    ensure_absent(
-        src_path,
-        project_root,
-        kind="File",
-        hint="Choose a different name or remove the existing file first.",
-    )
+    module = f"{base}_usecase"
+    src_path = project_root / "src" / project_ctx.python_package / "domain" / "usecase" / f"{module}.py"
+    test_path = resolve_tests_root(project_root) / "domain" / "usecase" / f"test_{module}.py"
+    for path in (src_path, test_path):
+        ensure_absent(
+            path,
+            project_root,
+            kind="File",
+            hint="Choose a different name or remove the existing file first.",
+        )
 
     builder = ModuleBuilder(project_root=project_root, project_ctx=project_ctx, module_ctx=module_ctx, dry_run=dry_run)
     created = build_and_persist(UseCaseFactory(), builder)
 
     if dry_run:
-        print_dry_run_tree(snake, created, project_root)
+        print_dry_run_tree(module, created, project_root)
         return
 
     msg = (

scaffold_ca_python/core/module_locator.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from pathlib import Path
 
+from scaffold_ca_python.core.name_utils import strip_usecase_suffix
 from scaffold_ca_python.core.project_detector import resolve_tests_root
 
 
@@ -11,7 +12,7 @@ def find_module_targets(project_root: Path, pkg: str, snake: str) -> list[tuple[
     """Return ``(src_path, test_path | None)`` pairs for every match of *snake*.
 
     Searches in order: domain/model/<snake>/ (package), domain/model/<snake>.py (legacy flat),
-    domain/usecase, driven_adapters,
+    domain/usecase (``<base>_usecase.py`` first, then legacy ``<snake>.py``), driven_adapters,
     entry_points, helpers.
     """
     src_root = project_root / "src" / pkg
@@ -24,9 +25,25 @@ def find_module_targets(project_root: Path, pkg: str, snake: str) -> list[tuple[
         model_pkg_test = tests_root / "domain" / "model" / snake
         candidates.append((model_pkg, model_pkg_test if model_pkg_test.exists() else None))
 
+    usecase_pairs: list[tuple[Path, Path]] = []
+    base = strip_usecase_suffix(snake)
+    if base:
+        usecase_pairs.append(
+            (
+                src_root / "domain" / "usecase" / f"{base}_usecase.py",
+                tests_root / "domain" / "usecase" / f"test_{base}_usecase.py",
+            )
+        )
+    legacy_usecase = (
+        src_root / "domain" / "usecase" / f"{snake}.py",
+        tests_root / "domain" / "usecase" / f"test_{snake}.py",
+    )
+    if legacy_usecase not in usecase_pairs:
+        usecase_pairs.append(legacy_usecase)
+
     for src_rel, test_rel in [
         (src_root / "domain" / "model" / f"{snake}.py", tests_root / "domain" / "model" / f"test_{snake}.py"),
-        (src_root / "domain" / "usecase" / f"{snake}.py", tests_root / "domain" / "usecase" / f"test_{snake}.py"),
+        *usecase_pairs,
     ]:
         if src_rel.exists():
             candidates.append((src_rel, test_rel if test_rel.exists() else None))

scaffold_ca_python/core/name_utils.py

@@ -9,6 +9,9 @@ NAME_RE = re.compile(r"^[a-z][a-z0-9]*([_-][a-z0-9]+)*$")
 # Stricter pattern for module/class-generating commands: snake_case only (no hyphens).
 MODULE_NAME_RE = re.compile(r"^[a-z][a-z0-9]*(_[a-z0-9]+)*$")
 
+# Trailing use case suffixes (applied to "_" + name so a bare "usecase" also matches)
+_USECASE_SUFFIX_RE = re.compile(r"(?:_(?:usecase|use_case))+$")
+
 # Matches transitions: lowercase→uppercase and letter→digit boundary runs
 _CAMEL_BOUNDARY_RE = re.compile(r"(?<=[a-z0-9])(?=[A-Z])|(?<=[A-Z])(?=[A-Z][a-z])")
 
@@ -50,6 +53,11 @@ def to_snake_case(name: str) -> str:
     return s.lower()
 
 
+def strip_usecase_suffix(name: str) -> str:
+    """Remove every trailing ``_usecase`` / ``_use_case`` suffix from *name* (may return an empty string)."""
+    return _USECASE_SUFFIX_RE.sub("", f"_{name}").removeprefix("_")
+
+
 def to_kebab_case(name: str) -> str:
     """Convert *name* (PascalCase, snake_case, or already kebab-case) to kebab-case."""
     # Normalise underscores to hyphens first (snake_case support)

scaffold_ca_python/factory/simple/delete_module_factory.py

@@ -22,7 +22,7 @@ class DeleteModuleFactory(ModuleFactory):
 
         Finds and deletes modules across:
         - domain/model/<snake>/ (package) or domain/model/<snake>.py (legacy)
-        - domain/usecase/<snake>.py
+        - domain/usecase/<base>_usecase.py or domain/usecase/<snake>.py (legacy)
         - infrastructure/driven_adapters/<snake>/
         - infrastructure/entry_points/<snake>/
         - infrastructure/helpers/<snake>/

scaffold_ca_python/factory/simple/use_case_factory.py

@@ -19,8 +19,8 @@ class UseCaseFactory(ModuleFactory):
         """Build domain use case files.
 
         Queues files:
-        - src/domain/usecase/{snake_name}.py
-        - tests/domain/usecase/test_{snake_name}.py
+        - src/domain/usecase/{snake_name}_usecase.py
+        - tests/domain/usecase/test_{snake_name}_usecase.py
 
         No dependencies injected (async/await are built-in).
         """
@@ -45,14 +45,14 @@ class UseCaseFactory(ModuleFactory):
 
         # Add source file
         builder.add_file(
-            src_dir / f"{snake_name}.py",
+            src_dir / f"{snake_name}_usecase.py",
             builder.render(f"{base}/use_case.py.jinja2", ctx_dict),
             template_name=f"{base}/use_case.py.jinja2",
         )
 
         # Add test file
         builder.add_file(
-            test_dir / f"test_{snake_name}.py",
+            test_dir / f"test_{snake_name}_usecase.py",
             builder.render(f"{base}/test_use_case.py.jinja2", ctx_dict),
             template_name=f"{base}/test_use_case.py.jinja2",
             is_test=True,

scaffold_ca_python/templates/use_case/test_use_case.py.jinja2

@@ -2,7 +2,7 @@
 
 import pytest
 
-from {{ project.python_package }}.domain.usecase.{{ module_name }} import {{ class_name }}UseCase
+from {{ project.python_package }}.domain.usecase.{{ module_name }}_usecase import {{ class_name }}UseCase
 
 
 @pytest.mark.asyncio

{scaffold_ca_python-0.3.0.dist-info → scaffold_ca_python-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: scaffold-ca-python
-Version: 0.3.0
+Version: 0.4.0
 Summary: Scaffolder to generate Clean Architecture apps
 Project-URL: Homepage, https://github.com/bancolombia/scaffold-clean-architecture-py
 Project-URL: Repository, https://github.com/bancolombia/scaffold-clean-architecture-py
@@ -128,7 +128,7 @@ scaffold gm --name order --dry-run
 
 ### scaffold guc
 
-Scaffold a use case in `domain/usecase/`.
+Scaffold a use case in `domain/usecase/`. The module is always named `<name>_usecase.py` and the class `<Name>UseCase`. Writing `_usecase` in `--name` is optional and the suffix is never duplicated: `create_order`, `create_order_usecase` and `create_order_use_case` all create `create_order_usecase.py` with `CreateOrderUseCase`.
 
 ```bash
 scaffold guc --name create_order

{scaffold_ca_python-0.3.0.dist-info → scaffold_ca_python-0.4.0.dist-info}/RECORD

@@ -11,15 +11,15 @@ scaffold_ca_python/commands/generate_helper.py,sha256=O98ua5Fj3judGxF_vmTYbm_j-q
 scaffold_ca_python/commands/generate_model.py,sha256=GBHPkoTYrABNdmdILWGLuQFM4ppzYbuHyunjhc-o4Dc,3387
 scaffold_ca_python/commands/generate_pipeline.py,sha256=Ip-rN4nSbwaUbtJ49awAs4LDURsrDTQsZdG5kBCLdyE,3773
 scaffold_ca_python/commands/generate_project.py,sha256=5KRsPI_WiWQVY1d_0AblUHKdDQCWpXJA7MaOCHae0fE,5312
-scaffold_ca_python/commands/generate_use_case.py,sha256=N72h2BAyNgbCLiphryrwF1aDXkDL5NNj14Lsq7D3YFE,2947
+scaffold_ca_python/commands/generate_use_case.py,sha256=3uKYZik9eF23Z9QMM2psGNWuW2AhxkB468urum5N8WA,3441
 scaffold_ca_python/commands/update_project.py,sha256=7bu2neRasxEtYK2rIvx0CFISSx9D64BNCkijp90zWGk,2367
 scaffold_ca_python/commands/validate_structure.py,sha256=p_bYTgOl4_TrC80z-v2teSsssc9xghlkCYlUp3SuzHo,2526
 scaffold_ca_python/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaffold_ca_python/core/file_writer.py,sha256=KdnNrq33Jsvqs1IQf0jbUKdXls4jBSWAizw4uJhMalU,5561
 scaffold_ca_python/core/mcp_tool_spec.py,sha256=mPLN7vOSgWFWxHQQxmr0fWEaimHWI-9A0oP7ob73-rU,10602
 scaffold_ca_python/core/module_builder.py,sha256=AHC3szEdfS3i3q74IM6USZTHWEUK6QizL6NEKcHCrrI,6837
-scaffold_ca_python/core/module_locator.py,sha256=VnvD3-g6NvSGJReYamBuoU1s72NdoHgau-SlpaB3xEg,1958
-scaffold_ca_python/core/name_utils.py,sha256=195Qb36CafP4CGRomzSAm3Hmm0C-Qld3I90boPAV-7A,2583
+scaffold_ca_python/core/module_locator.py,sha256=FFAwA7Vajxg0JgHoVXc1HpvdB67clvkv_BFVwiQDxHA,2552
+scaffold_ca_python/core/name_utils.py,sha256=IpXAieBKFe7QbOY4K8gNsjr4NXUfJX5MBCy2bQyPIk4,2958
 scaffold_ca_python/core/openapi_routes.py,sha256=RCQS7mHufWJZgbLI1cxGli-xGbU7p7WI95fHJhDnIss,1098
 scaffold_ca_python/core/project_detector.py,sha256=vcDAFCGgQVDMQ2MivJVUmn5Yyj58vGpTbzKhZTBQNtw,3524
 scaffold_ca_python/core/pyproject_writer.py,sha256=zpxgubt-XSZR5domgL4LG_9AWD9b_cNrDM8fuHmZRzE,7792
@@ -40,10 +40,10 @@ scaffold_ca_python/factory/entry_points/ep_restapi.py,sha256=PFkt9TH1aN6YO8w4zAe
 scaffold_ca_python/factory/pipelines/__init__.py,sha256=0YPpPGsZ6A3-udHTSZDyUHleLFLQQh1V5IL6AB0qJ6g,557
 scaffold_ca_python/factory/pipelines/pipeline_factory.py,sha256=s4fpuyhdxXiwko-LlM6Pv-QJdRGQJb17KVrC-DW6ojo,842
 scaffold_ca_python/factory/simple/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-scaffold_ca_python/factory/simple/delete_module_factory.py,sha256=hvDZNz8TULYx0zES3697-jnrzDQT6v6nxqPV0H9-mWo,1651
+scaffold_ca_python/factory/simple/delete_module_factory.py,sha256=v_Kl-m7bxvCwUsdQuCPq66uPksuLFLYvbsTNdE4Cs8Q,1696
 scaffold_ca_python/factory/simple/helper_factory.py,sha256=nBVOu_kGBVrEGnXFa918GPo-UFlcW-Y5-Uk6bwYWuhQ,2295
 scaffold_ca_python/factory/simple/model_factory.py,sha256=YdUpBvGgUrz4zzXMG2p8d6PWit62B9esjLZG49dT5PU,2467
-scaffold_ca_python/factory/simple/use_case_factory.py,sha256=znCyynIGmWgc4P8icJXfb2xSiNZB2Cu4SGVacDrpSdY,1954
+scaffold_ca_python/factory/simple/use_case_factory.py,sha256=CUY2SkneFWv-KukK-Cdn2KoLZwgYukNa25Hv15SQYx8,1986
 scaffold_ca_python/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scaffold_ca_python/models/context.py,sha256=Itp-YyPgY-0yNYA9YlCXrmPfa5nEVklGAOJQGHfBdHE,1909
 scaffold_ca_python/models/file_operation.py,sha256=R5Tu3KBvUnSmH5QZXBQTPoQjvr4YdH1YOKsKS9ICH_Q,1698
@@ -119,10 +119,10 @@ scaffold_ca_python/templates/project/application/config/container.py.jinja2,sha2
 scaffold_ca_python/templates/project/application/config/driven_adapters_container.py.jinja2,sha256=WhRpupvLP8tOJgp4IJ0A5RitntfRPVFjCDUjhAhBt8U,464
 scaffold_ca_python/templates/project/application/config/resource_container.py.jinja2,sha256=k3wy8uSD7GJZNEf379fv2lMEzdq5eaNqmoaOw9Jq1vs,643
 scaffold_ca_python/templates/project/application/config/usecases_container.py.jinja2,sha256=3fEHe6mkXkDHlfO5nhLqzLB7ccTpqwtjHZfLyfysbro,527
-scaffold_ca_python/templates/use_case/test_use_case.py.jinja2,sha256=3K1bNKDBQc29rcv8UHUZnROCUmcFSCwJhbm0xP9Uako,364
+scaffold_ca_python/templates/use_case/test_use_case.py.jinja2,sha256=spomnRHeXWiWjy3QHQt839yIMFDUqA7h-Wq4KfZxAyg,372
 scaffold_ca_python/templates/use_case/use_case.py.jinja2,sha256=KPtaK1wvZ-7qHdDZyuVfqXTPYwJdNUMPXQZGuKZFA7Y,217
-scaffold_ca_python-0.3.0.dist-info/METADATA,sha256=u5KDkAfy1Wb0HVt1Jrb2MzZr2Nqgb9xnwOZhhmmwVKw,7187
-scaffold_ca_python-0.3.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-scaffold_ca_python-0.3.0.dist-info/entry_points.txt,sha256=4PyYg6mNCvAlt2yF_o1-QR2CBXiowYGpNyqcP88tu6I,104
-scaffold_ca_python-0.3.0.dist-info/licenses/LICENSE,sha256=3ZZEP7DK_h3lEjS8r-DvQCec2q7zAqqq7HmSq6cuL0E,1068
-scaffold_ca_python-0.3.0.dist-info/RECORD,,
+scaffold_ca_python-0.4.0.dist-info/METADATA,sha256=7LQgO7e31QQ8vmmP1PfqwXgaWnQRrLIIpengbcw8mf4,7475
+scaffold_ca_python-0.4.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+scaffold_ca_python-0.4.0.dist-info/entry_points.txt,sha256=4PyYg6mNCvAlt2yF_o1-QR2CBXiowYGpNyqcP88tu6I,104
+scaffold_ca_python-0.4.0.dist-info/licenses/LICENSE,sha256=3ZZEP7DK_h3lEjS8r-DvQCec2q7zAqqq7HmSq6cuL0E,1068
+scaffold_ca_python-0.4.0.dist-info/RECORD,,