Handle multiplication by math functions

Author: devongovett

src/lib.rs

@@ -2519,6 +2519,19 @@ mod tests {
     minify_test(".foo { border-width: clamp(1px, 1px + 2em, 4px) }", ".foo{border-width:clamp(1px,1px + 2em,4px)}");
     minify_test(".foo { border-width: clamp(1px, 2pt, 1in) }", ".foo{border-width:2pt}");
 
+    minify_test(".foo { top: calc(-1 * clamp(1.75rem, 8vw, 4rem)) }", ".foo{top:calc(-1*clamp(1.75rem,8vw,4rem))}");
+    minify_test(".foo { top: calc(-1 * min(1.75rem, 8vw, 4rem)) }", ".foo{top:calc(-1*min(1.75rem,8vw))}");
+    minify_test(".foo { top: calc(-1 * max(1.75rem, 8vw, 4rem)) }", ".foo{top:calc(-1*max(4rem,8vw))}");
+    minify_test(".foo { top: calc(clamp(1.75rem, 8vw, 4rem) * -1) }", ".foo{top:calc(-1*clamp(1.75rem,8vw,4rem))}");
+    minify_test(".foo { top: calc(min(1.75rem, 8vw, 4rem) * -1) }", ".foo{top:calc(-1*min(1.75rem,8vw))}");
+    minify_test(".foo { top: calc(max(1.75rem, 8vw, 4rem) * -1) }", ".foo{top:calc(-1*max(4rem,8vw))}");
+    minify_test(".foo { top: calc(clamp(1.75rem, 8vw, 4rem) / 2) }", ".foo{top:calc(clamp(1.75rem,8vw,4rem)/2)}");
+    minify_test(".foo { top: calc(min(1.75rem, 8vw, 4rem) / 2) }", ".foo{top:calc(min(1.75rem,8vw)/2)}");
+    minify_test(".foo { top: calc(max(1.75rem, 8vw, 4rem) / 2) }", ".foo{top:calc(max(4rem,8vw)/2)}");
+    minify_test(".foo { top: calc(0.5 * clamp(1.75rem, 8vw, 4rem)) }", ".foo{top:calc(clamp(1.75rem,8vw,4rem)/2)}");
+    minify_test(".foo { top: calc(1 * clamp(1.75rem, 8vw, 4rem)) }", ".foo{top:calc(clamp(1.75rem,8vw,4rem))}");
+    minify_test(".foo { top: calc(2 * clamp(1.75rem, 8vw, 4rem) / 2) }", ".foo{top:calc(clamp(1.75rem,8vw,4rem))}");
+
     prefix_test(
       ".foo { border-width: clamp(1em, 2px, 4vh) }",
       indoc! { r#"

src/values/calc.rs

@@ -79,6 +79,7 @@ pub enum Calc<V> {
   Value(Box<V>),
   Number(f32),
   Sum(Box<Calc<V>>, Box<Calc<V>>),
+  Product(f32, Box<Calc<V>>),
   Function(Box<MathFunction<V>>)
 }
 
@@ -311,14 +312,25 @@ impl<V: std::ops::Mul<f32, Output = V>> std::ops::Mul<f32> for Calc<V> {
   type Output = Self;
 
   fn mul(self, other: f32) -> Self {
+    if other == 1.0 {
+      return self
+    }
+
     match self {
       Calc::Value(v) => Calc::Value(Box::new(*v * other)),
       Calc::Number(n) => Calc::Number(n * other),
       Calc::Sum(a, b) => Calc::Sum(Box::new(*a * other), Box::new(*b * other)),
+      Calc::Product(num, calc) => {
+        let num = num * other;
+        if num == 1.0 {
+          return *calc
+        }
+        Calc::Product(num, calc)
+      },
       Calc::Function(f) => {
         match *f {
           MathFunction::Calc(c) => Calc::Function(Box::new(MathFunction::Calc(c * other))),
-          _ => todo!()
+          _ => Calc::Product(other, Box::new(Calc::Function(f)))
         }
       }
     }
@@ -377,7 +389,19 @@ impl<V: ToCss + std::cmp::PartialOrd<f32> + std::ops::Mul<f32, Output = V> + Clo
           b.to_css(dest)?;
         }
         Ok(())
-      },
+      }
+      Calc::Product(num, calc) => {
+        if num.abs() < 1.0 {
+          let div = 1.0 / num;
+          calc.to_css(dest)?;
+          dest.delim('/', true)?;
+          div.to_css(dest)
+        } else {
+          num.to_css(dest)?;
+          dest.delim('*', true)?;
+          calc.to_css(dest)
+        }
+      }
       Calc::Function(f) => f.to_css(dest)
     }
   }