xslt-processor 4.3.0 → 4.3.1

package/index.d.mts

@@ -22,6 +22,7 @@ declare class XNode {
     parentNode: XNode;
     visited: boolean;
     escape: boolean;
+    fromXslText: boolean;
     static _unusedXNodes: any[];
     constructor(type: number, name: string, opt_value: any, opt_owner: any, opt_namespace?: any);
     /**
@@ -138,7 +139,7 @@ interface XPathNode {
     nodeType: number;
     nodeName: string;
     localName?: string;
-    namespaceURI?: string | null;
+    namespaceUri?: string | null;
     textContent?: string | null;
     parentNode?: XPathNode | null;
     childNodes?: ArrayLike<XPathNode>;
@@ -532,7 +533,7 @@ type XsltOptions = {
     cData: boolean;
     escape: boolean;
     selfClosingTags: boolean;
-    outputMethod?: 'xml' | 'html' | 'text' | 'xhtml' | 'json';
+    outputMethod?: 'xml' | 'html' | 'text' | 'xhtml' | 'json' | 'adaptive';
     parameters?: XsltParameter[];
 };
 
@@ -567,7 +568,7 @@ declare class Xslt {
     options: XsltOptions;
     decimalFormatSettings: XsltDecimalFormatSettings;
     outputDocument: XDocument;
-    outputMethod: 'xml' | 'html' | 'text' | 'name' | 'xhtml' | 'json';
+    outputMethod: 'xml' | 'html' | 'text' | 'name' | 'xhtml' | 'json' | 'adaptive';
     outputOmitXmlDeclaration: string;
     version: string;
     firstTemplateRan: boolean;
@@ -592,7 +593,7 @@ declare class Xslt {
      * The exported entry point of the XSL-T processor.
      * @param xmlDoc The input document root, as DOM node.
      * @param stylesheet The stylesheet document root, as DOM node.
-     * @returns the processed document, as XML text in a string, or JSON string if outputMethod is 'json'.
+     * @returns the processed document, as XML text in a string, JSON string if outputMethod is 'json', or text if outputMethod is 'text' or 'adaptive' (with text content).
      */
     xsltProcess(xmlDoc: XDocument, stylesheet: XDocument): Promise<string>;
     /**
@@ -843,6 +844,17 @@ declare class Xslt {
      */
     protected xsltTemplate(context: ExprContext, template: XNode, output?: XNode): Promise<void>;
     protected xsltText(context: ExprContext, template: XNode, output?: XNode): void;
+    /**
+     * Validates XSLT stylesheet/transform attributes.
+     * According to XSLT specification, validates:
+     * - Required version attribute
+     * - Valid version values (1.0, 2.0, 3.0)
+     * - Valid namespace declarations
+     * - Valid values for optional attributes (extension-element-prefixes, exclude-result-prefixes)
+     * @param stylesheetElement The `<xsl:stylesheet>` or `<xsl:transform>` element to validate.
+     * @param context The Expression Context for namespace access.
+     */
+    protected validateStylesheetAttributes(stylesheetElement: XNode, context: ExprContext): void;
     /**
      * Implements `<xsl:stylesheet>` and `<xsl:transform>`, and its corresponding
      * validations.

package/index.d.ts

@@ -22,6 +22,7 @@ declare class XNode {
     parentNode: XNode;
     visited: boolean;
     escape: boolean;
+    fromXslText: boolean;
     static _unusedXNodes: any[];
     constructor(type: number, name: string, opt_value: any, opt_owner: any, opt_namespace?: any);
     /**
@@ -138,7 +139,7 @@ interface XPathNode {
     nodeType: number;
     nodeName: string;
     localName?: string;
-    namespaceURI?: string | null;
+    namespaceUri?: string | null;
     textContent?: string | null;
     parentNode?: XPathNode | null;
     childNodes?: ArrayLike<XPathNode>;
@@ -532,7 +533,7 @@ type XsltOptions = {
     cData: boolean;
     escape: boolean;
     selfClosingTags: boolean;
-    outputMethod?: 'xml' | 'html' | 'text' | 'xhtml' | 'json';
+    outputMethod?: 'xml' | 'html' | 'text' | 'xhtml' | 'json' | 'adaptive';
     parameters?: XsltParameter[];
 };
 
@@ -567,7 +568,7 @@ declare class Xslt {
     options: XsltOptions;
     decimalFormatSettings: XsltDecimalFormatSettings;
     outputDocument: XDocument;
-    outputMethod: 'xml' | 'html' | 'text' | 'name' | 'xhtml' | 'json';
+    outputMethod: 'xml' | 'html' | 'text' | 'name' | 'xhtml' | 'json' | 'adaptive';
     outputOmitXmlDeclaration: string;
     version: string;
     firstTemplateRan: boolean;
@@ -592,7 +593,7 @@ declare class Xslt {
      * The exported entry point of the XSL-T processor.
      * @param xmlDoc The input document root, as DOM node.
      * @param stylesheet The stylesheet document root, as DOM node.
-     * @returns the processed document, as XML text in a string, or JSON string if outputMethod is 'json'.
+     * @returns the processed document, as XML text in a string, JSON string if outputMethod is 'json', or text if outputMethod is 'text' or 'adaptive' (with text content).
      */
     xsltProcess(xmlDoc: XDocument, stylesheet: XDocument): Promise<string>;
     /**
@@ -843,6 +844,17 @@ declare class Xslt {
      */
     protected xsltTemplate(context: ExprContext, template: XNode, output?: XNode): Promise<void>;
     protected xsltText(context: ExprContext, template: XNode, output?: XNode): void;
+    /**
+     * Validates XSLT stylesheet/transform attributes.
+     * According to XSLT specification, validates:
+     * - Required version attribute
+     * - Valid version values (1.0, 2.0, 3.0)
+     * - Valid namespace declarations
+     * - Valid values for optional attributes (extension-element-prefixes, exclude-result-prefixes)
+     * @param stylesheetElement The `<xsl:stylesheet>` or `<xsl:transform>` element to validate.
+     * @param context The Expression Context for namespace access.
+     */
+    protected validateStylesheetAttributes(stylesheetElement: XNode, context: ExprContext): void;
     /**
      * Implements `<xsl:stylesheet>` and `<xsl:transform>`, and its corresponding
      * validations.

package/index.js

@@ -742,12 +742,12 @@ var XPathStep = class extends XPathExpression {
           if (!nsUri) {
             return false;
           }
-          const nodeLocalName = node.localName || node.nodeName;
+          const nodeLocalName2 = node.localName || node.nodeName && this.extractLocalName(node.nodeName);
           const nodeNsUri = node.namespaceURI || node.namespaceUri || "";
-          return nodeLocalName === localName && nodeNsUri === nsUri;
+          return nodeLocalName2 === localName && nodeNsUri === nsUri;
         }
-        const nodeName = node.localName || node.nodeName;
-        return nodeName === testName;
+        const nodeLocalName = node.localName || this.extractLocalName(node.nodeName);
+        return nodeLocalName === testName;
       case "node-type":
         switch (this.nodeTest.nodeType) {
           case "node":
@@ -806,6 +806,17 @@ var XPathStep = class extends XPathExpression {
     if (Array.isArray(value)) return value.length > 0;
     return !!value;
   }
+  /**
+   * Extract the local name from a qualified name (e.g., "ns:name" -> "name", "name" -> "name")
+   */
+  extractLocalName(qname) {
+    if (!qname) return "";
+    const colonIndex = qname.indexOf(":");
+    if (colonIndex > 0) {
+      return qname.substring(colonIndex + 1);
+    }
+    return qname;
+  }
 };
 
 // src/xpath/lib/src/expressions/predicate-expression.ts
@@ -1090,7 +1101,7 @@ var XPathFunctionCall = class extends XPathExpression {
   namespaceUri(args, context) {
     var _a;
     const node = this.getNodeArg(args, context);
-    return (_a = node == null ? void 0 : node.namespaceURI) != null ? _a : "";
+    return (_a = node == null ? void 0 : node.namespaceUri) != null ? _a : "";
   }
   nodeName(args, context) {
     var _a;
@@ -1560,6 +1571,7 @@ var _XNode = class _XNode {
     this.childNodes = [];
     this.visited = false;
     this.escape = true;
+    this.fromXslText = false;
     this.siblingPosition = -1;
     this.init(type, name, opt_value, opt_owner, opt_namespace);
   }
@@ -2086,23 +2098,32 @@ function xmlTransformedTextRecursive(node, buffer, options) {
   const nodeType = node.nodeType;
   const nodeValue = node.nodeValue;
   if (nodeType === DOM_TEXT_NODE) {
-    if (node.nodeValue && node.nodeValue.trim() !== "") {
+    const isFromXslText = node.fromXslText === true;
+    if (node.nodeValue && (isFromXslText || node.nodeValue.trim() !== "")) {
       const finalText = node.escape && options.escape ? xmlEscapeText(node.nodeValue) : xmlUnescapeText(node.nodeValue);
       buffer.push(finalText);
     }
   } else if (nodeType === DOM_CDATA_SECTION_NODE) {
-    if (options.cData) {
+    if (options.outputMethod === "text") {
+      buffer.push(nodeValue);
+    } else if (options.cData) {
       buffer.push(xmlEscapeText(nodeValue));
     } else {
       buffer.push(`<![CDATA[${nodeValue}]]>`);
     }
   } else if (nodeType == DOM_COMMENT_NODE) {
-    buffer.push(`<!-- ${nodeValue} -->`);
+    if (options.outputMethod !== "text") {
+      buffer.push(`<!-- ${nodeValue} -->`);
+    }
   } else if (nodeType == DOM_ELEMENT_NODE) {
-    if (node.nodeName !== null && node.nodeName !== void 0) {
-      xmlElementLogicTrivial(node, buffer, options);
+    if (options.outputMethod === "text") {
+      xmlElementLogicTextOnly(node, buffer, options);
     } else {
-      xmlElementLogicMuted(node, buffer, options);
+      if (node.nodeName !== null && node.nodeName !== void 0) {
+        xmlElementLogicTrivial(node, buffer, options);
+      } else {
+        xmlElementLogicMuted(node, buffer, options);
+      }
     }
   } else if (nodeType === DOM_DOCUMENT_NODE || nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
     let childNodes = node.firstChild ? [] : node.childNodes;
@@ -2190,6 +2211,22 @@ function xmlElementLogicMuted(node, buffer, options) {
     xmlTransformedTextRecursive(childNodes[i], buffer, options);
   }
 }
+function xmlElementLogicTextOnly(node, buffer, options) {
+  let childNodes = [];
+  if (node.firstChild) {
+    let child = node.firstChild;
+    while (child) {
+      childNodes.push(child);
+      child = child.nextSibling;
+    }
+  } else {
+    childNodes = node.childNodes;
+  }
+  childNodes = childNodes.sort((a, b) => a.siblingPosition - b.siblingPosition);
+  for (let i = 0; i < childNodes.length; ++i) {
+    xmlTransformedTextRecursive(childNodes[i], buffer, options);
+  }
+}
 function xmlFullNodeName(node) {
   const nodeName = node.nodeName;
   if (node.prefix && nodeName.indexOf(`${node.prefix}:`) != 0) {
@@ -2297,6 +2334,41 @@ function nodeToJsonObject(node) {
   }
   return null;
 }
+function detectAdaptiveOutputFormat(node) {
+  if (!node) {
+    return "xml";
+  }
+  const nodeType = node.nodeType;
+  if (nodeType === DOM_DOCUMENT_NODE || nodeType === DOM_DOCUMENT_FRAGMENT_NODE) {
+    const children = node.childNodes || [];
+    let elementCount = 0;
+    let textCount = 0;
+    let hasSignificantText = false;
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i];
+      if (child.nodeType === DOM_ELEMENT_NODE) {
+        elementCount++;
+      } else if (child.nodeType === DOM_TEXT_NODE) {
+        const text = child.nodeValue ? child.nodeValue.trim() : "";
+        if (text.length > 0) {
+          textCount++;
+          hasSignificantText = true;
+        }
+      }
+    }
+    if (elementCount === 0 && hasSignificantText) {
+      return "text";
+    }
+    return "xml";
+  }
+  if (nodeType === DOM_TEXT_NODE || nodeType === DOM_CDATA_SECTION_NODE) {
+    const text = node.nodeValue ? node.nodeValue.trim() : "";
+    if (text.length > 0) {
+      return "text";
+    }
+  }
+  return "xml";
+}
 function xmlToJson(node) {
   if (!node) {
     return "{}";
@@ -2573,7 +2645,7 @@ var XmlParser = class {
       } else if (!tag && char === "<") {
         let text = xml.slice(start, i);
         if (text && parent !== root) {
-          domAppendChild(parent, domCreateTextNode(xmlDocument, text));
+          domAppendChild(parent, domCreateTextNode(xmlDocument, import_he2.default.decode(text)));
         }
         if (xml.slice(i + 1, i + 4) === "!--") {
           let endTagIndex = xml.slice(i + 4).indexOf("-->");
@@ -2717,15 +2789,6 @@ var NodeConverter = class {
   adaptXNode(node) {
     if (!node) return null;
     const adapted = node;
-    if (!("namespaceURI" in adapted)) {
-      Object.defineProperty(adapted, "namespaceURI", {
-        get() {
-          return this.namespaceUri;
-        },
-        enumerable: true,
-        configurable: true
-      });
-    }
     if (!("textContent" in adapted)) {
       Object.defineProperty(adapted, "textContent", {
         get() {
@@ -3693,7 +3756,7 @@ var Xslt = class {
    * The exported entry point of the XSL-T processor.
    * @param xmlDoc The input document root, as DOM node.
    * @param stylesheet The stylesheet document root, as DOM node.
-   * @returns the processed document, as XML text in a string, or JSON string if outputMethod is 'json'.
+   * @returns the processed document, as XML text in a string, JSON string if outputMethod is 'json', or text if outputMethod is 'text' or 'adaptive' (with text content).
    */
   xsltProcess(xmlDoc, stylesheet) {
     return __async(this, null, function* () {
@@ -3709,11 +3772,15 @@ var Xslt = class {
       if (this.outputMethod === "json") {
         return xmlToJson(outputDocument);
       }
+      let outputMethod = this.outputMethod;
+      if (this.outputMethod === "adaptive") {
+        outputMethod = detectAdaptiveOutputFormat(outputDocument);
+      }
       const transformedOutputXml = xmlTransformedText(outputDocument, {
         cData: this.options.cData,
         escape: this.options.escape,
         selfClosingTags: this.options.selfClosingTags,
-        outputMethod: this.outputMethod
+        outputMethod
       });
       return transformedOutputXml;
     });
@@ -3874,6 +3941,9 @@ var Xslt = class {
       for (let j = 0; j < modifiedContext.contextSize(); ++j) {
         const currentNode = modifiedContext.nodeList[j];
         if (currentNode.nodeType === DOM_TEXT_NODE) {
+          if (!this.xsltPassText(currentNode)) {
+            continue;
+          }
           const textNodeContext = context.clone(
             [currentNode],
             0
@@ -4642,6 +4712,7 @@ var Xslt = class {
   xsltText(context, template, output) {
     const text = xmlValue(template);
     const node = domCreateTextNode(this.outputDocument, text);
+    node.fromXslText = true;
     const disableOutputEscaping = template.childNodes.filter(
       (a) => a.nodeType === DOM_ATTRIBUTE_NODE && a.nodeName === "disable-output-escaping"
     );
@@ -4649,8 +4720,80 @@ var Xslt = class {
       node.escape = false;
     }
     const destinationTextNode = output || this.outputDocument;
+    node.siblingPosition = destinationTextNode.childNodes.length;
     destinationTextNode.appendChild(node);
   }
+  /**
+   * Validates XSLT stylesheet/transform attributes.
+   * According to XSLT specification, validates:
+   * - Required version attribute
+   * - Valid version values (1.0, 2.0, 3.0)
+   * - Valid namespace declarations
+   * - Valid values for optional attributes (extension-element-prefixes, exclude-result-prefixes)
+   * @param stylesheetElement The `<xsl:stylesheet>` or `<xsl:transform>` element to validate.
+   * @param context The Expression Context for namespace access.
+   */
+  validateStylesheetAttributes(stylesheetElement, context) {
+    const attributes = stylesheetElement.childNodes.filter((n) => n.nodeType === DOM_ATTRIBUTE_NODE);
+    const validAttributes = ["version", "id", "extension-element-prefixes", "exclude-result-prefixes", "default-collation"];
+    const validNamespaceAttributes = ["xmlns"];
+    let versionFound = false;
+    for (let attribute of attributes) {
+      const nodeName = attribute.nodeName;
+      const nodeValue = attribute.nodeValue;
+      if (attribute.prefix === "xmlns") {
+        context.knownNamespaces[attribute.localName] = nodeValue;
+        continue;
+      }
+      if (nodeName === "xmlns") {
+        context.knownNamespaces[""] = nodeValue;
+        continue;
+      }
+      if (nodeName === "version") {
+        versionFound = true;
+        if (!["1.0", "2.0", "3.0"].includes(nodeValue)) {
+          throw new Error(
+            `XSLT version not defined or invalid. Actual resolved version: ${nodeValue || "(none)"}.`
+          );
+        }
+        this.version = nodeValue;
+        context.xsltVersion = nodeValue;
+        continue;
+      }
+      if (nodeName === "extension-element-prefixes") {
+        const prefixes = nodeValue.split(/\s+/);
+        for (const prefix of prefixes) {
+          if (prefix && !/^[a-zA-Z_:][\w:.-]*$/.test(prefix)) {
+            throw new Error(`Invalid prefix in extension-element-prefixes: "${prefix}". Prefixes must be valid QNames.`);
+          }
+        }
+        continue;
+      }
+      if (nodeName === "exclude-result-prefixes") {
+        if (nodeValue !== "#all") {
+          const prefixes = nodeValue.split(/\s+/);
+          for (const prefix of prefixes) {
+            if (prefix && !/^[a-zA-Z_:][\w:.-]*$/.test(prefix)) {
+              throw new Error(`Invalid prefix in exclude-result-prefixes: "${prefix}". Prefixes must be valid QNames or "#all".`);
+            }
+          }
+        }
+        continue;
+      }
+      if (nodeName === "default-collation") {
+        if (!nodeValue || nodeValue.trim().length === 0) {
+          throw new Error("The default-collation attribute must contain a URI.");
+        }
+        continue;
+      }
+      if (nodeName === "id") {
+        if (!/^[a-zA-Z_:][\w:.-]*$/.test(nodeValue)) {
+          throw new Error(`Invalid id attribute value: "${nodeValue}". IDs must be valid NCNames.`);
+        }
+        continue;
+      }
+    }
+  }
   /**
    * Implements `<xsl:stylesheet>` and `<xsl:transform>`, and its corresponding
    * validations.
@@ -4661,24 +4804,7 @@ var Xslt = class {
    */
   xsltTransformOrStylesheet(context, template, output) {
     return __async(this, null, function* () {
-      for (let stylesheetAttribute of template.childNodes.filter((n) => n.nodeType === DOM_ATTRIBUTE_NODE)) {
-        switch (stylesheetAttribute.nodeName) {
-          case "version":
-            this.version = stylesheetAttribute.nodeValue;
-            if (!["1.0", "2.0", "3.0"].includes(this.version)) {
-              throw new Error(
-                `XSLT version not defined or invalid. Actual resolved version: ${this.version || "(none)"}.`
-              );
-            }
-            context.xsltVersion = this.version;
-            break;
-          default:
-            if (stylesheetAttribute.prefix === "xmlns") {
-              context.knownNamespaces[stylesheetAttribute.localName] = stylesheetAttribute.nodeValue;
-            }
-            break;
-        }
-      }
+      this.validateStylesheetAttributes(template, context);
       let importsDone = false;
       for (const child of template.childNodes) {
         if (child.nodeType === DOM_ELEMENT_NODE) {
@@ -4718,16 +4844,22 @@ var Xslt = class {
           }
         }
         if (matchCandidates.length > 0) {
-          matchCandidates.sort((a, b) => {
-            if (a.priority.importPrecedence !== b.priority.importPrecedence) {
-              return b.priority.importPrecedence - a.priority.importPrecedence;
-            }
-            if (a.priority.effectivePriority !== b.priority.effectivePriority) {
-              return b.priority.effectivePriority - a.priority.effectivePriority;
-            }
-            return b.priority.documentOrder - a.priority.documentOrder;
-          });
-          const winner = matchCandidates[0];
+          const rootPatternMatch = matchCandidates.find((c) => c.priority.matchPattern === "/");
+          let winner;
+          if (rootPatternMatch) {
+            winner = rootPatternMatch;
+          } else {
+            matchCandidates.sort((a, b) => {
+              if (a.priority.importPrecedence !== b.priority.importPrecedence) {
+                return b.priority.importPrecedence - a.priority.importPrecedence;
+              }
+              if (a.priority.effectivePriority !== b.priority.effectivePriority) {
+                return b.priority.effectivePriority - a.priority.effectivePriority;
+              }
+              return b.priority.documentOrder - a.priority.documentOrder;
+            });
+            winner = matchCandidates[0];
+          }
           const conflicts = matchCandidates.filter(
             (t) => t.priority.importPrecedence === winner.priority.importPrecedence && t.priority.effectivePriority === winner.priority.effectivePriority
           );
@@ -4865,7 +4997,11 @@ var Xslt = class {
     return __async(this, null, function* () {
       const contextClone = context.clone();
       for (let i = 0; i < template.childNodes.length; ++i) {
-        yield this.xsltProcessContext(contextClone, template.childNodes[i], output);
+        const child = template.childNodes[i];
+        if (child.nodeType === DOM_ATTRIBUTE_NODE) {
+          continue;
+        }
+        yield this.xsltProcessContext(contextClone, child, output);
       }
     });
   }