deps: upgrade facet crates

Move to facet-git-tree 0.1.0-alpha.1 and Facet 0.50.0-rc.7, adapting consumers to the published crate APIs.

Assisted-by: Goose:gpt-5.6-luna

Author: jdc-pub

Cargo.lock

@@ -5,10 +5,10 @@ edition = "2024"
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-facet = { version = "=0.50.0-rc.5", features = ["reflect"] }
-facet-value = "0.50.0-rc.5"
-facet-json = "0.50.0-rc.5"
-facet-git-tree = { features = ["value"], git = "https://github.com/git-ents/facet-git-tree.git", version = "0.1.0" }
+facet = { version = "=0.50.0-rc.7", features = ["reflect"] }
+facet-value = "0.50.0-rc.7"
+facet-json = "0.50.0-rc.7"
+facet-git-tree = { version = "0.1.0-alpha.1", features = ["value"] }
 gix = { version = "0.85.0", default-features = false, features = [
     "sha1",
     "sha256",

crates/git-prolly/Cargo.toml

@@ -12,16 +12,16 @@ path = "src/main.rs"
 gix-database = { path = "../gix-database" }
 git-prolly = { path = "../git-prolly" }
 gix-store = { path = "../gix-store" }
-facet = { version = "0.50.0-rc.0", features = ["reflect"] }
-facet-git-tree = { features = ["value"], git = "https://github.com/git-ents/facet-git-tree.git", version = "0.1.0" }
-facet-value = "0.50.0-rc.5"
-facet-json = "0.50.0-rc.5"
+facet = { version = "0.50.0-rc.7", features = ["reflect"] }
+facet-git-tree = { version = "0.1.0-alpha.1", features = ["value"] }
+facet-value = "0.50.0-rc.7"
+facet-json = "0.50.0-rc.7"
 gix = { version = "0.85.0", default-features = false, features = ["sha1", "zlib-rs", "interrupt", "revision"] }
 clap = { version = "4", features = ["derive"] }
 dialoguer = { version = "0.12", default-features = false }
 anyhow = "1"
 
 [dev-dependencies]
-facet = { version = "0.50.0-rc.0", features = ["reflect"] }
+facet = { version = "0.50.0-rc.7", features = ["reflect"] }
 tempfile = "3"
 test-support = { path = "../test-support" }

crates/git-store/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2024"
 readme = "README.adoc"
 
 [dependencies]
-facet-value = "0.50.0-rc.5"
+facet-value = "0.50.0-rc.7"
 git-prolly = { path = "../git-prolly" }
 gix = { version = "0.85.0", default-features = false, features = [
     "sha1",
@@ -17,6 +17,6 @@ gix-refstore = { path = "../gix-refstore" }
 thiserror = "2"
 
 [dev-dependencies]
-facet-value = "0.50.0-rc.5"
+facet-value = "0.50.0-rc.7"
 tempfile = "3"
 test-support = { path = "../test-support" }

crates/gix-database/Cargo.toml

@@ -5,9 +5,9 @@ edition = "2024"
 readme = "README.adoc"
 
 [dependencies]
-facet = { version = "0.50.0-rc.0", features = ["reflect"] }
-facet-git-tree = { features = ["value"], git = "https://github.com/git-ents/facet-git-tree.git", version = "0.1.0" }
-facet-value = "0.50.0-rc.5"
+facet = { version = "0.50.0-rc.7", features = ["reflect"] }
+facet-git-tree = { version = "0.1.0-alpha.1", features = ["value"] }
+facet-value = "0.50.0-rc.7"
 gix = { version = "0.85.0", default-features = false, features = ["sha1", "zlib-rs"] }
 gix-refstore = { path = "../gix-refstore" }
 thiserror = "2"

crates/gix-store/Cargo.toml

@@ -4,7 +4,7 @@ use std::{marker::PhantomData, rc::Rc};
 
 use facet::Facet;
 use facet_git_tree::{
-    Derivation, Hints, ObjectId, Schema, SchemaPinError, check_universe_at,
+    Derivation, Hints, ObjectId, Schema, SchemaPinError, check_universe,
     deserialize_value_with_schema, identity_subtrees, migration::derive::derive, schema_of,
 };
 use facet_value::Value;
@@ -19,7 +19,7 @@ use crate::encoding::{Encoding, Typed};
 use crate::error::Error;
 use crate::identity::{EntityId, canonical_document_id};
 use crate::index;
-use crate::migrate::TargetSchema;
+use crate::migrate::{TargetSchema, read_schema_document};
 use crate::store::{Publication, PublishOptions, Store};
 use crate::tombstone::{self, DeleteResult, EntityState, Tombstone, TombstoneEntry};
 
@@ -1175,12 +1175,10 @@ where
     /// schema is in hand and nothing has been published yet.
     fn check_identity_subtrees(&self, doc: &Schema) -> Result<(), Error> {
         for (subtree, node) in identity_subtrees(doc) {
-            check_universe_at(node, &doc.defs, subtree).map_err(|source| {
-                Error::IdentityUniverse {
-                    kind: self.kind.clone(),
-                    subtree: subtree.to_owned(),
-                    source,
-                }
+            check_universe(node, &doc.defs).map_err(|source| Error::IdentityUniverse {
+                kind: self.kind.clone(),
+                subtree: subtree.to_owned(),
+                source,
             })?;
         }
         Ok(())
@@ -1196,7 +1194,7 @@ where
         {
             Some(tip) => {
                 let tree = self.store.commit_tree(tip)?;
-                Ok(Some(Schema::read_pinned(&tree, self.store.objects())?))
+                Ok(Some(read_schema_document(&tree, self.store.objects())?))
             }
             None => Ok(None),
         }

crates/gix-store/src/kind.rs

@@ -5,7 +5,7 @@
 
 use facet_git_tree::{Edge, Migration, ObjectId, Schema, apply_chain};
 use facet_value::Value;
-use gix::objs::{Find, Write};
+use gix::objs::{Data, Find, Kind, Tree, TreeRef, Write, WriteTo};
 use gix_refstore::RefStore;
 
 use crate::error::Error;
@@ -80,6 +80,63 @@ where
 
 /// One step of a chain: the document values on this side conform to, and the
 /// migration off it.
+pub(crate) fn read_schema_document<F: Find + ?Sized>(
+    tree: &ObjectId,
+    store: &F,
+) -> Result<Schema, Error> {
+    let filtered = WithoutMigration { tree, store };
+    Ok(Schema::read_pinned(tree, &filtered)?)
+}
+
+struct WithoutMigration<'a, F: ?Sized> {
+    tree: &'a ObjectId,
+    store: &'a F,
+}
+
+impl<F: Find + ?Sized> Find for WithoutMigration<'_, F> {
+    fn try_find<'a>(
+        &self,
+        id: &gix::hash::oid,
+        buffer: &'a mut Vec<u8>,
+    ) -> Result<Option<Data<'a>>, gix::objs::find::Error> {
+        let Some((kind, object_hash, bytes)) = (|| {
+            let mut source = Vec::new();
+            self.store.try_find(id, &mut source).map(|object| {
+                object.map(|object| (object.kind, object.object_hash, object.data.to_vec()))
+            })
+        })()?
+        else {
+            return Ok(None);
+        };
+        let bytes = if id == self.tree.as_ref() && kind == Kind::Tree {
+            let entries = TreeRef::from_bytes(&bytes, object_hash)
+                .map_err(|error| Box::new(error) as gix::objs::find::Error)?
+                .entries
+                .into_iter()
+                .filter(|entry| entry.filename != ENTRY)
+                .map(|entry| gix::objs::tree::Entry {
+                    mode: entry.mode,
+                    filename: entry.filename.to_owned(),
+                    oid: ObjectId::from(entry.oid.to_owned()),
+                })
+                .collect();
+            let mut filtered = Vec::new();
+            Tree { entries }
+                .write_to(&mut filtered)
+                .map_err(|error| Box::new(error) as gix::objs::find::Error)?;
+            filtered
+        } else {
+            bytes
+        };
+        *buffer = bytes;
+        Ok(Some(Data {
+            kind,
+            object_hash,
+            data: buffer,
+        }))
+    }
+}
+
 struct Step {
     from: Schema,
     migration: Migration,
@@ -111,7 +168,7 @@ where
             kind: self.kind.clone(),
         })?;
         let tree = self.store.commit_tree(tip)?;
-        let schema = Schema::read_pinned(&tree, self.store.objects())?;
+        let schema = read_schema_document(&tree, self.store.objects())?;
         Ok(TargetSchema::new(schema, history))
     }
 
@@ -152,8 +209,8 @@ where
                 kind: self.kind.clone(),
             })?;
         let target_tree = self.store.commit_tree(tip)?;
-        let stored_target = self.store.schema(target_tree)?;
-        if stored_target.as_ref() != target.schema() || target.schema().kind != self.kind.as_str() {
+        let stored_target = read_schema_document(&target_tree, self.store.objects())?;
+        if stored_target != *target.schema() || target.schema().kind != self.kind.as_str() {
             return Err(Error::TargetSchemaMismatch {
                 kind: self.kind.clone(),
                 commit: tip,
@@ -172,7 +229,7 @@ where
             let (newer, older) = (pair[0], pair[1]);
             let older_tree = self.store.commit_tree(older)?;
             steps.push(Step {
-                from: Schema::read_pinned(&older_tree, self.store.objects())?,
+                from: read_schema_document(&older_tree, self.store.objects())?,
                 migration: self.migration_at(newer)?.ok_or(Error::MigrationMissing {
                     kind: self.kind.clone(),
                     commit: newer,

crates/gix-store/src/migrate.rs

@@ -70,7 +70,7 @@ fn stored_bytes_match_git_exactly() {
 
     assert_eq!(id, oid(GOLDEN_TWO_PARENTS));
 
-    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap() else {
+    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap().unwrap() else {
         panic!("canonical write did not produce a commit");
     };
     assert_eq!(read_back.tree, commit.tree());
@@ -143,7 +143,7 @@ fn zero_parents_write_a_root_commit() {
         "seal\n",
     );
     let id = store.write_canonical(commit).unwrap();
-    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap() else {
+    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap().unwrap() else {
         panic!("canonical write did not produce a commit");
     };
     assert!(read_back.parents.is_empty());
@@ -162,7 +162,7 @@ fn negative_time_offsets_frame_like_git() {
         "offset\n",
     );
     let id = store.write_canonical(commit).unwrap();
-    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap() else {
+    let gix::objs::Object::Commit(read_back) = store.objects().get(&id).unwrap().unwrap() else {
         panic!("canonical write did not produce a commit");
     };
     assert_eq!(read_back.author.time.offset, -18000);

crates/gix-store/tests/canonical.rs

@@ -81,8 +81,8 @@ fn identical_canonical_typed_content_deduplicates() {
         identity::canonical_document_id(first_id).object_id(),
         first_id
     );
-    assert!(first_objects.get(&first_id).is_some());
-    assert!(second_objects.get(&second_id).is_some());
+    assert!(first_objects.get(&first_id).unwrap().is_some());
+    assert!(second_objects.get(&second_id).unwrap().is_some());
 }
 
 #[test]

crates/gix-store/tests/identity.rs

@@ -82,7 +82,7 @@ fn explicit_parent_appends_above_legacy_tip_while_creating_absent_alias() {
         .unwrap();
 
     let legacy_commit = kind.put(&path("legacy"), &value!({ "n": 1 })).unwrap();
-    let legacy_tree = match store.objects().get(&legacy_commit).unwrap() {
+    let legacy_tree = match store.objects().get(&legacy_commit).unwrap().unwrap() {
         GitObject::Commit(commit) => commit.tree,
         other => panic!("expected legacy commit, got {other:?}"),
     };
@@ -103,7 +103,7 @@ fn explicit_parent_appends_above_legacy_tip_while_creating_absent_alias() {
         )
         .unwrap();
 
-    let commit = match store.objects().get(&publication.commit()).unwrap() {
+    let commit = match store.objects().get(&publication.commit()).unwrap().unwrap() {
         GitObject::Commit(commit) => commit,
         other => panic!("expected publication commit, got {other:?}"),
     };