@lix-js/sdk 0.6.0-preview.2 → 0.6.0-preview.3

package/dist-engine-src/src/transaction/live_state_overlay.rs

@@ -1,24 +1,25 @@
 use std::collections::BTreeSet;
 
-use crate::live_state::LiveStateRow;
+use crate::live_state::MaterializedLiveStateRow;
 use crate::live_state::{LiveStateReader, LiveStateScanRequest};
-use crate::transaction::staging::{StagedStateRowIdentity, StagedStateRowOverlay};
+use crate::transaction::staging::{PreparedStateRowIdentity, PreparedStateRowOverlay};
 use crate::LixError;
 
 pub(crate) async fn overlay_scan_rows(
     base: &dyn LiveStateReader,
-    staged: &StagedStateRowOverlay,
+    staged: &PreparedStateRowOverlay,
     request: &LiveStateScanRequest,
-) -> Result<Vec<LiveStateRow>, LixError> {
-    let mut rows = staged.scan(request);
-    let hidden_identities = staged.identities_matching_scan(request);
+) -> Result<Vec<MaterializedLiveStateRow>, LixError> {
+    let staged_parts = staged.scan_parts(request)?;
+    let hidden_identities = staged_parts.hidden_identities;
+    let mut rows = staged_parts.rows;
     let mut visible_identities = rows
         .iter()
-        .map(StagedStateRowIdentity::from)
+        .map(PreparedStateRowIdentity::from)
         .collect::<BTreeSet<_>>();
 
     for row in base.scan_rows(request).await? {
-        let identity = StagedStateRowIdentity::from(&row);
+        let identity = PreparedStateRowIdentity::from(&row);
         if hidden_identities.contains(&identity) {
             continue;
         }

package/dist-engine-src/src/transaction/mod.rs

@@ -2,6 +2,7 @@ mod commit;
 mod context;
 mod live_state_overlay;
 mod normalization;
+mod prep;
 mod schema_resolver;
 mod staging;
 pub(crate) mod types;
@@ -9,3 +10,4 @@ mod validation;
 
 pub(crate) use context::open_transaction;
 pub(crate) use context::Transaction;
+pub(crate) use prep::prepare_version_ref_row;