xslt-processor 4.8.3 → 4.8.5

package/index.d.mts

@@ -719,6 +719,11 @@ declare class MatchResolver {
     private relativeXsltMatch;
 }
 
+interface WhitespacePattern {
+    namespaceUri: string | null;
+    localName: string;
+    isWildcard: boolean;
+}
 /**
  * The main class for XSL-T processing.
  *
@@ -775,13 +780,13 @@ declare class Xslt {
      * List of element name patterns from xsl:strip-space declarations.
      * Whitespace-only text nodes inside matching elements will be stripped.
      */
-    stripSpacePatterns: string[];
+    stripSpacePatterns: WhitespacePattern[];
     /**
      * List of element name patterns from xsl:preserve-space declarations.
      * Whitespace-only text nodes inside matching elements will be preserved.
      * preserve-space takes precedence over strip-space for conflicting patterns.
      */
-    preserveSpacePatterns: string[];
+    preserveSpacePatterns: WhitespacePattern[];
     /**
      * Namespace aliases from xsl:namespace-alias declarations.
      * Maps stylesheet namespace prefixes to result namespace prefixes.
@@ -1346,6 +1351,9 @@ declare class Xslt {
      * @todo case-order is not implemented.
      */
     protected xsltSort(context: ExprContext, template: XNode): void;
+    private resolveNamespaceUriForPrefix;
+    private isNamespaceDeclaredOnAncestor;
+    private parseWhitespacePattern;
     /**
      * Implements `xsl:strip-space`.
      * Collects element name patterns for which whitespace-only text nodes should be stripped.
@@ -1378,7 +1386,7 @@ declare class Xslt {
      * @param element The element node (for namespace checking).
      * @returns True if the element matches the pattern.
      */
-    protected matchesNamePattern(elementName: string, pattern: string, element: XNode): boolean;
+    protected matchesNamePattern(elementName: string, pattern: WhitespacePattern, element: XNode): boolean;
     /**
      * Implements `xsl:template`.
      * @param context The Expression Context.

package/index.d.ts

@@ -719,6 +719,11 @@ declare class MatchResolver {
     private relativeXsltMatch;
 }
 
+interface WhitespacePattern {
+    namespaceUri: string | null;
+    localName: string;
+    isWildcard: boolean;
+}
 /**
  * The main class for XSL-T processing.
  *
@@ -775,13 +780,13 @@ declare class Xslt {
      * List of element name patterns from xsl:strip-space declarations.
      * Whitespace-only text nodes inside matching elements will be stripped.
      */
-    stripSpacePatterns: string[];
+    stripSpacePatterns: WhitespacePattern[];
     /**
      * List of element name patterns from xsl:preserve-space declarations.
      * Whitespace-only text nodes inside matching elements will be preserved.
      * preserve-space takes precedence over strip-space for conflicting patterns.
      */
-    preserveSpacePatterns: string[];
+    preserveSpacePatterns: WhitespacePattern[];
     /**
      * Namespace aliases from xsl:namespace-alias declarations.
      * Maps stylesheet namespace prefixes to result namespace prefixes.
@@ -1346,6 +1351,9 @@ declare class Xslt {
      * @todo case-order is not implemented.
      */
     protected xsltSort(context: ExprContext, template: XNode): void;
+    private resolveNamespaceUriForPrefix;
+    private isNamespaceDeclaredOnAncestor;
+    private parseWhitespacePattern;
     /**
      * Implements `xsl:strip-space`.
      * Collects element name patterns for which whitespace-only text nodes should be stripped.
@@ -1378,7 +1386,7 @@ declare class Xslt {
      * @param element The element node (for namespace checking).
      * @returns True if the element matches the pattern.
      */
-    protected matchesNamePattern(elementName: string, pattern: string, element: XNode): boolean;
+    protected matchesNamePattern(elementName: string, pattern: WhitespacePattern, element: XNode): boolean;
     /**
      * Implements `xsl:template`.
      * @param context The Expression Context.

package/index.js

@@ -9028,9 +9028,13 @@ var XPathBaseParser = class {
     return expr;
   }
   parsePrimaryExpr() {
-    var _a, _b;
+    var _a, _b, _c;
     if (this.match("DOLLAR")) {
-      const name = this.consume("IDENTIFIER", "Expected variable name after $").lexeme;
+      const next = this.peek();
+      if (!next || !this.isNcNameToken(next.type)) {
+        throw grammarViolation(`Expected variable name after $. Got: ${(_a = next == null ? void 0 : next.lexeme) != null ? _a : "EOF"}`);
+      }
+      const name = this.advance().lexeme;
       return new XPathVariableReference(name);
     }
     if (this.match("OPEN_PAREN")) {
@@ -9054,7 +9058,7 @@ var XPathBaseParser = class {
       return this.parseFunctionCall();
     }
     throw grammarViolation(
-      `Unexpected token in primary expression: ${(_b = (_a = this.peek()) == null ? void 0 : _a.lexeme) != null ? _b : "EOF"}`
+      `Unexpected token in primary expression: ${(_c = (_b = this.peek()) == null ? void 0 : _b.lexeme) != null ? _c : "EOF"}`
     );
   }
   parseFunctionCall() {
@@ -10969,6 +10973,9 @@ function xmlElementLogicTrivial(node, buffer, options) {
     if (!attribute) {
       continue;
     }
+    if (options.outputMethod === "html" && (attribute.nodeName === "xmlns" || attribute.nodeName.startsWith("xmlns:"))) {
+      continue;
+    }
     if (attribute.nodeName && attribute.nodeValue !== null && attribute.nodeValue !== void 0) {
       buffer.push(` ${xmlFullNodeName(attribute)}="${xmlEscapeAttr(attribute.nodeValue)}"`);
     }
@@ -14471,7 +14478,40 @@ var Xslt = class {
       } = currentTemplateContext;
       const currentNode = context.nodeList[context.position];
       const top = template.ownerDocument.documentElement;
-      const allTemplates = collectAndExpandTemplates(top, currentMode, this.xPath, this.templateSourceMap);
+      const stylesheetRoots = [];
+      if (top) {
+        stylesheetRoots.push(top);
+      }
+      this.importedStylesheets.forEach((doc) => {
+        if (!doc) {
+          return;
+        }
+        if (doc.nodeType === DOM_DOCUMENT_NODE) {
+          const rootElement = doc.childNodes.find(
+            (child) => child.nodeType === DOM_ELEMENT_NODE
+          );
+          if (rootElement) {
+            stylesheetRoots.push(rootElement);
+          }
+        } else if (doc.nodeType === DOM_ELEMENT_NODE) {
+          stylesheetRoots.push(doc);
+        }
+      });
+      let allTemplates = [];
+      let docOrderOffset = 0;
+      for (const root2 of stylesheetRoots) {
+        const templates = collectAndExpandTemplates(
+          root2,
+          currentMode,
+          this.xPath,
+          this.templateSourceMap
+        );
+        for (const templateEntry of templates) {
+          templateEntry.documentOrder += docOrderOffset;
+        }
+        docOrderOffset += templates.length;
+        allTemplates = allTemplates.concat(templates);
+      }
       const importedTemplates = allTemplates.filter((t) => {
         const metadata2 = this.templateSourceMap.get(t.template);
         return metadata2 && metadata2.importDepth > currentDepth;
@@ -14607,7 +14647,11 @@ var Xslt = class {
     if (source.nodeType == DOM_ELEMENT_NODE) {
       let node = domCreateElement(this.outputDocument, source.nodeName);
       if (source.namespaceUri !== null && source.namespaceUri !== void 0) {
-        domSetAttribute(node, "xmlns", source.namespaceUri);
+        const prefix = source.prefix || (source.nodeName.includes(":") ? source.nodeName.split(":")[0] : null);
+        const nsAttr = prefix ? `xmlns:${prefix}` : "xmlns";
+        if (!this.isNamespaceDeclaredOnAncestor(destination, nsAttr, source.namespaceUri)) {
+          domSetAttribute(node, nsAttr, source.namespaceUri);
+        }
       }
       node.siblingPosition = destination.childNodes.length;
       domAppendChild(destination, node);
@@ -16350,6 +16394,17 @@ var Xslt = class {
    * @returns The formatted number string.
    */
   xsltFormatNumber(number, format, groupingSeparator, groupingSize) {
+    if (format.match(/^0+1$/)) {
+      const width = format.length;
+      let result2 = number.toString().padStart(width, "0");
+      if (groupingSeparator && groupingSize) {
+        const size = parseInt(groupingSize, 10);
+        if (size > 0 && !isNaN(size)) {
+          result2 = this.applyGrouping(result2, groupingSeparator, size);
+        }
+      }
+      return result2;
+    }
     const formatChar = format.charAt(0);
     let result;
     switch (formatChar) {
@@ -16478,6 +16533,54 @@ var Xslt = class {
     }
     this.xPath.xPathSort(context, sort2);
   }
+  resolveNamespaceUriForPrefix(node, prefix) {
+    const attrName = prefix ? `xmlns:${prefix}` : "xmlns";
+    let current = node;
+    while (current) {
+      const attributes = current.childNodes.filter(
+        (child) => child.nodeType === DOM_ATTRIBUTE_NODE
+      );
+      for (const attribute of attributes) {
+        if (attribute.nodeName === attrName) {
+          return attribute.nodeValue;
+        }
+        if (prefix && attribute.prefix === "xmlns" && attribute.localName === prefix) {
+          return attribute.nodeValue;
+        }
+        if (!prefix && attribute.nodeName === "xmlns") {
+          return attribute.nodeValue;
+        }
+      }
+      current = current.parentNode;
+    }
+    return null;
+  }
+  isNamespaceDeclaredOnAncestor(node, nsAttr, nsUri) {
+    let current = node;
+    while (current) {
+      const value = domGetAttributeValue(current, nsAttr);
+      if (value === nsUri) {
+        return true;
+      }
+      current = current.parentNode;
+    }
+    return false;
+  }
+  parseWhitespacePattern(pattern, template) {
+    if (pattern === "*") {
+      return { namespaceUri: null, localName: "*", isWildcard: true };
+    }
+    if (pattern.includes(":")) {
+      const [prefix, localPart] = pattern.split(":");
+      const namespaceUri = this.resolveNamespaceUriForPrefix(template, prefix);
+      return {
+        namespaceUri: namespaceUri != null ? namespaceUri : null,
+        localName: localPart || "*",
+        isWildcard: localPart === "*"
+      };
+    }
+    return { namespaceUri: null, localName: pattern, isWildcard: false };
+  }
   /**
    * Implements `xsl:strip-space`.
    * Collects element name patterns for which whitespace-only text nodes should be stripped.
@@ -16487,7 +16590,9 @@ var Xslt = class {
     const elements = xmlGetAttribute(template, "elements");
     if (elements) {
       const patterns = elements.trim().split(/\s+/);
-      this.stripSpacePatterns.push(...patterns);
+      for (const pattern of patterns) {
+        this.stripSpacePatterns.push(this.parseWhitespacePattern(pattern, template));
+      }
     }
   }
   /**
@@ -16500,7 +16605,9 @@ var Xslt = class {
     const elements = xmlGetAttribute(template, "elements");
     if (elements) {
       const patterns = elements.trim().split(/\s+/);
-      this.preserveSpacePatterns.push(...patterns);
+      for (const pattern of patterns) {
+        this.preserveSpacePatterns.push(this.parseWhitespacePattern(pattern, template));
+      }
     }
   }
   /**
@@ -16557,19 +16664,19 @@ var Xslt = class {
    * @returns True if the element matches the pattern.
    */
   matchesNamePattern(elementName, pattern, element) {
-    if (pattern === "*") {
-      return true;
-    }
-    if (pattern.includes(":")) {
-      const [prefix, localPart] = pattern.split(":");
-      const elementPrefix = element.prefix || "";
-      if (localPart === "*") {
-        return elementPrefix === prefix;
-      } else {
-        return elementPrefix === prefix && elementName === localPart;
+    var _a;
+    const elementNamespace = (_a = element.namespaceUri) != null ? _a : this.resolveNamespaceUriForPrefix(element, element.prefix || null);
+    if (pattern.namespaceUri !== null) {
+      if (elementNamespace !== pattern.namespaceUri) {
+        return false;
       }
+    } else if (!pattern.isWildcard && elementNamespace) {
+      return false;
+    }
+    if (pattern.isWildcard) {
+      return true;
     }
-    return elementName === pattern;
+    return elementName === pattern.localName;
   }
   /**
    * Implements `xsl:template`.
@@ -17455,9 +17562,38 @@ var Xslt = class {
           let elementContext = context;
           node = context.nodeList[context.position];
           let newNode;
-          newNode = domCreateElement(this.outputDocument, template.nodeName);
+          let qualifiedName = template.nodeName;
+          let namespaceUri = template.namespaceUri;
+          const templatePrefix = template.prefix || "";
+          const aliasPrefix = this.namespaceAliases.get(templatePrefix);
+          if (aliasPrefix) {
+            const localName = template.localName || template.nodeName;
+            if (aliasPrefix === "#default") {
+              qualifiedName = localName;
+              namespaceUri = this.resolveNamespaceUriForPrefix(template, null);
+            } else {
+              qualifiedName = `${aliasPrefix}:${localName}`;
+              namespaceUri = this.resolveNamespaceUriForPrefix(template, aliasPrefix);
+            }
+          }
+          newNode = domCreateElement(this.outputDocument, qualifiedName);
           newNode.siblingPosition = (output || this.outputDocument).childNodes.length;
           domAppendChild(output || this.outputDocument, newNode);
+          if (aliasPrefix) {
+            if (aliasPrefix === "#default") {
+              if (namespaceUri) {
+                domSetAttribute(newNode, "xmlns", namespaceUri);
+              }
+            } else if (namespaceUri) {
+              domSetAttribute(newNode, `xmlns:${aliasPrefix}`, namespaceUri);
+            }
+          } else if (namespaceUri) {
+            const prefix = templatePrefix || (qualifiedName.includes(":") ? qualifiedName.split(":")[0] : null);
+            const nsAttr = prefix ? `xmlns:${prefix}` : "xmlns";
+            if (!this.isNamespaceDeclaredOnAncestor(output, nsAttr, namespaceUri)) {
+              domSetAttribute(newNode, nsAttr, namespaceUri);
+            }
+          }
           const useAttributeSetsAttr = template.childNodes.find(
             (a) => (a == null ? void 0 : a.nodeType) === DOM_ATTRIBUTE_NODE && a.nodeName === "use-attribute-sets"
           );