add to tg_core

Author: Natoandro

Cargo.lock

@@ -38,6 +38,7 @@ edition = "2021"
 # internal crates
 mt_deno = { path = "src/mt_deno/" }
 tg_schema = { path = "src/typegraph/schema" }
+tg_optimize = { path = "src/typegraph/optimize" }
 typegraph_core = { path = "src/typegraph/core" }
 substantial = { path = "src/substantial/" }
 metagen = { path = "src/metagen/" }

Cargo.toml

@@ -4,8 +4,8 @@ version = "0.5.1-rc.3"
 edition = "2021"
 
 [dependencies]
-# common.workspace = true
 tg_schema.workspace = true
+tg_optimize.workspace = true
 metagen.workspace = true
 grpc_utils.workspace = true
 archive_utils.workspace = true

src/typegraph/core/Cargo.toml

@@ -241,6 +241,8 @@ pub fn serialize(params: SerializeParams) -> Result<(String, Vec<SdkArtifact>)>
     }
     .postprocess(&mut tg)?;
 
+    let tg = tg_optimize::optimize(tg.into());
+
     let artifacts = tg
         .meta
         .artifacts

src/typegraph/core/src/typegraph.rs

@@ -1,5 +1,5 @@
 [package]
-name = "tg-optimize"
+name = "tg_optimize"
 version.workspace = true
 edition.workspace = true
 

src/typegraph/optimize/Cargo.toml

@@ -177,7 +177,7 @@ impl DedupEngine {
         }
     }
 
-    pub fn get_converted_typegraph(&self) -> Arc<Typegraph> {
+    pub fn get_converted_typegraph(&self) -> Typegraph {
         let map = self.generate_conversion_map();
 
         let types = map
@@ -234,7 +234,6 @@ impl DedupEngine {
             path: self.tg.path.clone(),
             deps: self.tg.deps.clone(),
         }
-        .into()
     }
 
     pub fn generate_conversion_map(&self) -> ConversionMap {

src/typegraph/optimize/src/dedup.rs

@@ -29,7 +29,7 @@ impl TypeIdx {
     }
 }
 
-pub fn optimize(tg: Arc<Typegraph>) -> Arc<Typegraph> {
+pub fn optimize(tg: Arc<Typegraph>) -> Typegraph {
     let mut k = Kosaraju::new(tg);
     k.run();
 

src/typegraph/optimize/src/lib.rs

@@ -10,7 +10,7 @@ fn main() -> color_eyre::eyre::Result<()> {
     std::io::stdin().read_line(&mut buffer)?;
     let tg: Typegraph = serde_json::from_str(&buffer)?;
     let opt_tg = tg_optimize::optimize(Arc::new(tg));
-    println!("{}", serde_json::to_string(opt_tg.as_ref())?);
+    println!("{}", serde_json::to_string(&opt_tg)?);
 
     Ok(())
 }