feat(tmpl): css_ref

Author: fiji-flo

Diff for: Cargo.lock

@@ -36,6 +36,8 @@ imagesize = "0.13"
 svg_metadata = "0.5"
 itertools = "0.13"
 memoize = "0.4"
+concat-in-place = "1"
+indexmap = "2"
 
 rari-utils = { path = "../rari-utils" }
 rari-types = { path = "../rari-types" }

Diff for: crates/rari-doc/Cargo.toml

@@ -1,8 +1,8 @@
 use std::borrow::Cow;
-use std::collections::HashMap;
 use std::fmt::Write;
 use std::sync::OnceLock;
 
+use indexmap::IndexMap;
 use itertools::Itertools;
 use rari_l10n::l10n_json_data;
 use rari_types::globals::data_dir;
@@ -20,9 +20,13 @@ use crate::templ::templs::links::cssxref::cssxref_internal;
 // mdn/data is deprecated so we do a least effort integration here.
 #[derive(Debug, Default)]
 pub struct MDNDataFiles {
-    pub css_properties: HashMap<String, Value>,
-    pub css_at_rules: HashMap<String, Value>,
-    pub css_l10n: HashMap<String, Value>,
+    pub css_properties: IndexMap<String, Value>,
+    pub css_at_rules: IndexMap<String, Value>,
+    pub css_types: IndexMap<String, Value>,
+    pub css_l10n: IndexMap<String, Value>,
+    pub css_syntaxes: IndexMap<String, Value>,
+    pub css_seclectors: IndexMap<String, Value>,
+    pub css_units: IndexMap<String, Value>,
 }
 
 impl MDNDataFiles {
@@ -37,6 +41,18 @@ impl MDNDataFiles {
             css_l10n: serde_json::from_str(&read_to_string(
                 data_dir().join("mdn-data/package/l10n/css.json"),
             )?)?,
+            css_types: serde_json::from_str(&read_to_string(
+                data_dir().join("mdn-data/package/css/types.json"),
+            )?)?,
+            css_syntaxes: serde_json::from_str(&read_to_string(
+                data_dir().join("mdn-data/package/css/syntaxes.json"),
+            )?)?,
+            css_seclectors: serde_json::from_str(&read_to_string(
+                data_dir().join("mdn-data/package/css/selectors.json"),
+            )?)?,
+            css_units: serde_json::from_str(&read_to_string(
+                data_dir().join("mdn-data/package/css/units.json"),
+            )?)?,
         })
     }
 }

Diff for: crates/rari-doc/src/helpers/css_info.rs

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 
+use rari_md::anchor::anchorize;
 use rari_types::fm_types::FeatureStatus;
 use rari_types::locale::Locale;
 use tracing::warn;
@@ -28,7 +29,7 @@ pub fn render_internal_link(
     out.push_str(url);
     if let Some(anchor) = anchor {
         out.push('#');
-        out.push_str(anchor);
+        out.push_str(&anchorize(anchor));
     }
     if let Some(title) = title {
         out.push_str("\" title=\"");
@@ -136,9 +137,17 @@ pub fn render_link_via_page(
 
     out.push_str("<a href=\"");
     let content = match content {
-        Some(content) => &html_escape::encode_safe(content),
-        None if url.starts_with('/') => &url[url.rfind('/').unwrap_or(0)..],
-        _ => &html_escape::encode_safe(&url),
+        Some(content) => {
+            let decoded_content = html_escape::decode_html_entities(content);
+            let encoded_content = html_escape::encode_safe(&decoded_content);
+            if content != encoded_content {
+                Cow::Owned(encoded_content.into_owned())
+            } else {
+                Cow::Borrowed(content)
+            }
+        }
+        None if url.starts_with('/') => Cow::Borrowed(&url[url.rfind('/').unwrap_or(0)..]),
+        _ => html_escape::encode_safe(&url),
     };
     out.push_str(&url);
     if let Some(title) = title {
@@ -149,7 +158,7 @@ pub fn render_link_via_page(
     if code {
         out.push_str("<code>");
     }
-    out.push_str(content);
+    out.push_str(&content);
     if code {
         out.push_str("</code>");
     }

Diff for: crates/rari-doc/src/html/links.rs

@@ -56,27 +56,27 @@ pub fn add_missing_ids(html: &mut Html) -> Result<(), DocError> {
                     el.text().collect::<String>()
                 };
                 let mut id = anchorize(&text);
-                if ids.contains(id.as_str()) {
+                if ids.contains(id.as_ref()) {
                     let (prefix, mut count) = if let Some((prefix, counter)) = id.rsplit_once('_') {
                         if counter.chars().all(|c| c.is_ascii_digit()) {
                             let count = counter.parse::<i64>().unwrap_or_default() + 1;
                             (prefix, count)
                         } else {
-                            (id.as_str(), 2)
+                            (id.as_ref(), 2)
                         }
                     } else {
-                        (id.as_str(), 2)
+                        (id.as_ref(), 2)
                     };
                     let mut new_id = format!("{prefix}_{count}");
                     while ids.contains(new_id.as_str()) && count < 666 {
                         count += 1;
                         new_id = format!("{prefix}_{count}");
                     }
-                    id = new_id;
+                    id = Cow::Owned(new_id);
                 }
-
-                ids.insert(Cow::Owned(id.clone()));
-                (el.id(), id)
+                let id_ = id.to_string();
+                ids.insert(Cow::Owned(id.into_owned()));
+                (el.id(), id_)
             })
             .collect::<Vec<_>>();
     for (el_id, id) in subs {

Diff for: crates/rari-doc/src/html/modifier.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use percent_encoding::utf8_percent_encode;
 use rari_md::anchor::anchorize;
 use rari_types::globals::{deny_warnings, settings};
@@ -11,7 +13,7 @@ use crate::redirects::resolve_redirect;
 
 pub struct RariApi {}
 impl RariApi {
-    pub fn anchorize(content: &str) -> String {
+    pub fn anchorize(content: &str) -> Cow<'_, str> {
         anchorize(content)
     }