Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

perf: reduce allocator #34

Merged
merged 4 commits into from
Sep 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/core/src/hast_to_swc_ast/decode_xml.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pub fn decode_xml(s: &str) -> String {
let bytes = s.as_bytes();

let mut ret = String::new();
let mut ret = String::with_capacity(s.len());
let mut cur_idx = 0;
let mut last_idx = 0;

Expand Down
7 changes: 5 additions & 2 deletions crates/core/src/hast_to_swc_ast/mappings.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
use std::collections::HashMap;

use lazy_static::lazy_static;

// From https://raw.githubusercontent.com/facebook/react/master/packages/react-dom/src/shared/possibleStandardNames.js
pub fn create_attr_mappings() -> HashMap<&'static str, &'static str> {
lazy_static! {
pub static ref ATTR_MAPPINGS: HashMap<&'static str, &'static str> =
HashMap::from([
// HTML
("accept", "accept"),
Expand Down Expand Up @@ -488,5 +491,5 @@ pub fn create_attr_mappings() -> HashMap<&'static str, &'static str> {
("ychannelselector", "yChannelSelector"),
("z", "z"),
("zoomandpan", "zoomAndPan"),
])
]);
}
56 changes: 27 additions & 29 deletions crates/core/src/hast_to_swc_ast/mod.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::{borrow::Cow, collections::HashMap};

use lazy_static::lazy_static;
use regex::{Captures, Regex};
Expand All @@ -15,19 +15,17 @@ mod string_to_object_style;
mod util;

use self::decode_xml::*;
use self::mappings::*;
use self::mappings::ATTR_MAPPINGS;
use self::string_to_object_style::*;
use self::util::*;

fn kebab_case(str: &str) -> String {
fn kebab_case(str: &str) -> Cow<str> {
lazy_static! {
static ref KEBAB_REGEX: Regex = Regex::new(r"[A-Z\u00C0-\u00D6\u00D8-\u00DE]").unwrap();
}
KEBAB_REGEX
.replace_all(str, |caps: &Captures| {
format!("-{}", &caps[0].to_lowercase())
})
.to_string()
KEBAB_REGEX.replace_all(str, |caps: &Captures| {
format!("-{}", &caps[0].to_lowercase())
})
}

fn convert_aria_attribute(kebab_key: &str) -> String {
Expand All @@ -37,11 +35,11 @@ fn convert_aria_attribute(kebab_key: &str) -> String {
format!("{}-{}", aria, lowercase_parts)
}

fn replace_spaces(s: &str) -> String {
fn replace_spaces(s: &str) -> Cow<str> {
lazy_static! {
static ref SPACES_REGEX: Regex = Regex::new(r"[\t\r\n\u0085\u2028\u2029]+").unwrap();
}
SPACES_REGEX.replace_all(s, |_: &Captures| " ").to_string()
SPACES_REGEX.replace_all(s, |_: &Captures| " ")
}

fn get_value(attr_name: &str, value: &JsWord) -> JSXAttrValue {
Expand Down Expand Up @@ -77,44 +75,44 @@ fn text(n: &swc_xml::ast::Text) -> Option<JSXElementChild> {
static ref SPACE_REGEX: Regex = Regex::new(r"^\s+$").unwrap();
}

let value = n.data.to_string();
if SPACE_REGEX.is_match(&value) {
let value = n.data.as_str();
if SPACE_REGEX.is_match(value) {
return None;
}

Some(JSXElementChild::JSXExprContainer(JSXExprContainer {
span: DUMMY_SP,
expr: JSXExpr::Expr(Box::new(Expr::Lit(Lit::Str(Str {
span: DUMMY_SP,
value: decode_xml(&value).into(),
value: decode_xml(value).into(),
raw: None,
})))),
}))
}

pub struct HastVisitor {
jsx: Option<JSXElement>,
attr_mappings: HashMap<&'static str, &'static str>,
attr_mappings: &'static HashMap<&'static str, &'static str>,
}

impl HastVisitor {
fn new() -> Self {
Self {
jsx: None,
attr_mappings: create_attr_mappings(),
attr_mappings: &ATTR_MAPPINGS,
}
}

pub fn get_jsx(&self) -> Option<JSXElement> {
self.jsx.clone()
pub fn take_jsx(&mut self) -> Option<JSXElement> {
self.jsx.take()
}

fn element(&self, n: &swc_xml::ast::Element) -> JSXElement {
let attrs = n
.attributes
.iter()
.map(|attr| {
let value = attr.value.clone().map(|v| get_value(&attr.name, &v));
let value = attr.value.as_ref().map(|v| get_value(&attr.name, v));
JSXAttrOrSpread::JSXAttr(JSXAttr {
span: DUMMY_SP,
name: JSXAttrName::Ident(self.get_key(&attr.name, &n.tag_name).into()),
Expand All @@ -130,23 +128,23 @@ impl HastVisitor {
));
let children = self.all(&n.children);

let opening = JSXOpeningElement {
span: DUMMY_SP,
name: name.clone(),
attrs,
self_closing: children.is_empty(),
type_args: None,
};

let closing = if !children.is_empty() {
Some(JSXClosingElement {
span: DUMMY_SP,
name,
name: name.clone(),
})
} else {
None
};

let opening = JSXOpeningElement {
span: DUMMY_SP,
name,
attrs,
self_closing: children.is_empty(),
type_args: None,
};

JSXElement {
span: DUMMY_SP,
opening,
Expand Down Expand Up @@ -243,7 +241,7 @@ impl Visit for HastVisitor {
pub fn to_swc_ast(hast: swc_xml::ast::Document) -> Option<JSXElement> {
let mut v = HastVisitor::new();
hast.visit_with(&mut v);
v.get_jsx()
v.take_jsx()
}

#[cfg(test)]
Expand Down Expand Up @@ -285,7 +283,7 @@ mod tests {
})))
.unwrap();

String::from_utf8_lossy(&buf).to_string()
unsafe { String::from_utf8_unchecked(buf) }
}

fn document_test(input: PathBuf) {
Expand Down
8 changes: 4 additions & 4 deletions crates/core/src/hast_to_swc_ast/string_to_object_style.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use std::borrow::Cow;

use lazy_static::lazy_static;
use regex::{Captures, Regex};
use swc_core::{common::DUMMY_SP, ecma::ast::*};

use super::util::*;

pub fn hyphen_to_camel_case(s: &str) -> String {
pub fn hyphen_to_camel_case(s: &str) -> Cow<str> {
lazy_static! {
static ref HYPHEN_REGEX: Regex = Regex::new(r#"-(.)"#).unwrap();
}
HYPHEN_REGEX
.replace_all(s, |caps: &Captures| caps[1].to_uppercase())
.into()
HYPHEN_REGEX.replace_all(s, |caps: &Captures| caps[1].to_uppercase())
}

// Format style key into JSX style object key.
Expand Down
Loading