Allow positional arguments in dictsort (#4132)

* Allow positional arguments in dictsort to maintain a parity with Jinja

* fix the test

* fix the test 2

GitOrigin-RevId: 1f9e3c00eb0e0613a29f18126e9babaef31c98da

Author: MartinNeupauer

.changes/unreleased/Fixes-20250625-092524.yaml

@@ -0,0 +1,3 @@
+kind: Fixes
+body: Allow positional arguments in dictsort
+time: 2025-06-25T09:25:24.679392309-07:00

crates/dbt-jinja/minijinja/src/filters.rs

@@ -441,24 +441,34 @@ mod builtins {
     /// * `by`: set to `"value"` to sort by value. Defaults to `"key"`.
     /// * `reverse`: set to `true` to sort in reverse.
     #[cfg_attr(docsrs, doc(cfg(feature = "builtins")))]
-    pub fn dictsort(v: &Value, kwargs: Kwargs) -> Result<Value, Error> {
+    pub fn dictsort(
+        v: &Value,
+        case_sensitive: Option<bool>,
+        by_value: Option<Cow<'_, str>>,
+        reverse: Option<bool>,
+        kwargs: Kwargs,
+    ) -> Result<Value, Error> {
         if v.kind() != ValueKind::Map {
             return Err(Error::new(
                 ErrorKind::InvalidOperation,
                 "cannot convert value into pair list",
             ));
         }
 
-        let by_value = matches!(ok!(kwargs.get("by")), Some("value"));
-        let case_sensitive = ok!(kwargs.get::<Option<bool>>("case_sensitive")).unwrap_or(false);
+        let by_value = matches!(
+            ok!(kwargs.get::<Option<&str>>("by")).unwrap_or(by_value.as_deref().unwrap_or("key")),
+            "value"
+        );
+        let case_sensitive = ok!(kwargs.get::<Option<bool>>("case_sensitive"))
+            .unwrap_or(case_sensitive.unwrap_or(false));
         let mut rv: Vec<_> = ok!(v.try_iter())
             .map(|key| (key.clone(), v.get_item(&key).unwrap_or(Value::UNDEFINED)))
             .collect();
         rv.sort_by(|a, b| {
             let (a, b) = if by_value { (&a.1, &b.1) } else { (&a.0, &b.0) };
             cmp_helper(a, b, case_sensitive)
         });
-        if let Some(true) = ok!(kwargs.get("reverse")) {
+        if ok!(kwargs.get::<Option<bool>>("reverse")).unwrap_or(reverse.unwrap_or(false)) {
             rv.reverse();
         }
         kwargs.assert_all_used()?;

crates/dbt-jinja/minijinja/tests/inputs/loop_dictsort.txt

@@ -26,4 +26,12 @@ reverse:
 case_sensitive:
 {%- for key, value in map|dictsort(case_sensitive=true) %}
 * {{ key }}: {{ value }}
-{%- endfor %}
+{%- endfor %}
+case_sensitive_positional:
+{%- for key, value in map|dictsort(true) %}
+* {{ key }}: {{ value }}
+{%- endfor %}
+case_sensitive_by_value_positional:
+{%- for key, value in map|dictsort(true, 'value') %}
+* {{ key }}: {{ value }}
+{%- endfor %}

crates/dbt-jinja/minijinja/tests/snapshots/test_templates__vm@loop_dictsort.txt.snap

@@ -1,6 +1,6 @@
 ---
 source: minijinja/tests/test_templates.rs
-description: "key implied:\n{%- for key, value in map|dictsort %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nkey explicit:\n{%- for key, value in map|dictsort(by=\"key\") %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nvalue:\n{%- for key, value in map|dictsort(by=\"value\") %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nreverse:\n{%- for key, value in map|dictsort(reverse=true) %}\n* {{ key }}: {{ value }}\n{%- endfor %}\ncase_sensitive:\n{%- for key, value in map|dictsort(case_sensitive=true) %}\n* {{ key }}: {{ value }}\n{%- endfor %}"
+description: "key implied:\n{%- for key, value in map|dictsort %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nkey explicit:\n{%- for key, value in map|dictsort(by=\"key\") %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nvalue:\n{%- for key, value in map|dictsort(by=\"value\") %}\n* {{ key }}: {{ value }}\n{%- endfor %}\nreverse:\n{%- for key, value in map|dictsort(reverse=true) %}\n* {{ key }}: {{ value }}\n{%- endfor %}\ncase_sensitive:\n{%- for key, value in map|dictsort(case_sensitive=true) %}\n* {{ key }}: {{ value }}\n{%- endfor %}\ncase_sensitive_positional:\n{%- for key, value in map|dictsort(true) %}\n* {{ key }}: {{ value }}\n{%- endfor %}\ncase_sensitive_by_value_positional:\n{%- for key, value in map|dictsort(true, 'value') %}\n* {{ key }}: {{ value }}\n{%- endfor %}"
 info:
   map:
     Blafasel: aha
@@ -34,4 +34,13 @@ case_sensitive:
 * bar: 2
 * baz: 100
 * foo: 1
-
+case_sensitive_positional:
+* Blafasel: aha
+* bar: 2
+* baz: 100
+* foo: 1
+case_sensitive_by_value_positional:
+* foo: 1
+* bar: 2
+* baz: 100
+* Blafasel: aha