Skip to content
Open
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
17 changes: 17 additions & 0 deletions __test__/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -601,6 +601,23 @@ test('should throw because invalid SVG attribute (width attribute is 0)', (t) =>
t.is(error.message, 'SVG has an invalid size')
})

test('should throw because render options contain an unknown field', (t) => {
const svg = '<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"></svg>'
const error = t.throws(() => {
new Resvg(svg, { dpii: 96 } as any)
})

t.regex(error.message, /Invalid options:.*dpii/)
})

test('renderAsync should reject because render options contain an unknown field', async (t) => {
const svg = '<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"></svg>'

await t.throwsAsync(renderAsync(svg, { dpii: 96 } as any), {
message: /Invalid options:.*dpii/,
})
})

test('should throw because invalid options (width 0)', (t) => {
const error = t.throws(
() => {
Expand Down
3 changes: 3 additions & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ pub enum Error {

#[error("Unsupported image types (currently resvg only supports PNG, JPEG and GIF)")]
UnsupportedImage,

#[error("Invalid options: {0}")]
InvalidOptions(String),
}

#[cfg(not(target_arch = "wasm32"))]
Expand Down
8 changes: 2 additions & 6 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,7 @@ impl Resvg {
svg: &Either<String, Buffer>,
options: Option<String>,
) -> Result<Resvg, NapiError> {
let js_options: JsOptions = options
.and_then(|o| serde_json::from_str(o.as_str()).ok())
.unwrap_or_default();
let js_options = options::parse_js_options(options.as_deref())?;
let _ = env_logger::builder()
.filter_level(js_options.log_level)
.try_init();
Expand Down Expand Up @@ -388,9 +386,7 @@ impl Resvg {
options: Option<String>,
custom_font_buffers: Option<js_sys::Array>,
) -> Result<Resvg, js_sys::Error> {
let js_options: JsOptions = options
.and_then(|o| serde_json::from_str(o.as_str()).ok())
.unwrap_or_default();
let js_options = options::parse_js_options(options.as_deref())?;

let (mut opts, mut fontdb) = js_options.to_usvg_options();

Expand Down
34 changes: 34 additions & 0 deletions src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,15 @@ impl Default for JsOptions {
}
}

pub(crate) fn parse_js_options(options: Option<&str>) -> Result<JsOptions, Error> {
match options {
Some(options) => serde_json::from_str::<Option<JsOptions>>(options)
.map(Option::unwrap_or_default)
.map_err(|error| Error::InvalidOptions(error.to_string())),
None => Ok(JsOptions::default()),
}
}

impl JsOptions {
pub(crate) fn to_usvg_options(&self) -> (usvg::Options, Database) {
// Load fonts
Expand Down Expand Up @@ -377,3 +386,28 @@ pub(crate) fn tweak_usvg_options(opts: &mut usvg::Options) {
}
});
}

#[cfg(test)]
mod tests {
use super::parse_js_options;

#[test]
fn parse_js_options_uses_defaults_for_missing_options() {
assert!(parse_js_options(None).is_ok());
}

#[test]
fn parse_js_options_uses_defaults_for_null() {
assert!(parse_js_options(Some("null")).is_ok());
}

#[test]
fn parse_js_options_rejects_invalid_json() {
assert!(parse_js_options(Some("{")).is_err());
}

#[test]
fn parse_js_options_rejects_unknown_fields() {
assert!(parse_js_options(Some(r#"{"unknown":true}"#)).is_err());
}
}