wip

crates/reg_core/src/lib.rs

@@ -28,6 +28,7 @@ pub enum CompareError {
 static SUPPORTED_EXTENTIONS: [&str; 7] = ["tiff", "jpeg", "jpg", "gif", "png", "bmp", "webp"];
 
 static DEFAULT_JSON_PATH: &'static str = "./reg.json";
+static DEFAULT_REPORT_PATH: &'static str = "./report.html";
 
 fn is_supported_extension(path: &Path) -> bool {
     if let Some(extension) = path.extension() {
@@ -103,6 +104,9 @@ pub fn run(
     let expected_dir = expected_dir.as_ref();
     let diff_dir = diff_dir.as_ref();
     let json_path = options.json.unwrap_or_else(|| Path::new(DEFAULT_JSON_PATH));
+    let report = options
+        .report
+        .unwrap_or_else(|| Path::new(DEFAULT_REPORT_PATH));
 
     let detected = find_images(&expected_dir, &actual_dir);
 
@@ -171,7 +175,7 @@ pub fn run(
         deleted: detected.deleted,
         actual: detected.actual,
         expected: detected.expected,
-        report: options.report,
+        report,
         differences,
         json: json_path,
         actual_dir,

crates/reg_core/src/report.rs

@@ -28,7 +28,7 @@ pub(crate) struct ReportInput<'a> {
     pub(crate) actual_dir: &'a Path,
     pub(crate) expected_dir: &'a Path,
     pub(crate) diff_dir: &'a Path,
-    pub(crate) report: Option<&'a Path>,
+    pub(crate) report: &'a Path,
     // junitReport: string,
     // extendedErrors: boolean,
     pub(crate) url_prefix: Option<url::Url>,
@@ -146,7 +146,8 @@ pub fn create_reports(input: ReportInput) -> Reports {
         diff_dir: create_dir_for_json_report(input.json, input.diff_dir, input.url_prefix.clone()),
     };
 
-    let html_report = if let Some(report) = input.report {
+    let html_report = {
+        let report = input.report;
         let template = include_str!("../../../template/template.html");
         let js = include_str!("../../../report/ui/dist/report.js");
         let css = include_str!("../../../report/ui/dist/style.css");
@@ -207,8 +208,6 @@ pub fn create_reports(input: ReportInput) -> Reports {
             .render_data(&mut html, &data)
             .expect("should render report.");
         Some(html.into())
-    } else {
-        None
     };
 
     Reports {

js/index.ts

@@ -111,7 +111,7 @@ export const compare = (input: CompareInput): EventEmitter => {
     actualDir,
     expectedDir,
     diffDir,
-    ...Object.entries(rest).flatMap(([k, v]) => [`--${k}`, String(v)]),
+    ...Object.entries(rest).flatMap(([k, v]) => (v == null ? [] : [`--${k}`, String(v)])),
   ];
   return run(args);
 };

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "reg-cli",
-  "version": "0.0.0-experimental-wasm9",
+  "version": "0.0.0-experimental-wasm10",
   "description": "",
   "type": "module",
   "start": "node ./dist/cli.mjs",