@peerbit/native-backbone 0.2.8 → 0.2.10

package/src/append_tx/committed_no_next.rs

@@ -7,7 +7,7 @@ use wasm_bindgen::prelude::*;
 
 use crate::append_tx::{
     ensure_batch_append_lens, ensure_batch_projection_lens, no_next_compact_entry_row,
-    push_optional_trim_result, required_projection_encoded_document,
+    push_optional_trim_result, push_trim_gid_extension, required_projection_encoded_document,
     LatestCompactBatchPendingAppend,
 };
 use crate::documents::{
@@ -965,7 +965,7 @@ impl NativePeerbitBackbone {
             let (meta_data, payload_data) =
                 self.copy_append_inputs_profiled(meta_datas.get(index_u32), &payload_bytes)?;
 
-            let (entry_facts, trim_hashes) = self.prepare_no_next_log_append_profiled(
+            let (entry_facts, trim_hashes, trim_gids) = self.prepare_no_next_log_append_profiled(
                 wall_times.get_index(index_u32),
                 logicals.get_index(index_u32),
                 gid.clone(),
@@ -1000,6 +1000,7 @@ impl NativePeerbitBackbone {
                 gid,
                 entry_facts,
                 trim_hashes,
+                trim_gids,
                 document_index_commit,
                 previous_document_context: None,
                 delete_trimmed_document_heads,
@@ -1061,6 +1062,7 @@ impl NativePeerbitBackbone {
                     document_trimmed_heads_processed,
                 );
             }
+            push_trim_gid_extension(&row, pending.trim_gids);
             out.push(&row);
             if let Some(started) = result_row_started {
                 self.append_profile.result_row_ms += crate::time::now_ms() - started;
@@ -1098,7 +1100,7 @@ impl NativePeerbitBackbone {
         let (meta_data, payload_data) =
             self.copy_append_inputs_profiled(meta_data, &payload_data)?;
 
-        let (entry_facts, trim_hashes) = self.prepare_no_next_log_append_profiled(
+        let (entry_facts, trim_hashes, trim_gids) = self.prepare_no_next_log_append_profiled(
             wall_time,
             logical,
             gid.clone(),
@@ -1156,6 +1158,7 @@ impl NativePeerbitBackbone {
         let result_row_started = profile_enabled.then(crate::time::now_ms);
         let out = no_next_compact_entry_row(&self.resolution, &entry_facts, &coordinate_facts);
         push_optional_trim_result(&out, trim_hashes, document_trimmed_heads_processed);
+        push_trim_gid_extension(&out, trim_gids);
         if let Some(started) = result_row_started {
             self.append_profile.result_row_ms += crate::time::now_ms() - started;
         }

package/src/append_tx/facts.rs

@@ -1,5 +1,5 @@
 use js_sys::{Array, Uint8Array};
-use peerbit_log_rust::LogIndexEntry;
+use peerbit_log_rust::{LogIndexEntry, NativeCommittedEntryFacts};
 use wasm_bindgen::prelude::*;
 
 use crate::append_tx::{
@@ -41,8 +41,82 @@ fn log_trim_entries_to_rows(values: Vec<LogIndexEntry>) -> Array {
     out
 }
 
+/// Additive compact row carrying the gid paired with every trimmed hash.
+/// The legacy hash-only compact row remains frozen in `append_tx::mod`.
+fn compact_committed_entry_facts_trim_refs_to_row(
+    entry: &NativeCommittedEntryFacts,
+    trim_hashes: Vec<String>,
+    trim_gids: Vec<String>,
+    document_trimmed_heads_processed: bool,
+) -> Array {
+    let row = Array::new();
+    row.push(&JsValue::from_str(&entry.hash));
+    row.push(&JsValue::from_f64(entry.byte_length as f64));
+    row.push(&Uint8Array::from(entry.meta_bytes.as_slice()));
+    row.push(&Uint8Array::from(entry.hash_digest_bytes.as_slice()));
+    row.push(&strings_to_array(trim_hashes));
+    row.push(&strings_to_array(trim_gids));
+    row.push(&JsValue::from_bool(document_trimmed_heads_processed));
+    row
+}
+
 #[wasm_bindgen]
 impl NativePeerbitBackbone {
+    /// Compact counterpart to `prepare_plain_entry_commit_facts`. This is an
+    /// additive export so older native bundles retain their frozen row shape.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_facts_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        gid: String,
+        next: Array,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: usize,
+    ) -> Result<Array, JsValue> {
+        let (entry_facts, trim_refs) = if next.length() == 0 {
+            self.log
+                .prepare_entry_v0_plain_entry_commit_no_next_facts_core_profiled_and_put_with_builder_trim_refs(
+                    &self.builder,
+                    &mut self.blocks,
+                    wall_time,
+                    logical,
+                    gid,
+                    entry_type,
+                    optional_bytes_from_js(meta_data, "meta data")?,
+                    payload_data.to_vec(),
+                    trim_length_to,
+                    None,
+                )?
+        } else {
+            self.log
+                .prepare_entry_v0_plain_entry_commit_facts_core_profiled_and_put_with_builder_trim_refs(
+                    &self.builder,
+                    &mut self.blocks,
+                    wall_time,
+                    logical,
+                    gid,
+                    strings_from_array(next)?,
+                    entry_type,
+                    optional_bytes_from_js(meta_data, "meta data")?,
+                    payload_data.to_vec(),
+                    Some(trim_length_to),
+                    None,
+                )?
+        };
+        let out = Array::new();
+        out.push(&committed_entry_facts_to_row(
+            &entry_facts,
+            !entry_facts.next.is_empty(),
+        ));
+        let (trim_hashes, trim_gids) = trim_refs.into_iter().unzip();
+        out.push(&strings_to_array(trim_hashes));
+        out.push(&strings_to_array(trim_gids));
+        Ok(out)
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn prepare_plain_entry_commit_facts(
         &mut self,
@@ -472,6 +546,55 @@ impl NativePeerbitBackbone {
         )
     }
 
+    /// Additive trim-ref counterpart to the compact inline document-index
+    /// append. The hash-only export above retains its frozen row layout.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_no_next_facts_document_index_compact_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: usize,
+        document_key: String,
+        document_value_prefix_bytes: Vec<u8>,
+        document_existing_created: String,
+        document_byte_element_index_limit: usize,
+        document_delete_trimmed_heads: bool,
+        document_projection_plan: JsValue,
+        document_projection_encoded_document: JsValue,
+        document_projection_signer: JsValue,
+    ) -> Result<Array, JsValue> {
+        let document_gid = gid.clone();
+        let payload_size = payload_data.length();
+        let document_index_commit = document_index_append_commit(
+            document_key,
+            document_value_prefix_bytes,
+            document_existing_created,
+            document_byte_element_index_limit,
+            document_delete_trimmed_heads,
+            document_projection_plan,
+            document_projection_encoded_document,
+            document_projection_signer,
+        )?;
+        Ok(
+            self.prepare_plain_entry_commit_no_next_document_index_compact_trim_refs(
+                wall_time,
+                logical,
+                gid,
+                entry_type,
+                meta_data,
+                payload_data,
+                trim_length_to,
+                document_gid,
+                payload_size,
+                document_index_commit,
+            )?,
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn prepare_plain_entry_commit_no_next_facts_document_index_cached_plan_trim_hashes(
         &mut self,
@@ -560,6 +683,50 @@ impl NativePeerbitBackbone {
         )
     }
 
+    /// Additive trim-ref counterpart to the latest-context document-index
+    /// append. Gids are returned parallel to the existing trimmed hashes.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_latest_facts_document_index_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        fallback_gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: JsValue,
+        document_key: String,
+        document_value_prefix_bytes: Vec<u8>,
+        document_byte_element_index_limit: usize,
+        document_delete_trimmed_heads: bool,
+        document_projection_plan: JsValue,
+        document_projection_encoded_document: JsValue,
+        document_projection_signer: JsValue,
+    ) -> Result<Array, JsValue> {
+        let document_index_commit = document_index_append_commit(
+            document_key,
+            document_value_prefix_bytes,
+            String::new(),
+            document_byte_element_index_limit,
+            document_delete_trimmed_heads,
+            document_projection_plan,
+            document_projection_encoded_document,
+            document_projection_signer,
+        )?;
+        Ok(
+            self.prepare_plain_entry_commit_latest_document_index_trim_refs_inner(
+                wall_time,
+                logical,
+                fallback_gid,
+                entry_type,
+                meta_data,
+                payload_data,
+                trim_length_to,
+                document_index_commit,
+            )?,
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn prepare_plain_entry_commit_latest_facts_document_index_cached_plan_trim_hashes(
         &mut self,
@@ -600,6 +767,48 @@ impl NativePeerbitBackbone {
         )
     }
 
+    /// Cached-plan counterpart to
+    /// `prepare_plain_entry_commit_latest_facts_document_index_trim_refs`.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_latest_facts_document_index_cached_plan_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        fallback_gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: JsValue,
+        document_key: String,
+        document_byte_element_index_limit: usize,
+        document_delete_trimmed_heads: bool,
+        document_projection_plan_id: u32,
+        document_projection_encoded_document: JsValue,
+        document_projection_signer: JsValue,
+    ) -> Result<Array, JsValue> {
+        let document_index_commit = document_index_cached_projection_append_commit(
+            document_key,
+            String::new(),
+            document_byte_element_index_limit,
+            document_delete_trimmed_heads,
+            document_projection_plan_id,
+            document_projection_encoded_document,
+            document_projection_signer,
+        )?;
+        Ok(
+            self.prepare_plain_entry_commit_latest_document_index_trim_refs_inner(
+                wall_time,
+                logical,
+                fallback_gid,
+                entry_type,
+                meta_data,
+                payload_data,
+                trim_length_to,
+                document_index_commit,
+            )?,
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn prepare_plain_entry_commit_no_next_facts_document_index_cached_plan_compact_trim_hashes(
         &mut self,
@@ -646,6 +855,52 @@ impl NativePeerbitBackbone {
         )
     }
 
+    /// Additive trim-ref counterpart to the cached-plan compact append.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_no_next_facts_document_index_cached_plan_compact_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: usize,
+        document_key: String,
+        document_existing_created: String,
+        document_byte_element_index_limit: usize,
+        document_delete_trimmed_heads: bool,
+        document_projection_plan_id: u32,
+        document_projection_encoded_document: JsValue,
+        document_projection_signer: JsValue,
+    ) -> Result<Array, JsValue> {
+        let document_gid = gid.clone();
+        let payload_size = payload_data.length();
+        let document_index_commit = document_index_cached_projection_append_commit(
+            document_key,
+            document_existing_created,
+            document_byte_element_index_limit,
+            document_delete_trimmed_heads,
+            document_projection_plan_id,
+            document_projection_encoded_document,
+            document_projection_signer,
+        )?;
+        Ok(
+            self.prepare_plain_entry_commit_no_next_document_index_compact_trim_refs(
+                wall_time,
+                logical,
+                gid,
+                entry_type,
+                meta_data,
+                payload_data,
+                trim_length_to,
+                document_gid,
+                payload_size,
+                document_index_commit,
+            )?,
+        )
+    }
+
     #[allow(clippy::too_many_arguments)]
     pub fn prepare_plain_entry_commit_no_next_facts_document_index_cached_plan_compact_trim_hashes_plain_put_payload(
         &mut self,
@@ -706,6 +961,71 @@ impl NativePeerbitBackbone {
             document_trimmed_heads_processed,
         ))
     }
+
+    /// Additive trim-ref counterpart to the cached-plan compact append that
+    /// reuses the plain payload bytes for the document-index put.
+    #[allow(clippy::too_many_arguments)]
+    pub fn prepare_plain_entry_commit_no_next_facts_document_index_cached_plan_compact_trim_refs_plain_put_payload(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: usize,
+        document_key: String,
+        document_existing_created: String,
+        document_byte_element_index_limit: usize,
+        document_delete_trimmed_heads: bool,
+        document_projection_plan_id: u32,
+        document_projection_signer: JsValue,
+    ) -> Result<Array, JsValue> {
+        let document_gid = gid.clone();
+        let payload_size = payload_data.length();
+        let payload_data = payload_data.to_vec();
+        let document_index_commit =
+            document_index_cached_projection_plain_put_payload_append_commit(
+                document_key,
+                document_existing_created,
+                document_byte_element_index_limit,
+                document_delete_trimmed_heads,
+                document_projection_plan_id,
+                document_projection_signer,
+            )?;
+        let delete_trimmed_document_heads = document_index_commit.delete_trimmed_heads;
+        let (entry_facts, trim_refs) = self
+            .log
+            .prepare_entry_v0_plain_entry_commit_no_next_facts_core_profiled_and_put_with_builder_trim_refs_borrowed(
+                &self.builder,
+                &mut self.blocks,
+                wall_time,
+                logical,
+                gid,
+                entry_type,
+                optional_bytes_from_js(meta_data, "meta data")?,
+                &payload_data,
+                trim_length_to,
+                None,
+            )?;
+        self.put_document_index_for_append_with_plain_put_payload(
+            Some(document_index_commit),
+            wall_time,
+            &entry_facts.hash,
+            &document_gid,
+            payload_size,
+            Some(&payload_data),
+        )?;
+        let (trim_hashes, trim_gids): (Vec<String>, Vec<String>) = trim_refs.into_iter().unzip();
+        let document_trimmed_heads_processed = delete_trimmed_document_heads
+            && self.delete_documents_by_context_heads_profiled(&trim_hashes);
+        Ok(compact_committed_entry_facts_trim_refs_to_row(
+            &entry_facts,
+            trim_hashes,
+            trim_gids,
+            document_trimmed_heads_processed,
+        ))
+    }
 }
 
 impl NativePeerbitBackbone {
@@ -798,6 +1118,53 @@ impl NativePeerbitBackbone {
         Ok(out)
     }
 
+    #[allow(clippy::too_many_arguments)]
+    fn prepare_plain_entry_commit_no_next_document_index_compact_trim_refs(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: usize,
+        document_gid: String,
+        payload_size: u32,
+        document_index_commit: DocumentIndexAppendCommit,
+    ) -> Result<Array, BackboneError> {
+        let delete_trimmed_document_heads = document_index_commit.delete_trimmed_heads;
+        let (entry_facts, trim_refs) = self
+            .log
+            .prepare_entry_v0_plain_entry_commit_no_next_facts_core_profiled_and_put_with_builder_trim_refs(
+                &self.builder,
+                &mut self.blocks,
+                wall_time,
+                logical,
+                gid,
+                entry_type,
+                optional_bytes_from_js(meta_data, "meta data")?,
+                payload_data.to_vec(),
+                trim_length_to,
+                None,
+            )?;
+        self.put_document_index_for_append(
+            Some(document_index_commit),
+            wall_time,
+            &entry_facts.hash,
+            &document_gid,
+            payload_size,
+        )?;
+        let (trim_hashes, trim_gids): (Vec<String>, Vec<String>) = trim_refs.into_iter().unzip();
+        let document_trimmed_heads_processed = delete_trimmed_document_heads
+            && self.delete_documents_by_context_heads_profiled(&trim_hashes);
+        Ok(compact_committed_entry_facts_trim_refs_to_row(
+            &entry_facts,
+            trim_hashes,
+            trim_gids,
+            document_trimmed_heads_processed,
+        ))
+    }
+
     #[allow(clippy::too_many_arguments)]
     fn prepare_plain_entry_commit_latest_document_index_trim_hashes_inner(
         &mut self,
@@ -854,4 +1221,63 @@ impl NativePeerbitBackbone {
         );
         Ok(out)
     }
+
+    #[allow(clippy::too_many_arguments)]
+    fn prepare_plain_entry_commit_latest_document_index_trim_refs_inner(
+        &mut self,
+        wall_time: u64,
+        logical: u32,
+        fallback_gid: String,
+        entry_type: u8,
+        meta_data: JsValue,
+        payload_data: Uint8Array,
+        trim_length_to: JsValue,
+        mut document_index_commit: DocumentIndexAppendCommit,
+    ) -> Result<Array, BackboneError> {
+        let trim_length_to = optional_usize_from_js(trim_length_to, "trimLengthTo")?;
+        let (previous_context, gid, next_hashes) =
+            self.resolve_latest_document_append_context(&mut document_index_commit, fallback_gid)?;
+        let delete_trimmed_document_heads = document_index_commit.delete_trimmed_heads;
+        let payload_size = payload_data.length();
+        let (entry_facts, trim_refs) = self
+            .log
+            .prepare_entry_v0_plain_entry_commit_facts_core_profiled_and_put_with_builder_trim_refs(
+                &self.builder,
+                &mut self.blocks,
+                wall_time,
+                logical,
+                gid.clone(),
+                next_hashes,
+                entry_type,
+                optional_bytes_from_js(meta_data, "meta data")?,
+                payload_data.to_vec(),
+                trim_length_to,
+                None,
+            )?;
+        self.put_document_index_for_append(
+            Some(document_index_commit),
+            wall_time,
+            &entry_facts.hash,
+            &gid,
+            payload_size,
+        )?;
+        let (trim_hashes, trim_gids): (Vec<String>, Vec<String>) = trim_refs.into_iter().unzip();
+        let document_trimmed_heads_processed = delete_trimmed_document_heads
+            && self.delete_documents_by_context_heads_profiled(&trim_hashes);
+        let out = Array::new();
+        out.push(&committed_entry_facts_to_row(
+            &entry_facts,
+            !entry_facts.next.is_empty(),
+        ));
+        out.push(&strings_to_array(trim_hashes));
+        out.push(&strings_to_array(trim_gids));
+        out.push(&JsValue::from_bool(document_trimmed_heads_processed));
+        out.push(
+            &previous_context
+                .as_ref()
+                .map(|context| document_context_facts_to_row(context).into())
+                .unwrap_or(JsValue::UNDEFINED),
+        );
+        Ok(out)
+    }
 }