wip: restructure the entire CLI
This commit is contained in:
Jonathan Kelley committed
1 parent
6b991bf184
commit
6c351efbf0
27 files changed
+259
-232
No files matched your search
Whitespace-only changes.
@@ -0,0 +1,13 @@
|
||||
use crate::cfg::ConfigOptsBuild;
|
||||
use anyhow::Result;
|
||||
use std::path::PathBuf;
|
||||
use structopt::StructOpt;
|
||||
|
||||
pub mod extract_svgs;
|
||||
pub mod to_component;
|
||||
pub mod translate;
|
||||
|
||||
/// Build the Rust WASM app and all of its assets.
|
||||
#[derive(Clone, Debug, StructOpt)]
|
||||
#[structopt(name = "translate")]
|
||||
pub struct Translate {}
|
||||
@@ -0,0 +1,181 @@
|
||||
//! Intelligently converts html to rsx with appropraite transformations and extractions.
|
||||
//!
|
||||
//! - [*] Creates a component
|
||||
//! - [ ] Extracts svgs
|
||||
//! - [ ] Attempts to extract lists
|
||||
|
||||
use std::{
|
||||
fmt::{Display, Formatter},
|
||||
io::Write,
|
||||
};
|
||||
|
||||
use anyhow::Result;
|
||||
|
||||
use html_parser::{Dom, Element, Node};
|
||||
|
||||
pub fn convert_html_to_component(html: &str) -> Result<ComponentRenderer> {
|
||||
Ok(ComponentRenderer {
|
||||
dom: Dom::parse(html)?,
|
||||
icon_index: 0,
|
||||
})
|
||||
}
|
||||
|
||||
pub struct ComponentRenderer {
|
||||
dom: Dom,
|
||||
icon_index: usize,
|
||||
}
|
||||
|
||||
impl Display for ComponentRenderer {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
writeln!(
|
||||
f,
|
||||
r##"
|
||||
fn component(cx: Scope) -> Element {{
|
||||
cx.render(rsx!("##
|
||||
)?;
|
||||
let mut svg_nodes = vec![];
|
||||
|
||||
let mut svg_idx = 0;
|
||||
for child in &self.dom.children {
|
||||
render_child(f, child, 2, &mut svg_nodes, true, &mut svg_idx)?;
|
||||
}
|
||||
write!(
|
||||
f,
|
||||
r##" ))
|
||||
}}"##
|
||||
)?;
|
||||
|
||||
if svg_idx == 0 {
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
writeln!(f, "\n\nmod icons {{")?;
|
||||
|
||||
let mut id = 0;
|
||||
while let Some(svg) = svg_nodes.pop() {
|
||||
writeln!(
|
||||
f,
|
||||
r##" pub(super) fn icon_{}(cx: Scope) -> Element {{
|
||||
cx.render(rsx!("##,
|
||||
id
|
||||
)?;
|
||||
write_tabs(f, 3)?;
|
||||
|
||||
render_element(f, svg, 3, &mut svg_nodes, false, &mut 0)?;
|
||||
writeln!(f, "\t\t))\n\t}}\n")?;
|
||||
id += 1;
|
||||
}
|
||||
|
||||
writeln!(f, "}}")?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn render_child<'a>(
|
||||
f: &mut Formatter<'_>,
|
||||
child: &'a Node,
|
||||
il: u32,
|
||||
svg_buffer: &mut Vec<&'a Element>,
|
||||
skip_svg: bool,
|
||||
svg_idx: &mut usize,
|
||||
) -> std::fmt::Result {
|
||||
write_tabs(f, il)?;
|
||||
match child {
|
||||
Node::Text(t) => writeln!(f, "\"{}\"", t)?,
|
||||
Node::Comment(e) => writeln!(f, "/* {} */", e)?,
|
||||
Node::Element(el) => render_element(f, el, il, svg_buffer, skip_svg, svg_idx)?,
|
||||
};
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn render_element<'a>(
|
||||
f: &mut Formatter<'_>,
|
||||
el: &'a Element,
|
||||
il: u32,
|
||||
svg_buffer: &mut Vec<&'a Element>,
|
||||
skip_svg: bool,
|
||||
svg_idx: &mut usize,
|
||||
) -> std::fmt::Result {
|
||||
if el.name == "svg" && skip_svg {
|
||||
svg_buffer.push(el);
|
||||
// todo: attach the right icon ID
|
||||
writeln!(f, "icons::icon_{} {{}}", svg_idx)?;
|
||||
*svg_idx += 1;
|
||||
return Ok(());
|
||||
}
|
||||
|
||||
// open the tag
|
||||
write!(f, "{} {{ ", &el.name)?;
|
||||
|
||||
// todo: dioxus will eventually support classnames
|
||||
// for now, just write them with a space between each
|
||||
let class_iter = &mut el.classes.iter();
|
||||
if let Some(first_class) = class_iter.next() {
|
||||
write!(f, "class: \"{}", first_class)?;
|
||||
for next_class in class_iter {
|
||||
write!(f, " {}", next_class)?;
|
||||
}
|
||||
write!(f, "\",")?;
|
||||
}
|
||||
write!(f, "\n")?;
|
||||
|
||||
// write the attributes
|
||||
if let Some(id) = &el.id {
|
||||
write_tabs(f, il + 1)?;
|
||||
writeln!(f, "id: \"{}\",", id)?;
|
||||
}
|
||||
|
||||
for (name, value) in &el.attributes {
|
||||
write_tabs(f, il + 1)?;
|
||||
|
||||
use convert_case::{Case, Casing};
|
||||
if name.chars().any(|ch| ch.is_ascii_uppercase() || ch == '-') {
|
||||
let new_name = name.to_case(Case::Snake);
|
||||
match value {
|
||||
Some(val) => writeln!(f, "{}: \"{}\",", new_name, val)?,
|
||||
None => writeln!(f, "{}: \"\",", new_name)?,
|
||||
}
|
||||
} else {
|
||||
match name.as_str() {
|
||||
"for" | "async" | "type" | "as" => write!(f, "r#")?,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
match value {
|
||||
Some(val) => writeln!(f, "{}: \"{}\",", name, val)?,
|
||||
None => writeln!(f, "{}: \"\",", name)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// now the children
|
||||
for child in &el.children {
|
||||
render_child(f, child, il + 1, svg_buffer, skip_svg, svg_idx)?;
|
||||
}
|
||||
|
||||
// close the tag
|
||||
write_tabs(f, il)?;
|
||||
writeln!(f, "}}")?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn write_tabs(f: &mut Formatter, num: u32) -> std::fmt::Result {
|
||||
for _ in 0..num {
|
||||
write!(f, " ")?
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn generates_svgs() {
|
||||
let st = include_str!("../../../tests/svg.html");
|
||||
|
||||
let out = format!("{:}", convert_html_to_component(st).unwrap());
|
||||
dbg!(&out);
|
||||
|
||||
std::fs::File::create("svg_rsx.rs")
|
||||
.unwrap()
|
||||
.write_all(out.as_bytes())
|
||||
.unwrap();
|
||||
}
|
||||
@@ -0,0 +1,128 @@
|
||||
use std::fmt::{Display, Formatter};
|
||||
|
||||
use anyhow::Result;
|
||||
|
||||
use html_parser::{Dom, Node};
|
||||
|
||||
pub fn translate_from_html_file(target: &str) -> Result<RsxRenderer> {
|
||||
use std::fs::File;
|
||||
use std::io::Read;
|
||||
let mut file = File::open(target).unwrap();
|
||||
|
||||
let mut contents = String::new();
|
||||
file.read_to_string(&mut contents)
|
||||
.expect("Failed to read your file.");
|
||||
translate_from_html_to_rsx(&contents, true)
|
||||
}
|
||||
|
||||
pub fn translate_from_html_to_rsx(html: &str, as_call: bool) -> Result<RsxRenderer> {
|
||||
let contents = Dom::parse(html)?;
|
||||
let renderer = RsxRenderer {
|
||||
as_call,
|
||||
dom: contents,
|
||||
};
|
||||
Ok(renderer)
|
||||
}
|
||||
|
||||
pub struct RsxRenderer {
|
||||
dom: Dom,
|
||||
as_call: bool,
|
||||
}
|
||||
|
||||
impl Display for RsxRenderer {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
if self.as_call {
|
||||
writeln!(f, r##"use dioxus::prelude::*;"##)?;
|
||||
writeln!(
|
||||
f,
|
||||
r##"
|
||||
fn component(cx: Scope) -> Element {{
|
||||
cx.render(rsx!(
|
||||
"##
|
||||
)?;
|
||||
}
|
||||
for child in &self.dom.children {
|
||||
render_child(f, child, 1)?;
|
||||
}
|
||||
if self.as_call {
|
||||
write!(
|
||||
f,
|
||||
r##"
|
||||
)
|
||||
)
|
||||
"##
|
||||
)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
fn render_child(f: &mut Formatter<'_>, child: &Node, il: u32) -> std::fmt::Result {
|
||||
write_tabs(f, il);
|
||||
match child {
|
||||
Node::Text(t) => writeln!(f, "\"{}\"", t)?,
|
||||
Node::Comment(e) => writeln!(f, "/* {} */", e)?,
|
||||
Node::Element(el) => {
|
||||
// open the tag
|
||||
write!(f, "{} {{ ", &el.name)?;
|
||||
|
||||
// todo: dioxus will eventually support classnames
|
||||
// for now, just write them with a space between each
|
||||
let class_iter = &mut el.classes.iter();
|
||||
if let Some(first_class) = class_iter.next() {
|
||||
write!(f, "class: \"{}", first_class)?;
|
||||
for next_class in class_iter {
|
||||
write!(f, " {}", next_class)?;
|
||||
}
|
||||
write!(f, "\",")?;
|
||||
}
|
||||
write!(f, "\n")?;
|
||||
|
||||
// write the attributes
|
||||
if let Some(id) = &el.id {
|
||||
write_tabs(f, il + 1)?;
|
||||
writeln!(f, "id: \"{}\",", id)?;
|
||||
}
|
||||
|
||||
for (name, value) in &el.attributes {
|
||||
write_tabs(f, il + 1)?;
|
||||
|
||||
use convert_case::{Case, Casing};
|
||||
if name.chars().any(|ch| ch.is_ascii_uppercase() || ch == '-') {
|
||||
let new_name = name.to_case(Case::Snake);
|
||||
match value {
|
||||
Some(val) => writeln!(f, "{}: \"{}\",", new_name, val)?,
|
||||
None => writeln!(f, "{}: \"\",", new_name)?,
|
||||
}
|
||||
} else {
|
||||
match name.as_str() {
|
||||
"for" | "async" | "type" | "as" => write!(f, "r#")?,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
match value {
|
||||
Some(val) => writeln!(f, "{}: \"{}\",", name, val)?,
|
||||
None => writeln!(f, "{}: \"\",", name)?,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// now the children
|
||||
for child in &el.children {
|
||||
render_child(f, child, il + 1)?;
|
||||
}
|
||||
|
||||
// close the tag
|
||||
write_tabs(f, il)?;
|
||||
writeln!(f, "}}")?;
|
||||
}
|
||||
};
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn write_tabs(f: &mut Formatter, num: u32) -> std::fmt::Result {
|
||||
for _ in 0..num {
|
||||
write!(f, " ")?
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
Reference in new issue
Block a user