- Allow buildClassValue to take an array literal as an argument

PiperOrigin-RevId: 631126861

java/src/com/google/template/soy/basicfunctions/BasicFunctionsRuntime.java

@@ -541,7 +541,21 @@ public static String buildAttrValue(List<SoyValue> values) {
   /** Joins items with a space, filtering out falsey values. */
   @Nonnull
   public static String buildClassValue(List<SoyValue> values) {
-    return joinHelper(values, " ");
+    return values.stream()
+        .filter(v -> v != null)
+        .filter(s -> s.coerceToBoolean())
+        .map(
+            s -> {
+              if (s instanceof SoyList) {
+                return s.asJavaList().stream()
+                    .filter(v -> v != null)
+                    .filter(v -> v.resolve().coerceToBoolean())
+                    .map(v -> v.resolve().coerceToString())
+                    .collect(joining(" "));
+              }
+              return s.coerceToString();
+            })
+        .collect(joining(" "));
   }
 
   private static final Pattern CSS_NAME_REGEX = Pattern.compile("^\\s*[\\w-]+\\s*$");

java/src/com/google/template/soy/basicfunctions/BuildClassValueFunction.java

@@ -42,7 +42,9 @@
     name = "buildClassValue",
     value = {
       @Signature(
-          parameterTypes = {"string | css | bool | null | undefined"},
+          parameterTypes = {
+            "string | css | bool | null | undefined | list<string|css|bool|null|undefined>"
+          },
           returnType = "string"),
       @Signature(
           parameterTypes = {

javascript/soyutils_usegoog.js

@@ -1840,12 +1840,12 @@ const $$buildAttrValue = function(...values) {
 
 /**
  * Joins items with a space, filtering out falsey values.
- * @param {...(string|SanitizedCss!|boolean|null|undefined)} values The values
+ * @param {...(string|SanitizedCss!|boolean|null|undefined|!ReadonlyArray<?>)} values The values
  *     to join.
  * @return {string} The joined string.
  */
 const $$buildClassValue = function(...values) {
-  return values.filter((s) => s).join(' ');
+  return values.flat(1).filter((s) => s).join(' ');
 };
 
 

python/runtime.py

@@ -210,7 +210,7 @@ def concat_css_values(l, r):
 def merge_into_dict(original, secondary):
   """Merge two dictionaries into the first and return it.
 
-  This is simply a conveinence wrapper around the dictionary update method. In
+  This is simply a convenience wrapper around the dictionary update method. In
   addition to the update it returns the original dict to allow for chaining.
 
   Args:
@@ -714,7 +714,9 @@ def build_class_value(*values):
   Returns:
     The joined string.
   """
-  return ' '.join([str(x) for x in values if x])
+
+  return ' '.join([build_class_value(*x) if isinstance(x, list)
+                   else str(x) for x in values if x])
 
 
 def build_style_value(*values):