xslt-processor 1.2.4 → 1.2.5

package/{xslt → xpath}/expr-context.d.ts

@@ -1,5 +1,5 @@
 import { XNode } from '../dom';
-import { XsltDecimalFormatSettings } from './xslt-decimal-format-settings';
+import { XsltDecimalFormatSettings } from '../xslt/xslt-decimal-format-settings';
 /** XPath expression evaluation context. An XPath context consists of a
  * DOM node, a list of DOM nodes that contains this node, a number
  * that represents the position of the single node in the list, and a

package/{xslt → xpath}/expr-context.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExprContext = void 0;
 var constants_1 = require("../constants");
-var boolean_value_1 = require("../xpath/values/boolean-value");
-var node_set_value_1 = require("../xpath/values/node-set-value");
-var number_value_1 = require("../xpath/values/number-value");
-var string_value_1 = require("../xpath/values/string-value");
-var tokens_1 = require("../xpath/tokens");
+var boolean_value_1 = require("./values/boolean-value");
+var node_set_value_1 = require("./values/node-set-value");
+var number_value_1 = require("./values/number-value");
+var string_value_1 = require("./values/string-value");
+var tokens_1 = require("./tokens");
 /** XPath expression evaluation context. An XPath context consists of a
  * DOM node, a list of DOM nodes that contains this node, a number
  * that represents the position of the single node in the list, and a

package/xpath/expr-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expr-context.js","sourceRoot":"","sources":["../../src/xpath/expr-context.ts"],"names":[],"mappings":"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"}

package/xpath/expressions/binary-expr.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { BooleanValue } from "../values/boolean-value";
 import { Expression } from "./expression";
 export declare class BinaryExpr extends Expression {

package/xpath/expressions/function-call-expr.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from '../../xslt/expr-context';
+import { ExprContext } from '../expr-context';
 import { Expression } from './expression';
 export declare class FunctionCallExpr extends Expression {
     name: any;

package/xpath/expressions/location-expr.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeSetValue } from "../values/node-set-value";
 import { Expression } from "./expression";
 import { XPath } from "../xpath";

package/xpath/expressions/step-expr.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from '../../xslt/expr-context';
+import { ExprContext } from '../expr-context';
 import { NodeSetValue } from '../values/node-set-value';
 import { Expression } from './expression';
 import { XPath } from '../xpath';

package/xpath/functions/non-standard.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeSetValue, StringValue } from "../values";
 export declare function extCardinal(context: ExprContext): NodeSetValue;
 /**

package/xpath/functions/standard.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { BooleanValue, NodeSetValue, NumberValue, StringValue } from "../values";
 export declare function boolean(context: ExprContext): BooleanValue;
 export declare function ceiling(context: ExprContext): NumberValue;

package/xpath/index.d.ts

@@ -1,3 +1,3 @@
-export * from '../xslt/expr-context';
+export * from './expr-context';
 export * from './xpath';
 export * from './xpath-token-rule';

package/xpath/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("../xslt/expr-context"), exports);
+__exportStar(require("./expr-context"), exports);
 __exportStar(require("./xpath"), exports);
 __exportStar(require("./xpath-token-rule"), exports);
 //# sourceMappingURL=index.js.map

package/xpath/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/xpath/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,uDAAqC;AACrC,0CAAwB;AACxB,qDAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/xpath/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,0CAAwB;AACxB,qDAAmC"}

package/xpath/match-resolver.d.ts

@@ -0,0 +1,55 @@
+import { XNode } from "../dom";
+import { ExprContext } from "./expr-context";
+import { Expression } from "./expressions/expression";
+/**
+ * Class that resolves XPath expressions, returning nodes.
+ */
+export declare class MatchResolver {
+    /**
+     * This class entry point.
+     * @param expression The expression to be resolved.
+     * @param context The Expression Context
+     * @returns An array of nodes.
+     */
+    expressionMatch(expression: Expression, context: ExprContext): XNode[];
+    /**
+     * Resolves a `LocationExpr`.
+     * @param expression The Location Expression.
+     * @param context The Expression Context.
+     * @returns Either the results of a relative resolution, or the results of an
+     *          absolute resolution.
+     */
+    private locationExpressionMatch;
+    /**
+     * Resolves a `UnionExpr`.
+     * @param expression The Union Expression.
+     * @param context The Expression Context.
+     * @returns The concatenated result of evaluating the both sides of the expression.
+     */
+    private unionExpressionMatch;
+    /**
+     * Finds all the nodes through absolute XPath search, starting on
+     * the #document parent node.
+     * @param expression The Expression.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    private absoluteXsltMatchByDocumentNode;
+    /**
+     * Finds all the nodes through absolute xPath search, starting with the
+     * first child of the #document node.
+     * @param expression The Expression.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    private absoluteXsltMatch;
+    /**
+     * Tries to find relative nodes from the actual context position.
+     * If found nodes are already in the context, or if they are children of
+     * nodes in the context, they are returned.
+     * @param expression The expression used.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    private relativeXsltMatch;
+}

package/xpath/match-resolver.js

@@ -0,0 +1,137 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MatchResolver = void 0;
+var expressions_1 = require("./expressions");
+/**
+ * Class that resolves XPath expressions, returning nodes.
+ */
+var MatchResolver = /** @class */ (function () {
+    function MatchResolver() {
+    }
+    /**
+     * This class entry point.
+     * @param expression The expression to be resolved.
+     * @param context The Expression Context
+     * @returns An array of nodes.
+     */
+    MatchResolver.prototype.expressionMatch = function (expression, context) {
+        if (expression instanceof expressions_1.LocationExpr) {
+            return this.locationExpressionMatch(expression, context);
+        }
+        if (expression instanceof expressions_1.UnionExpr) {
+            return this.unionExpressionMatch(expression, context);
+        }
+        // TODO: Other expressions
+        return [];
+    };
+    /**
+     * Resolves a `LocationExpr`.
+     * @param expression The Location Expression.
+     * @param context The Expression Context.
+     * @returns Either the results of a relative resolution, or the results of an
+     *          absolute resolution.
+     */
+    MatchResolver.prototype.locationExpressionMatch = function (expression, context) {
+        if (expression === undefined || expression.steps === undefined || expression.steps.length <= 0) {
+            throw new Error('Error resolving XSLT match: Location Expression should have steps.');
+        }
+        if (expression.absolute) {
+            // If expression is absolute and the axis of first step is self,
+            // the match starts by the #document node (for instance, `<xsl:template match="/">`).
+            // Otherwise (axis === 'child'), the match stasts on the first
+            // child of #document node.
+            var firstStep = expression.steps[0];
+            if (firstStep.axis === 'self') {
+                return this.absoluteXsltMatchByDocumentNode(expression, context);
+            }
+            return this.absoluteXsltMatch(expression, context);
+        }
+        return this.relativeXsltMatch(expression, context);
+    };
+    /**
+     * Resolves a `UnionExpr`.
+     * @param expression The Union Expression.
+     * @param context The Expression Context.
+     * @returns The concatenated result of evaluating the both sides of the expression.
+     */
+    MatchResolver.prototype.unionExpressionMatch = function (expression, context) {
+        var expr1Nodes = this.expressionMatch(expression.expr1, context);
+        return expr1Nodes.concat(this.expressionMatch(expression.expr2, context));
+    };
+    /**
+     * Finds all the nodes through absolute XPath search, starting on
+     * the #document parent node.
+     * @param expression The Expression.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    MatchResolver.prototype.absoluteXsltMatchByDocumentNode = function (expression, context) {
+        var clonedContext = context.clone([context.root], undefined, 0, undefined);
+        var matchedNodes = expression.evaluate(clonedContext).nodeSetValue();
+        var finalList = [];
+        for (var _i = 0, matchedNodes_1 = matchedNodes; _i < matchedNodes_1.length; _i++) {
+            var element = matchedNodes_1[_i];
+            if (element.id === context.nodeList[context.position].id) {
+                finalList.push(element);
+                continue;
+            }
+        }
+        return finalList;
+    };
+    /**
+     * Finds all the nodes through absolute xPath search, starting with the
+     * first child of the #document node.
+     * @param expression The Expression.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    MatchResolver.prototype.absoluteXsltMatch = function (expression, context) {
+        var firstChildOfRoot = context.root.childNodes[0];
+        var clonedContext = context.clone([firstChildOfRoot], undefined, 0, undefined);
+        var matchedNodes = expression.evaluate(clonedContext).nodeSetValue();
+        var finalList = [];
+        // If the context is pointing to #document node, it's child node is
+        // considered.
+        var nodeList;
+        if (context.nodeList.length === 1 && context.nodeList[0].nodeName === '#document') {
+            nodeList = [context.nodeList[0].childNodes[0]];
+        }
+        else {
+            nodeList = context.nodeList;
+        }
+        for (var _i = 0, matchedNodes_2 = matchedNodes; _i < matchedNodes_2.length; _i++) {
+            var element = matchedNodes_2[_i];
+            if (element.id === nodeList[context.position].id) {
+                finalList.push(element);
+                continue;
+            }
+        }
+        return finalList;
+    };
+    /**
+     * Tries to find relative nodes from the actual context position.
+     * If found nodes are already in the context, or if they are children of
+     * nodes in the context, they are returned.
+     * @param expression The expression used.
+     * @param context The Expression Context.
+     * @returns The list of found nodes.
+     */
+    MatchResolver.prototype.relativeXsltMatch = function (expression, context) {
+        // For some reason, XPath understands a default as 'child axis'.
+        // There's no "self + siblings" axis, so what is expected at this point
+        // is to have in the expression context the parent that should
+        // have the nodes we are interested in.
+        var clonedContext = context.clone();
+        var nodes = expression.evaluate(clonedContext).nodeSetValue();
+        if (nodes.length === 1 && nodes[0].nodeName === '#document') {
+            // As we don't work with the #document node directly, this part
+            // returns its first sibling.
+            // By the way, it should be *always* one sibling here.
+            return [nodes[0].childNodes[0]];
+        }
+        return nodes;
+    };
+    return MatchResolver;
+}());
+exports.MatchResolver = MatchResolver;
+//# sourceMappingURL=match-resolver.js.map

package/xpath/match-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"match-resolver.js","sourceRoot":"","sources":["../../src/xpath/match-resolver.ts"],"names":[],"mappings":"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"}

package/xpath/node-tests/node-test-comment.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeTest } from "./node-test";
 import { BooleanValue } from "../values/boolean-value";
 export declare class NodeTestComment implements NodeTest {

package/xpath/node-tests/node-test-element-or-attribute.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { BooleanValue } from "../values/boolean-value";
 import { NodeTest } from "./node-test";
 export declare class NodeTestElementOrAttribute implements NodeTest {

package/xpath/node-tests/node-test-name.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeValue } from "../values";
 import { NodeTest } from "./node-test";
 export declare class NodeTestName implements NodeTest {

package/xpath/node-tests/node-test-nc.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeTest } from "./node-test";
 import { BooleanValue } from "../values/boolean-value";
 export declare class NodeTestNC implements NodeTest {

package/xpath/node-tests/node-test-pi.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { BooleanValue } from "../values/boolean-value";
 import { NodeTest } from "./node-test";
 export declare class NodeTestPI implements NodeTest {

package/xpath/node-tests/node-test-text.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { BooleanValue } from "../values/boolean-value";
 import { NodeTest } from "./node-test";
 export declare class NodeTestText implements NodeTest {

package/xpath/node-tests/node-test.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from "../../xslt/expr-context";
+import { ExprContext } from "../expr-context";
 import { NodeValue } from "../values";
 export interface NodeTest {
     evaluate(_ctx: ExprContext): NodeValue;

package/xpath/xpath.d.ts

@@ -1,4 +1,4 @@
-import { ExprContext } from '../xslt/expr-context';
+import { ExprContext } from './expr-context';
 import { BinaryExpr, FunctionCallExpr, LiteralExpr, LocationExpr, NumberExpr, PathExpr, PredicateExpr, StepExpr, TokenExpr, UnaryMinusExpr, UnionExpr, VariableExpr } from './expressions';
 import { Expression } from './expressions/expression';
 import { XPathTokenRule } from './xpath-token-rule';

package/xslt/xslt.d.ts

@@ -2,6 +2,7 @@ import { XDocument, XNode } from '../dom';
 import { ExprContext, XPath } from '../xpath';
 import { XsltOptions } from './xslt-options';
 import { XsltDecimalFormatSettings } from './xslt-decimal-format-settings';
+import { MatchResolver } from '../xpath/match-resolver';
 /**
  * The main class for XSL-T processing. The implementation is NOT
  * complete; some xsl element are left out.
@@ -28,6 +29,7 @@ import { XsltDecimalFormatSettings } from './xslt-decimal-format-settings';
  */
 export declare class Xslt {
     xPath: XPath;
+    matchResolver: MatchResolver;
     options: XsltOptions;
     decimalFormatSettings: XsltDecimalFormatSettings;
     outputDocument: XDocument;
@@ -79,7 +81,6 @@ export declare class Xslt {
      * @param output The output.
      */
     protected xsltForEach(context: ExprContext, template: XNode, output: XNode): void;
-    protected groupBy(xs: any, key: any): any;
     /**
      * Orders the current node list in the input context according to the
      * sort order specified by xsl:sort child nodes of the current
@@ -119,6 +120,14 @@ export declare class Xslt {
      * @param output The XML output.
      */
     protected xsltChildNodes(context: ExprContext, template: XNode, output: XNode): void;
+    /**
+     * This logic is used in two different places:
+     * - `xsltPassThrough`, if the template asks this library to write a text node;
+     * - `xsltProcessContext`, `apply-templates` operation, when the current node is text.
+     * @param context The Expression Context.
+     * @param template The template, that contains the node value to be written.
+     */
+    private commonLogicTextNode;
     /**
      * Passes template text to the output. The current template node does
      * not specify an XSL-T operation and therefore is appended to the
@@ -159,25 +168,6 @@ export declare class Xslt {
      * @returns {XNode[]} A list of the found nodes.
      */
     protected xsltMatch(match: string, context: ExprContext, axis?: string): XNode[];
-    private xsltLocationExpressionMatch;
-    /**
-     * Finds all the nodes through absolute xPath search.
-     * Returns only nodes that match either the context position node,
-     * or an ancestor.
-     * @param expression The Expression.
-     * @param context The Expression Context.
-     * @returns The list of found nodes.
-     */
-    private absoluteXsltMatch;
-    /**
-     * Tries to find relative nodes from the actual context position.
-     * If found nodes are already in the context, or if they are children of
-     * nodes in the context, they are returned.
-     * @param expression The expression used.
-     * @param context The Expression Context.
-     * @returns The list of found nodes.
-     */
-    private relativeXsltMatch;
     /**
      * Sets parameters defined by xsl:with-param child nodes of the
      * current template node, in the current input context. This happens

package/xslt/xslt.js

@@ -14,7 +14,7 @@ var dom_1 = require("../dom");
 var xpath_1 = require("../xpath");
 var constants_1 = require("../constants");
 var values_1 = require("../xpath/values");
-var expressions_1 = require("../xpath/expressions");
+var match_resolver_1 = require("../xpath/match-resolver");
 /**
  * The main class for XSL-T processing. The implementation is NOT
  * complete; some xsl element are left out.
@@ -47,6 +47,7 @@ var Xslt = /** @class */ (function () {
             parameters: []
         }; }
         this.xPath = new xpath_1.XPath();
+        this.matchResolver = new match_resolver_1.MatchResolver();
         this.options = {
             escape: options.escape || true,
             selfClosingTags: options.selfClosingTags || true,
@@ -84,12 +85,12 @@ var Xslt = /** @class */ (function () {
             }
         }
         this.xsltProcessContext(expressionContext, stylesheet, outputDocument);
-        var ret = (0, dom_1.xmlTransformedText)(outputDocument, {
+        var transformedOutputXml = (0, dom_1.xmlTransformedText)(outputDocument, {
             cData: false,
             escape: this.options.escape,
             selfClosingTags: this.options.selfClosingTags
         });
-        return ret;
+        return transformedOutputXml;
     };
     /**
      * The main entry point of the XSL-T processor, as explained on the top of the file.
@@ -141,12 +142,21 @@ var Xslt = /** @class */ (function () {
                     var modifiedContext = context.clone(nodes);
                     for (var i = 0; i < templates.length; ++i) {
                         for (var j = 0; j < modifiedContext.contextSize(); ++j) {
-                            var clonedContext_1 = modifiedContext.clone([modifiedContext.nodeList[j]], undefined, 0, undefined);
-                            clonedContext_1.inApplyTemplates = true;
-                            // The output depth should be restarted, since
-                            // another template is being applied from this point.
-                            clonedContext_1.outputDepth = 0;
-                            this.xsltProcessContext(clonedContext_1, templates[i], output);
+                            // If the current node is text, there's no need to test all the templates
+                            // against it. Just appending it to its parent is fine.
+                            if (modifiedContext.nodeList[j].nodeType === constants_1.DOM_TEXT_NODE) {
+                                var textNodeContext = context.clone([modifiedContext.nodeList[j]], undefined, 0, undefined);
+                                // TODO: verify if it is okay to pass the own text node as template.
+                                this.commonLogicTextNode(textNodeContext, modifiedContext.nodeList[j]);
+                            }
+                            else {
+                                var clonedContext_1 = modifiedContext.clone([modifiedContext.nodeList[j]], undefined, 0, undefined);
+                                clonedContext_1.inApplyTemplates = true;
+                                // The output depth should be restarted, since
+                                // another template is being applied from this point.
+                                clonedContext_1.outputDepth = 0;
+                                this.xsltProcessContext(clonedContext_1, templates[i], output);
+                            }
                         }
                     }
                     break;
@@ -441,22 +451,6 @@ var Xslt = /** @class */ (function () {
         for (var i = 0; i < sortContext.contextSize(); ++i) {
             this.xsltChildNodes(sortContext.clone(sortContext.nodeList, undefined, i), template, output);
         }
-        // TODO: group nodes by parent node.
-        // const nodeGroups = this.groupBy(nodes, 'parentNode');
-        /* for (let [group, _nodes] of Object.entries(nodeGroups)) {
-            const sortContext = context.clone(_nodes, 0);
-            this.xsltSort(sortContext, template);
-
-            for (let i = 0; i < sortContext.contextSize(); ++i) {
-                this.xsltChildNodes(sortContext.clone(sortContext.nodeList, i), template, output);
-            }
-        } */
-    };
-    Xslt.prototype.groupBy = function (xs, key) {
-        return xs.reduce(function (rv, x) {
-            (rv[x[key]] = rv[x[key]] || []).push(x);
-            return rv;
-        }, {});
     };
     /**
      * Orders the current node list in the input context according to the
@@ -562,6 +556,25 @@ var Xslt = /** @class */ (function () {
             this.xsltProcessContext(contextClone, template.childNodes[i], output);
         }
     };
+    /**
+     * This logic is used in two different places:
+     * - `xsltPassThrough`, if the template asks this library to write a text node;
+     * - `xsltProcessContext`, `apply-templates` operation, when the current node is text.
+     * @param context The Expression Context.
+     * @param template The template, that contains the node value to be written.
+     */
+    Xslt.prototype.commonLogicTextNode = function (context, template) {
+        var textNodeList = context.outputNodeList[context.outputPosition].transformedChildNodes.filter(function (n) { return n.nodeType === constants_1.DOM_TEXT_NODE; });
+        if (textNodeList.length > 0) {
+            var node = textNodeList[0];
+            node.transformedNodeValue = template.nodeValue;
+        }
+        else {
+            var node = (0, dom_1.domCreateTransformedTextNode)(this.outputDocument, template.nodeValue);
+            node.transformedParentNode = context.outputNodeList[context.outputPosition];
+            (0, dom_1.domAppendTransformedChild)(context.outputNodeList[context.outputPosition], node);
+        }
+    };
     /**
      * Passes template text to the output. The current template node does
      * not specify an XSL-T operation and therefore is appended to the
@@ -574,21 +587,11 @@ var Xslt = /** @class */ (function () {
     Xslt.prototype.xsltPassThrough = function (context, template, output) {
         if (template.nodeType == constants_1.DOM_TEXT_NODE) {
             if (this.xsltPassText(template)) {
-                var textNodeList = context.outputNodeList[context.outputPosition].transformedChildNodes.filter(function (n) { return n.nodeType === constants_1.DOM_TEXT_NODE; });
-                if (textNodeList.length > 0) {
-                    var node = textNodeList[0];
-                    node.transformedNodeValue = template.nodeValue;
-                }
-                else {
-                    var node = (0, dom_1.domCreateTransformedTextNode)(this.outputDocument, template.nodeValue);
-                    node.transformedParentNode = context.outputNodeList[context.outputPosition];
-                    (0, dom_1.domAppendTransformedChild)(context.outputNodeList[context.outputPosition], node);
-                }
+                this.commonLogicTextNode(context, template);
             }
         }
         else if (template.nodeType == constants_1.DOM_ELEMENT_NODE) {
             var node = void 0;
-            // let node = domCreateElement(outputDocument, template.nodeName);
             var elementContext = context;
             if (context.nodeList[context.position].nodeName === '#document') {
                 node = context.nodeList[context.position].firstChild;
@@ -700,72 +703,7 @@ var Xslt = /** @class */ (function () {
      */
     Xslt.prototype.xsltMatch = function (match, context, axis) {
         var expression = this.xPath.xPathParse(match, axis);
-        if (expression instanceof expressions_1.LocationExpr) {
-            return this.xsltLocationExpressionMatch(expression, context);
-        }
-        if (expression instanceof expressions_1.UnionExpr) {
-            // TODO: What about if `expr1` and `expr2` are not `LocationExpr`?
-            return (this.xsltLocationExpressionMatch(expression.expr1, context) ||
-                this.xsltLocationExpressionMatch(expression.expr2, context));
-        }
-        // TODO: Other expressions
-        return [];
-    };
-    Xslt.prototype.xsltLocationExpressionMatch = function (expression, context) {
-        if (expression === undefined || expression.steps === undefined || expression.steps.length <= 0) {
-            throw new Error('Error resolving XSLT match: Location Expression should have steps.');
-        }
-        if (expression.absolute) {
-            return this.absoluteXsltMatch(expression, context);
-        }
-        return this.relativeXsltMatch(expression, context);
-    };
-    /**
-     * Finds all the nodes through absolute xPath search.
-     * Returns only nodes that match either the context position node,
-     * or an ancestor.
-     * @param expression The Expression.
-     * @param context The Expression Context.
-     * @returns The list of found nodes.
-     */
-    Xslt.prototype.absoluteXsltMatch = function (expression, context) {
-        var clonedContext = context.clone([context.root], undefined, 0, undefined);
-        var matchedNodes = expression.evaluate(clonedContext).nodeSetValue();
-        var finalList = [];
-        for (var _i = 0, matchedNodes_1 = matchedNodes; _i < matchedNodes_1.length; _i++) {
-            var element = matchedNodes_1[_i];
-            if (element.id === context.nodeList[context.position].id) {
-                finalList.push(element);
-                continue;
-            }
-            if (element.getAncestorById(context.nodeList[context.position].id) !== undefined) {
-                finalList.push(element);
-            }
-        }
-        return finalList;
-    };
-    /**
-     * Tries to find relative nodes from the actual context position.
-     * If found nodes are already in the context, or if they are children of
-     * nodes in the context, they are returned.
-     * @param expression The expression used.
-     * @param context The Expression Context.
-     * @returns The list of found nodes.
-     */
-    Xslt.prototype.relativeXsltMatch = function (expression, context) {
-        // For some reason, XPath understands a default as 'child axis'.
-        // There's no "self + siblings" axis, so what is expected at this point
-        // is to have in the expression context the parent that should
-        // have the nodes we are interested in.
-        var clonedContext = context.clone();
-        var nodes = expression.evaluate(clonedContext).nodeSetValue();
-        if (nodes.length === 1 && nodes[0].nodeName === '#document') {
-            // As we don't work with the #document node directly, this part
-            // returns its first sibling.
-            // By the way, it should be *always* one sibling here.
-            return [nodes[0].childNodes[0]];
-        }
-        return nodes;
+        return this.matchResolver.expressionMatch(expression, context);
     };
     /**
      * Sets parameters defined by xsl:with-param child nodes of the