xslt-processor 5.0.0 → 5.0.1

package/index.mjs

@@ -11853,28 +11853,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;
@@ -12467,7 +12476,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,