xslt-processor 5.0.2 → 5.0.4

package/{index.mjs → dist/index.mjs}

@@ -16212,23 +16212,36 @@ var Xslt = class {
       errorMessage = errorMessage.slice(0, -2);
       throw new Error(errorMessage);
     }
-    let keyContext;
-    if (context.nodeList[context.position].nodeName === "#document") {
-      keyContext = context.clone(context.nodeList[context.position].childNodes);
-    } else {
-      keyContext = context;
-    }
-    const nodes = this.xsltMatch(match, keyContext);
     if (!(name in context.keys)) {
       context.keys[name] = {};
     }
-    for (const node of nodes) {
-      const nodeContext = context.clone([node]);
-      const attribute = this.xPath.xPathEval(use, nodeContext);
-      const attributeValue = attribute.stringValue();
-      context.keys[name][attributeValue] = new NodeSetValue([node]);
+    const allNodes = this.collectAllDescendants(context.root);
+    for (const node of allNodes) {
+      if (nodeMatchesPattern(node, match, context, this.matchResolver, this.xPath)) {
+        const nodeContext = context.clone([node]);
+        const attribute = this.xPath.xPathEval(use, nodeContext);
+        const attributeValue = attribute.stringValue();
+        if (!(attributeValue in context.keys[name])) {
+          context.keys[name][attributeValue] = new NodeSetValue([node]);
+        } else {
+          context.keys[name][attributeValue].nodeSetValue().push(node);
+        }
+      }
     }
   }
+  /**
+   * Returns all descendant nodes of the given node, depth-first.
+   * @param node The root node to traverse from.
+   * @returns All descendant nodes.
+   */
+  collectAllDescendants(node) {
+    const result = [];
+    for (const child of node.childNodes || []) {
+      result.push(child);
+      result.push(...this.collectAllDescendants(child));
+    }
+    return result;
+  }
   /**
    * Implements `xsl:message`.
    * Outputs a message to the console. If terminate="yes", throws an error to stop processing.