Fixing LocationExpr to work with relative template when template is the root element.

leonelsanchesdasilva · leonelsanchesdasilva · commit 9cb8fe245dc8 · 2023-07-28T19:43:58.000-07:00
diff --git a/src/xpath/expressions/location-expr.ts b/src/xpath/expressions/location-expr.ts
@@ -69,6 +69,9 @@ export class LocationExpr extends Expression {
             start = context.root;
         } else {
             start = context.nodeList[context.position];
+            if (start.nodeName === '#document') {
+                start = start.childNodes[0];
+            }
         }
 
         const nodes = [];
diff --git a/src/xslt/xslt.ts b/src/xslt/xslt.ts
@@ -330,7 +330,6 @@ export class Xslt {
                     // XPath doesn't have an axis to select "self and siblings", and
                     // the default axis is "child", so to select the correct children
                     // in relative path, we force a 'self-and-siblings' axis.
-                    // nodes = this.xsltMatch(match, context, context.inApplyTemplates ? 'self-and-siblings' : undefined);
                     nodes = this.xsltMatch(match, context, 'self-and-siblings');
                     if (nodes.length > 0) {
                         if (!context.inApplyTemplates) {
diff --git a/tests/lmht.test.tsx b/tests/lmht.test.tsx
@@ -0,0 +1,47 @@
+/* eslint-disable no-undef */
+import assert from 'assert';
+
+import React from 'react';
+import { dom } from 'isomorphic-jsx';
+import { Xslt } from '../src/xslt';
+import { xmlParse } from '../src/dom';
+
+// Just touching the `dom`, otherwise Babel prunes the import.
+console.log(dom);
+describe('LMHT', () => {
+    it('Trivial', () => {
+        const xmlString = (
+            <lmht>
+                <cabeca>
+                    <titulo>Teste</titulo>
+                </cabeca>
+                <corpo>
+                    Teste
+                </corpo>
+            </lmht>
+        );
+
+        const xsltString =
+            '<?xml version="1.0"?>' +
+            (
+                <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+                    <xsl:template match="lmht">
+                        <html>
+                            Teste
+                        </html>
+                    </xsl:template>
+                </xsl:stylesheet>
+            );
+
+            const expectedOutString = (
+                <html>Teste</html>
+            );
+
+            const xsltClass = new Xslt();
+            const xml = xmlParse(xmlString);
+            const xslt = xmlParse(xsltString);
+            const outXmlString = xsltClass.xsltProcess(xml, xslt);
+
+            assert.equal(outXmlString, expectedOutString);
+    });
+});

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,9 @@ export class LocationExpr extends Expression {`
`69`	`69`	`start = context.root;`
`70`	`70`	`} else {`
`71`	`71`	`start = context.nodeList[context.position];`
	`72`	`+ if (start.nodeName === '#document') {`
	`73`	`+ start = start.childNodes[0];`
	`74`	`+ }`
`72`	`75`	`}`
`73`	`76`
`74`	`77`	`const nodes = [];`