Skip to content

Format rust source code using rustfmt #134

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.

Sign up for GitHub

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

Merged
devongovett merged 1 commit into from
Apr 4, 2022
Merged

Format rust source code using rustfmt #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: Swatinem/rust-cache@v1
- run: cargo fmt
- run: cargo test
129 changes: 72 additions & 57 deletions node/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
#[global_allocator]
static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc;

use std::collections::HashSet;
use std::path::Path;
use serde::{Serialize, Deserialize};
use parcel_css::stylesheet::{StyleSheet, StyleAttribute, ParserOptions, PrinterOptions, MinifyOptions, PseudoClasses};
use parcel_css::targets::Browsers;
use parcel_css::bundler::{BundleErrorKind, Bundler, FileProvider, SourceProvider};
use parcel_css::css_modules::CssModuleExports;
use parcel_css::dependencies::Dependency;
use parcel_css::error::{ParserError, Error, ErrorLocation, MinifyErrorKind, PrinterErrorKind};
use parcel_css::bundler::{FileProvider, Bundler, BundleErrorKind, SourceProvider};
use parcel_css::error::{Error, ErrorLocation, MinifyErrorKind, ParserError, PrinterErrorKind};
use parcel_css::stylesheet::{
MinifyOptions, ParserOptions, PrinterOptions, PseudoClasses, StyleAttribute, StyleSheet,
};
use parcel_css::targets::Browsers;
use parcel_sourcemap::SourceMap;
use serde::{Deserialize, Serialize};
use std::collections::HashSet;
use std::path::Path;

// ---------------------------------------------

Expand All @@ -24,7 +26,7 @@ use wasm_bindgen::prelude::*;
#[wasm_bindgen]
pub fn transform(config_val: JsValue) -> Result<JsValue, JsValue> {
let config: Config = from_value(config_val).map_err(JsValue::from)?;
let code = unsafe { std::str::from_utf8_unchecked(&config.code) };
let code = unsafe { std::str::from_utf8_unchecked(&config.code) };
let res = compile(code, &config)?;
let serializer = Serializer::new().serialize_maps_as_objects(true);
res.serialize(&serializer).map_err(JsValue::from)
Expand All @@ -42,10 +44,10 @@ pub fn transform_style_attribute(config_val: JsValue) -> Result<JsValue, JsValue

// ---------------------------------------------

#[cfg(not(target_arch = "wasm32"))]
use napi_derive::{js_function, module_exports};
#[cfg(not(target_arch = "wasm32"))]
use napi::{CallContext, JsObject, JsUnknown};
#[cfg(not(target_arch = "wasm32"))]
use napi_derive::{js_function, module_exports};

#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
Expand All @@ -54,7 +56,7 @@ struct SourceMapJson<'a> {
mappings: String,
sources: &'a Vec<String>,
sources_content: &'a Vec<String>,
names: &'a Vec<String>
names: &'a Vec<String>,
}

#[derive(Serialize)]
Expand All @@ -65,20 +67,20 @@ struct TransformResult {
#[serde(with = "serde_bytes")]
map: Option<Vec<u8>>,
exports: Option<CssModuleExports>,
dependencies: Option<Vec<Dependency>>
dependencies: Option<Vec<Dependency>>,
}

#[cfg(not(target_arch = "wasm32"))]
#[js_function(1)]
fn transform(ctx: CallContext) -> napi::Result<JsUnknown> {
let opts = ctx.get::<JsObject>(0)?;
let config: Config = ctx.env.from_js_value(opts)?;
let code = unsafe { std::str::from_utf8_unchecked(&config.code) };
let code = unsafe { std::str::from_utf8_unchecked(&config.code) };
let res = compile(code, &config);

match res {
Ok(res) => ctx.env.to_js_value(&res),
Err(err) => err.throw(ctx, Some(code))
Err(err) => err.throw(ctx, Some(code)),
}
}

Expand All @@ -92,7 +94,7 @@ fn transform_style_attribute(ctx: CallContext) -> napi::Result<JsUnknown> {

match res {
Ok(res) => ctx.env.to_js_value(&res),
Err(err) => err.throw(ctx, Some(code))
Err(err) => err.throw(ctx, Some(code)),
}
}

Expand All @@ -108,13 +110,23 @@ fn bundle(ctx: CallContext) -> napi::Result<JsUnknown> {
Ok(res) => ctx.env.to_js_value(&res),
Err(err) => {
let code = match &err {
CompileError::ParseError(Error { loc: Some(ErrorLocation { filename, .. }), .. }) |
CompileError::PrinterError(Error { loc: Some(ErrorLocation { filename, .. }), .. }) |
CompileError::MinifyError(Error { loc: Some(ErrorLocation { filename, .. }), .. }) |
CompileError::BundleError(Error { loc: Some(ErrorLocation { filename, .. }), .. }) => {
Some(fs.read(Path::new(filename))?)
},
_ => None
CompileError::ParseError(Error {
loc: Some(ErrorLocation { filename, .. }),
..
})
| CompileError::PrinterError(Error {
loc: Some(ErrorLocation { filename, .. }),
..
})
| CompileError::MinifyError(Error {
loc: Some(ErrorLocation { filename, .. }),
..
})
| CompileError::BundleError(Error {
loc: Some(ErrorLocation { filename, .. }),
..
}) => Some(fs.read(Path::new(filename))?),
_ => None,
};
err.throw(ctx, code)
}
Expand Down Expand Up @@ -146,7 +158,7 @@ struct Config {
pub css_modules: Option<bool>,
pub analyze_dependencies: Option<bool>,
pub pseudo_classes: Option<OwnedPseudoClasses>,
pub unused_symbols: Option<HashSet<String>>
pub unused_symbols: Option<HashSet<String>>,
}

#[derive(Debug, Deserialize)]
Expand All @@ -160,7 +172,7 @@ struct BundleConfig {
pub css_modules: Option<bool>,
pub analyze_dependencies: Option<bool>,
pub pseudo_classes: Option<OwnedPseudoClasses>,
pub unused_symbols: Option<HashSet<String>>
pub unused_symbols: Option<HashSet<String>>,
}

#[derive(Debug, Deserialize)]
Expand All @@ -170,7 +182,7 @@ struct OwnedPseudoClasses {
pub active: Option<String>,
pub focus: Option<String>,
pub focus_visible: Option<String>,
pub focus_within: Option<String>
pub focus_within: Option<String>,
}

impl<'a> Into<PseudoClasses<'a>> for &'a OwnedPseudoClasses {
Expand All @@ -180,7 +192,7 @@ impl<'a> Into<PseudoClasses<'a>> for &'a OwnedPseudoClasses {
active: self.active.as_deref(),
focus: self.focus.as_deref(),
focus_visible: self.focus_visible.as_deref(),
focus_within: self.focus_within.as_deref()
focus_within: self.focus_within.as_deref(),
}
}
}
Expand All @@ -191,20 +203,24 @@ struct Drafts {
#[serde(default)]
nesting: bool,
#[serde(default)]
custom_media: bool
custom_media: bool,
}

fn compile<'i>(code: &'i str, config: &Config) -> Result<TransformResult, CompileError<'i>> {
let drafts = config.drafts.as_ref();
let mut stylesheet = StyleSheet::parse(config.filename.clone(), &code, ParserOptions {
nesting: matches!(drafts, Some(d) if d.nesting),
custom_media: matches!(drafts, Some(d) if d.custom_media),
css_modules: config.css_modules.unwrap_or(false),
source_index: 0
})?;
let mut stylesheet = StyleSheet::parse(
config.filename.clone(),
&code,
ParserOptions {
nesting: matches!(drafts, Some(d) if d.nesting),
custom_media: matches!(drafts, Some(d) if d.custom_media),
css_modules: config.css_modules.unwrap_or(false),
source_index: 0,
},
)?;
stylesheet.minify(MinifyOptions {
targets: config.targets,
unused_symbols: config.unused_symbols.clone().unwrap_or_default()
unused_symbols: config.unused_symbols.clone().unwrap_or_default(),
})?;

let mut source_map = if config.source_map.unwrap_or(false) {
Expand All @@ -221,7 +237,7 @@ fn compile<'i>(code: &'i str, config: &Config) -> Result<TransformResult, Compil
source_map: source_map.as_mut(),
targets: config.targets,
analyze_dependencies: config.analyze_dependencies.unwrap_or(false),
pseudo_classes: config.pseudo_classes.as_ref().map(|p| p.into())
pseudo_classes: config.pseudo_classes.as_ref().map(|p| p.into()),
})?;

let map = if let Some(mut source_map) = source_map {
Expand All @@ -234,7 +250,7 @@ fn compile<'i>(code: &'i str, config: &Config) -> Result<TransformResult, Compil
code: res.code.into_bytes(),
map,
exports: res.exports,
dependencies: res.dependencies
dependencies: res.dependencies,
})
}

Expand All @@ -258,15 +274,15 @@ fn compile_bundle<'i>(fs: &'i FileProvider, config: &BundleConfig) -> Result<Tra

stylesheet.minify(MinifyOptions {
targets: config.targets,
unused_symbols: config.unused_symbols.clone().unwrap_or_default()
unused_symbols: config.unused_symbols.clone().unwrap_or_default(),
})?;

let res = stylesheet.to_css(PrinterOptions {
minify: config.minify.unwrap_or(false),
source_map: source_map.as_mut(),
targets: config.targets,
analyze_dependencies: config.analyze_dependencies.unwrap_or(false),
pseudo_classes: config.pseudo_classes.as_ref().map(|p| p.into())
pseudo_classes: config.pseudo_classes.as_ref().map(|p| p.into()),
})?;

let map = if let Some(source_map) = &mut source_map {
Expand All @@ -279,7 +295,7 @@ fn compile_bundle<'i>(fs: &'i FileProvider, config: &BundleConfig) -> Result<Tra
code: res.code.into_bytes(),
map,
exports: res.exports,
dependencies: res.dependencies
dependencies: res.dependencies,
})
}

Expand All @@ -293,7 +309,7 @@ fn source_map_to_json<'i>(source_map: &mut SourceMap) -> Result<Vec<u8>, Compile
mappings: unsafe { String::from_utf8_unchecked(vlq_output) },
sources: source_map.get_sources(),
sources_content: source_map.get_sources_content(),
names: source_map.get_names()
names: source_map.get_names(),
};

Ok(serde_json::to_vec(&sm).unwrap())
Expand All @@ -306,15 +322,15 @@ struct AttrConfig {
pub code: Vec<u8>,
pub targets: Option<Browsers>,
pub minify: Option<bool>,
pub analyze_dependencies: Option<bool>
pub analyze_dependencies: Option<bool>,
}

#[derive(Serialize)]
#[serde(rename_all = "camelCase")]
struct AttrResult {
#[serde(with = "serde_bytes")]
code: Vec<u8>,
dependencies: Option<Vec<Dependency>>
dependencies: Option<Vec<Dependency>>,
}

fn compile_attr<'i>(code: &'i str, config: &AttrConfig) -> Result<AttrResult, CompileError<'i>> {
Expand All @@ -328,11 +344,11 @@ fn compile_attr<'i>(code: &'i str, config: &AttrConfig) -> Result<AttrResult, Co
source_map: None,
targets: config.targets,
analyze_dependencies: config.analyze_dependencies.unwrap_or(false),
pseudo_classes: None
pseudo_classes: None,
})?;
Ok(AttrResult {
code: res.code.into_bytes(),
dependencies: res.dependencies
dependencies: res.dependencies,
})
}

Expand All @@ -341,7 +357,7 @@ enum CompileError<'i> {
MinifyError(Error<MinifyErrorKind>),
PrinterError(Error<PrinterErrorKind>),
SourceMapError(parcel_sourcemap::SourceMapError),
BundleError(Error<BundleErrorKind<'i>>)
BundleError(Error<BundleErrorKind<'i>>),
}

impl<'i> CompileError<'i> {
Expand All @@ -351,7 +367,7 @@ impl<'i> CompileError<'i> {
CompileError::MinifyError(err) => err.kind.reason(),
CompileError::PrinterError(err) => err.kind.reason(),
CompileError::BundleError(err) => err.kind.reason(),
_ => "Unknown error".into()
_ => "Unknown error".into(),
}
}

Expand All @@ -363,17 +379,16 @@ impl<'i> CompileError<'i> {
CompileError::PrinterError(Error { kind, .. }) => ctx.env.to_js_value(kind)?,
CompileError::MinifyError(Error { kind, .. }) => ctx.env.to_js_value(kind)?,
CompileError::BundleError(Error { kind, .. }) => ctx.env.to_js_value(kind)?,
_ => ctx.env.get_null()?.into_unknown()
_ => ctx.env.get_null()?.into_unknown(),
};

match self {
CompileError::ParseError(Error { loc, .. }) |
CompileError::PrinterError(Error { loc, .. }) |
CompileError::MinifyError(Error { loc, .. }) |
CompileError::BundleError(Error { loc, .. }) => {
CompileError::ParseError(Error { loc, .. })
| CompileError::PrinterError(Error { loc, .. })
| CompileError::MinifyError(Error { loc, .. })
| CompileError::BundleError(Error { loc, .. }) => {
// Generate an error with location information.
let syntax_error = ctx.env.get_global()?
.get_named_property::<napi::JsFunction>("SyntaxError")?;
let syntax_error = ctx.env.get_global()?.get_named_property::<napi::JsFunction>("SyntaxError")?;
let reason = ctx.env.create_string_from_std(reason)?;
let mut obj = syntax_error.new(&[reason])?;
if let Some(loc) = loc {
Expand All @@ -393,8 +408,8 @@ impl<'i> CompileError<'i> {
obj.set_named_property("data", data)?;
ctx.env.throw(obj)?;
Ok(ctx.env.get_undefined()?.into_unknown())
},
_ => Err(self.into())
}
_ => Err(self.into()),
}
}
}
Expand Down Expand Up @@ -434,7 +449,7 @@ impl<'i> From<CompileError<'i>> for napi::Error {
fn from(e: CompileError) -> napi::Error {
match e {
CompileError::SourceMapError(e) => napi::Error::from_reason(e.to_string()),
_ => napi::Error::new(napi::Status::GenericFailure, e.reason())
_ => napi::Error::new(napi::Status::GenericFailure, e.reason()),
}
}
}
Expand All @@ -444,7 +459,7 @@ impl<'i> From<CompileError<'i>> for wasm_bindgen::JsValue {
fn from(e: CompileError) -> wasm_bindgen::JsValue {
match e {
CompileError::SourceMapError(e) => js_sys::Error::new(&e.to_string()).into(),
_ => js_sys::Error::new(&e.reason()).into()
_ => js_sys::Error::new(&e.reason()).into(),
}
}
}
Loading