@vitus-labs/styler 2.0.0-alpha.6 → 2.0.0-alpha.7

package/lib/index.js

@@ -25,18 +25,49 @@ const resolve = (strings, values, props) => {
 };
 /**
 * Normalize resolved CSS text for strict `insertRule` compatibility.
-* Removes double semicolons, empty declarations, and excess whitespace
-* that arise from template interpolation (conditional expressions,
-* empty CSSResult values, etc.).
+*
+* Single-pass scanner that handles all cleanup in one traversal:
+* - Strips block comments and line comments (preserves :// in URLs)
+* - Collapses whitespace to single spaces
+* - Removes redundant semicolons
+* - Trims leading/trailing whitespace
 */
 const normalizeCSS = (css) => {
-	let s = css.replace(/(?<!:)\/\/[^\n]*/g, "");
-	s = s.replace(/\/\*[\s\S]*?\*\//g, "");
-	s = s.replace(/\s+/g, " ").trim();
-	while (s.includes("; ;") || s.includes(";;")) s = s.replace(/;(\s*;)+/g, ";");
-	s = s.replace(/\{\s*;/g, "{").replace(/}\s*;/g, "}");
-	s = s.replace(/^\s*;/, "").trim();
-	return s;
+	const len = css.length;
+	let out = "";
+	let space = false;
+	let last = 0;
+	for (let i = 0; i < len; i++) {
+		const c = css.charCodeAt(i);
+		if (c === 47 && css.charCodeAt(i + 1) === 42) {
+			const end = css.indexOf("*/", i + 2);
+			i = end === -1 ? len : end + 1;
+			space = true;
+			continue;
+		}
+		if (c === 47 && css.charCodeAt(i + 1) === 47 && last !== 58) {
+			const nl = css.indexOf("\n", i + 2);
+			i = nl === -1 ? len : nl;
+			space = true;
+			continue;
+		}
+		if (c === 32 || c === 9 || c === 10 || c === 13 || c === 12) {
+			space = true;
+			continue;
+		}
+		if (c === 59) {
+			if (last === 0 || last === 123 || last === 125 || last === 59) continue;
+			space = false;
+			out += ";";
+			last = 59;
+			continue;
+		}
+		if (space && last !== 0) out += " ";
+		space = false;
+		out += css[i];
+		last = c;
+	}
+	return out;
 };
 const resolveValue = (value, props) => {
 	if (value == null || value === false || value === true) return "";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vitus-labs/styler",
-  "version": "2.0.0-alpha.6+b2b6894",
+  "version": "2.0.0-alpha.7+006ed81",
   "license": "MIT",
   "author": "Vit Bokisch <vit@bokisch.cz>",
   "maintainers": [
@@ -63,5 +63,5 @@
     "goober": "^2.1.18",
     "styled-components": "^6.3.9"
   },
-  "gitHead": "b2b68944934573b5b5df8ac03cf4be3b14eb6645"
+  "gitHead": "006ed81acbebc3a0a827c3f265a37b0722f2ae75"
 }