feat: pass all mention attrs in normalization process

Author: hejsztynx

cpp/parser/GumboNormalizer.c

@@ -428,9 +428,10 @@ static void emit_attributes(GumboElement *el, const char *tag_name,
     if (gumbo_get_attribute(&el->attributes, "checked") != NULL)
       buffer_append_str(out, " checked");
   } else if (strcmp(tag_name, "mention") == 0) {
-    emit_one_attr(out, el, "id");
-    emit_one_attr(out, el, "text");
-    emit_one_attr(out, el, "indicator");
+    for (unsigned int i = 0; i < el->attributes.length; i++) {
+      GumboAttribute *attr = (GumboAttribute *)el->attributes.data[i];
+      emit_one_attr(out, el, attr->name);
+    }
   }
 }
 

cpp/tests/GumboParserTest.cpp

@@ -307,13 +307,20 @@ TEST(GumboParserTest, EnrichedTagRemappings) {
   EXPECT_EQ(
       GumboParser::normalizeHtml(
           "<mention text='@John Doe' indicator='@' id='1'>@John Doe</mention>"),
-      "<mention id=\"1\" text=\"@John Doe\" indicator=\"@\">@John "
+      "<mention text=\"@John Doe\" indicator=\"@\" id=\"1\">@John "
       "Doe</mention>");
   EXPECT_EQ(
       GumboParser::normalizeHtml("<mention text=\"@John Doe\" indicator=\"@\" "
                                  "id=\"1\">@John Doe</mention>"),
-      "<mention id=\"1\" text=\"@John Doe\" indicator=\"@\">@John "
+      "<mention text=\"@John Doe\" indicator=\"@\" id=\"1\">@John "
       "Doe</mention>");
+  // Custom mention attributes are preserved
+  EXPECT_EQ(
+      GumboParser::normalizeHtml(
+          "<mention id=\"1\" text=\"@John Doe\" indicator=\"@\" type=\"user\" "
+          "data-custom=\"custom data\">@John Doe</mention>"),
+      "<mention id=\"1\" text=\"@John Doe\" indicator=\"@\" type=\"user\" "
+      "data-custom=\"custom data\">@John Doe</mention>");
 
   // Link
   EXPECT_EQ(GumboParser::normalizeHtml(

src/web/__tests__/htmlNormalizer.test.ts

@@ -285,14 +285,19 @@ describe('htmlNormalizer', () => {
         '<ul data-type="checkbox"><li checked>x</li></ul>',
       ],
 
-      // Mentions (note: cpp reorders attrs to id, text, indicator)
+      // Mentions
       [
         "<mention text='@John Doe' indicator='@' id='1'>@John Doe</mention>",
-        '<mention id="1" text="@John Doe" indicator="@">@John Doe</mention>',
+        '<mention text="@John Doe" indicator="@" id="1">@John Doe</mention>',
       ],
       [
         '<mention text="@John Doe" indicator="@" id="1">@John Doe</mention>',
-        '<mention id="1" text="@John Doe" indicator="@">@John Doe</mention>',
+        '<mention text="@John Doe" indicator="@" id="1">@John Doe</mention>',
+      ],
+      // Custom mention attributes are preserved
+      [
+        '<mention id="1" text="@John Doe" indicator="@" type="user" data-custom="custom data">@John Doe</mention>',
+        '<mention id="1" text="@John Doe" indicator="@" type="user" data-custom="custom data">@John Doe</mention>',
       ],
 
       // Link

src/web/normalization/htmlNormalizer.ts

@@ -255,12 +255,13 @@ function emitAttributes(el: Element, name: string): string {
     }
     case 'li':
       return el.hasAttribute('checked') ? ' checked' : '';
-    case 'mention':
-      return (
-        emitOneAttr(el, 'id') +
-        emitOneAttr(el, 'text') +
-        emitOneAttr(el, 'indicator')
-      );
+    case 'mention': {
+      let out = '';
+      for (const attr of Array.from(el.attributes)) {
+        out += emitOneAttr(el, attr.name);
+      }
+      return out;
+    }
     default:
       return '';
   }