xslt-processor 5.0.8 → 5.0.10

package/dist/index.d.mts

@@ -285,7 +285,7 @@ declare class ExprContext {
     ignoreAttributesWithoutValue: any;
     returnOnFirstMatch: any;
     ignoreNonElementNodesForNTA: any;
-    parent: ExprContext;
+    parent: ExprContext | null;
     root: XNode;
     decimalFormatSettings: XsltDecimalFormatSettings;
     inApplyTemplates: boolean;
@@ -348,8 +348,8 @@ declare class ExprContext {
      * @returns A new ExprContext instance with the specified node list and position, and the current context as its parent.
      */
     clone(opt_nodeList?: XNode[], opt_position?: number): ExprContext;
-    setVariable(name?: string, value?: NodeValue | string): void;
-    getVariable(name: string): NodeValue;
+    setVariable(name: string, value?: NodeValue | string): void;
+    getVariable(name: string): NodeValue | null;
     /**
      * Gets a regex group from xsl:analyze-string context.
      * Searches up the parent chain for regexGroups.
@@ -612,6 +612,13 @@ declare class NodeConverter {
      * followed by the evaluated function arguments.
      */
     private createCustomFunctions;
+    /**
+     * Minimal XSLT/XPath format-number() picture formatter.
+     * Supports grouping, decimal precision, percent/per-mille scaling and positive/negative subpictures.
+     */
+    private formatXsltNumberPicture;
+    private applyGrouping;
+    private leftPad;
     /**
      * Convert an XPathNode interface tree to actual XNode objects.
      * This is needed to convert json-to-xml() output to XSLT-compatible nodes.

package/dist/index.d.ts

@@ -285,7 +285,7 @@ declare class ExprContext {
     ignoreAttributesWithoutValue: any;
     returnOnFirstMatch: any;
     ignoreNonElementNodesForNTA: any;
-    parent: ExprContext;
+    parent: ExprContext | null;
     root: XNode;
     decimalFormatSettings: XsltDecimalFormatSettings;
     inApplyTemplates: boolean;
@@ -348,8 +348,8 @@ declare class ExprContext {
      * @returns A new ExprContext instance with the specified node list and position, and the current context as its parent.
      */
     clone(opt_nodeList?: XNode[], opt_position?: number): ExprContext;
-    setVariable(name?: string, value?: NodeValue | string): void;
-    getVariable(name: string): NodeValue;
+    setVariable(name: string, value?: NodeValue | string): void;
+    getVariable(name: string): NodeValue | null;
     /**
      * Gets a regex group from xsl:analyze-string context.
      * Searches up the parent chain for regexGroups.
@@ -612,6 +612,13 @@ declare class NodeConverter {
      * followed by the evaluated function arguments.
      */
     private createCustomFunctions;
+    /**
+     * Minimal XSLT/XPath format-number() picture formatter.
+     * Supports grouping, decimal precision, percent/per-mille scaling and positive/negative subpictures.
+     */
+    private formatXsltNumberPicture;
+    private applyGrouping;
+    private leftPad;
     /**
      * Convert an XPathNode interface tree to actual XNode objects.
      * This is needed to convert json-to-xml() output to XSLT-compatible nodes.

package/dist/index.js

@@ -9084,13 +9084,9 @@ var XPathBaseParser = class {
     return expr;
   }
   parsePrimaryExpr() {
-    var _a, _b, _c;
+    var _a, _b;
     if (this.match("DOLLAR")) {
-      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;
+      const name = this.parseVariableReferenceName();
       return new XPathVariableReference(name);
     }
     if (this.match("OPEN_PAREN")) {
@@ -9114,7 +9110,7 @@ var XPathBaseParser = class {
       return this.parseFunctionCall();
     }
     throw grammarViolation(
-      `Unexpected token in primary expression: ${(_c = (_b = this.peek()) == null ? void 0 : _b.lexeme) != null ? _c : "EOF"}`
+      `Unexpected token in primary expression: ${(_b = (_a = this.peek()) == null ? void 0 : _a.lexeme) != null ? _b : "EOF"}`
     );
   }
   parseFunctionCall() {
@@ -9186,6 +9182,27 @@ var XPathBaseParser = class {
   isFunctionNameToken(type) {
     return type === "IDENTIFIER" || type === "FUNCTION" || type === "OPERATOR" || type === "LOCATION" || type === "EQNAME";
   }
+  parseVariableReferenceName() {
+    var _a, _b;
+    if (this.check("EQNAME")) {
+      return this.advance().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"}`);
+    }
+    let name = this.advance().lexeme;
+    if (this.match("COLON")) {
+      const local = this.peek();
+      if (!local || !this.isNcNameToken(local.type)) {
+        throw grammarViolation(
+          `Expected local name after namespace prefix in variable reference. Got: ${(_b = local == null ? void 0 : local.lexeme) != null ? _b : "EOF"}`
+        );
+      }
+      name = `${name}:${this.advance().lexeme}`;
+    }
+    return name;
+  }
   isNcNameToken(type) {
     return type === "IDENTIFIER" || type === "FUNCTION" || type === "OPERATOR" || type === "LOCATION" || type === "NODE_TYPE";
   }
@@ -9298,16 +9315,12 @@ var XPath20Parser = class extends XPathBaseParser {
     return left;
   }
   parsePrimaryExpr() {
-    var _a, _b;
     if (this.check("RESERVED_WORD") && this.peek().lexeme === "if") {
       return this.parseIfExpr();
     }
     if (this.check("DOLLAR")) {
       this.advance();
-      if (!this.isNameToken()) {
-        throw new Error(`Expected variable name after $. Got: ${(_b = (_a = this.peek()) == null ? void 0 : _a.lexeme) != null ? _b : "EOF"}`);
-      }
-      const name = this.advance().lexeme;
+      const name = this.parseVariableReferenceName();
       return new XPathVariableReference(name);
     }
     return super.parsePrimaryExpr();
@@ -9684,7 +9697,7 @@ var XPath30Parser = class extends XPath20Parser {
       let args = [];
       if (this.check("DOLLAR")) {
         this.advance();
-        const varName = this.consume("IDENTIFIER", "Expected variable name after $").lexeme;
+        const varName = this.parseVariableReferenceName();
         funcExpr = new XPathVariableReference(varName);
         this.consume(
           "OPEN_PAREN",
@@ -9752,8 +9765,7 @@ var XPath30Parser = class extends XPath20Parser {
       return this.parseStringTemplateFromLexeme(template);
     }
     if (this.match("DOLLAR")) {
-      const nameToken = this.consumeNameTokenInternal("Expected variable name after $");
-      return new XPathVariableReference(nameToken.lexeme);
+      return new XPathVariableReference(this.parseVariableReferenceName());
     }
     if (this.checkReservedWordInternal("function")) {
       return this.parseInlineFunction();
@@ -11846,7 +11858,9 @@ var NodeConverter = class {
    * We add missing properties but keep the original XNode reference.
    */
   adaptXNode(node) {
-    if (!node) return null;
+    if (!node) {
+      throw new Error("Cannot adapt undefined XPath node.");
+    }
     const adapted = node;
     if (!("textContent" in adapted)) {
       Object.defineProperty(adapted, "textContent", {
@@ -11932,7 +11946,12 @@ var NodeConverter = class {
     }
     for (let i = contexts.length - 1; i >= 0; i--) {
       const current = contexts[i];
-      for (const [name, value] of Object.entries(current.variables || {})) {
+      const currentVariables = current.variables || {};
+      for (const name in currentVariables) {
+        if (!Object.prototype.hasOwnProperty.call(currentVariables, name)) {
+          continue;
+        }
+        const value = currentVariables[name];
         if (value && typeof value === "object" && "stringValue" in value) {
           const nodeValue = value;
           if (nodeValue.type === "node-set") {
@@ -11981,7 +12000,7 @@ var NodeConverter = class {
     };
     functions["format-number"] = (_context, number, format, decimalFormatName) => {
       const settings = exprContext.decimalFormatSettings;
-      return number.toLocaleString();
+      return this.formatXsltNumberPicture(Number(number), String(format), settings);
     };
     functions["xml-to-json"] = (_context, nodes) => {
       if (exprContext.xsltVersion !== "3.0") {
@@ -12062,7 +12081,7 @@ var NodeConverter = class {
         "xsl:with-param"
       ];
       const normalizedName = name.startsWith("xsl:") ? name : `xsl:${name}`;
-      return xsltElements.includes(normalizedName) || xsltElements.includes(name);
+      return xsltElements.indexOf(normalizedName) >= 0 || xsltElements.indexOf(name) >= 0;
     };
     functions["function-available"] = (_context, functionName2) => {
       const name = String(functionName2);
@@ -12113,7 +12132,7 @@ var NodeConverter = class {
         "json-to-xml"
       ];
       const allFunctions = [...xpathCoreFunctions, ...xsltFunctions, ...additionalFunctions];
-      return allFunctions.includes(name);
+      return allFunctions.indexOf(name) >= 0;
     };
     functions["document"] = (_context, uriOrNodeSet, _baseNode) => {
       var _a, _b;
@@ -12157,6 +12176,95 @@ var NodeConverter = class {
     }
     return functions;
   }
+  /**
+   * Minimal XSLT/XPath format-number() picture formatter.
+   * Supports grouping, decimal precision, percent/per-mille scaling and positive/negative subpictures.
+   */
+  formatXsltNumberPicture(value, picture, settings) {
+    if (Number.isNaN(value)) {
+      return settings.naN;
+    }
+    if (!Number.isFinite(value)) {
+      return value < 0 ? `${settings.minusSign}${settings.infinity}` : settings.infinity;
+    }
+    const subPictures = picture.split(settings.patternSeparator);
+    const isNegative = value < 0;
+    const activePicture = (isNegative && subPictures.length > 1 ? subPictures[1] : subPictures[0]) || "";
+    const absValue = Math.abs(value);
+    const placeholders = /* @__PURE__ */ new Set([settings.digit, settings.zeroDigit, settings.groupingSeparator, settings.decimalSeparator]);
+    let firstPatternIndex = -1;
+    let lastPatternIndex = -1;
+    for (let i = 0; i < activePicture.length; i++) {
+      if (placeholders.has(activePicture[i])) {
+        if (firstPatternIndex === -1) {
+          firstPatternIndex = i;
+        }
+        lastPatternIndex = i;
+      }
+    }
+    if (firstPatternIndex === -1) {
+      return activePicture;
+    }
+    const prefix = activePicture.slice(0, firstPatternIndex);
+    const suffix = activePicture.slice(lastPatternIndex + 1);
+    const numericPicture = activePicture.slice(firstPatternIndex, lastPatternIndex + 1);
+    let scaledValue = absValue;
+    if (activePicture.includes(settings.percent)) {
+      scaledValue *= 100;
+    }
+    if (activePicture.includes(settings.perMille)) {
+      scaledValue *= 1e3;
+    }
+    const decimalIndex = numericPicture.indexOf(settings.decimalSeparator);
+    const integerPattern = decimalIndex >= 0 ? numericPicture.slice(0, decimalIndex) : numericPicture;
+    const fractionPattern = decimalIndex >= 0 ? numericPicture.slice(decimalIndex + 1) : "";
+    const minIntegerDigits = integerPattern.split("").filter((c) => c === settings.zeroDigit).length;
+    const minFractionDigits = fractionPattern.split("").filter((c) => c === settings.zeroDigit).length;
+    const maxFractionDigits = fractionPattern.split("").filter((c) => c === settings.zeroDigit || c === settings.digit).length;
+    const rounded = maxFractionDigits > 0 ? scaledValue.toFixed(maxFractionDigits) : Math.round(scaledValue).toString();
+    let [integerPart, fractionPart = ""] = rounded.split(".");
+    if (integerPart.length < minIntegerDigits) {
+      integerPart = this.leftPad(integerPart, minIntegerDigits, settings.zeroDigit);
+    }
+    while (fractionPart.length > minFractionDigits && fractionPart.endsWith(settings.zeroDigit)) {
+      fractionPart = fractionPart.slice(0, -1);
+    }
+    const lastGroupingPos = integerPattern.lastIndexOf(settings.groupingSeparator);
+    if (lastGroupingPos >= 0) {
+      const groupSize = integerPattern.slice(lastGroupingPos + 1).split("").filter((c) => c === settings.zeroDigit || c === settings.digit).length;
+      if (groupSize > 0) {
+        integerPart = this.applyGrouping(integerPart, settings.groupingSeparator, groupSize);
+      }
+    }
+    const numberText = fractionPart.length > 0 ? `${integerPart}${settings.decimalSeparator}${fractionPart}` : integerPart;
+    if (isNegative && subPictures.length < 2) {
+      return `${settings.minusSign}${prefix}${numberText}${suffix}`;
+    }
+    return `${prefix}${numberText}${suffix}`;
+  }
+  applyGrouping(numberText, separator, groupSize) {
+    if (groupSize <= 0 || numberText.length <= groupSize) {
+      return numberText;
+    }
+    const chunks = [];
+    for (let i = numberText.length; i > 0; i -= groupSize) {
+      const start = Math.max(0, i - groupSize);
+      chunks.unshift(numberText.slice(start, i));
+    }
+    return chunks.join(separator);
+  }
+  leftPad(value, width, fillChar) {
+    if (value.length >= width) {
+      return value;
+    }
+    const padChar = fillChar && fillChar.length > 0 ? fillChar.charAt(0) : "0";
+    const missing = width - value.length;
+    let padding = "";
+    for (let i = 0; i < missing; i++) {
+      padding += padChar;
+    }
+    return padding + value;
+  }
   /**
    * Convert an XPathNode interface tree to actual XNode objects.
    * This is needed to convert json-to-xml() output to XSLT-compatible nodes.
@@ -12169,7 +12277,11 @@ var NodeConverter = class {
     if (xpathNode.nodeType === DOM_DOCUMENT_NODE) {
       if (xpathNode.childNodes && xpathNode.childNodes.length > 0) {
         const rootChild = xpathNode.childNodes[0];
-        node = this.convertXPathNodeToXNode(rootChild, ownerDoc);
+        const convertedNode = this.convertXPathNodeToXNode(rootChild, ownerDoc);
+        if (!convertedNode) {
+          return null;
+        }
+        node = convertedNode;
         return node;
       }
       return null;
@@ -15402,7 +15514,7 @@ var Xslt = class {
       );
       if (onCompletionElements.length > 0) {
         const onCompletion = onCompletionElements[0];
-        const completionContext = context.clone([], 0);
+        const completionContext = context.clone();
         for (const accName in accumulators) {
           completionContext.variables[accName] = accumulators[accName];
         }