0.5.10 core library update (#155)

* advance to core library version 0.5.10 - update PatchAction API to reflect marks changes

* corresponding API updates for removing Marks from Patch:Insert

* rustfmt cleanup

Author: heckj

AutomergeUniffi/automerge.swift

@@ -642,11 +642,12 @@ open class Doc:
     }
 
     public convenience init() {
-        let pointer = try! rustCall {
-            uniffi_uniffi_automerge_fn_constructor_doc_new(
-                $0
-            )
-        }
+        let pointer =
+            try! rustCall {
+                uniffi_uniffi_automerge_fn_constructor_doc_new(
+                    $0
+                )
+            }
         self.init(unsafeFromRawPointer: pointer)
     }
 
@@ -1385,11 +1386,12 @@ open class SyncState:
     }
 
     public convenience init() {
-        let pointer = try! rustCall {
-            uniffi_uniffi_automerge_fn_constructor_syncstate_new(
-                $0
-            )
-        }
+        let pointer =
+            try! rustCall {
+                uniffi_uniffi_automerge_fn_constructor_syncstate_new(
+                    $0
+                )
+            }
         self.init(unsafeFromRawPointer: pointer)
     }
 
@@ -1998,8 +2000,7 @@ public enum PatchAction {
     case insert(
         obj: ObjId,
         index: UInt64,
-        values: [Value],
-        marks: [String: Value]
+        values: [Value]
     )
     case spliceText(
         obj: ObjId,
@@ -2046,8 +2047,7 @@ public struct FfiConverterTypePatchAction: FfiConverterRustBuffer {
         case 2: return try .insert(
                 obj: FfiConverterTypeObjId.read(from: &buf),
                 index: FfiConverterUInt64.read(from: &buf),
-                values: FfiConverterSequenceTypeValue.read(from: &buf),
-                marks: FfiConverterDictionaryStringTypeValue.read(from: &buf)
+                values: FfiConverterSequenceTypeValue.read(from: &buf)
             )
 
         case 3: return try .spliceText(
@@ -2096,12 +2096,11 @@ public struct FfiConverterTypePatchAction: FfiConverterRustBuffer {
             FfiConverterTypeProp.write(prop, into: &buf)
             FfiConverterTypeValue.write(value, into: &buf)
 
-        case let .insert(obj, index, values, marks):
+        case let .insert(obj, index, values):
             writeInt(&buf, Int32(2))
             FfiConverterTypeObjId.write(obj, into: &buf)
             FfiConverterUInt64.write(index, into: &buf)
             FfiConverterSequenceTypeValue.write(values, into: &buf)
-            FfiConverterDictionaryStringTypeValue.write(marks, into: &buf)
 
         case let .spliceText(obj, index, value, marks):
             writeInt(&buf, Int32(3))

Sources/Automerge/Patch.swift

@@ -50,10 +50,8 @@ public enum PatchAction: Equatable {
     ///
     /// The property included within the `Put` can be either an index to a sequence, or a key into a map.
     case Put(ObjId, Prop, Value)
-    /// Insert a collection of values at the index you provide for the identified object with the given marks
-    ///
-    /// `marks` will only  be set for text objects.
-    case Insert(obj: ObjId, index: UInt64, values: [Value], marks: [String: Value])
+    /// Insert a collection of values at the index you provide for the identified object.
+    case Insert(obj: ObjId, index: UInt64, values: [Value])
     /// Splices characters into and/or removes characters from the identified object at a given position within it.
     ///
     /// > Note: The unsigned 64bit integer is the index to a UTF-8 code point, and not a grapheme cluster index.
@@ -77,12 +75,11 @@ public enum PatchAction: Equatable {
         switch ffi {
         case let .put(obj, prop, value):
             return .Put(ObjId(bytes: obj), Prop.fromFfi(prop), Value.fromFfi(value: value))
-        case let .insert(obj, index, values, marks):
+        case let .insert(obj, index, values):
             return .Insert(
                 obj: ObjId(bytes: obj),
                 index: index,
-                values: values.map { Value.fromFfi(value: $0) },
-                marks: marks.mapValues(Value.fromFfi)
+                values: values.map { Value.fromFfi(value: $0) }
             )
         case let .spliceText(obj, index, value, marks):
             return .SpliceText(

rust/Cargo.lock

@@ -13,10 +13,10 @@ path = "uniffi-bindgen.rs"
 required-features = ["uniffi/cli"]
 
 [dependencies]
-automerge = "0.5.9"
+automerge = "0.5.10"
 thiserror = "1.0.38"
-uniffi = "0.27.0"
+uniffi = "0.27.1"
 
 [build-dependencies]
-uniffi = {version = "0.27.0", features = ["build"] }
+uniffi = {version = "0.27.1", features = ["build"] }
 

rust/Cargo.toml

@@ -120,7 +120,7 @@ dictionary Patch {
 [Enum]
 interface PatchAction {
     Put( ObjId obj, Prop prop, Value value);
-    Insert( ObjId obj, u64 index, sequence<Value> values, record<string, Value> marks);
+    Insert( ObjId obj, u64 index, sequence<Value> values);
     SpliceText( ObjId obj, u64 index, string value, record<string, Value> marks);
     Increment( ObjId obj, Prop prop, i64 value);
     Conflict( ObjId obj, Prop prop);

rust/src/automerge.udl

@@ -34,7 +34,6 @@ pub enum PatchAction {
         obj: ObjId,
         index: u64,
         values: Vec<Value>,
-        marks: HashMap<String, Value>,
     },
     SpliceText {
         obj: ObjId,
@@ -81,18 +80,13 @@ impl PatchAction {
                 },
                 value: value.into(),
             },
-            am::PatchAction::Insert {
-                index,
-                values,
-                marks,
-            } => PatchAction::Insert {
+            am::PatchAction::Insert { index, values } => PatchAction::Insert {
                 obj: obj.into(),
                 index: index as u64,
                 values: values
                     .into_iter()
                     .map(|(v, id, _conflict)| Value::from((v.clone(), id.clone())))
                     .collect(),
-                marks: convert_marks(marks),
             },
             am::PatchAction::SpliceText {
                 index,