fix(Rust): Republish patches to other subscribers

stencila · Oct 9, 2021 · a02b40e · a02b40e
1 parent 51259b4
commit a02b40e
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 2 deletions.
diff --git a/rust/src/documents.rs b/rust/src/documents.rs
@@ -666,8 +666,23 @@ impl Document {
     /// - `node_id`:  the id of the node at the origin of the patch; defaults to `root`
     /// - `patch`: the patch to apply
     pub fn patch(&mut self, node_id: Option<String>, patch: &Patch) -> Result<()> {
-        let mut pointer = Self::resolve(&mut self.root, &self.addresses, node_id)?;
-        pointer.patch(patch)
+        let mut pointer = Self::resolve(&mut self.root, &self.addresses, node_id.clone())?;
+        pointer.patch(patch)?;
+
+        // TODO: Only generate and publish a DomPatch if there are subscribers
+        let dom_patch = DomPatch::new(&patch, node_id);
+        publish(
+            &["documents:", &self.id, ":patched"].concat(),
+            &DocumentEvent {
+                type_: DocumentEventType::Patched,
+                document: self.clone(),
+                content: None,
+                format: None,
+                patch: Some(dom_patch),
+            },
+        );
+
+        Ok(())
     }
 
     /// Execute the document, optionally providing a [`Patch`] to apply before execution, and

diff --git a/rust/src/patches/mod.rs b/rust/src/patches/mod.rs
@@ -677,6 +677,7 @@ impl DomOperation {
                 $(to_html!($type);)*
             }
         }
+
         // Types roughly ordered by expected incidence (more commonly used types in
         // patches first)
         to_html!(
@@ -693,6 +694,15 @@ impl DomOperation {
             Null
         );
 
+        // The value may be a JSON value (if this patch was sent from a client)
+        if let Some(value) = value.downcast_ref::<serde_json::Value>() {
+            if let Some(str) = value.as_str() {
+                return str.to_string()
+            } else {
+                return value.to_string()
+            }
+        }
+
         tracing::error!("Unhandled value type when generating HTML for `DomOperation`");
         "<span class=\"todo\">TODO</span>".to_string()
     }
@@ -716,6 +726,8 @@ impl DomOperation {
                 $(to_json!($type);)*
             }
         }
+
+        // As above, types roughly ordered by expected incidence
         to_json!(
             InlineContent
             BlockContent
@@ -730,6 +742,11 @@ impl DomOperation {
             Null
         );
 
+        // The value may be a JSON value (if this patch was sent from a client)
+        if let Some(value) = value.downcast_ref::<serde_json::Value>() {
+            return value.clone()
+        }
+
         tracing::error!("Unhandled value type when generating JSON for `DomOperation`");
         serde_json::Value::String("TODO".to_string())
     }