Resolving CDATA issue reported in #95:

leonelsanchesdasilva · leonelsanchesdasilva · commit 814995d87eb0 · 2024-09-09T14:06:14.000-07:00
- `output` node should only be expected for fragments;
- While transforming source elements, attributes can be 1) created by a previous transformation, and 2) previous attributes could be renamed.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ node_modules/
 
 package-lock.json
 .history/
+
+# Strange bug with debugging a unit test causes a stop in `async_hooks`.
+test-without-jest.ts
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -19,6 +19,20 @@
             "skipFiles": ["<node_internals>/**", "node_modules/**"],
             "console": "integratedTerminal",
             "internalConsoleOptions": "neverOpen"
+        },
+        {
+            "name": "Launch TS file",
+            "type": "node",
+            "request": "launch",
+            "runtimeArgs": [
+                "-r",
+                "ts-node/register"
+            ],
+            "args": [
+                "${file}"
+            ],
+            "console": "integratedTerminal",
+            "internalConsoleOptions": "neverOpen"
         }
     ]
 }
diff --git a/jest.config.ts b/jest.config.ts
@@ -1,7 +1,9 @@
 import type { Config } from '@jest/types';
 export default async (): Promise<Config.InitialOptions> => ({
     verbose: true,
-    modulePathIgnorePatterns: ['<rootDir>/dist/'],
+    modulePathIgnorePatterns: [
+        '<rootDir>/dist/'
+    ],
     testEnvironment: 'node',
     coverageReporters: ['json-summary', 'lcov', 'text', 'text-summary'],
     displayName: {
diff --git a/src/xslt/xslt.ts b/src/xslt/xslt.ts
@@ -262,8 +262,10 @@ export class Xslt {
                     node.transformedNodeName = name;
 
                     domAppendTransformedChild(context.outputNodeList[context.outputPosition], node);
+                    // The element becomes the output node of the source node.
+                    context.nodeList[context.position].outputNode = node;
                     const clonedContext = context.clone(undefined, [node], undefined, 0);
-                    await this.xsltChildNodes(clonedContext, template, node);
+                    await this.xsltChildNodes(clonedContext, template);
                     break;
                 case 'fallback':
                     throw new Error(`not implemented: ${template.localName}`);
@@ -353,7 +355,7 @@ export class Xslt {
                     node = domCreateTransformedTextNode(this.outputDocument, value);
                     node.siblingPosition = context.nodeList[context.position].siblingPosition;
 
-                    if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
+                    if (output && output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
                         output.appendTransformedChild(node);
                     } else {
                         context.outputNodeList[context.outputPosition].appendTransformedChild(node);
@@ -471,7 +473,7 @@ export class Xslt {
         await this.xsltChildNodes(context, template, documentFragment);
         const value = xmlValue2(documentFragment);
 
-        if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
+        if (output && output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
             domSetTransformedAttribute(output, name, value);
         } else {
             let sourceNode = context.nodeList[context.position];
@@ -507,15 +509,19 @@ export class Xslt {
 
             // If the parent transformation is something like `xsl:element`, we should
             // add a copy of the attribute to this element.
-            domSetTransformedAttribute(output, name, value);
+            domSetTransformedAttribute(outputNode, name, value);
+
+            if (sourceNode.nodeType === DOM_ATTRIBUTE_NODE) {
+                sourceNode.transformedNodeType = DOM_ATTRIBUTE_NODE;
+                sourceNode.transformedNodeName = name;
+                sourceNode.transformedNodeValue = value;
+            }
 
             // Some operations start by the tag attributes, and not by the tag itself.
             // When this is the case, the output node is not set yet, so
             // we add the transformed attributes into the original tag.
             if (parentSourceNode && parentSourceNode.outputNode) {
                 domSetTransformedAttribute(parentSourceNode.outputNode, name, value);
-            } else {
-                domSetTransformedAttribute(parentSourceNode, name, value);
             }
         }
     }
@@ -527,7 +533,7 @@ export class Xslt {
      * @param template The template.
      * @param output The output. Only used if there's no corresponding output node already defined.
      */
-    protected async xsltChoose(context: ExprContext, template: XNode, output: XNode) {
+    protected async xsltChoose(context: ExprContext, template: XNode, output?: XNode) {
         for (const childNode of template.childNodes) {
             if (childNode.nodeType !== DOM_ELEMENT_NODE) {
                 continue;
@@ -536,13 +542,11 @@ export class Xslt {
             if (this.isXsltElement(childNode, 'when')) {
                 const test = xmlGetAttribute(childNode, 'test');
                 if (this.xPath.xPathEval(test, context).booleanValue()) {
-                    const outputNode = context.outputNodeList[context.outputPosition] || output;
-                    await this.xsltChildNodes(context, childNode, outputNode);
+                    await this.xsltChildNodes(context, childNode, output);
                     break;
                 }
             } else if (this.isXsltElement(childNode, 'otherwise')) {
-                const outputNode = context.outputNodeList[context.outputPosition] || output;
-                await this.xsltChildNodes(context, childNode, outputNode);
+                await this.xsltChildNodes(context, childNode, output);
                 break;
             }
         }
@@ -740,9 +744,9 @@ export class Xslt {
 
         const nonAttributeChildren = template.childNodes.filter((n) => n.nodeType !== DOM_ATTRIBUTE_NODE);
         if (nonAttributeChildren.length > 0) {
-            const root = domCreateDocumentFragment(template.ownerDocument);
-            await this.xsltChildNodes(context, template, root);
-            value = new NodeSetValue([root]);
+            const fragment = domCreateDocumentFragment(template.ownerDocument);
+            await this.xsltChildNodes(context, template, fragment);
+            value = new NodeSetValue([fragment]);
         } else if (select) {
             value = this.xPath.xPathEval(select, context);
         } else {
@@ -785,7 +789,7 @@ export class Xslt {
      * @param output The output.
      */
     private commonLogicTextNode(context: ExprContext, template: XNode, output: XNode) {
-        if (output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
+        if (output && output.nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
             let node = domCreateTransformedTextNode(this.outputDocument, template.nodeValue);
             domAppendTransformedChild(output, node);
         } else {
@@ -843,7 +847,16 @@ export class Xslt {
             newNode.transformedLocalName = template.localName;
 
             // The node can have transformed attributes from previous transformations.
-            const transformedAttributes = node.transformedChildNodes.filter((n) => n.nodeType === DOM_ATTRIBUTE_NODE);
+            // Case 1: attributes that were created by a transformation without a source attribute.
+            const transformedChildNodes = node.transformedChildNodes.filter((n) => n.nodeType === DOM_ATTRIBUTE_NODE);
+            for (const previouslyTransformedAttribute of transformedChildNodes) {
+                const name = previouslyTransformedAttribute.transformedNodeName;
+                const value = previouslyTransformedAttribute.transformedNodeValue;
+                domSetTransformedAttribute(newNode, name, value);
+            }
+
+            // Case 2: attributes that existed as a source attribute and were transformed.
+            const transformedAttributes = node.childNodes.filter((n) => n.nodeType === DOM_ATTRIBUTE_NODE && n.transformedNodeName)
             for (const previouslyTransformedAttribute of transformedAttributes) {
                 const name = previouslyTransformedAttribute.transformedNodeName;
                 const value = previouslyTransformedAttribute.transformedNodeValue;
@@ -864,7 +877,7 @@ export class Xslt {
                 outputNode.transformedChildNodes.length - 1,
                 ++elementContext.outputDepth
             );
-            await this.xsltChildNodes(clonedContext, template, output);
+            await this.xsltChildNodes(clonedContext, template);
         } else {
             // This applies also to the DOCUMENT_NODE of the XSL stylesheet,
             // so we don't have to treat it specially.
diff --git a/tests/lmht/html-to-lmht.test.tsx b/tests/lmht/html-to-lmht.test.tsx
@@ -1523,28 +1523,28 @@ describe('HTML to LMHT', () => {
         const xmlString =
             '<!DOCTYPE html>' +
             `<html lang="en">
-        <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">
-            <!-- <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content=""><meta name="author" content=""> -->
-            <title>About - Simple Blog Template</title>
-            <!-- Bootstrap Core CSS -->
-            <link href="css/bootstrap.min.css" rel="stylesheet">
-            <!-- Custom CSS -->
-            <link href="css/simple-blog-template.css" rel="stylesheet">
-            <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-            <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
-            <!--[if lt IE 9]>
-            <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
-            <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
-            <![endif]-->
-        </head>
-        <body>
-            <p class="anything">This is a paragraph with a class</p>
-        </body>
-    </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">
+                    <!-- <meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content=""><meta name="author" content=""> -->
+                    <title>About - Simple Blog Template</title>
+                    <!-- Bootstrap Core CSS -->
+                    <link href="css/bootstrap.min.css" rel="stylesheet">
+                    <!-- Custom CSS -->
+                    <link href="css/simple-blog-template.css" rel="stylesheet">
+                    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+                    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+                    <!--[if lt IE 9]>
+                    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+                    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+                    <![endif]-->
+                </head>
+                <body>
+                    <p class="anything">This is a paragraph with a class</p>
+                </body>
+            </html>
         `;
 
         const expectedOutString = `<lmht>` +
diff --git a/tests/xslt/for-each.test.tsx b/tests/xslt/for-each.test.tsx
@@ -0,0 +1,74 @@
+import { XmlParser } from '../../src/dom';
+import { Xslt } from '../../src/xslt';
+
+import assert from 'assert';
+
+describe('xsl:for-each', () => {
+    const xmlString = (
+        `<all>
+            <item pos="2">A</item>
+            <item pos="3">B</item>
+            <item pos="1">C</item>
+        </all>`
+    );
+
+    it('handles for-each sort', async () => {
+        const xsltForEachSort = (
+            `<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+                <xsl:template match="/">
+                    <xsl:for-each select="//item">
+                        <xsl:sort select="@pos" />
+                        <xsl:value-of select="." />
+                    </xsl:for-each>
+                </xsl:template>
+            </xsl:stylesheet>`
+        );
+
+        const xsltClass = new Xslt();
+        const xmlParser = new XmlParser();
+        const xml = xmlParser.xmlParse(xmlString);
+        const xslt = xmlParser.xmlParse(xsltForEachSort);
+        const html = await xsltClass.xsltProcess(xml, xslt);
+        assert.equal(html, 'CAB');
+    });
+
+    it('handles for-each sort ascending', async () => {
+        const xsltForEachSortAscending = (
+            `<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+                <xsl:template match="/">
+                    <xsl:for-each select="//item">
+                        <xsl:sort select="." order="ascending" />
+                        <xsl:value-of select="." />
+                    </xsl:for-each>
+                </xsl:template>
+            </xsl:stylesheet>`
+        );
+
+        const xsltClass = new Xslt();
+        const xmlParser = new XmlParser();
+        const xml = xmlParser.xmlParse(xmlString);
+        const xslt = xmlParser.xmlParse(xsltForEachSortAscending);
+        const html = await xsltClass.xsltProcess(xml, xslt);
+        assert.equal(html, 'ABC');
+    });
+
+    it('handles for-each sort descending', async () => {
+        const xsltForEachSortDescending = (
+            `<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+                <xsl:template match="/">
+                    <xsl:for-each select="//item">
+                        <xsl:sort select="." order="descending" />
+                        <xsl:value-of select="." />
+                    </xsl:for-each>
+                </xsl:template>
+            </xsl:stylesheet>`
+        );
+
+        const xsltClass = new Xslt();
+        const xmlParser = new XmlParser();
+        const xml = xmlParser.xmlParse(xmlString);
+        const xslt = xmlParser.xmlParse(xsltForEachSortDescending);
+        const html = await xsltClass.xsltProcess(xml, xslt);
+        assert.equal(html, 'CBA');
+    });
+});
diff --git a/tests/xslt/xslt.test.tsx b/tests/xslt/xslt.test.tsx
