fix(html): preserve case-sensitive attributes (#5109)

Attributes in non-HTML tags are considered case-sensitive.

src/language-html/parser-parse5.js

@@ -14,62 +14,53 @@ function parse(text /*, parsers, opts*/) {
     sourceCodeLocationInfo: true
   });
 
-  return normalize(extendAst(ast), text);
+  return normalize(ast, text);
 }
 
-function normalize(ast, text) {
+function normalize(node, text) {
-  if (Array.isArray(ast)) {
+  delete node.parent;
-    return ast.map(child => normalize(child, text));
+  delete node.next;
-  }
+  delete node.prev;
 
-  if (!ast || typeof ast !== "object") {
+  let isCaseSensitiveTag = false;
-    return ast;
-  }
-
-  delete ast.parent;
-  delete ast.next;
-  delete ast.prev;
 
   // preserve case-sensitive tag names
   if (
-    ast.type === "tag" &&
+    node.type === "tag" &&
-    ast.sourceCodeLocation &&
+    node.sourceCodeLocation &&
-    htmlTagNames.indexOf(ast.name) === -1
+    htmlTagNames.indexOf(node.name) === -1
   ) {
-    ast.name = text.slice(
+    isCaseSensitiveTag = true;
-      ast.sourceCodeLocation.startOffset + 1, // <
+    node.name = text.slice(
-      ast.sourceCodeLocation.startOffset + 1 + ast.name.length
+      node.sourceCodeLocation.startOffset + 1, // <
+      node.sourceCodeLocation.startOffset + 1 + node.name.length
     );
   }
 
-  for (const key of Object.keys(ast)) {
+  if (node.attribs) {
-    ast[key] = normalize(ast[key], text);
+    node.attributes = Object.keys(node.attribs).map(attributeKey => {
+      const sourceCodeLocation = node.sourceCodeLocation.attrs[attributeKey];
+      return {
+        type: "attribute",
+        key: isCaseSensitiveTag
+          ? text
+              .slice(
+                sourceCodeLocation.startOffset,
+                sourceCodeLocation.endOffset
+              )
+              .split("=", 1)[0]
+          : attributeKey,
+        value: node.attribs[attributeKey],
+        sourceCodeLocation
+      };
+    });
   }
 
-  return ast;
+  if (node.children) {
-}
+    node.children = node.children.map(child => normalize(child, text));
-
-function extendAst(ast) {
-  if (!ast || !ast.children) {
-    return ast;
   }
-  for (const child of ast.children) {
-    extendAst(child);
-    if (child.attribs) {
-      child.attributes = convertAttribs(child.attribs);
-    }
-  }
-  return ast;
-}
 
-function convertAttribs(attribs) {
+  return node;
-  return Object.keys(attribs).map(attributeKey => {
-    return {
-      type: "attribute",
-      key: attributeKey,
-      value: attribs[attributeKey]
-    };
-  });
 }
 
 module.exports = {

src/language-html/printer-htmlparser2.js

@@ -182,11 +182,9 @@ function genericPrint(path, options, print) {
           return n.key;
         }
 
-        const attributeSourceCodeLocation =
-          parentNode.sourceCodeLocation.attrs[n.key];
         const originalAttributeSourceCode = options.originalText.slice(
-          attributeSourceCodeLocation.startOffset,
+          n.sourceCodeLocation.startOffset,
-          attributeSourceCodeLocation.endOffset
+          n.sourceCodeLocation.endOffset
         );
         const hasEqualSign = originalAttributeSourceCode.indexOf("=") !== -1;
 

tests/html_tags/__snapshots__/jsfmt.spec.js.snap

@@ -1,9 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`case-sensitive.html - parse5-verify 1`] = `
-<CaseSensitive>hello world</CaseSensitive>
+<CaseSensitive CaseSensitive="true">hello world</CaseSensitive>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-<CaseSensitive>hello world</CaseSensitive>
+<CaseSensitive CaseSensitive="true">hello world</CaseSensitive>
 
 `;
 

tests/html_tags/case-sensitive.html

@@ -1 +1 @@
-<CaseSensitive>hello world</CaseSensitive>
+<CaseSensitive CaseSensitive="true">hello world</CaseSensitive>