xslt-processor 5.0.0 → 5.0.2

package/index.mjs

@@ -6450,8 +6450,15 @@ var init_function_call_expression = __esm({
         return !!value;
       }
       toNumber(args, context) {
+        const toNumberFromString = (text) => {
+          const trimmed = text.trim();
+          if (trimmed.length === 0) {
+            return NaN;
+          }
+          return Number(trimmed);
+        };
         if (args.length === 0) {
-          return Number(this.stringValue([], context));
+          return toNumberFromString(this.stringValue([], context));
         }
         const value = args[0];
         if (typeof value === "object" && value !== null && "numberValue" in value && typeof value.numberValue === "function") {
@@ -6461,7 +6468,10 @@ var init_function_call_expression = __esm({
           if (value.length === 0) return NaN;
           const firstNode = value[0];
           const stringValue = this.getNodeStringValue(firstNode);
-          return Number(stringValue);
+          return toNumberFromString(stringValue);
+        }
+        if (typeof value === "string") {
+          return toNumberFromString(value);
         }
         return Number(value);
       }
@@ -11619,7 +11629,11 @@ var StringValue = class {
     return this.value.length > 0;
   }
   numberValue() {
-    return this.value - 0;
+    const text = String(this.value).trim();
+    if (text.length === 0) {
+      return NaN;
+    }
+    return Number(text);
   }
   nodeSetValue() {
     throw this;
@@ -11853,28 +11867,37 @@ var NodeConverter = class {
    */
   convertVariables(exprContext) {
     const variables = {};
-    for (const [name, value] of Object.entries(exprContext.variables || {})) {
-      if (value && typeof value === "object" && "stringValue" in value) {
-        const nodeValue = value;
-        if (nodeValue.type === "node-set") {
-          variables[name] = value.nodeSetValue().map((n) => this.adaptXNode(n));
-        } else if (nodeValue.type === "string") {
-          variables[name] = value.stringValue();
-        } else if (nodeValue.type === "number") {
-          variables[name] = value.numberValue();
-        } else if (nodeValue.type === "boolean") {
-          variables[name] = value.booleanValue();
-        } else if (nodeValue.type === "map") {
-          variables[name] = nodeValue.value;
-        } else if (nodeValue.type === "array") {
-          variables[name] = nodeValue.value;
-        } else if (nodeValue.type === "function") {
-          variables[name] = nodeValue.value;
+    const contexts = [];
+    let ctx = exprContext;
+    while (ctx) {
+      contexts.push(ctx);
+      ctx = ctx.parent;
+    }
+    for (let i = contexts.length - 1; i >= 0; i--) {
+      const current = contexts[i];
+      for (const [name, value] of Object.entries(current.variables || {})) {
+        if (value && typeof value === "object" && "stringValue" in value) {
+          const nodeValue = value;
+          if (nodeValue.type === "node-set") {
+            variables[name] = value.nodeSetValue().map((n) => this.adaptXNode(n));
+          } else if (nodeValue.type === "string") {
+            variables[name] = value.stringValue();
+          } else if (nodeValue.type === "number") {
+            variables[name] = value.numberValue();
+          } else if (nodeValue.type === "boolean") {
+            variables[name] = value.booleanValue();
+          } else if (nodeValue.type === "map") {
+            variables[name] = nodeValue.value;
+          } else if (nodeValue.type === "array") {
+            variables[name] = nodeValue.value;
+          } else if (nodeValue.type === "function") {
+            variables[name] = nodeValue.value;
+          } else {
+            variables[name] = value.stringValue();
+          }
         } else {
-          variables[name] = value.stringValue();
+          variables[name] = value;
         }
-      } else {
-        variables[name] = value;
       }
     }
     return variables;
@@ -12409,13 +12432,14 @@ var ExprContext = class _ExprContext {
    *
    * Notice that position starts at 0 at the outside interface;
    * inside XPath expressions this shows up as position()=1.
-   * @param nodeList TODO
-   * @param opt_position TODO
-   * @param opt_parent TODO
-   * @param opt_caseInsensitive TODO
-   * @param opt_ignoreAttributesWithoutValue TODO
-   * @param opt_returnOnFirstMatch TODO
-   * @param opt_ignoreNonElementNodesForNTA TODO
+   * @param nodeList The list of nodes that contains the current node. This is needed to implement the position() and last() functions, and to evaluate predicates.
+   * @param xsltVersion The XSLT version in use, which may affect certain function behaviors (e.g. 1.0 vs 2.0).
+   * @param opt_position The position of the current node in the nodeList. Defaults to 0.
+   * @param opt_parent The parent expression context, used for variable scoping. Defaults to null.
+   * @param opt_caseInsensitive Whether node name tests should be case insensitive. Defaults to false.
+   * @param opt_ignoreAttributesWithoutValue Whether to ignore attributes that have no value (e.g. <input disabled>) when evaluating XPath expressions. Defaults to false.
+   * @param opt_returnOnFirstMatch Whether XPath evaluation should return as soon as the first match is found. Defaults to false.
+   * @param opt_ignoreNonElementNodesForNTA Whether to ignore non-element nodes when evaluating the "node()" any node test. Defaults to false.
    */
   constructor(nodeList, xsltVersion = "1.0", opt_position, opt_decimalFormatSettings, opt_variables, opt_knownNamespaces, opt_parent, opt_caseInsensitive, opt_ignoreAttributesWithoutValue, opt_returnOnFirstMatch, opt_ignoreNonElementNodesForNTA, opt_warningsCallback) {
     this.nodeList = nodeList;
@@ -12457,9 +12481,9 @@ var ExprContext = class _ExprContext {
    * parent. If passed as argument to clone(), the new context has a
    * different node, position, or node set. What is not passed is
    * inherited from the cloned context.
-   * @param opt_nodeList TODO
-   * @param opt_position TODO
-   * @returns TODO
+   * @param opt_nodeList The node list for the new context. If not provided, the new context inherits the node list of the current context.
+   * @param opt_position The position for the new context. If not provided, the new context inherits the position of the current context.
+   * @returns A new ExprContext instance with the specified node list and position, and the current context as its parent.
    */
   clone(opt_nodeList, opt_position) {
     return new _ExprContext(
@@ -12467,7 +12491,7 @@ var ExprContext = class _ExprContext {
       this.xsltVersion,
       typeof opt_position !== "undefined" ? opt_position : this.position,
       this.decimalFormatSettings,
-      this.variables,
+      Object.create(this.variables || {}),
       this.knownNamespaces,
       this,
       this.caseInsensitive,