From c25ee1cb568577ca9a28362176135cc61de7fa4f Mon Sep 17 00:00:00 2001
From: yanyongyu <yanyongyu_1@126.com>
Date: Sun, 5 Dec 2021 17:29:38 +0800
Subject: [PATCH] :zap: check param first then dependencies

---
 nonebot/dependencies/__init__.py | 37 ++++++++++++++++----------------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/nonebot/dependencies/__init__.py b/nonebot/dependencies/__init__.py
index 8cc331cc..d15a2ddc 100644
--- a/nonebot/dependencies/__init__.py
+++ b/nonebot/dependencies/__init__.py
@@ -131,7 +131,6 @@ def get_dependent(
     return dependent
 
 
-# FIXME: check param types first then run dependencies
 async def solve_dependencies(
     *,
     _dependent: Dependent,
@@ -143,6 +142,24 @@ async def solve_dependencies(
     values: Dict[str, Any] = {}
     dependency_cache = {} if _dependency_cache is None else _dependency_cache
 
+    # usual dependency
+    for field in _dependent.params:
+        field_info = field.field_info
+        assert isinstance(field_info, Param), "Params must be subclasses of Param"
+        value = field_info._solve(**params)
+        if value == Undefined:
+            value = field.get_default()
+        _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias))
+        if errs_:
+            logger.debug(
+                f"{field_info} "
+                f"type {type(value)} not match depends {_dependent.func} "
+                f"annotation {field._type_display()}, ignored"
+            )
+            raise SkippedException
+        else:
+            values[field.name] = value
+
     # solve sub dependencies
     sub_dependent: Dependent
     for sub_dependent in chain(_sub_dependents or tuple(), _dependent.dependencies):
@@ -183,24 +200,6 @@ async def solve_dependencies(
             if sub_dependent.cache_key not in dependency_cache:
                 dependency_cache[sub_dependent.cache_key] = solved
 
-    # usual dependency
-    for field in _dependent.params:
-        field_info = field.field_info
-        assert isinstance(field_info, Param), "Params must be subclasses of Param"
-        value = field_info._solve(**params)
-        if value == Undefined:
-            value = field.get_default()
-        _, errs_ = field.validate(value, values, loc=(str(field_info), field.alias))
-        if errs_:
-            logger.debug(
-                f"{field_info} "
-                f"type {type(value)} not match depends {_dependent.func} "
-                f"annotation {field._type_display()}, ignored"
-            )
-            raise SkippedException
-        else:
-            values[field.name] = value
-
     return values, dependency_cache