@lix-js/sdk 0.6.0-preview.4 → 0.6.0-preview.5

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

@@ -2,7 +2,7 @@ mod context;
 mod overlay;
 mod reader;
 mod types;
-mod visibility;
+pub(crate) mod visibility;
 
 #[allow(unused_imports)]
 pub(crate) use context::{LiveStateContext, LiveStateStoreReader};
@@ -10,6 +10,12 @@ pub(crate) use context::{LiveStateContext, LiveStateStoreReader};
 pub(crate) use reader::LiveStateReader;
 #[allow(unused_imports)]
 pub(crate) use types::{
-    Bound, LiveStateFilter, LiveStateProjection, LiveStateRowIdentity, LiveStateRowRequest,
-    LiveStateScanRequest, MaterializedLiveStateRow, ScanConstraint, ScanField, ScanOperator,
+    Bound, LiveStateFilter, LiveStateProjection, LiveStateRowFilter, LiveStateRowIdentity,
+    LiveStateRowRequest, LiveStateScanRequest, MaterializedLiveStateRow, ScanConstraint, ScanField,
+    ScanOperator,
+};
+#[allow(unused_imports)]
+pub(crate) use visibility::{
+    expanded_branch_ids, overlay_scan_rows, resolve_visible_rows, StagedLiveStateRows,
+    VisibilityBranchScope, VisibilityRequest,
 };

package/dist-engine-src/src/live_state/overlay.rs

@@ -5,7 +5,7 @@ use crate::live_state::{LiveStateRowIdentity, MaterializedLiveStateRow};
 /// Applies the local untracked overlay to tracked live-state rows.
 ///
 /// The visible live-state contract is "latest local untracked row wins" for
-/// the same version/schema/entity/file identity. This keeps SQL providers from
+/// the same branch/schema/entity/file identity. This keeps SQL providers from
 /// knowing whether a visible row came from tracked changelog projection or from
 /// local untracked state.
 pub(crate) fn overlay_untracked_rows(
@@ -48,7 +48,7 @@ mod tests {
     fn different_identities_are_preserved() {
         let tracked = live_row("tracked", false, Some("change-tracked"));
         let mut untracked = live_row("untracked", true, None);
-        untracked.entity_id = crate::entity_identity::EntityIdentity::single("other");
+        untracked.entity_pk = crate::entity_pk::EntityPk::single("other");
 
         let rows = overlay_untracked_rows(vec![tracked], vec![untracked]);
 
@@ -57,7 +57,7 @@ mod tests {
 
     fn live_row(value: &str, untracked: bool, change_id: Option<&str>) -> MaterializedLiveStateRow {
         MaterializedLiveStateRow {
-            entity_id: crate::entity_identity::EntityIdentity::single("entity"),
+            entity_pk: crate::entity_pk::EntityPk::single("entity"),
             schema_key: "schema".to_string(),
             file_id: None,
             snapshot_content: Some(format!("{{\"value\":\"{value}\"}}")),
@@ -69,7 +69,7 @@ mod tests {
             change_id: change_id.map(str::to_string),
             commit_id: None,
             untracked,
-            version_id: "global".to_string(),
+            branch_id: "global".to_string(),
         }
     }
 }

package/dist-engine-src/src/live_state/types.rs

@@ -1,4 +1,4 @@
-use crate::entity_identity::EntityIdentity;
+use crate::entity_pk::EntityPk;
 use crate::tracked_state::MaterializedTrackedStateRow;
 use crate::untracked_state::{
     MaterializedUntrackedStateRow, UntrackedStateFilter, UntrackedStateRowRequest,
@@ -11,7 +11,7 @@ use crate::{NullableKeyFilter, Value};
 /// generated fields should be caught before this type is constructed.
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 pub(crate) struct MaterializedLiveStateRow {
-    pub(crate) entity_id: EntityIdentity,
+    pub(crate) entity_pk: EntityPk,
     pub(crate) schema_key: String,
     pub(crate) file_id: Option<String>,
     pub(crate) snapshot_content: Option<String>,
@@ -23,13 +23,13 @@ pub(crate) struct MaterializedLiveStateRow {
     pub(crate) change_id: Option<String>,
     pub(crate) commit_id: Option<String>,
     pub(crate) untracked: bool,
-    pub(crate) version_id: String,
+    pub(crate) branch_id: String,
 }
 
 impl From<MaterializedUntrackedStateRow> for MaterializedLiveStateRow {
     fn from(row: MaterializedUntrackedStateRow) -> Self {
         MaterializedLiveStateRow {
-            entity_id: row.entity_id,
+            entity_pk: row.entity_pk,
             schema_key: row.schema_key,
             file_id: row.file_id,
             snapshot_content: row.snapshot_content,
@@ -41,7 +41,7 @@ impl From<MaterializedUntrackedStateRow> for MaterializedLiveStateRow {
             change_id: None,
             commit_id: None,
             untracked: true,
-            version_id: row.version_id,
+            branch_id: row.branch_id,
         }
     }
 }
@@ -70,7 +70,7 @@ impl TryFrom<&MaterializedLiveStateRow> for MaterializedTrackedStateRow {
         };
 
         Ok(MaterializedTrackedStateRow {
-            entity_id: row.entity_id.clone(),
+            entity_pk: row.entity_pk.clone(),
             schema_key: row.schema_key.clone(),
             file_id: row.file_id.clone(),
             snapshot_content: row.snapshot_content.clone(),
@@ -87,7 +87,7 @@ impl TryFrom<&MaterializedLiveStateRow> for MaterializedTrackedStateRow {
 impl From<&MaterializedLiveStateRow> for MaterializedUntrackedStateRow {
     fn from(row: &MaterializedLiveStateRow) -> Self {
         MaterializedUntrackedStateRow {
-            entity_id: row.entity_id.clone(),
+            entity_pk: row.entity_pk.clone(),
             schema_key: row.schema_key.clone(),
             file_id: row.file_id.clone(),
             snapshot_content: row.snapshot_content.clone(),
@@ -96,7 +96,7 @@ impl From<&MaterializedLiveStateRow> for MaterializedUntrackedStateRow {
             created_at: row.created_at.clone(),
             updated_at: row.updated_at.clone(),
             global: row.global,
-            version_id: row.version_id.clone(),
+            branch_id: row.branch_id.clone(),
         }
     }
 }
@@ -104,7 +104,7 @@ impl From<&MaterializedLiveStateRow> for MaterializedUntrackedStateRow {
 /// Which indexed field a live-state scan constraint applies to.
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
 pub(crate) enum ScanField {
-    EntityId,
+    EntityPk,
     FileId,
 }
 
@@ -136,12 +136,14 @@ pub(crate) enum ScanOperator {
 /// Identity-centered filter for visible live entities.
 #[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize, Default)]
 pub(crate) struct LiveStateFilter {
+    #[serde(default)]
+    pub(crate) rows: LiveStateRowFilter,
     #[serde(default)]
     pub(crate) schema_keys: Vec<String>,
     #[serde(default)]
-    pub(crate) entity_ids: Vec<EntityIdentity>,
+    pub(crate) entity_pks: Vec<EntityPk>,
     #[serde(default)]
-    pub(crate) version_ids: Vec<String>,
+    pub(crate) branch_ids: Vec<String>,
     #[serde(default)]
     pub(crate) file_ids: Vec<NullableKeyFilter<String>>,
     #[serde(default)]
@@ -152,12 +154,19 @@ pub(crate) struct LiveStateFilter {
     pub(crate) include_tombstones: bool,
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, Default)]
+pub(crate) enum LiveStateRowFilter {
+    #[default]
+    All,
+    None,
+}
+
 impl From<LiveStateFilter> for UntrackedStateFilter {
     fn from(filter: LiveStateFilter) -> Self {
         Self {
             schema_keys: filter.schema_keys,
-            entity_ids: filter.entity_ids,
-            version_ids: filter.version_ids,
+            entity_pks: filter.entity_pks,
+            branch_ids: filter.branch_ids,
             file_ids: filter.file_ids,
         }
     }
@@ -185,8 +194,8 @@ pub(crate) struct LiveStateScanRequest {
 #[derive(Debug, Clone, PartialEq)]
 pub(crate) struct LiveStateRowRequest {
     pub(crate) schema_key: String,
-    pub(crate) version_id: String,
-    pub(crate) entity_id: EntityIdentity,
+    pub(crate) branch_id: String,
+    pub(crate) entity_pk: EntityPk,
     pub(crate) file_id: NullableKeyFilter<String>,
 }
 
@@ -194,8 +203,8 @@ impl From<&LiveStateRowRequest> for UntrackedStateRowRequest {
     fn from(request: &LiveStateRowRequest) -> Self {
         Self {
             schema_key: request.schema_key.clone(),
-            version_id: request.version_id.clone(),
-            entity_id: request.entity_id.clone(),
+            branch_id: request.branch_id.clone(),
+            entity_pk: request.entity_pk.clone(),
             file_id: request.file_id.clone(),
         }
     }
@@ -204,18 +213,18 @@ impl From<&LiveStateRowRequest> for UntrackedStateRowRequest {
 /// Stable visible-row identity used for overlay composition.
 #[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
 pub(crate) struct LiveStateRowIdentity {
-    pub(crate) version_id: String,
+    pub(crate) branch_id: String,
     pub(crate) schema_key: String,
-    pub(crate) entity_id: EntityIdentity,
+    pub(crate) entity_pk: EntityPk,
     pub(crate) file_id: Option<String>,
 }
 
 impl LiveStateRowIdentity {
     pub(crate) fn from_row(row: &MaterializedLiveStateRow) -> Self {
         Self {
-            version_id: row.version_id.clone(),
+            branch_id: row.branch_id.clone(),
             schema_key: row.schema_key.clone(),
-            entity_id: row.entity_id.clone(),
+            entity_pk: row.entity_pk.clone(),
             file_id: row.file_id.clone(),
         }
     }