Refactor for many backends (#111)

* Remove commented out code

* Update lyon_geom

* Fix debug assertions warning

* Reorganize in preparation for multi-backend support

Author: sameer

Cargo.lock

@@ -1,5 +1,5 @@
 [workspace]
-members = ["lib", "cli", "web"]
+members = ["g_code", "cli", "web", "star"]
 default-members = ["cli"]
 resolver = "2"
 
@@ -12,6 +12,7 @@ license = "MIT"
 [workspace.dependencies]
 g-code = "0.6.0"
 log = "0"
+lyon_geom = "=1.0.19"
 roxmltree = "0.21"
 serde_json = "1"
 svgtypes = "0.16"

Cargo.toml

@@ -8,7 +8,7 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-svg2gcode = { path = "../lib", version = "0.3.4", features = ["serde"] }
+svg2gcode = { path = "../g_code", version = "0.4.0", features = ["serde"] }
 env_logger = "0.11"
 log.workspace = true
 g-code.workspace = true

cli/Cargo.toml

@@ -1,3 +1,5 @@
+#![cfg_attr(not(test), deny(unused_crate_dependencies))]
+
 use std::{
     env,
     fs::File,
@@ -14,7 +16,9 @@ use g_code::{
 use log::{error, info};
 use roxmltree::ParsingOptions;
 use svg2gcode::{
-    ConversionOptions, Machine, Settings, SupportedFunctionality, Version, svg2program,
+    Machine,
+    config::{ConversionOptions, Settings, SupportedFunctionality, Version},
+    svg_to_gcode,
 };
 use svgtypes::LengthListParser;
 
@@ -122,7 +126,7 @@ fn main() -> io::Result<()> {
 
         {
             let conversion = &mut settings.conversion;
-            conversion.dpi = opt.dpi.unwrap_or(conversion.dpi);
+            conversion.inner.dpi = opt.dpi.unwrap_or(conversion.inner.dpi);
             conversion.feedrate = opt.feedrate.unwrap_or(conversion.feedrate);
             conversion.tolerance = opt.tolerance.unwrap_or(conversion.tolerance);
         }
@@ -160,7 +164,7 @@ fn main() -> io::Result<()> {
                     .take(2)
                     .enumerate()
                 {
-                    settings.conversion.origin[i] = Some(dimension_origin);
+                    settings.conversion.inner.origin[i] = Some(dimension_origin);
                 }
             }
         }
@@ -177,12 +181,12 @@ fn main() -> io::Result<()> {
             settings.postprocess.newline_before_comment = newline_before_comment;
         }
 
-        settings.conversion.extra_attribute_name = opt.extra_attribute_name;
+        settings.conversion.inner.extra_attribute_name = opt.extra_attribute_name;
         if let Some(optimize_path_order) = opt.optimize_path_order {
-            settings.conversion.optimize_path_order = optimize_path_order;
+            settings.conversion.inner.optimize_path_order = optimize_path_order;
         }
         if let Some(selector_filter) = opt.selector_filter {
-            settings.conversion.selector_filter = Some(selector_filter);
+            settings.conversion.inner.selector_filter = Some(selector_filter);
         }
 
         if let Version::Unknown(ref unknown) = settings.version {
@@ -334,7 +338,7 @@ fn main() -> io::Result<()> {
     )
     .unwrap();
 
-    let program = svg2program(&document, &settings.conversion, options, machine);
+    let program = svg_to_gcode(&document, &settings.conversion, options, machine);
 
     if let Some(out_path) = opt.out {
         format_gcode_io(

cli/src/main.rs

@@ -1,27 +1,21 @@
 [package]
 name = "svg2gcode"
-version = "0.3.4"
+version = "0.4.0"
 description = "Convert paths in SVG files to GCode for a pen plotter, laser engraver, or other machine."
 authors.workspace = true
 edition.workspace = true
 repository.workspace = true
 license.workspace = true
 
 [features]
-serde = ["dep:serde", "dep:serde_repr", "g-code/serde"]
+serde = ["dep:serde", "g-code/serde", "svg2star/serde"]
 
 [dependencies]
+svg2star = { path = "../star", version = "0.4.0" }
 g-code.workspace = true
-peg = "0.8"
-rand = "0.8"
-rustc-hash = "1"
 rust_decimal = { version = "1", default-features = false }
-lyon_geom = "=1.0.6"
-euclid = "0.22"
-log.workspace = true
-uom = "0.38"
+lyon_geom.workspace = true
 roxmltree.workspace = true
-svgtypes.workspace = true
 paste = "1"
 
 [dependencies.serde]
@@ -30,10 +24,7 @@ optional = true
 version = "1"
 features = ["derive", "std"]
 
-[dependencies.serde_repr]
-optional = true
-version = "0.1"
-
 [dev-dependencies]
 serde_json.workspace = true
 pretty_assertions = "1.4.1"
+svgtypes.workspace = true