feat: Add keep_link_tags configuration option

* chore(wasm): Use `ParseError` from `css-inline`

* feat: Add `keep_link_tags` configuration option

Author: Stranger6667

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- `keep_link_tags` configuration option.
+
 ### Changed
 
 - Replace `remove_style_tags` with `keep_style_tags`.

CONTRIBUTING.md

@@ -2,7 +2,7 @@
 
 Thank you for your interest in making `css-inline` better!
 We'd love to have your contribution. We expect all contributors to
-abide by the [Contributor Covenant Code of Conduct], which you can find in the
+abide by the Contributor Covenant Code of Conduct, which you can find in the
 [`CODE_OF_CONDUCT.md`] file in this repository.
 
 [`CODE_OF_CONDUCT.md`]: https://github.com/Stranger6667/css-inline/blob/master/CODE_OF_CONDUCT.md
@@ -24,7 +24,7 @@ your commits before merging, depending.
 
 ## Feature requests and feedback
 
-If you'd like to suggest a feature, feel free to `submit an issue <https://github.com/Stranger6667/css-inline/issues>`_
+If you'd like to suggest a feature, feel free to [submit an issue](https://github.com/Stranger6667/css-inline/issues)
 and:
 
 * Write a simple and descriptive title to identify your suggestion.
@@ -34,7 +34,7 @@ and:
 
 ## Report bugs
 
-Report bugs for `css-inline` in the `issue tracker <https://github.com/Stranger6667/css-inline/issues>`_.
+Report bugs for `css-inline` in the [issue tracker](https://github.com/Stranger6667/css-inline/issues).
 
 If you are reporting a bug, please:
 

README.md

@@ -86,6 +86,7 @@ fn main() -> Result<(), css_inline::InlineError> {
 ```
 
 - `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`
 - `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`
 - `extra_css`. Extra CSS to be inlined. Default: `None`

bindings/python/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- `keep_link_tags` configuration option.
+
 ### Changed
 
 - Replace `remove_style_tags` with `keep_style_tags`.

bindings/python/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.9.0"
 authors = ["Dmitry Dygalo <[email protected]>"]
 edition = "2021"
 rust-version = "1.60"
+include = ["src/lib.rs", "README.md", "CHANGELOG.md", "build.rs"]
 
 [lib]
 name = "css_inline"

bindings/python/README.md

@@ -106,6 +106,7 @@ inliner.inline("...")
 ```
 
 - `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`
 - `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`
 - `extra_css`. Extra CSS to be inlined. Default: `None`
@@ -197,7 +198,7 @@ Realistic email 2:
 - `pynliner 0.8.0` - `Error: No match was found`
 
 You can take a look at the benchmarks' code at `benches/bench.py` file.
-The results above were measured with stable `rustc 1.69.0`, `Python 3.11.0`, `Linux x86_64` on i8700K, and 32GB RAM.
+The results above were measured with stable `rustc 1.70.0`, `Python 3.11.0` on `Linux x86_64`.
 
 ## Comparison with other libraries
 

bindings/python/css_inline.pyi

@@ -2,6 +2,7 @@ class CSSInliner:
     def __init__(
         self,
         keep_style_tags: bool = False,
+        keep_link_tags: bool = False,
         base_url: str | None = None,
         load_remote_stylesheets: bool = True,
         extra_css: str | None = None,
@@ -13,6 +14,7 @@ class CSSInliner:
 def inline(
     html: str,
     keep_style_tags: bool = False,
+    keep_link_tags: bool = False,
     base_url: str | None = None,
     load_remote_stylesheets: bool = True,
     extra_css: str | None = None,
@@ -22,6 +24,7 @@ def inline(
 def inline_many(
     html: list[str],
     keep_style_tags: bool = False,
+    keep_link_tags: bool = False,
     base_url: str | None = None,
     load_remote_stylesheets: bool = True,
     extra_css: str | None = None,

bindings/python/src/lib.rs

@@ -67,7 +67,7 @@ fn parse_url(url: Option<String>) -> PyResult<Option<url::Url>> {
     })
 }
 
-/// CSSInliner(keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=0)
+/// CSSInliner(keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)
 ///
 /// Customizable CSS inliner.
 #[pyclass]
@@ -78,22 +78,23 @@ struct CSSInliner {
 #[pymethods]
 impl CSSInliner {
     #[new(
-        text_signature = "(keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=0)"
+        text_signature = "(keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)"
     )]
     fn new(
         keep_style_tags: Option<bool>,
+        keep_link_tags: Option<bool>,
         base_url: Option<String>,
         load_remote_stylesheets: Option<bool>,
         extra_css: Option<String>,
         preallocate_node_capacity: Option<usize>,
     ) -> PyResult<Self> {
         let options = rust_inline::InlineOptions {
             keep_style_tags: keep_style_tags.unwrap_or(false),
+            keep_link_tags: keep_link_tags.unwrap_or(false),
             base_url: parse_url(base_url)?,
             load_remote_stylesheets: load_remote_stylesheets.unwrap_or(true),
             extra_css: extra_css.map(Cow::Owned),
-            preallocate_node_capacity: preallocate_node_capacity
-                .unwrap_or(rust_inline::DEFAULT_HTML_TREE_CAPACITY),
+            preallocate_node_capacity: preallocate_node_capacity.unwrap_or(8),
         };
         Ok(CSSInliner {
             inner: rust_inline::CSSInliner::new(options),
@@ -117,55 +118,57 @@ impl CSSInliner {
     }
 }
 
-/// inline(html, keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None)
+/// inline(html, keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)
 ///
 /// Inline CSS in the given HTML document
 #[pyfunction]
 #[pyo3(
-    text_signature = "(html, keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None)"
+    text_signature = "(html, keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)"
 )]
 fn inline(
     html: &str,
     keep_style_tags: Option<bool>,
+    keep_link_tags: Option<bool>,
     base_url: Option<String>,
     load_remote_stylesheets: Option<bool>,
     extra_css: Option<&str>,
     preallocate_node_capacity: Option<usize>,
 ) -> PyResult<String> {
     let options = rust_inline::InlineOptions {
         keep_style_tags: keep_style_tags.unwrap_or(false),
+        keep_link_tags: keep_link_tags.unwrap_or(false),
         base_url: parse_url(base_url)?,
         load_remote_stylesheets: load_remote_stylesheets.unwrap_or(true),
         extra_css: extra_css.map(Cow::Borrowed),
-        preallocate_node_capacity: preallocate_node_capacity
-            .unwrap_or(rust_inline::DEFAULT_HTML_TREE_CAPACITY),
+        preallocate_node_capacity: preallocate_node_capacity.unwrap_or(8),
     };
     let inliner = rust_inline::CSSInliner::new(options);
     Ok(inliner.inline(html).map_err(InlineErrorWrapper)?)
 }
 
-/// inline_many(htmls, keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None)
+/// inline_many(htmls, keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)
 ///
 /// Inline CSS in multiple HTML documents
 #[pyfunction]
 #[pyo3(
-    text_signature = "(htmls, keep_style_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None)"
+    text_signature = "(htmls, keep_style_tags=False, keep_link_tags=False, base_url=None, load_remote_stylesheets=True, extra_css=None, preallocate_node_capacity=8)"
 )]
 fn inline_many(
     htmls: &PyList,
     keep_style_tags: Option<bool>,
+    keep_link_tags: Option<bool>,
     base_url: Option<String>,
     load_remote_stylesheets: Option<bool>,
     extra_css: Option<&str>,
     preallocate_node_capacity: Option<usize>,
 ) -> PyResult<Vec<String>> {
     let options = rust_inline::InlineOptions {
         keep_style_tags: keep_style_tags.unwrap_or(false),
+        keep_link_tags: keep_link_tags.unwrap_or(false),
         base_url: parse_url(base_url)?,
         load_remote_stylesheets: load_remote_stylesheets.unwrap_or(true),
         extra_css: extra_css.map(Cow::Borrowed),
-        preallocate_node_capacity: preallocate_node_capacity
-            .unwrap_or(rust_inline::DEFAULT_HTML_TREE_CAPACITY),
+        preallocate_node_capacity: preallocate_node_capacity.unwrap_or(8),
     };
     let inliner = rust_inline::CSSInliner::new(options);
     inline_many_impl(&inliner, htmls)

bindings/wasm/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+### Added
+
+- `keep_link_tags` configuration option.
+
 ### Changed
 
 - Replace `remove_style_tags` with `keep_style_tags`.

bindings/wasm/Cargo.toml

@@ -10,16 +10,17 @@ keywords = ["html", "css", "css-inline"]
 categories = ["web-programming"]
 license = "MIT"
 rust-version = "1.60"
+include = ["src/lib.rs", "LICENSE", "README.md", "CHANGELOG.md"]
 
 [lib]
 name = "css_inline"
 crate-type = ["cdylib"]
 
 [dependencies]
-serde = { version = "1.0.145", features = ["derive"], default-features = false }
-serde_json = "1.0.85"
-url = "2.3.1"
-wasm-bindgen = { version = "0.2.83", features = ["serde-serialize"] }
+serde = { version = "1", features = ["derive"], default-features = false }
+serde-wasm-bindgen = "0.5"
+serde_json = "1"
+wasm-bindgen = { version = "0.2" }
 
 [dependencies.css-inline]
 path = "../../css-inline"