From 1d8643da6b8f287692f07eae43dfeb54a4fa38f0 Mon Sep 17 00:00:00 2001
From: Matt Dziuban
Date: Fri, 17 Oct 2025 11:27:04 -0400
Subject: [PATCH 1/8] feat: Add option to minify CSS.
---
bindings/c/src/lib.rs | 4 +
.../java/org/cssinline/CssInlineConfig.java | 26 ++++-
bindings/java/src/main/rust/lib.rs | 2 +
bindings/javascript/index.d.ts | 2 +
bindings/javascript/js-binding.d.ts | 3 +
bindings/javascript/src/lib.rs | 1 +
bindings/javascript/src/options.rs | 3 +
bindings/javascript/wasm/index.d.ts | 1 +
bindings/python/css_inline.pyi | 6 ++
bindings/python/src/lib.rs | 33 ++++--
bindings/ruby/ext/css_inline/src/lib.rs | 101 +++++++++++-------
css-inline/src/html/document.rs | 4 +
css-inline/src/html/serializer.rs | 64 ++++++++---
css-inline/src/lib.rs | 11 ++
css-inline/src/main.rs | 7 ++
css-inline/tests/test_cli.rs | 21 ++++
css-inline/tests/test_inlining.rs | 22 ++++
17 files changed, 242 insertions(+), 69 deletions(-)
diff --git a/bindings/c/src/lib.rs b/bindings/c/src/lib.rs
index 7f48a1dc..08920313 100644
--- a/bindings/c/src/lib.rs
+++ b/bindings/c/src/lib.rs
@@ -95,6 +95,8 @@ pub struct CssInlinerOptions {
/// Pre-allocate capacity for HTML nodes during parsing.
/// It can improve performance when you have an estimate of the number of nodes in your HTML document.
pub preallocate_node_capacity: size_t,
+ /// Remove trailing semicolons and spaces between properties and values.
+ pub minify_css: bool,
}
macro_rules! inliner {
@@ -186,6 +188,7 @@ pub extern "C" fn css_inliner_default_options() -> CssInlinerOptions {
keep_style_tags: false,
keep_link_tags: false,
keep_at_rules: false,
+ minify_css: false,
base_url: ptr::null(),
load_remote_stylesheets: true,
cache: std::ptr::null(),
@@ -229,6 +232,7 @@ impl TryFrom<&CssInlinerOptions> for InlineOptions<'_> {
keep_style_tags: value.keep_style_tags,
keep_link_tags: value.keep_link_tags,
keep_at_rules: value.keep_at_rules,
+ minify_css: value.minify_css,
base_url: match base_url {
Some(url) => Some(Url::parse(url).map_err(|_| InlineOptionsError::InvalidUrl)?),
None => None,
diff --git a/bindings/java/src/main/java/org/cssinline/CssInlineConfig.java b/bindings/java/src/main/java/org/cssinline/CssInlineConfig.java
index 043da02a..2c1bba66 100644
--- a/bindings/java/src/main/java/org/cssinline/CssInlineConfig.java
+++ b/bindings/java/src/main/java/org/cssinline/CssInlineConfig.java
@@ -14,6 +14,9 @@ public class CssInlineConfig {
/** Keep "at-rules" after inlining. */
public final boolean keepAtRules;
+ /** Remove trailing semicolons and spaces between properties and values. */
+ public final boolean minifyCss;
+
/** Whether remote stylesheets should be loaded or not. */
public final boolean loadRemoteStylesheets;
@@ -30,12 +33,13 @@ public class CssInlineConfig {
public final int preallocateNodeCapacity;
private CssInlineConfig(boolean inlineStyleTags, boolean keepStyleTags, boolean keepLinkTags,
- boolean keepAtRules, boolean loadRemoteStylesheets, String baseUrl, String extraCss, int cacheSize,
- int preallocateNodeCapacity) {
+ boolean keepAtRules, boolean minifyCss, boolean loadRemoteStylesheets, String baseUrl, String extraCss,
+ int cacheSize, int preallocateNodeCapacity) {
this.inlineStyleTags = inlineStyleTags;
this.keepStyleTags = keepStyleTags;
this.keepLinkTags = keepLinkTags;
this.keepAtRules = keepAtRules;
+ this.minifyCss = minifyCss;
this.loadRemoteStylesheets = loadRemoteStylesheets;
this.baseUrl = baseUrl;
this.extraCss = extraCss;
@@ -51,6 +55,7 @@ public static class Builder {
private boolean keepStyleTags = false;
private boolean keepLinkTags = false;
private boolean keepAtRules = false;
+ private boolean minifyCss = false;
private boolean loadRemoteStylesheets = true;
private String baseUrl = null;
private String extraCss = null;
@@ -110,6 +115,17 @@ public Builder setKeepAtRules(boolean b) {
return this;
}
+ /**
+ * Remove trailing semicolons and spaces between properties and values.
+ *
+ * @param b true to remove, false to keep them
+ * @return this builder instance for method chaining
+ */
+ public Builder setMinifyCss(boolean b) {
+ this.minifyCss = b;
+ return this;
+ }
+
/**
* Whether remote stylesheets should be loaded or not.
*
@@ -148,7 +164,7 @@ public Builder setExtraCss(String css) {
*
* @param size
* cache size, must be non-negative
- * @return this builder instance for method chaining
+ * @return this builder instance for method chaining
* @throws IllegalArgumentException
* if size is negative
*/
@@ -166,7 +182,7 @@ public Builder setCacheSize(int size) {
*
* @param cap
* initial node capacity, must be positive
- * @return this builder instance for method chaining
+ * @return this builder instance for method chaining
* @throws IllegalArgumentException
* if cap is zero or negative
*/
@@ -184,7 +200,7 @@ public Builder setPreallocateNodeCapacity(int cap) {
* @return a new immutable configuration instance
*/
public CssInlineConfig build() {
- return new CssInlineConfig(inlineStyleTags, keepStyleTags, keepLinkTags, keepAtRules, loadRemoteStylesheets, baseUrl,
+ return new CssInlineConfig(inlineStyleTags, keepStyleTags, keepLinkTags, keepAtRules, minifyCss, loadRemoteStylesheets, baseUrl,
extraCss, cacheSize, preallocateNodeCapacity);
}
}
diff --git a/bindings/java/src/main/rust/lib.rs b/bindings/java/src/main/rust/lib.rs
index 6be63a69..680c8c0c 100644
--- a/bindings/java/src/main/rust/lib.rs
+++ b/bindings/java/src/main/rust/lib.rs
@@ -75,6 +75,7 @@ fn build_inliner(
let keep_style_tags = env.get_bool_field(&cfg, "keepStyleTags")?;
let keep_link_tags = env.get_bool_field(&cfg, "keepLinkTags")?;
let keep_at_rules = env.get_bool_field(&cfg, "keepAtRules")?;
+ let minify_css = env.get_bool_field(&cfg, "minifyCss")?;
let load_remote_stylesheets = env.get_bool_field(&cfg, "loadRemoteStylesheets")?;
let cache_size = env.get_int_field(&cfg, "cacheSize")?;
let preallocate_node_capacity = env.get_int_field(&cfg, "preallocateNodeCapacity")?;
@@ -86,6 +87,7 @@ fn build_inliner(
.keep_style_tags(keep_style_tags)
.keep_link_tags(keep_link_tags)
.keep_at_rules(keep_at_rules)
+ .minify_css(minify_css)
.load_remote_stylesheets(load_remote_stylesheets)
.extra_css(extra_css.map(Cow::Owned))
.preallocate_node_capacity(preallocate_node_capacity as usize);
diff --git a/bindings/javascript/index.d.ts b/bindings/javascript/index.d.ts
index feb181c5..91598f33 100644
--- a/bindings/javascript/index.d.ts
+++ b/bindings/javascript/index.d.ts
@@ -20,6 +20,8 @@ export interface Options {
keepLinkTags?: boolean
/** Keep "at-rules" after inlining. */
keepAtRules?: boolean
+ /** Remove trailing semicolons and spaces between properties and values. */
+ minifyCss?: boolean
/** Used for loading external stylesheets via relative URLs. */
baseUrl?: string
/** Whether remote stylesheets should be loaded or not. */
diff --git a/bindings/javascript/js-binding.d.ts b/bindings/javascript/js-binding.d.ts
index 19aac708..541bb38a 100644
--- a/bindings/javascript/js-binding.d.ts
+++ b/bindings/javascript/js-binding.d.ts
@@ -19,6 +19,9 @@ export interface Options {
keepStyleTags?: boolean
/** Keep "link" tags after inlining. */
keepLinkTags?: boolean
+ /** Remove trailing semicolons and spaces between properties and values. */
+ // TODO - is it correct that `keepAtRules` isn't here?
+ minifyCss?: boolean
/** Used for loading external stylesheets via relative URLs. */
baseUrl?: string
/** Whether remote stylesheets should be loaded or not. */
diff --git a/bindings/javascript/src/lib.rs b/bindings/javascript/src/lib.rs
index abea8da2..367e648b 100644
--- a/bindings/javascript/src/lib.rs
+++ b/bindings/javascript/src/lib.rs
@@ -75,6 +75,7 @@ const INLINE: &'static str = r#"export interface InlineOptions {
keepStyleTags?: boolean,
keepLinkTags?: boolean,
keepAtRules?: boolean,
+ minifyCss?: boolean,
baseUrl?: string,
loadRemoteStylesheets?: boolean,
extraCss?: string,
diff --git a/bindings/javascript/src/options.rs b/bindings/javascript/src/options.rs
index 37cd60c7..fec4093e 100644
--- a/bindings/javascript/src/options.rs
+++ b/bindings/javascript/src/options.rs
@@ -42,6 +42,8 @@ pub struct Options {
pub keep_link_tags: Option,
/// Keep "at-rules" after inlining.
pub keep_at_rules: Option,
+ /// Remove trailing semicolons and spaces between properties and values.
+ pub minify_css: Option,
/// Used for loading external stylesheets via relative URLs.
pub base_url: Option,
/// Whether remote stylesheets should be loaded or not.
@@ -65,6 +67,7 @@ impl TryFrom for css_inline::InlineOptions<'_> {
keep_style_tags: value.keep_style_tags.unwrap_or(false),
keep_link_tags: value.keep_link_tags.unwrap_or(false),
keep_at_rules: value.keep_at_rules.unwrap_or(false),
+ minify_css: value.minify_css.unwrap_or(false),
base_url: parse_url(value.base_url)?,
load_remote_stylesheets: value.load_remote_stylesheets.unwrap_or(true),
extra_css: value.extra_css.map(Cow::Owned),
diff --git a/bindings/javascript/wasm/index.d.ts b/bindings/javascript/wasm/index.d.ts
index 82705066..574e8623 100644
--- a/bindings/javascript/wasm/index.d.ts
+++ b/bindings/javascript/wasm/index.d.ts
@@ -7,6 +7,7 @@ export interface InlineOptions {
keepStyleTags?: boolean;
keepLinkTags?: boolean;
keepAtRules?: boolean;
+ minifyCss?: boolean;
baseUrl?: string;
loadRemoteStylesheets?: boolean;
extraCss?: string;
diff --git a/bindings/python/css_inline.pyi b/bindings/python/css_inline.pyi
index da01bc9a..86427172 100644
--- a/bindings/python/css_inline.pyi
+++ b/bindings/python/css_inline.pyi
@@ -7,6 +7,8 @@ class CSSInliner:
inline_style_tags: bool = True,
keep_style_tags: bool = False,
keep_link_tags: bool = False,
+ # TODO - is it correct that `keep_at_rules` isn't here?
+ minify_css: bool = False,
base_url: str | None = None,
load_remote_stylesheets: bool = True,
cache: StylesheetCache | None = None,
@@ -23,6 +25,7 @@ def inline(
inline_style_tags: bool = True,
keep_style_tags: bool = False,
keep_link_tags: bool = False,
+ minify_css: bool = False,
base_url: str | None = None,
load_remote_stylesheets: bool = True,
cache: StylesheetCache | None = None,
@@ -35,6 +38,7 @@ def inline_fragment(
inline_style_tags: bool = True,
keep_style_tags: bool = False,
keep_link_tags: bool = False,
+ minify_css: bool = False,
base_url: str | None = None,
load_remote_stylesheets: bool = True,
cache: StylesheetCache | None = None,
@@ -46,6 +50,7 @@ def inline_many(
inline_style_tags: bool = True,
keep_style_tags: bool = False,
keep_link_tags: bool = False,
+ minify_css: bool = False,
base_url: str | None = None,
load_remote_stylesheets: bool = True,
cache: StylesheetCache | None = None,
@@ -58,6 +63,7 @@ def inline_many_fragments(
inline_style_tags: bool = True,
keep_style_tags: bool = False,
keep_link_tags: bool = False,
+ minify_css: bool = False,
base_url: str | None = None,
load_remote_stylesheets: bool = True,
cache: StylesheetCache | None = None,
diff --git a/bindings/python/src/lib.rs b/bindings/python/src/lib.rs
index f958411d..9f5019e2 100644
--- a/bindings/python/src/lib.rs
+++ b/bindings/python/src/lib.rs
@@ -99,7 +99,7 @@ impl StylesheetCache {
}
}
-/// CSSInliner(inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
+/// CSSInliner(inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, minify_css=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
///
/// Customizable CSS inliner.
#[pyclass]
@@ -108,12 +108,13 @@ struct CSSInliner {
}
macro_rules! inliner {
- ($inline_style_tags:expr, $keep_style_tags:expr, $keep_link_tags:expr, $keep_at_rules:expr, $base_url:expr, $load_remote_stylesheets:expr, $cache:expr, $extra_css:expr, $preallocate_node_capacity:expr) => {{
+ ($inline_style_tags:expr, $keep_style_tags:expr, $keep_link_tags:expr, $keep_at_rules:expr, $minify_css:expr, $base_url:expr, $load_remote_stylesheets:expr, $cache:expr, $extra_css:expr, $preallocate_node_capacity:expr) => {{
let options = rust_inline::InlineOptions {
inline_style_tags: $inline_style_tags.unwrap_or(true),
keep_style_tags: $keep_style_tags.unwrap_or(false),
keep_link_tags: $keep_link_tags.unwrap_or(false),
keep_at_rules: $keep_at_rules.unwrap_or(false),
+ minify_css: $minify_css.unwrap_or(false),
base_url: $crate::parse_url($base_url)?,
load_remote_stylesheets: $load_remote_stylesheets.unwrap_or(true),
cache: {
@@ -137,7 +138,7 @@ macro_rules! inliner {
impl CSSInliner {
#[new]
#[pyo3(
- signature = (inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
+ signature = (inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, minify_css=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
)]
#[allow(clippy::too_many_arguments)]
fn new(
@@ -145,6 +146,7 @@ impl CSSInliner {
keep_style_tags: Option,
keep_link_tags: Option,
keep_at_rules: Option,
+ minify_css: Option,
base_url: Option,
load_remote_stylesheets: Option,
cache: Option,
@@ -156,6 +158,7 @@ impl CSSInliner {
keep_style_tags,
keep_link_tags,
keep_at_rules,
+ minify_css,
base_url,
load_remote_stylesheets,
cache,
@@ -205,12 +208,12 @@ impl CSSInliner {
}
}
-/// inline(html, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
+/// inline(html, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, minify_css=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
///
/// Inline CSS in the given HTML document
#[pyfunction]
#[pyo3(
- signature = (html, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
+ signature = (html, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, minify_css=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
)]
#[allow(clippy::too_many_arguments)]
fn inline(
@@ -219,6 +222,7 @@ fn inline(
keep_style_tags: Option,
keep_link_tags: Option,
keep_at_rules: Option,
+ minify_css: Option,
base_url: Option,
load_remote_stylesheets: Option,
cache: Option,
@@ -230,6 +234,7 @@ fn inline(
keep_style_tags,
keep_link_tags,
keep_at_rules,
+ minify_css,
base_url,
load_remote_stylesheets,
cache,
@@ -239,12 +244,12 @@ fn inline(
Ok(inliner.inline(html).map_err(InlineErrorWrapper)?)
}
-/// inline_fragment(html, css, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
+/// inline_fragment(html, css, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, minify_css=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
///
/// Inline CSS in the given HTML fragment
#[pyfunction]
#[pyo3(
- signature = (html, css, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
+ signature = (html, css, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, minify_css=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
)]
#[allow(clippy::too_many_arguments)]
fn inline_fragment(
@@ -254,6 +259,7 @@ fn inline_fragment(
keep_style_tags: Option,
keep_link_tags: Option,
keep_at_rules: Option,
+ minify_css: Option,
base_url: Option,
load_remote_stylesheets: Option,
cache: Option,
@@ -265,6 +271,7 @@ fn inline_fragment(
keep_style_tags,
keep_link_tags,
keep_at_rules,
+ minify_css,
base_url,
load_remote_stylesheets,
cache,
@@ -276,12 +283,12 @@ fn inline_fragment(
.map_err(InlineErrorWrapper)?)
}
-/// inline_many(htmls, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
+/// inline_many(htmls, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, minify_css=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
///
/// Inline CSS in multiple HTML documents
#[pyfunction]
#[pyo3(
- signature = (htmls, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
+ signature = (htmls, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, minify_css=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
)]
#[allow(clippy::too_many_arguments)]
fn inline_many(
@@ -290,6 +297,7 @@ fn inline_many(
keep_style_tags: Option,
keep_link_tags: Option,
keep_at_rules: Option,
+ minify_css: Option,
base_url: Option,
load_remote_stylesheets: Option,
cache: Option,
@@ -301,6 +309,7 @@ fn inline_many(
keep_style_tags,
keep_link_tags,
keep_at_rules,
+ minify_css,
base_url,
load_remote_stylesheets,
cache,
@@ -323,12 +332,12 @@ fn inline_many_impl(
Ok(output.map_err(InlineErrorWrapper)?)
}
-/// inline_many_fragments(htmls, css, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
+/// inline_many_fragments(htmls, css, inline_style_tags=True, keep_style_tags=False, keep_link_tags=False, keep_at_rules=False, minify_css=False, base_url=None, load_remote_stylesheets=True, cache=None, extra_css=None, preallocate_node_capacity=32)
///
/// Inline CSS in multiple HTML fragments
#[pyfunction]
#[pyo3(
- signature = (htmls, css, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
+ signature = (htmls, css, inline_style_tags=true, keep_style_tags=false, keep_link_tags=false, keep_at_rules=false, minify_css=false, base_url=None, load_remote_stylesheets=true, cache=None, extra_css=None, preallocate_node_capacity=32)
)]
#[allow(clippy::too_many_arguments)]
fn inline_many_fragments(
@@ -338,6 +347,7 @@ fn inline_many_fragments(
keep_style_tags: Option,
keep_link_tags: Option,
keep_at_rules: Option,
+ minify_css: Option,
base_url: Option,
load_remote_stylesheets: Option,
cache: Option,
@@ -349,6 +359,7 @@ fn inline_many_fragments(
keep_style_tags,
keep_link_tags,
keep_at_rules,
+ minify_css,
base_url,
load_remote_stylesheets,
cache,
diff --git a/bindings/ruby/ext/css_inline/src/lib.rs b/bindings/ruby/ext/css_inline/src/lib.rs
index 734cf2f1..cbdd61da 100644
--- a/bindings/ruby/ext/css_inline/src/lib.rs
+++ b/bindings/ruby/ext/css_inline/src/lib.rs
@@ -31,7 +31,7 @@ use magnus::{
prelude::*,
scan_args::{get_kwargs, scan_args, Args},
typed_data::Obj,
- DataTypeFunctions, RHash, TypedData, Value,
+ DataTypeFunctions, RHash, Symbol, TryConvert, TypedData, Value,
};
use rayon::prelude::*;
use std::{
@@ -42,52 +42,71 @@ use std::{
type RubyResult = Result;
+#[allow(clippy::struct_excessive_bools)]
+struct Options {
+ /// Whether to inline CSS from "style" tags.
+ ///
+ /// Sometimes HTML may include a lot of boilerplate styles, that are not applicable in every
+ /// scenario, and it is useful to ignore them and use `extra_css` instead.
+ inline_style_tags: Option,
+ /// Keep "style" tags after inlining.
+ keep_style_tags: Option,
+ /// Keep "link" tags after inlining.
+ keep_link_tags: Option,
+ /// Keep "at-rules" after inlining.
+ keep_at_rules: Option,
+ /// Remove trailing semicolons and spaces between properties and values.
+ minify_css: Option,
+ /// Used for loading external stylesheets via relative URLs.
+ base_url: Option,
+ /// Whether remote stylesheets should be loaded or not.
+ load_remote_stylesheets: Option,
+ /// An LRU Cache for external stylesheets.
+ cache: Option>,
+ /// Additional CSS to inline.
+ extra_css: Option,
+ /// Pre-allocate capacity for HTML nodes during parsing.
+ /// It can improve performance when you have an estimate of the number of nodes in your HTML document.
+ preallocate_node_capacity: Option,
+}
+
+impl TryConvert for Options {
+ fn try_convert(v: Value) -> Result {
+ let h = RHash::try_convert(v)?;
+ Ok(Self {
+ inline_style_tags: h.aref::<_, Option>(Symbol::new("inline_style_tags"))?,
+ keep_style_tags: h.aref::<_, Option>(Symbol::new("keep_style_tags"))?,
+ keep_link_tags: h.aref::<_, Option>(Symbol::new("keep_link_tags"))?,
+ keep_at_rules: h.aref::<_, Option>(Symbol::new("keep_at_rules"))?,
+ minify_css: h.aref::<_, Option>(Symbol::new("minify_css"))?,
+ base_url: h.aref::<_, Option>(Symbol::new("base_url"))?,
+ load_remote_stylesheets: h
+ .aref::<_, Option>(Symbol::new("load_remote_stylesheets"))?,
+ cache: h.aref::<_, Option>>(Symbol::new("cache"))?,
+ extra_css: h.aref::<_, Option>(Symbol::new("extra_css"))?,
+ preallocate_node_capacity: h
+ .aref::<_, Option>(Symbol::new("preallocate_node_capacity"))?,
+ })
+ }
+}
+
fn parse_options(
args: &Args,
) -> RubyResult> {
- let kwargs = get_kwargs::<
- _,
- (),
- (
- Option,
- Option,
- Option,
- Option,
- Option,
- Option,
- Option>,
- Option,
- Option,
- ),
- (),
- >(
- args.keywords,
- &[],
- &[
- "inline_style_tags",
- "keep_style_tags",
- "keep_link_tags",
- "keep_at_rules",
- "base_url",
- "load_remote_stylesheets",
- "cache",
- "extra_css",
- "preallocate_node_capacity",
- ],
- )?;
- let kwargs = kwargs.optional;
+ let kwargs: Options = Options::try_convert(args.keywords.as_value())?;
Ok(rust_inline::InlineOptions {
- inline_style_tags: kwargs.0.unwrap_or(true),
- keep_style_tags: kwargs.1.unwrap_or(false),
- keep_link_tags: kwargs.2.unwrap_or(false),
- keep_at_rules: kwargs.3.unwrap_or(false),
- base_url: parse_url(kwargs.4)?,
- load_remote_stylesheets: kwargs.5.unwrap_or(true),
+ inline_style_tags: kwargs.inline_style_tags.unwrap_or(true),
+ keep_style_tags: kwargs.keep_style_tags.unwrap_or(false),
+ keep_link_tags: kwargs.keep_link_tags.unwrap_or(false),
+ keep_at_rules: kwargs.keep_at_rules.unwrap_or(false),
+ minify_css: kwargs.minify_css.unwrap_or(false),
+ base_url: parse_url(kwargs.base_url)?,
+ load_remote_stylesheets: kwargs.load_remote_stylesheets.unwrap_or(true),
cache: kwargs
- .6
+ .cache
.map(|cache| Mutex::new(rust_inline::StylesheetCache::new(cache.size))),
- extra_css: kwargs.7.map(Cow::Owned),
- preallocate_node_capacity: kwargs.8.unwrap_or(32),
+ extra_css: kwargs.extra_css.map(Cow::Owned),
+ preallocate_node_capacity: kwargs.preallocate_node_capacity.unwrap_or(32),
resolver: Arc::new(rust_inline::DefaultStylesheetResolver),
})
}
diff --git a/css-inline/src/html/document.rs b/css-inline/src/html/document.rs
index 717b9595..31331fc3 100644
--- a/css-inline/src/html/document.rs
+++ b/css-inline/src/html/document.rs
@@ -282,12 +282,14 @@ impl Document {
}
/// Serialize the document to HTML string.
+ #[allow(clippy::too_many_arguments)]
pub(crate) fn serialize(
&self,
writer: &mut W,
styles: DocumentStyleMap<'_>,
keep_style_tags: bool,
keep_link_tags: bool,
+ minify_css: bool,
at_rules: Option<&String>,
mode: InliningMode,
) -> Result<(), InlineError> {
@@ -297,6 +299,7 @@ impl Document {
styles,
keep_style_tags,
keep_link_tags,
+ minify_css,
at_rules,
mode,
)
@@ -350,6 +353,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
None,
InliningMode::Document,
)
diff --git a/css-inline/src/html/serializer.rs b/css-inline/src/html/serializer.rs
index c2cf4d37..6463a4c4 100644
--- a/css-inline/src/html/serializer.rs
+++ b/css-inline/src/html/serializer.rs
@@ -9,12 +9,14 @@ use html5ever::{local_name, ns, tendril::StrTendril, LocalName, QualName};
use smallvec::{smallvec, SmallVec};
use std::io::Write;
+#[allow(clippy::too_many_arguments)]
pub(crate) fn serialize_to(
document: &Document,
writer: &mut W,
styles: DocumentStyleMap<'_>,
keep_style_tags: bool,
keep_link_tags: bool,
+ minify_css: bool,
at_rules: Option<&String>,
mode: InliningMode,
) -> Result<(), InlineError> {
@@ -23,6 +25,7 @@ pub(crate) fn serialize_to(
NodeId::document_id(),
keep_style_tags,
keep_link_tags,
+ minify_css,
at_rules,
mode,
);
@@ -36,6 +39,7 @@ struct Sink<'a> {
node: NodeId,
keep_style_tags: bool,
keep_link_tags: bool,
+ minify_css: bool,
at_rules: Option<&'a String>,
inlining_mode: InliningMode,
}
@@ -46,6 +50,7 @@ impl<'a> Sink<'a> {
node: NodeId,
keep_style_tags: bool,
keep_link_tags: bool,
+ minify_css: bool,
at_rules: Option<&'a String>,
inlining_mode: InliningMode,
) -> Sink<'a> {
@@ -54,6 +59,7 @@ impl<'a> Sink<'a> {
node,
keep_style_tags,
keep_link_tags,
+ minify_css,
at_rules,
inlining_mode,
}
@@ -65,6 +71,7 @@ impl<'a> Sink<'a> {
node,
self.keep_style_tags,
self.keep_link_tags,
+ self.minify_css,
self.at_rules,
self.inlining_mode,
)
@@ -117,7 +124,12 @@ impl<'a> Sink<'a> {
Some(self.node)
};
- serializer.start_elem(&element.name, &element.attributes, style_node_id)?;
+ serializer.start_elem(
+ &element.name,
+ &element.attributes,
+ style_node_id,
+ self.minify_css,
+ )?;
if element.name.local == local_name!("head") {
if let Some(at_rules) = &self.at_rules {
@@ -227,11 +239,13 @@ impl<'a, W: Write> HtmlSerializer<'a, W> {
Ok(())
}
+ #[allow(clippy::too_many_lines)]
fn start_elem(
&mut self,
name: &QualName,
attrs: &Attributes,
style_node_id: Option,
+ minify_css: bool,
) -> Result<(), InlineError> {
let html_name = match name.ns {
ns!(html) => Some(name.local.clone()),
@@ -292,6 +306,7 @@ impl<'a, W: Write> HtmlSerializer<'a, W> {
&attr.value,
new_styles,
&mut self.style_buffer,
+ minify_css,
)?;
styles = None;
} else {
@@ -304,9 +319,19 @@ impl<'a, W: Write> HtmlSerializer<'a, W> {
}
if let Some(styles) = styles {
self.writer.write_all(b" style=\"")?;
- for (property, (_, value)) in styles {
- write_declaration(&mut self.writer, property, value)?;
- self.writer.write_all(b";")?;
+ if minify_css {
+ let mut it = styles.iter().peekable();
+ while let Some((property, (_, value))) = it.next() {
+ write_declaration(&mut self.writer, property, value, minify_css)?;
+ if !minify_css || it.peek().is_some() {
+ self.writer.write_all(b";")?;
+ }
+ }
+ } else {
+ for (property, (_, value)) in styles {
+ write_declaration(&mut self.writer, property, value, minify_css)?;
+ self.writer.write_all(b";")?;
+ }
}
self.writer.write_all(b"\"")?;
}
@@ -416,15 +441,21 @@ impl<'a, W: Write> HtmlSerializer<'a, W> {
}
const STYLE_SEPARATOR: &[u8] = b": ";
+const STYLE_SEPARATOR_MIN: &[u8] = b":";
#[inline]
fn write_declaration(
writer: &mut Wr,
name: &str,
value: &str,
+ minify_css: bool,
) -> Result<(), InlineError> {
writer.write_all(name.as_bytes())?;
- writer.write_all(STYLE_SEPARATOR)?;
+ if minify_css {
+ writer.write_all(STYLE_SEPARATOR_MIN)?;
+ } else {
+ writer.write_all(STYLE_SEPARATOR)?;
+ }
write_declaration_value(writer, value)
}
@@ -453,10 +484,10 @@ fn write_declaration_value(writer: &mut Wr, value: &str) -> Result<()
}
macro_rules! push_or_update {
- ($style_buffer:expr, $length:expr, $name: expr, $value:expr) => {{
+ ($style_buffer:expr, $length:expr, $name: expr, $value:expr, $minify_css:expr) => {{
if let Some(style) = $style_buffer.get_mut($length) {
style.clear();
- write_declaration(style, &$name, $value)?;
+ write_declaration(style, &$name, $value, $minify_css)?;
} else {
let value = $value.trim();
let mut style = Vec::with_capacity(
@@ -465,7 +496,7 @@ macro_rules! push_or_update {
.saturating_add(STYLE_SEPARATOR.len())
.saturating_add(value.len()),
);
- write_declaration(&mut style, &$name, $value)?;
+ write_declaration(&mut style, &$name, $value, $minify_css)?;
$style_buffer.push(style);
};
$length = $length.saturating_add(1);
@@ -480,6 +511,7 @@ fn merge_styles(
current_style: &StrTendril,
new_styles: &ElementStyleMap<'_>,
declarations_buffer: &mut SmallVec<[Vec; 8]>,
+ minify_css: bool,
) -> Result<(), InlineError> {
// This function is designed with a focus on reusing existing allocations where possible
// We start by parsing the current declarations in the "style" attribute
@@ -502,10 +534,10 @@ fn merge_styles(
if let Some(buffer) = declarations_buffer.get_mut(idx) {
buffer.clear();
buffer.reserve(estimated_declaration_size);
- write_declaration(buffer, &property, value)?;
+ write_declaration(buffer, &property, value, minify_css)?;
} else {
let mut buffer = Vec::with_capacity(estimated_declaration_size);
- write_declaration(&mut buffer, &property, value)?;
+ write_declaration(&mut buffer, &property, value, minify_css)?;
declarations_buffer.push(buffer);
}
}
@@ -539,7 +571,8 @@ fn merge_styles(
declarations_buffer,
parsed_declarations_count,
property,
- value
+ value,
+ minify_css
);
}
// There's no existing rule with the same name, and the new rule is not `!important`
@@ -548,7 +581,8 @@ fn merge_styles(
declarations_buffer,
parsed_declarations_count,
property,
- value
+ value,
+ minify_css
),
// Rule exists and the new one is not `!important` - leave the existing rule as-is and
// ignore the new one.
@@ -595,6 +629,7 @@ mod tests {
IndexMap::default(),
true,
false,
+ false,
None,
InliningMode::Document,
)
@@ -615,6 +650,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
None,
InliningMode::Document,
)
@@ -635,6 +671,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
None,
InliningMode::Document,
)
@@ -655,6 +692,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
None,
InliningMode::Document,
)
@@ -678,6 +716,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
None,
InliningMode::Document,
)
@@ -698,6 +737,7 @@ mod tests {
IndexMap::default(),
false,
false,
+ false,
Some(&String::from(
"@media (max-width: 600px) { h1 { font-size: 18px; } }",
)),
diff --git a/css-inline/src/lib.rs b/css-inline/src/lib.rs
index b8520abc..ef9e5155 100644
--- a/css-inline/src/lib.rs
+++ b/css-inline/src/lib.rs
@@ -64,6 +64,8 @@ pub struct InlineOptions<'a> {
pub keep_link_tags: bool,
/// Keep "at-rules" after inlining.
pub keep_at_rules: bool,
+ /// Remove trailing semicolons and spaces between properties and values.
+ pub minify_css: bool,
/// Used for loading external stylesheets via relative URLs.
pub base_url: Option,
/// Whether remote stylesheets should be loaded or not.
@@ -132,6 +134,13 @@ impl<'a> InlineOptions<'a> {
self
}
+ /// Override whether trailing semicolons and spaces between properties and values should be removed.
+ #[must_use]
+ pub fn minify_css(mut self, minify_css: bool) -> Self {
+ self.minify_css = minify_css;
+ self
+ }
+
/// Set base URL that will be used for loading external stylesheets via relative URLs.
#[must_use]
pub fn base_url(mut self, base_url: Option) -> Self {
@@ -194,6 +203,7 @@ impl Default for InlineOptions<'_> {
keep_style_tags: false,
keep_link_tags: false,
keep_at_rules: false,
+ minify_css: false,
base_url: None,
load_remote_stylesheets: true,
#[cfg(feature = "stylesheet-cache")]
@@ -528,6 +538,7 @@ impl<'a> CSSInliner<'a> {
styles,
self.options.keep_style_tags,
self.options.keep_link_tags,
+ self.options.minify_css,
at_rules.as_ref(),
mode,
)?;
diff --git a/css-inline/src/main.rs b/css-inline/src/main.rs
index f0888f75..b9e4784a 100644
--- a/css-inline/src/main.rs
+++ b/css-inline/src/main.rs
@@ -61,6 +61,7 @@ fn main() -> Result<(), Box> {
load_remote_stylesheets: bool,
#[cfg(feature = "stylesheet-cache")]
cache_size: Option,
+ minify_css: bool,
}
impl Default for ParsedArgs {
@@ -80,6 +81,7 @@ fn main() -> Result<(), Box> {
load_remote_stylesheets: false,
#[cfg(feature = "stylesheet-cache")]
cache_size: None,
+ minify_css: false,
}
}
}
@@ -153,6 +155,7 @@ fn main() -> Result<(), Box> {
"keep-style-tags" => parsed.keep_style_tags = true,
"keep-link-tags" => parsed.keep_link_tags = true,
"keep-at-rules" => parsed.keep_at_rules = true,
+ "minify-css" => parsed.minify_css = true,
_ => {
return Err(ParseError {
message: format!("Unknown flag: {flag}"),
@@ -236,6 +239,9 @@ OPTIONS:
--keep-at-rules
Keep "at-rules" after inlining.
+ --minify-css
+ Minify CSS by removing trailing semicolons and spaces between properties and values.
+
--base-url
Used for loading external stylesheets via relative URLs.
@@ -344,6 +350,7 @@ OPTIONS:
keep_style_tags: args.keep_style_tags,
keep_link_tags: args.keep_link_tags,
keep_at_rules: args.keep_at_rules,
+ minify_css: args.minify_css,
base_url,
load_remote_stylesheets: args.load_remote_stylesheets,
#[cfg(feature = "stylesheet-cache")]
diff --git a/css-inline/tests/test_cli.rs b/css-inline/tests/test_cli.rs
index 3505dca1..3d48a85f 100644
--- a/css-inline/tests/test_cli.rs
+++ b/css-inline/tests/test_cli.rs
@@ -77,6 +77,27 @@ pub mod tests {
)
}
+ #[test]
+ fn minify_css() {
+ css_inline()
+ .arg("tests/example.html")
+ .arg("--minify-css")
+ .arg("--output-filename-prefix=inlined.minify-css.")
+ .assert()
+ .success()
+ .stdout("tests/example.html: SUCCESS\n");
+ let content = fs::read_to_string("tests/inlined.minify-css.example.html").unwrap();
+ assert_eq!(
+ content,
+ "\n \n \n \n\
+ \n\
+ \n\
+ Test\n\
+ Test
\n\n\n\
+ "
+ )
+ }
+
#[test]
fn dont_inline_styles() {
css_inline()
diff --git a/css-inline/tests/test_inlining.rs b/css-inline/tests/test_inlining.rs
index e0c27eb3..b767f571 100644
--- a/css-inline/tests/test_inlining.rs
+++ b/css-inline/tests/test_inlining.rs
@@ -1031,6 +1031,28 @@ p { margin: 10px; }
assert_eq!(inlined, expected);
}
+#[test]
+fn minify_css() {
+ let inliner = CSSInliner::options().minify_css(true).build();
+ let html = r#"
+
+
+
+
+
+Hello
+
+"#;
+ let inlined = inliner.inline(html).unwrap();
+ let expected = "\n\n\n\nHello
\n\n";
+ assert_eq!(inlined, expected);
+}
+
#[test]
fn nth_child_selector() {
let html = r#"
From 0e8f72b88309c23eaceee954d71d9f313b75083c Mon Sep 17 00:00:00 2001
From: Matt Dziuban
Date: Fri, 17 Oct 2025 11:42:32 -0400
Subject: [PATCH 2/8] chore: Add junit-platform-launcher.
---
bindings/java/build.gradle | 1 +
1 file changed, 1 insertion(+)
diff --git a/bindings/java/build.gradle b/bindings/java/build.gradle
index 1e6cfa84..029cc59a 100644
--- a/bindings/java/build.gradle
+++ b/bindings/java/build.gradle
@@ -18,6 +18,7 @@ repositories {
dependencies {
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.0'
+ testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
jmh 'org.openjdk.jmh:jmh-core:1.37'
jmh 'org.openjdk.jmh:jmh-generator-annprocess:1.37'
From 08598048d150ae1fca1e4054459294d491b8fa5b Mon Sep 17 00:00:00 2001
From: Matt Dziuban
Date: Fri, 17 Oct 2025 12:09:50 -0400
Subject: [PATCH 3/8] chore: Run `fmt` and `clippy` on java bindings.
---
.github/workflows/build.yml | 7 +++++++
bindings/java/src/main/rust/lib.rs | 2 +-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3778721f..2fa5fa1e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -107,6 +107,9 @@ jobs:
- run: cargo fmt --all -- --check
working-directory: ./bindings/c
+ - run: cargo fmt --all -- --check
+ working-directory: ./bindings/java
+
- run: cargo fmt --all -- --check
working-directory: ./bindings/javascript
@@ -148,6 +151,10 @@ jobs:
run: cargo clippy -- -D warnings
working-directory: ./bindings/python
+ - name: Java
+ run: cargo clippy -- -D warnings
+ working-directory: ./bindings/java
+
- name: JavaScript
run: cargo clippy -- -D warnings
working-directory: ./bindings/javascript
diff --git a/bindings/java/src/main/rust/lib.rs b/bindings/java/src/main/rust/lib.rs
index 680c8c0c..47502eff 100644
--- a/bindings/java/src/main/rust/lib.rs
+++ b/bindings/java/src/main/rust/lib.rs
@@ -18,7 +18,7 @@ trait JNIExt {
impl<'a> JNIExt for JNIEnv<'a> {
fn get_rust_string(&mut self, obj: &JString) -> String {
- self.get_string(&obj)
+ self.get_string(obj)
.expect("Failed to get Java String")
.into()
}
From 86d6ab31d70b5640c67b8c02a3729dc64c1b1b3f Mon Sep 17 00:00:00 2001
From: Matt Dziuban
Date: Fri, 17 Oct 2025 14:13:59 -0400
Subject: [PATCH 4/8] chore: Update docs.
---
CHANGELOG.md | 4 ++++
README.md | 14 ++++++++++++++
bindings/c/CHANGELOG.md | 4 ++++
bindings/c/README.md | 14 ++++++++++++++
bindings/java/CHANGELOG.md | 4 ++++
bindings/java/README.md | 16 +++++++++++++++-
bindings/javascript/CHANGELOG.md | 4 ++++
bindings/javascript/README.md | 14 ++++++++++++++
bindings/python/CHANGELOG.md | 4 ++++
bindings/python/README.md | 14 ++++++++++++++
bindings/ruby/CHANGELOG.md | 4 ++++
bindings/ruby/README.md | 14 ++++++++++++++
12 files changed, 109 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 789ac41c..0d0173d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
## [Unreleased]
+### Added
+
+- `minify_css` option [#12](https://github.com/Stranger6667/css-inline/issues/12)
+
## [0.17.0] - 2025-07-26
### Added
diff --git a/README.md b/README.md
index f7860cc7..633c5863 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,7 @@ fn main() -> css_inline::Result<()> {
- `keep_style_tags`. Specifies whether to keep "style" tags after inlining. Default: `false`
- `keep_link_tags`. Specifies whether to keep "link" tags after inlining. Default: `false`
- `keep_at_rules`. Specifies whether to keep "at-rules" (starting with `@`) after inlining. Default: `false`
+- `minify_css`. Specifies whether to remove trailing semicolons and spaces between properties and values. Default: `false`
- `base_url`. The base URL used to resolve relative URLs. If you'd like to load stylesheets from your filesystem, use the `file://` scheme. Default: `None`
- `load_remote_stylesheets`. Specifies whether remote stylesheets should be loaded. Default: `true`
- `cache`. Specifies cache for external stylesheets. Default: `None`
@@ -186,6 +187,19 @@ Such tags will be kept in the resulting HTML even if the `keep_style_tags` optio
```
+If you set the the `minify_css` option to `true`, the inlined styles will be minified by removing trailing semicolons
+and spaces between properties and values.
+
+```html
+