fix: non-string values are passed to XmlPrelim attribute value (#218)

Author: satoren

native/yex/src/yinput.rs

@@ -65,7 +65,7 @@ impl Prelim for NifXmlFragmentPrelim {
 #[module = "Yex.XmlElementPrelim"]
 pub struct NifXmlElementPrelim {
     tag: String,
-    attributes: HashMap<String, String>,
+    attributes: HashMap<String, NifAny>,
     children: Vec<NifXmlIn>,
 }
 impl XmlPrelim for NifXmlElementPrelim {}
@@ -81,7 +81,7 @@ impl Prelim for NifXmlElementPrelim {
     fn integrate(self, txn: &mut TransactionMut, inner_ref: BranchPtr) {
         let xml = XmlElementRef::from(inner_ref);
         for (key, value) in self.attributes {
-            xml.insert_attribute(txn, key, value);
+            xml.insert_attribute(txn, key, value.0);
         }
         for value in self.children {
             xml.push_back(txn, value);
@@ -92,7 +92,7 @@ impl Prelim for NifXmlElementPrelim {
 #[derive(NifStruct)]
 #[module = "Yex.XmlTextPrelim"]
 pub struct NifXmlTextPrelim {
-    attributes: HashMap<String, String>,
+    attributes: HashMap<String, NifAny>,
     delta: NifYInputDelta,
 }
 
@@ -107,7 +107,7 @@ impl Prelim for NifXmlTextPrelim {
     fn integrate(self, txn: &mut TransactionMut, inner_ref: BranchPtr) {
         let text_ref = XmlTextRef::from(inner_ref);
         for (key, value) in self.attributes {
-            text_ref.insert_attribute(txn, key, value);
+            text_ref.insert_attribute(txn, key, value.0);
         }
         text_ref.apply_delta(txn, self.delta.0);
     }

test/shared_type/xml_element_test.exs

@@ -551,6 +551,45 @@ defmodule YexXmlElementTest do
       %{doc: d1, xml_fragment: f}
     end
 
+    test "insert prelim with any attribute types", %{xml_fragment: xml_fragment} do
+      assert :ok ==
+               Yex.XmlFragment.insert(xml_fragment, 0, %Yex.XmlElementPrelim{
+                 tag: "blockContainer",
+                 attributes: %{"id" => "f6d3b168-05b2-4eb7-8d4e-132beb6fdc5b"},
+                 children: [
+                   %Yex.XmlElementPrelim{
+                     tag: "checkListItem",
+                     attributes: %{
+                       "backgroundColor" => "default",
+                       "checked" => false,
+                       "data" => %{"custom" => "data"},
+                       "indentation" => 0,
+                       "itemType" => <<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>>,
+                       "lineHeight" => 1.5,
+                       "array" => [1, 2, 3],
+                       "textAlignment" => "left",
+                       "textColor" => "default"
+                     },
+                     children: []
+                   }
+                 ]
+               })
+
+      {:ok, root} = Yex.XmlFragment.fetch(xml_fragment, 0)
+      assert "blockContainer" == Yex.XmlElement.get_tag(root)
+      assert "f6d3b168-05b2-4eb7-8d4e-132beb6fdc5b" == Yex.XmlElement.get_attribute(root, "id")
+
+      {:ok, child} = Yex.XmlElement.fetch(root, 0)
+      assert false == Yex.XmlElement.get_attribute(child, "checked")
+      assert 0 == Yex.XmlElement.get_attribute(child, "indentation")
+      assert 1.5 == Yex.XmlElement.get_attribute(child, "lineHeight")
+      assert [1, 2, 3] == Yex.XmlElement.get_attribute(child, "array")
+      assert %{"custom" => "data"} == Yex.XmlElement.get_attribute(child, "data")
+
+      assert <<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>> ==
+               Yex.XmlElement.get_attribute(child, "itemType")
+    end
+
     test "XmlElementPrelim.new", %{xml_fragment: xml_fragment} do
       XmlFragment.push(
         xml_fragment,

test/shared_type/xml_fragment_test.exs

@@ -462,5 +462,22 @@ defmodule YexXmlFragmentTest do
       # Ensure protocol implementation is exercised
       assert Yex.Output.as_prelim(f) == XmlFragment.as_prelim(f)
     end
+
+    test "load blocknote_data.bin and as_prelim" do
+      path = Path.expand("../test_data/blocknote_data.bin", __DIR__)
+      {:ok, bin} = File.read(path)
+      doc = Yex.Doc.new()
+      Yex.apply_update(doc, bin)
+      prelim = Yex.Doc.get_xml_fragment(doc, "document-store") |> Yex.Output.as_prelim()
+
+      new_doc = Yex.Doc.new()
+      frag = Yex.Doc.get_xml_fragment(new_doc, "document-store")
+
+      Enum.each(prelim.children, fn child ->
+        Yex.XmlFragment.insert(frag, Yex.XmlFragment.length(frag), child)
+      end)
+
+      assert frag |> Yex.Output.as_prelim() == prelim
+    end
   end
 end

test/shared_type/xml_text_test.exs

@@ -215,6 +215,58 @@ defmodule YexXmlTextTest do
     end
   end
 
+  describe "XmlTextPrelim" do
+    setup do
+      d1 = Doc.with_options(%Doc.Options{client_id: 1})
+      f = Doc.get_xml_fragment(d1, "xml")
+      %{doc: d1, xml_fragment: f}
+    end
+
+    test "insert prelim with any attribute types", %{xml_fragment: xml_fragment} do
+      assert :ok =
+               XmlFragment.insert(xml_fragment, 0, %Yex.XmlTextPrelim{
+                 delta: [
+                   %{
+                     attributes: %{
+                       "link" => %{
+                         "class" => nil,
+                         "indentation" => 0,
+                         "itemType" => <<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>>,
+                         "lineHeight" => 1.5,
+                         "array" => [1, 2, 3],
+                         "href" => "http://google.com",
+                         "rel" => "noopener noreferrer nofollow",
+                         "target" => "_blank"
+                       }
+                     },
+                     insert: "http://google.com"
+                   }
+                 ],
+                 attributes: %{}
+               })
+
+      {:ok, text} = XmlFragment.fetch(xml_fragment, 0)
+
+      assert [
+               %{
+                 insert: "http://google.com",
+                 attributes: %{
+                   "link" => %{
+                     "class" => nil,
+                     "indentation" => 0,
+                     "itemType" => <<0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15>>,
+                     "lineHeight" => 1.5,
+                     "array" => [1, 2, 3],
+                     "href" => "http://google.com",
+                     "rel" => "noopener noreferrer nofollow",
+                     "target" => "_blank"
+                   }
+                 }
+               }
+             ] == Yex.XmlText.to_delta(text)
+    end
+  end
+
   describe "as_prelim" do
     setup do
       d1 = Doc.with_options(%Doc.Options{client_id: 1})