Adjusting special output for HTML.

Author: leonelsanchesdasilva

.vscode/launch.json

@@ -11,7 +11,7 @@
             "runtimeArgs": [
                 "--inspect-brk",
                 "${workspaceRoot}/node_modules/jest/bin/jest.js",
-                "html.test",
+                "xslt.test",
                 "--runInBand"
             ],
             "skipFiles": ["<node_internals>/**", "node_modules/**"],

src/dom/xml-functions.ts

@@ -248,7 +248,9 @@ function xmlElementLogicTrivial(node: XNode, buffer: string[], options: XmlOutpu
     let childNodes = node.transformedChildNodes.length > 0 ? node.transformedChildNodes : node.childNodes;
     childNodes = childNodes.sort((a, b) => a.siblingPosition - b.siblingPosition);
     if (childNodes.length === 0) {
-        if (options.selfClosingTags || (options.outputMethod === 'html' && ['hr', 'link'].includes(node.nodeName))) {
+        if (options.outputMethod === 'html' && ['hr', 'link', 'meta'].includes(node.nodeName)) {
+            buffer.push('>');
+        } else if (options.selfClosingTags) {
             buffer.push('/>');
         } else {
             buffer.push(`></${xmlFullNodeName(node)}>`);
@@ -278,7 +280,13 @@ function xmlElementLogicMuted(node: XNode, buffer: any[], options: XmlOutputOpti
     }
 }
 
-function xmlFullNodeName(node: XNode) {
+/**
+ * Gets the full node name.
+ * When namespace is set, the node name is `namespace:node`.
+ * @param node The node.
+ * @returns The full node name as a string.
+ */
+function xmlFullNodeName(node: XNode): string {
     const nodeName = node.transformedNodeName || node.nodeName;
     if (node.transformedPrefix && nodeName.indexOf(`${node.transformedPrefix}:`) != 0) {
         return `${node.transformedPrefix}:${nodeName}`;
@@ -294,7 +302,7 @@ function xmlFullNodeName(node: XNode) {
  * @param s The string to be escaped.
  * @returns The escaped string.
  */
-export function xmlEscapeText(s: string) {
+export function xmlEscapeText(s: string): string {
     return `${s}`
         .replace(/&/g, '&amp;')
         .replace(/&amp;amp;/g, '&amp;')
@@ -310,7 +318,7 @@ export function xmlEscapeText(s: string) {
  * @param s The string to be escaped.
  * @returns The escaped string.
  */
-function xmlEscapeAttr(s: string) {
+function xmlEscapeAttr(s: string): string {
     return xmlEscapeText(s).replace(/"/g, '&quot;');
 }
 
@@ -324,7 +332,7 @@ function xmlEscapeAttr(s: string) {
  * @param name TODO
  * @returns TODO
  */
-export function xmlGetAttribute(node: XNode, name: string) {
+export function xmlGetAttribute(node: XNode, name: string): string {
     // TODO(mesch): This should not be necessary if the DOM is working
     // correctly. The DOM is responsible for resolving entities, not the
     // application.

src/dom/xml-output-options.ts

@@ -2,5 +2,5 @@ export type XmlOutputOptions = {
     cData: boolean;
     escape: boolean;
     selfClosingTags: boolean;
-    outputMethod: 'xml' | 'html'
+    outputMethod: 'xml' | 'html' | 'text' | 'name'
 }

src/dom/xml-parser.ts

@@ -36,7 +36,7 @@ export class XmlParser {
     XML11_TAGNAME_REGEXP = new RegExp(`^(${XML11_NAME})`);
     XML11_ATTRIBUTE_REGEXP = new RegExp(XML11_ATTRIBUTE, 'g');
 
-    lenientHtmlTags = ['hr', 'link'];
+    lenientHtmlTags = ['hr', 'link', 'meta'];
 
     /**
      * The entry point for this parser.

src/xslt/xslt.ts

@@ -74,7 +74,7 @@ export class Xslt {
     decimalFormatSettings: XsltDecimalFormatSettings;
 
     outputDocument: XDocument;
-    outputMethod: 'xml' | 'html';
+    outputMethod: 'xml' | 'html' | 'text' | 'name';
     outputOmitXmlDeclaration: string;
     version: string;
 
@@ -369,7 +369,7 @@ export class Xslt {
                 case 'otherwise':
                     throw `error if here: ${template.localName}`;
                 case 'output':
-                    this.outputMethod = xmlGetAttribute(template, 'method');
+                    this.outputMethod = (xmlGetAttribute(template, 'method') as 'xml' | 'html' | 'text' | 'name');
                     this.outputOmitXmlDeclaration = xmlGetAttribute(template, 'omit-xml-declaration');
                     break;
                 case 'param':

tests/lmht.test.tsx

@@ -1576,24 +1576,22 @@ describe('LMHT', () => {
             </lmht>
         );
 
-        const expectedOutString = (
-            <html>
-                <head>
-                    <meta name="description" content="LMHT" />
-                    <meta name="keywords" content="HTML, LMHT, Desenvolvimento, Web" />
-                    <meta name="author" content="Leonel Sanches da Silva" />
-                    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-                    <title>Meu blog</title>
-                    <link rel="stylesheet" href="/publico/css/teste.css" />
-                </head>
-                <body>
-                    <article>
-                        <h1>Meu primeiro artigo</h1>
-                        <p>Este é meu primeiro artigo.</p>
-                    </article>
-                </body>
-            </html>
-        );
+        const expectedOutString = `<html>`+
+                `<head>`+
+                    `<meta name="description" content="LMHT">`+
+                    `<meta name="keywords" content="HTML, LMHT, Desenvolvimento, Web">`+
+                    `<meta name="author" content="Leonel Sanches da Silva">`+
+                    `<meta name="viewport" content="width=device-width, initial-scale=1.0">`+
+                    `<title>Meu blog</title>`+
+                    `<link rel="stylesheet" href="/publico/css/teste.css">`+
+                `</head>`+
+                `<body>`+
+                    `<article>`+
+                        `<h1>Meu primeiro artigo</h1>`+
+                        `<p>Este é meu primeiro artigo.</p>`+
+                    `</article>`+
+                `</body>`+
+            `</html>`;
 
         const xsltClass = new Xslt({ selfClosingTags: false });
         const xmlParser = new XmlParser();