json-p3 2.2.1 → 2.2.2

package/dist/json-p3.cjs.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 2.2.1
+ * json-p3 version 2.2.2
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -2718,7 +2718,13 @@ class Lexer {
    * If the stack is empty, we are not in a function call. Remember that
    * function arguments can use arbitrarily nested in parentheses.
    */
-  parenStack = [];
+  funcCallStack = [];
+
+  /**
+   * A stack of parentheses and square brackets used to check for balanced
+   * brackets.
+   */
+  bracketStack = [];
 
   /** Tokens resulting from tokenizing a JSONPath query. */
   tokens = [];
@@ -2847,9 +2853,19 @@ function lex(environment, path) {
 function tokenize(environment, path) {
   const [lexer, tokens] = lex(environment, path);
   lexer.run();
+
+  // If there's an error, it will be the last token with kind set to ERROR.
   if (tokens.length && tokens[tokens.length - 1].kind === TokenKind.ERROR) {
     throw new JSONPathSyntaxError(tokens[tokens.length - 1].value, tokens[tokens.length - 1]);
   }
+
+  // If the bracket stack is not empty, we hav unbalanced brackets.
+  // This might not be reachable.
+  if (lexer.bracketStack.length !== 0) {
+    const [ch, index] = lexer.bracketStack[lexer.bracketStack.length - 1];
+    const msg = "unbalanced brackets";
+    throw new JSONPathSyntaxError(msg, new Token(TokenKind.ERROR, ch, index, path));
+  }
   return tokens;
 }
 function lexRoot(l) {
@@ -2879,6 +2895,7 @@ function lexSegment(l) {
       }
       return lexDotSelector;
     case "[":
+      l.bracketStack.push(["[", l.start]);
       l.emit(TokenKind.LBRACKET);
       return lexInsideBracketedSelection;
     default:
@@ -2935,6 +2952,7 @@ function lexDescendantSelection(l) {
       l.emit(TokenKind.WILD);
       return lexSegment;
     case "[":
+      l.bracketStack.push(["[", l.start]);
       l.emit(TokenKind.LBRACKET);
       return lexInsideBracketedSelection;
     default:
@@ -3016,6 +3034,12 @@ function lexInsideBracketedSelection(l) {
     const ch = l.next();
     switch (ch) {
       case "]":
+        if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "[") {
+          l.backup();
+          l.error("unbalanced brackets");
+          return null;
+        }
+        l.bracketStack.pop();
         l.emit(TokenKind.RBRACKET);
         return lexSegment;
       case "":
@@ -3057,17 +3081,13 @@ function lexInsideFilter(l) {
         return null;
       case "]":
         l.filterLevel -= 1;
-        if (l.parenStack.length === 1) {
-          l.error("unbalanced parentheses");
-          return null;
-        }
         l.backup();
         return lexInsideBracketedSelection;
       case ",":
         l.emit(TokenKind.COMMA);
         // If we have unbalanced parens, we are inside a function call and a
         // comma separates arguments. Otherwise a comma separates selectors.
-        if (l.parenStack.length) continue;
+        if (l.funcCallStack.length) continue;
         l.filterLevel -= 1;
         return lexInsideBracketedSelection;
       case "'":
@@ -3075,18 +3095,25 @@ function lexInsideFilter(l) {
       case '"':
         return lexDoubleQuoteStringInsideFilterExpression;
       case "(":
+        l.bracketStack.push(["(", l.start]);
         l.emit(TokenKind.LPAREN);
         // Are we in a function call? If so, a function argument contains parens.
-        if (l.parenStack.length) l.parenStack[l.parenStack.length - 1] += 1;
+        if (l.funcCallStack.length) l.funcCallStack[l.funcCallStack.length - 1] += 1;
         continue;
       case ")":
+        if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "(") {
+          l.backup();
+          l.error("unbalanced brackets");
+          return null;
+        }
+        l.bracketStack.pop();
         l.emit(TokenKind.RPAREN);
         // Are we closing a function call or a parenthesized expression?
-        if (l.parenStack.length) {
-          if (l.parenStack[l.parenStack.length - 1] === 1) {
-            l.parenStack.pop();
+        if (l.funcCallStack.length) {
+          if (l.funcCallStack[l.funcCallStack.length - 1] === 1) {
+            l.funcCallStack.pop();
           } else {
-            l.parenStack[l.parenStack.length - 1] -= 1;
+            l.funcCallStack[l.funcCallStack.length - 1] -= 1;
           }
         }
         continue;
@@ -3183,8 +3210,9 @@ function lexInsideFilter(l) {
         // functions
         if (l.acceptMatchRun(functionNamePattern) && l.peek() === "(") {
           // Keep track of parentheses for this function call.
-          l.parenStack.push(1);
+          l.funcCallStack.push(1);
           l.emit(TokenKind.FUNCTION);
+          l.bracketStack.push(["(", l.start]);
           l.next();
           l.ignore();
           continue;
@@ -5299,7 +5327,7 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "2.2.1";
+const version = "2.2.2";
 
 exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
 exports.FunctionExpressionType = FunctionExpressionType;

package/dist/json-p3.esm.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 2.2.1
+ * json-p3 version 2.2.2
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -2716,7 +2716,13 @@ class Lexer {
    * If the stack is empty, we are not in a function call. Remember that
    * function arguments can use arbitrarily nested in parentheses.
    */
-  parenStack = [];
+  funcCallStack = [];
+
+  /**
+   * A stack of parentheses and square brackets used to check for balanced
+   * brackets.
+   */
+  bracketStack = [];
 
   /** Tokens resulting from tokenizing a JSONPath query. */
   tokens = [];
@@ -2845,9 +2851,19 @@ function lex(environment, path) {
 function tokenize(environment, path) {
   const [lexer, tokens] = lex(environment, path);
   lexer.run();
+
+  // If there's an error, it will be the last token with kind set to ERROR.
   if (tokens.length && tokens[tokens.length - 1].kind === TokenKind.ERROR) {
     throw new JSONPathSyntaxError(tokens[tokens.length - 1].value, tokens[tokens.length - 1]);
   }
+
+  // If the bracket stack is not empty, we hav unbalanced brackets.
+  // This might not be reachable.
+  if (lexer.bracketStack.length !== 0) {
+    const [ch, index] = lexer.bracketStack[lexer.bracketStack.length - 1];
+    const msg = "unbalanced brackets";
+    throw new JSONPathSyntaxError(msg, new Token(TokenKind.ERROR, ch, index, path));
+  }
   return tokens;
 }
 function lexRoot(l) {
@@ -2877,6 +2893,7 @@ function lexSegment(l) {
       }
       return lexDotSelector;
     case "[":
+      l.bracketStack.push(["[", l.start]);
       l.emit(TokenKind.LBRACKET);
       return lexInsideBracketedSelection;
     default:
@@ -2933,6 +2950,7 @@ function lexDescendantSelection(l) {
       l.emit(TokenKind.WILD);
       return lexSegment;
     case "[":
+      l.bracketStack.push(["[", l.start]);
       l.emit(TokenKind.LBRACKET);
       return lexInsideBracketedSelection;
     default:
@@ -3014,6 +3032,12 @@ function lexInsideBracketedSelection(l) {
     const ch = l.next();
     switch (ch) {
       case "]":
+        if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "[") {
+          l.backup();
+          l.error("unbalanced brackets");
+          return null;
+        }
+        l.bracketStack.pop();
         l.emit(TokenKind.RBRACKET);
         return lexSegment;
       case "":
@@ -3055,17 +3079,13 @@ function lexInsideFilter(l) {
         return null;
       case "]":
         l.filterLevel -= 1;
-        if (l.parenStack.length === 1) {
-          l.error("unbalanced parentheses");
-          return null;
-        }
         l.backup();
         return lexInsideBracketedSelection;
       case ",":
         l.emit(TokenKind.COMMA);
         // If we have unbalanced parens, we are inside a function call and a
         // comma separates arguments. Otherwise a comma separates selectors.
-        if (l.parenStack.length) continue;
+        if (l.funcCallStack.length) continue;
         l.filterLevel -= 1;
         return lexInsideBracketedSelection;
       case "'":
@@ -3073,18 +3093,25 @@ function lexInsideFilter(l) {
       case '"':
         return lexDoubleQuoteStringInsideFilterExpression;
       case "(":
+        l.bracketStack.push(["(", l.start]);
         l.emit(TokenKind.LPAREN);
         // Are we in a function call? If so, a function argument contains parens.
-        if (l.parenStack.length) l.parenStack[l.parenStack.length - 1] += 1;
+        if (l.funcCallStack.length) l.funcCallStack[l.funcCallStack.length - 1] += 1;
         continue;
       case ")":
+        if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "(") {
+          l.backup();
+          l.error("unbalanced brackets");
+          return null;
+        }
+        l.bracketStack.pop();
         l.emit(TokenKind.RPAREN);
         // Are we closing a function call or a parenthesized expression?
-        if (l.parenStack.length) {
-          if (l.parenStack[l.parenStack.length - 1] === 1) {
-            l.parenStack.pop();
+        if (l.funcCallStack.length) {
+          if (l.funcCallStack[l.funcCallStack.length - 1] === 1) {
+            l.funcCallStack.pop();
           } else {
-            l.parenStack[l.parenStack.length - 1] -= 1;
+            l.funcCallStack[l.funcCallStack.length - 1] -= 1;
           }
         }
         continue;
@@ -3181,8 +3208,9 @@ function lexInsideFilter(l) {
         // functions
         if (l.acceptMatchRun(functionNamePattern) && l.peek() === "(") {
           // Keep track of parentheses for this function call.
-          l.parenStack.push(1);
+          l.funcCallStack.push(1);
           l.emit(TokenKind.FUNCTION);
+          l.bracketStack.push(["(", l.start]);
           l.next();
           l.ignore();
           continue;
@@ -5297,6 +5325,6 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "2.2.1";
+const version = "2.2.2";
 
 export { DEFAULT_ENVIRONMENT, FunctionExpressionType, JSONPatch, JSONPatchError, JSONPatchTestFailure, JSONPathEnvironment, JSONPathError, JSONPathIndexError, JSONPathLexerError, JSONPathNode, JSONPathNodeList, JSONPathQuery, JSONPathRecursionLimitError, JSONPathSyntaxError, JSONPathTypeError, JSONPointer, Nothing, RelativeJSONPointer, Token, TokenKind, UNDEFINED, apply, compile, index as jsonpatch, index$1 as jsonpath, index$3 as jsonpointer, lazyQuery, query, resolve, version };

package/dist/json-p3.iife.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 2.2.1
+ * json-p3 version 2.2.2
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -2719,7 +2719,13 @@ var json_p3 = (function (exports) {
      * If the stack is empty, we are not in a function call. Remember that
      * function arguments can use arbitrarily nested in parentheses.
      */
-    parenStack = [];
+    funcCallStack = [];
+
+    /**
+     * A stack of parentheses and square brackets used to check for balanced
+     * brackets.
+     */
+    bracketStack = [];
 
     /** Tokens resulting from tokenizing a JSONPath query. */
     tokens = [];
@@ -2848,9 +2854,19 @@ var json_p3 = (function (exports) {
   function tokenize(environment, path) {
     const [lexer, tokens] = lex(environment, path);
     lexer.run();
+
+    // If there's an error, it will be the last token with kind set to ERROR.
     if (tokens.length && tokens[tokens.length - 1].kind === TokenKind.ERROR) {
       throw new JSONPathSyntaxError(tokens[tokens.length - 1].value, tokens[tokens.length - 1]);
     }
+
+    // If the bracket stack is not empty, we hav unbalanced brackets.
+    // This might not be reachable.
+    if (lexer.bracketStack.length !== 0) {
+      const [ch, index] = lexer.bracketStack[lexer.bracketStack.length - 1];
+      const msg = "unbalanced brackets";
+      throw new JSONPathSyntaxError(msg, new Token(TokenKind.ERROR, ch, index, path));
+    }
     return tokens;
   }
   function lexRoot(l) {
@@ -2880,6 +2896,7 @@ var json_p3 = (function (exports) {
         }
         return lexDotSelector;
       case "[":
+        l.bracketStack.push(["[", l.start]);
         l.emit(TokenKind.LBRACKET);
         return lexInsideBracketedSelection;
       default:
@@ -2936,6 +2953,7 @@ var json_p3 = (function (exports) {
         l.emit(TokenKind.WILD);
         return lexSegment;
       case "[":
+        l.bracketStack.push(["[", l.start]);
         l.emit(TokenKind.LBRACKET);
         return lexInsideBracketedSelection;
       default:
@@ -3017,6 +3035,12 @@ var json_p3 = (function (exports) {
       const ch = l.next();
       switch (ch) {
         case "]":
+          if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "[") {
+            l.backup();
+            l.error("unbalanced brackets");
+            return null;
+          }
+          l.bracketStack.pop();
           l.emit(TokenKind.RBRACKET);
           return lexSegment;
         case "":
@@ -3058,17 +3082,13 @@ var json_p3 = (function (exports) {
           return null;
         case "]":
           l.filterLevel -= 1;
-          if (l.parenStack.length === 1) {
-            l.error("unbalanced parentheses");
-            return null;
-          }
           l.backup();
           return lexInsideBracketedSelection;
         case ",":
           l.emit(TokenKind.COMMA);
           // If we have unbalanced parens, we are inside a function call and a
           // comma separates arguments. Otherwise a comma separates selectors.
-          if (l.parenStack.length) continue;
+          if (l.funcCallStack.length) continue;
           l.filterLevel -= 1;
           return lexInsideBracketedSelection;
         case "'":
@@ -3076,18 +3096,25 @@ var json_p3 = (function (exports) {
         case '"':
           return lexDoubleQuoteStringInsideFilterExpression;
         case "(":
+          l.bracketStack.push(["(", l.start]);
           l.emit(TokenKind.LPAREN);
           // Are we in a function call? If so, a function argument contains parens.
-          if (l.parenStack.length) l.parenStack[l.parenStack.length - 1] += 1;
+          if (l.funcCallStack.length) l.funcCallStack[l.funcCallStack.length - 1] += 1;
           continue;
         case ")":
+          if (l.bracketStack.length === 0 || l.bracketStack[l.bracketStack.length - 1][0] !== "(") {
+            l.backup();
+            l.error("unbalanced brackets");
+            return null;
+          }
+          l.bracketStack.pop();
           l.emit(TokenKind.RPAREN);
           // Are we closing a function call or a parenthesized expression?
-          if (l.parenStack.length) {
-            if (l.parenStack[l.parenStack.length - 1] === 1) {
-              l.parenStack.pop();
+          if (l.funcCallStack.length) {
+            if (l.funcCallStack[l.funcCallStack.length - 1] === 1) {
+              l.funcCallStack.pop();
             } else {
-              l.parenStack[l.parenStack.length - 1] -= 1;
+              l.funcCallStack[l.funcCallStack.length - 1] -= 1;
             }
           }
           continue;
@@ -3184,8 +3211,9 @@ var json_p3 = (function (exports) {
           // functions
           if (l.acceptMatchRun(functionNamePattern) && l.peek() === "(") {
             // Keep track of parentheses for this function call.
-            l.parenStack.push(1);
+            l.funcCallStack.push(1);
             l.emit(TokenKind.FUNCTION);
+            l.bracketStack.push(["(", l.start]);
             l.next();
             l.ignore();
             continue;
@@ -5300,7 +5328,7 @@ var json_p3 = (function (exports) {
     apply: apply
   });
 
-  const version = "2.2.1";
+  const version = "2.2.2";
 
   exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
   exports.FunctionExpressionType = FunctionExpressionType;