From ece1f84fc45117881c69051bc153fe1eb2bda640 Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Sat, 23 Oct 2021 13:39:06 +1100
Subject: [PATCH] Fix spaces not being added between unquoted attributes when
 requested

---
 CHANGELOG.md                    | 1 +
 rust/main/src/minify/attr.rs    | 4 ++--
 rust/main/src/minify/element.rs | 5 +++--
 rust/main/src/tests/mod.rs      | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 039d8ef..87fb7e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,3 +3,4 @@
 ## 0.6.9
 
 - Intrepret `type=module` on `<script>` tags as a JavaScript MIME eligible for its contents to be minified as JavaScript (previously it would not be and so its contents would be considered data and never minified as JavaScript).
+- Fix issue where spaces are not added between unquoted attributes even when `cfg.keep_spaces_between_attributes` is `true`.
diff --git a/rust/main/src/minify/attr.rs b/rust/main/src/minify/attr.rs
index 977292c..5cf4057 100644
--- a/rust/main/src/minify/attr.rs
+++ b/rust/main/src/minify/attr.rs
@@ -306,7 +306,7 @@ pub fn minify_attr(
         if should_trim {
             right_trim(&mut value_raw);
             left_trim(&mut value_raw);
-        }
+        };
         if should_collapse {
             collapse_whitespace(&mut value_raw);
         };
@@ -325,7 +325,7 @@ pub fn minify_attr(
             &value_raw_wrapped,
             &MINIFY_CSS_TRANSFORM_OPTIONS.clone(),
         );
-        // If input was invalid, wrapper syntax may not exist anymore.
+        // TODO If input was invalid, wrapper syntax may not exist anymore.
         if value_raw_wrapped_min.starts_with(b"x{") {
             value_raw_wrapped_min.drain(0..2);
         };
diff --git a/rust/main/src/minify/element.rs b/rust/main/src/minify/element.rs
index 844a93e..773a27b 100644
--- a/rust/main/src/minify/element.rs
+++ b/rust/main/src/minify/element.rs
@@ -75,8 +75,9 @@ pub fn minify_element(
         }
         for (i, (name, value)) in unquoted.iter().enumerate() {
             // Write a space between unquoted attributes,
-            // and after the tag name if it wasn't written already during `quoted` processing.
-            if i > 0 || (i == 0 && quoted.len() == 0) {
+            // or after the tag name if it wasn't written already during `quoted` processing,
+            // or if forced by Cfg.
+            if i > 0 || (i == 0 && quoted.len() == 0) || cfg.keep_spaces_between_attributes {
                 out.push(b' ');
             };
             out.extend_from_slice(&name);
diff --git a/rust/main/src/tests/mod.rs b/rust/main/src/tests/mod.rs
index 8b57a5d..fad97bf 100644
--- a/rust/main/src/tests/mod.rs
+++ b/rust/main/src/tests/mod.rs
@@ -128,6 +128,12 @@ fn test_viewport_attr_minification() {
         b"<meta name=viewport content='width=device-width, initial-scale=1'>",
         b"<meta content=width=device-width,initial-scale=1 name=viewport>",
     );
+    let spec_compliant_cfg = Cfg::spec_compliant();
+    eval_with_cfg(
+        b"<meta name=viewport content='width=device-width, initial-scale=1'>",
+        br#"<meta content="width=device-width,initial-scale=1" name=viewport>"#,
+        &spec_compliant_cfg
+    );
 }
 
 #[cfg(feature = "js-esbuild")]