json-p3 1.3.2 → 1.3.4

package/dist/json-p3.cjs.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 1.3.2
+ * json-p3 version 1.3.4
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -2552,6 +2552,12 @@ class TokenStream {
       throw new JSONPathSyntaxError(`expected token '${kind}', found '${peeked.kind}'`, peeked);
     }
   }
+  expectPeekNot(kind, message) {
+    const peeked = this.peek;
+    if (peeked.kind === kind) {
+      throw new JSONPathSyntaxError(message, peeked);
+    }
+  }
 }
 
 /** A lexer that accepts additional, non-standard tokens. */
@@ -2559,7 +2565,7 @@ class TokenStream {
 
 // These regular expressions are to be used with Lexer.acceptMatchRun(),
 // which expects the sticky flag to be set.
-const exponentPattern = /e[+-]?\d+/y;
+const exponentPattern = /[eE][+-]?\d+/y;
 const functionNamePattern = /[a-z][a-z_0-9]*/y;
 const indexPattern = /-?\d+/y;
 const intPattern = /-?[0-9]+/y;
@@ -4002,7 +4008,7 @@ class Parser {
       switch (stream.current.kind) {
         case TokenKind.SINGLE_QUOTE_STRING:
         case TokenKind.DOUBLE_QUOTE_STRING:
-          items.push(new NameSelector(this.environment, stream.current, this.decodeString(stream.current, true), false));
+          items.push(new NameSelector(this.environment, stream.current, this.decodeString(stream.current), false));
           break;
         case TokenKind.FILTER:
           items.push(this.parseFilter(stream));
@@ -4022,7 +4028,7 @@ class Parser {
           break;
         case TokenKind.KEY_SINGLE_QUOTE_STRING:
         case TokenKind.KEY_DOUBLE_QUOTE_STRING:
-          items.push(new KeySelector(this.environment, stream.current, this.decodeString(stream.current, true), false));
+          items.push(new KeySelector(this.environment, stream.current, this.decodeString(stream.current), false));
           break;
         case TokenKind.KEYS_FILTER:
           items.push(this.parseFilter(stream, true));
@@ -4038,6 +4044,7 @@ class Parser {
       if (stream.peek.kind !== TokenKind.RBRACKET) {
         stream.expectPeek(TokenKind.COMMA);
         stream.next();
+        stream.expectPeekNot(TokenKind.RBRACKET, "unexpected trailing comma");
       }
       stream.next();
     }
@@ -4056,6 +4063,7 @@ class Parser {
         throw new JSONPathTypeError(`result of ${expr.name}()  must be compared`, expr.token);
       }
     }
+    this.throwForLiteral(expr);
     return keys ? new KeysFilterSelector(this.environment, tok, new LogicalExpression(tok, expr)) : new FilterSelector(this.environment, tok, new LogicalExpression(tok, expr));
   }
   parseBoolean(stream) {
@@ -4069,7 +4077,15 @@ class Parser {
     return new StringLiteral(stream.current, this.decodeString(stream.current));
   }
   parseNumber(stream) {
-    return new NumberLiteral(stream.current, Number(stream.current.value));
+    const value = stream.current.value;
+    if (value.startsWith("0") && value.length > 1) {
+      throw new JSONPathSyntaxError(`invalid number literal '${value}'`, stream.current);
+    }
+    const num = Number(stream.current.value);
+    if (isNaN(num)) {
+      throw new JSONPathSyntaxError(`invalid number literal '${value}'`, stream.current);
+    }
+    return new NumberLiteral(stream.current, num);
   }
   parsePrefixExpression(stream) {
     stream.expect(TokenKind.NOT);
@@ -4087,6 +4103,9 @@ class Parser {
     if (COMPARISON_OPERATORS.has(operator)) {
       this.throwForNonComparable(left);
       this.throwForNonComparable(right);
+    } else {
+      this.throwForLiteral(left);
+      this.throwForLiteral(right);
     }
     return new InfixExpression(tok, left, operator, right);
   }
@@ -4177,11 +4196,155 @@ class Parser {
     return left;
   }
   decodeString(token) {
-    let isName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    return this.unescapeString(token.kind === TokenKind.SINGLE_QUOTE_STRING ? token.value.replaceAll('"', '\\"').replaceAll("\\'", "'") : token.value, token);
+  }
+  unescapeString(value, token) {
+    const rv = [];
+    const length = value.length;
+    let index = 0;
+    let codepoint;
+    while (index < length) {
+      const ch = value[index];
+      if (ch === "\\") {
+        // Handle escape sequences
+        index += 1; // Move past '\'
+
+        switch (value[index]) {
+          case '"':
+            rv.push('"');
+            break;
+          case "\\":
+            rv.push("\\");
+            break;
+          case "/":
+            rv.push("/");
+            break;
+          case "b":
+            rv.push("\x08");
+            break;
+          case "f":
+            rv.push("\x0C");
+            break;
+          case "n":
+            rv.push("\n");
+            break;
+          case "r":
+            rv.push("\r");
+            break;
+          case "t":
+            rv.push("\t");
+            break;
+          case "u":
+            [codepoint, index] = this.decodeHexChar(value, index, token);
+            rv.push(this.stringFromCodePoint(codepoint, token));
+            break;
+          default:
+            // TODO: This is unreachable. The lexer will catch unknown escape sequences.
+            throw new JSONPathSyntaxError(`unknown escape sequence at index ${token.index + index - 1}`, token);
+        }
+      } else {
+        this.stringFromCodePoint(ch.codePointAt(0), token);
+        rv.push(ch);
+      }
+      index += 1;
+    }
+    return rv.join("");
+  }
+
+  /**
+   * Decode a `\uXXXX` or `\uXXXX\uXXXX` escape sequence from _value_ at _index_.
+   *
+   * @param value - A string value containing the sequence to decode.
+   * @param index - The start index of an escape sequence in _value_.
+   * @param token - The token for the string value.
+   * @returns - A codepoint, new index tuple.
+   */
+  decodeHexChar(value, index, token) {
+    const length = value.length;
+    if (index + 4 >= length) {
+      throw new JSONPathSyntaxError(`incomplete escape sequence at index ${token.index + index - 1}`, token);
+    }
+    index += 1; // Move past 'u'
+    let codepoint = this.parseHexDigits(value.slice(index, index + 4), token);
+    if (isLowSurrogate(codepoint)) {
+      throw new JSONPathSyntaxError(`unexpected low surrogate codepoint at index ${token.index + index - 2}`, token);
+    }
+    if (isHighSurrogate(codepoint)) {
+      // Expect a surrogate pair.
+      if (!(index + 9 < length && value[index + 4] === "\\" && value[index + 5] === "u")) {
+        throw new JSONPathSyntaxError(`incomplete escape sequence at index ${token.index + index - 2}`, token);
+      }
+      const lowSurrogate = this.parseHexDigits(value.slice(index + 6, index + 10), token);
+      if (!isLowSurrogate(lowSurrogate)) {
+        throw new JSONPathSyntaxError(`unexpected codepoint at index ${token.index + index + 4}`, token);
+      }
+      codepoint = 0x10000 + ((codepoint & 0x03ff) << 10 | lowSurrogate & 0x03ff);
+      return [codepoint, index + 9];
+    }
+    return [codepoint, index + 3];
+  }
+
+  /**
+   * Parse a hexadecimal string as an integer.
+   *
+   * @param digits - Hexadecimal digit string.
+   * @param token - The token for the string value.
+   * @returns - The number representation of _digits_.
+   *
+   * Note that we're not using `parseInt(digits, 16)` because it accepts `+`
+   * and `-` and things we don't allow.
+   */
+  parseHexDigits(digits, token) {
+    const encoder = new TextEncoder();
+    let codepoint = 0;
+    for (const digit of encoder.encode(digits)) {
+      codepoint <<= 4;
+      switch (digit) {
+        case 48:
+        case 49:
+        case 50:
+        case 51:
+        case 52:
+        case 53:
+        case 54:
+        case 55:
+        case 56:
+        case 57:
+          codepoint |= digit - 48; // '0'
+          break;
+        case 97:
+        case 98:
+        case 99:
+        case 100:
+        case 101:
+        case 102:
+          codepoint |= digit - 97 + 10; // 'a'
+          break;
+        case 65:
+        case 66:
+        case 67:
+        case 68:
+        case 69:
+        case 70:
+          codepoint |= digit - 65 + 10; // 'A'
+          break;
+        default:
+          throw new JSONPathSyntaxError("invalid \\uXXXX escape sequence", token);
+      }
+    }
+    return codepoint;
+  }
+
+  /** Check the codepoint is valid and return its string representation. */
+  stringFromCodePoint(codepoint, token) {
+    if (codepoint === undefined || codepoint <= 0x1f) {
+      throw new JSONPathSyntaxError(`invalid character`, token);
+    }
     try {
-      return JSON.parse(token.kind === TokenKind.SINGLE_QUOTE_STRING ? `"${token.value.replaceAll('"', '\\"').replaceAll("\\'", "'")}"` : `"${token.value}"`);
+      return String.fromCodePoint(codepoint);
     } catch {
-      throw new JSONPathSyntaxError(`invalid ${isName ? "name selector" : "string literal"} '${token.value}'`, token);
+      // This should not be reachable.
+      throw new JSONPathSyntaxError("invalid escape sequence", token);
     }
   }
   throwForNonComparable(expr) {
@@ -4195,6 +4358,17 @@ class Parser {
       }
     }
   }
+  throwForLiteral(expr) {
+    if (expr instanceof FilterExpressionLiteral) {
+      throw new JSONPathSyntaxError(`filter expression literals (${expr.toString()}) must be compared`, expr.token);
+    }
+  }
+}
+function isHighSurrogate(codepoint) {
+  return codepoint >= 0xd800 && codepoint <= 0xdbff;
+}
+function isLowSurrogate(codepoint) {
+  return codepoint >= 0xdc00 && codepoint <= 0xdfff;
 }
 
 /**
@@ -4253,7 +4427,7 @@ class JSONPathEnvironment {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.strict = options.strict ?? true;
     this.maxIntIndex = options.maxIntIndex ?? Math.pow(2, 53) - 1;
-    this.minIntIndex = options.maxIntIndex ?? -Math.pow(2, 53) - 1;
+    this.minIntIndex = options.maxIntIndex ?? -Math.pow(2, 53) + 1;
     this.maxRecursionDepth = options.maxRecursionDepth ?? 50;
     this.nondeterministic = options.nondeterministic ?? false;
     this.keysPattern = options.keysPattern ?? /~/y;
@@ -4977,7 +5151,7 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "1.3.2";
+const version = "1.3.4";
 
 exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
 exports.FunctionExpressionType = FunctionExpressionType;

package/dist/json-p3.esm.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 1.3.2
+ * json-p3 version 1.3.4
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -2550,6 +2550,12 @@ class TokenStream {
       throw new JSONPathSyntaxError(`expected token '${kind}', found '${peeked.kind}'`, peeked);
     }
   }
+  expectPeekNot(kind, message) {
+    const peeked = this.peek;
+    if (peeked.kind === kind) {
+      throw new JSONPathSyntaxError(message, peeked);
+    }
+  }
 }
 
 /** A lexer that accepts additional, non-standard tokens. */
@@ -2557,7 +2563,7 @@ class TokenStream {
 
 // These regular expressions are to be used with Lexer.acceptMatchRun(),
 // which expects the sticky flag to be set.
-const exponentPattern = /e[+-]?\d+/y;
+const exponentPattern = /[eE][+-]?\d+/y;
 const functionNamePattern = /[a-z][a-z_0-9]*/y;
 const indexPattern = /-?\d+/y;
 const intPattern = /-?[0-9]+/y;
@@ -4000,7 +4006,7 @@ class Parser {
       switch (stream.current.kind) {
         case TokenKind.SINGLE_QUOTE_STRING:
         case TokenKind.DOUBLE_QUOTE_STRING:
-          items.push(new NameSelector(this.environment, stream.current, this.decodeString(stream.current, true), false));
+          items.push(new NameSelector(this.environment, stream.current, this.decodeString(stream.current), false));
           break;
         case TokenKind.FILTER:
           items.push(this.parseFilter(stream));
@@ -4020,7 +4026,7 @@ class Parser {
           break;
         case TokenKind.KEY_SINGLE_QUOTE_STRING:
         case TokenKind.KEY_DOUBLE_QUOTE_STRING:
-          items.push(new KeySelector(this.environment, stream.current, this.decodeString(stream.current, true), false));
+          items.push(new KeySelector(this.environment, stream.current, this.decodeString(stream.current), false));
           break;
         case TokenKind.KEYS_FILTER:
           items.push(this.parseFilter(stream, true));
@@ -4036,6 +4042,7 @@ class Parser {
       if (stream.peek.kind !== TokenKind.RBRACKET) {
         stream.expectPeek(TokenKind.COMMA);
         stream.next();
+        stream.expectPeekNot(TokenKind.RBRACKET, "unexpected trailing comma");
       }
       stream.next();
     }
@@ -4054,6 +4061,7 @@ class Parser {
         throw new JSONPathTypeError(`result of ${expr.name}()  must be compared`, expr.token);
       }
     }
+    this.throwForLiteral(expr);
     return keys ? new KeysFilterSelector(this.environment, tok, new LogicalExpression(tok, expr)) : new FilterSelector(this.environment, tok, new LogicalExpression(tok, expr));
   }
   parseBoolean(stream) {
@@ -4067,7 +4075,15 @@ class Parser {
     return new StringLiteral(stream.current, this.decodeString(stream.current));
   }
   parseNumber(stream) {
-    return new NumberLiteral(stream.current, Number(stream.current.value));
+    const value = stream.current.value;
+    if (value.startsWith("0") && value.length > 1) {
+      throw new JSONPathSyntaxError(`invalid number literal '${value}'`, stream.current);
+    }
+    const num = Number(stream.current.value);
+    if (isNaN(num)) {
+      throw new JSONPathSyntaxError(`invalid number literal '${value}'`, stream.current);
+    }
+    return new NumberLiteral(stream.current, num);
   }
   parsePrefixExpression(stream) {
     stream.expect(TokenKind.NOT);
@@ -4085,6 +4101,9 @@ class Parser {
     if (COMPARISON_OPERATORS.has(operator)) {
       this.throwForNonComparable(left);
       this.throwForNonComparable(right);
+    } else {
+      this.throwForLiteral(left);
+      this.throwForLiteral(right);
     }
     return new InfixExpression(tok, left, operator, right);
   }
@@ -4175,11 +4194,155 @@ class Parser {
     return left;
   }
   decodeString(token) {
-    let isName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    return this.unescapeString(token.kind === TokenKind.SINGLE_QUOTE_STRING ? token.value.replaceAll('"', '\\"').replaceAll("\\'", "'") : token.value, token);
+  }
+  unescapeString(value, token) {
+    const rv = [];
+    const length = value.length;
+    let index = 0;
+    let codepoint;
+    while (index < length) {
+      const ch = value[index];
+      if (ch === "\\") {
+        // Handle escape sequences
+        index += 1; // Move past '\'
+
+        switch (value[index]) {
+          case '"':
+            rv.push('"');
+            break;
+          case "\\":
+            rv.push("\\");
+            break;
+          case "/":
+            rv.push("/");
+            break;
+          case "b":
+            rv.push("\x08");
+            break;
+          case "f":
+            rv.push("\x0C");
+            break;
+          case "n":
+            rv.push("\n");
+            break;
+          case "r":
+            rv.push("\r");
+            break;
+          case "t":
+            rv.push("\t");
+            break;
+          case "u":
+            [codepoint, index] = this.decodeHexChar(value, index, token);
+            rv.push(this.stringFromCodePoint(codepoint, token));
+            break;
+          default:
+            // TODO: This is unreachable. The lexer will catch unknown escape sequences.
+            throw new JSONPathSyntaxError(`unknown escape sequence at index ${token.index + index - 1}`, token);
+        }
+      } else {
+        this.stringFromCodePoint(ch.codePointAt(0), token);
+        rv.push(ch);
+      }
+      index += 1;
+    }
+    return rv.join("");
+  }
+
+  /**
+   * Decode a `\uXXXX` or `\uXXXX\uXXXX` escape sequence from _value_ at _index_.
+   *
+   * @param value - A string value containing the sequence to decode.
+   * @param index - The start index of an escape sequence in _value_.
+   * @param token - The token for the string value.
+   * @returns - A codepoint, new index tuple.
+   */
+  decodeHexChar(value, index, token) {
+    const length = value.length;
+    if (index + 4 >= length) {
+      throw new JSONPathSyntaxError(`incomplete escape sequence at index ${token.index + index - 1}`, token);
+    }
+    index += 1; // Move past 'u'
+    let codepoint = this.parseHexDigits(value.slice(index, index + 4), token);
+    if (isLowSurrogate(codepoint)) {
+      throw new JSONPathSyntaxError(`unexpected low surrogate codepoint at index ${token.index + index - 2}`, token);
+    }
+    if (isHighSurrogate(codepoint)) {
+      // Expect a surrogate pair.
+      if (!(index + 9 < length && value[index + 4] === "\\" && value[index + 5] === "u")) {
+        throw new JSONPathSyntaxError(`incomplete escape sequence at index ${token.index + index - 2}`, token);
+      }
+      const lowSurrogate = this.parseHexDigits(value.slice(index + 6, index + 10), token);
+      if (!isLowSurrogate(lowSurrogate)) {
+        throw new JSONPathSyntaxError(`unexpected codepoint at index ${token.index + index + 4}`, token);
+      }
+      codepoint = 0x10000 + ((codepoint & 0x03ff) << 10 | lowSurrogate & 0x03ff);
+      return [codepoint, index + 9];
+    }
+    return [codepoint, index + 3];
+  }
+
+  /**
+   * Parse a hexadecimal string as an integer.
+   *
+   * @param digits - Hexadecimal digit string.
+   * @param token - The token for the string value.
+   * @returns - The number representation of _digits_.
+   *
+   * Note that we're not using `parseInt(digits, 16)` because it accepts `+`
+   * and `-` and things we don't allow.
+   */
+  parseHexDigits(digits, token) {
+    const encoder = new TextEncoder();
+    let codepoint = 0;
+    for (const digit of encoder.encode(digits)) {
+      codepoint <<= 4;
+      switch (digit) {
+        case 48:
+        case 49:
+        case 50:
+        case 51:
+        case 52:
+        case 53:
+        case 54:
+        case 55:
+        case 56:
+        case 57:
+          codepoint |= digit - 48; // '0'
+          break;
+        case 97:
+        case 98:
+        case 99:
+        case 100:
+        case 101:
+        case 102:
+          codepoint |= digit - 97 + 10; // 'a'
+          break;
+        case 65:
+        case 66:
+        case 67:
+        case 68:
+        case 69:
+        case 70:
+          codepoint |= digit - 65 + 10; // 'A'
+          break;
+        default:
+          throw new JSONPathSyntaxError("invalid \\uXXXX escape sequence", token);
+      }
+    }
+    return codepoint;
+  }
+
+  /** Check the codepoint is valid and return its string representation. */
+  stringFromCodePoint(codepoint, token) {
+    if (codepoint === undefined || codepoint <= 0x1f) {
+      throw new JSONPathSyntaxError(`invalid character`, token);
+    }
     try {
-      return JSON.parse(token.kind === TokenKind.SINGLE_QUOTE_STRING ? `"${token.value.replaceAll('"', '\\"').replaceAll("\\'", "'")}"` : `"${token.value}"`);
+      return String.fromCodePoint(codepoint);
     } catch {
-      throw new JSONPathSyntaxError(`invalid ${isName ? "name selector" : "string literal"} '${token.value}'`, token);
+      // This should not be reachable.
+      throw new JSONPathSyntaxError("invalid escape sequence", token);
     }
   }
   throwForNonComparable(expr) {
@@ -4193,6 +4356,17 @@ class Parser {
       }
     }
   }
+  throwForLiteral(expr) {
+    if (expr instanceof FilterExpressionLiteral) {
+      throw new JSONPathSyntaxError(`filter expression literals (${expr.toString()}) must be compared`, expr.token);
+    }
+  }
+}
+function isHighSurrogate(codepoint) {
+  return codepoint >= 0xd800 && codepoint <= 0xdbff;
+}
+function isLowSurrogate(codepoint) {
+  return codepoint >= 0xdc00 && codepoint <= 0xdfff;
 }
 
 /**
@@ -4251,7 +4425,7 @@ class JSONPathEnvironment {
     let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     this.strict = options.strict ?? true;
     this.maxIntIndex = options.maxIntIndex ?? Math.pow(2, 53) - 1;
-    this.minIntIndex = options.maxIntIndex ?? -Math.pow(2, 53) - 1;
+    this.minIntIndex = options.maxIntIndex ?? -Math.pow(2, 53) + 1;
     this.maxRecursionDepth = options.maxRecursionDepth ?? 50;
     this.nondeterministic = options.nondeterministic ?? false;
     this.keysPattern = options.keysPattern ?? /~/y;
@@ -4975,6 +5149,6 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "1.3.2";
+const version = "1.3.4";
 
 export { DEFAULT_ENVIRONMENT, FunctionExpressionType, JSONPatch, JSONPatchError, JSONPatchTestFailure, JSONPath, JSONPathEnvironment, JSONPathError, JSONPathIndexError, JSONPathLexerError, JSONPathNode, JSONPathNodeList, 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 };