fix cargo tests

Author: Natoandro

Cargo.lock

@@ -206,6 +206,9 @@ impl PySelectionsPage {
             }
         }
 
-        ManifestPage::with_extras(map, Extras { input_types })
+        let res = ManifestPage::with_extras(map, Extras { input_types });
+        res.cache_references();
+
+        res
     }
 }

src/metagen/src/client_py/selections.rs

@@ -11,3 +11,6 @@ enum_dispatch.workspace = true
 indexmap.workspace = true
 paste.workspace = true
 color-eyre.workspace = true
+
+[dev-dependencies]
+insta.workspace = true

src/typegraph/graph/Cargo.toml

@@ -11,7 +11,7 @@ use std::collections::HashMap;
 use super::dedup::DuplicationKey;
 use super::{RelativePath, TypeKey};
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
 pub enum ValueTypeKind {
     Input,
     Output,
@@ -232,12 +232,12 @@ impl ConversionMap {
                 let item = value_type.get_mut(variant).ok_or_else(|| {
                     eyre!("value type not found: local index out of bound: {:?}", key)
                 })?;
-                let added = item.relative_paths.insert(
-                    rpath
-                        .clone()
-                        .try_into()
-                        .map_err(|e| eyre!("relative path is not a value type: {:?}", e))?,
-                );
+                let vtype_path = rpath
+                    .clone()
+                    .try_into()
+                    .map_err(|e| eyre!("relative path is not a value type: {:?}", e))?;
+                let added = item.relative_paths.insert(vtype_path);
+
                 if !added {
                     return Ok(false);
                 }

src/typegraph/graph/src/conv/map.rs

@@ -202,7 +202,9 @@ impl PartialEq for ValueTypePath {
         let left = self.owner.upgrade().expect("no strong pointer for type");
         let right = other.owner.upgrade().expect("no strong pointer for type");
 
-        left.base.type_idx == right.base.type_idx && self.path == other.path
+        self.branch == other.branch
+            && left.base.type_idx == right.base.type_idx
+            && self.path == other.path
     }
 }
 

src/typegraph/graph/src/path.rs

@@ -1,18 +1,16 @@
 // Copyright Metatype OÜ, licensed under the Mozilla Public License Version 2.0.
 // SPDX-License-Identifier: MPL-2.0
 
-use std::{path::Path, process::Command, sync::Arc};
+use std::{collections::BTreeMap, path::Path, process::Command, sync::Arc};
 
 use typegraph::{TypeNode as _, TypeNodeExt as _};
 
 #[test]
 fn test_expanded_graph() -> color_eyre::Result<()> {
     let project_dir = Path::new(env!("CARGO_MANIFEST_DIR"));
-    eprintln!("project_dir={:?}", project_dir);
     let path = project_dir
         .join("../../../tests/metagen/typegraphs/metagen.ts")
         .canonicalize()?;
-    eprintln!("path={:?}", path);
     let output = Command::new("cargo")
         .args(
             "run -p meta-cli -- serialize -1 -f"
@@ -21,42 +19,37 @@ fn test_expanded_graph() -> color_eyre::Result<()> {
         )
         .arg(path)
         .output()?;
-    eprintln!("status={}", output.status);
-    if !output.status.success() {
-        eprintln!("stderr={}", String::from_utf8_lossy(&output.stderr));
-        color_eyre::eyre::bail!("error running meta-cli");
-    }
+    assert!(output.status.success());
+
     let schema = String::from_utf8(output.stdout)?;
     let schema: tg_schema::Typegraph = serde_json::from_str(&schema)?;
     let schema: Arc<_> = schema.into();
 
     let tg = typegraph::Typegraph::try_from(schema.clone())?;
 
-    println!("namespaces");
-    for (ns, obj) in tg.namespace_objects.iter() {
-        println!("    /{}: {}", ns.join("/"), obj.name());
-    }
-
-    println!("functions");
-    for (idx, func) in tg.functions.iter() {
-        println!("    {:2}: {}", idx, func.name());
-    }
-
-    println!("input_types");
-    for (key, ty) in tg.input_types.iter() {
-        println!("    {:?}({}): {}", key, ty.tag(), ty.name());
-    }
-
-    println!("output_types");
-    for (key, ty) in tg.output_types.iter() {
-        println!(
-            "    {:?}({}): {} parent_idx={}",
-            key,
-            ty.tag(),
-            ty.name(),
-            ty.parent().unwrap().idx()
-        );
-    }
+    insta::assert_debug_snapshot!(tg
+        .namespace_objects
+        .iter()
+        .map(|(ns, obj)| { (ns.join("/"), obj.name()) })
+        .collect::<BTreeMap<_, _>>());
+
+    insta::assert_debug_snapshot!(tg
+        .functions
+        .iter()
+        .map(|(idx, func)| { (idx, func.name()) })
+        .collect::<BTreeMap<_, _>>());
+
+    insta::assert_debug_snapshot!(tg
+        .input_types
+        .iter()
+        .map(|(idx, ty)| { (idx, (ty.tag(), ty.name())) })
+        .collect::<BTreeMap<_, _>>());
+
+    insta::assert_debug_snapshot!(tg
+        .output_types
+        .iter()
+        .map(|(idx, ty)| { (idx, (ty.tag(), ty.name())) })
+        .collect::<BTreeMap<_, _>>());
 
     Ok(())
 }

src/typegraph/graph/tests/expanded.rs

@@ -0,0 +1,9 @@
+---
+source: src/typegraph/graph/tests/expanded.rs
+expression: "tg.functions.iter().map(|(idx, func)|\n            { (idx, func.name()) }).collect::<BTreeMap<_, _>>()"
+---
+{
+    1: "root_one_fn",
+    8: "root_two_fn",
+    10: "root_three_fn",
+}

src/typegraph/graph/tests/snapshots/expanded__expanded_graph-2.snap

@@ -0,0 +1,22 @@
+---
+source: src/typegraph/graph/tests/expanded.rs
+expression: "tg.input_types.iter().map(|(idx, ty)|\n            { (idx, (ty.tag(), ty.name())) }).collect::<BTreeMap<_, _>>()"
+---
+{
+    Ty_2/0: (
+        "object",
+        "OneInput",
+    ),
+    Ty_3/0: (
+        "string",
+        "string_3fb09",
+    ),
+    Ty_9/0: (
+        "object",
+        "TwoInput",
+    ),
+    Ty_11/0: (
+        "object",
+        "root_three_fn_input",
+    ),
+}

src/typegraph/graph/tests/snapshots/expanded__expanded_graph-3.snap

@@ -0,0 +1,26 @@
+---
+source: src/typegraph/graph/tests/expanded.rs
+expression: "tg.output_types.iter().map(|(idx, ty)|\n            { (idx, (ty.tag(), ty.name())) }).collect::<BTreeMap<_, _>>()"
+---
+{
+    Ty_3/0: (
+        "string",
+        "string_3fb09",
+    ),
+    Ty_4/0: (
+        "list",
+        "root_one_fn_output",
+    ),
+    Ty_5/0: (
+        "object",
+        "Student",
+    ),
+    Ty_6/0: (
+        "integer",
+        "Student_id_integer",
+    ),
+    Ty_7/0: (
+        "optional",
+        "Student_peers_placeholder_optional",
+    ),
+}

src/typegraph/graph/tests/snapshots/expanded__expanded_graph-4.snap

@@ -0,0 +1,7 @@
+---
+source: src/typegraph/graph/tests/expanded.rs
+expression: "tg.namespace_objects.iter().map(|(ns, obj)|\n            { (ns.join(\"/\"), obj.name()) }).collect::<BTreeMap<_, _>>()"
+---
+{
+    "": "example-metagen",
+}