xslt-processor 5.0.9 → 5.0.11

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,8 +9182,29 @@ 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";
+    return type === "IDENTIFIER" || type === "FUNCTION" || type === "OPERATOR" || type === "LOCATION" || type === "NODE_TYPE" || type === "RESERVED_WORD";
   }
   parseNameOrWildcard() {
     let name = "";
@@ -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();
@@ -15236,10 +15248,6 @@ var Xslt = class {
       }
       const sortContext = context.clone(nodes);
       this.xsltSort(sortContext, template);
-      const nodesWithParent = sortContext.nodeList.filter((n) => n.parentNode !== null && n.parentNode !== void 0);
-      if (nodesWithParent.length <= 0) {
-        throw new Error("Nodes with no parents defined.");
-      }
       for (let i = 0; i < sortContext.contextSize(); ++i) {
         yield this.xsltChildNodesExcludingConditional(
           sortContext.clone(sortContext.nodeList, i),
@@ -15502,7 +15510,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];
         }