json-p3 1.3.0 → 1.3.1

package/dist/json-p3.cjs.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 1.3.0
+ * json-p3 version 1.3.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -1116,9 +1116,53 @@ class Match {
   }
   fullMatch(pattern) {
     const parts = [];
-    if (!pattern.startsWith("^")) parts.push("^");
-    parts.push(pattern);
-    if (!pattern.endsWith("$")) parts.push("$");
+    let nonCaptureGroup = false;
+    if (!pattern.startsWith("^") && !pattern.startsWith("^(")) {
+      nonCaptureGroup = true;
+      parts.push("^(?:");
+    }
+    parts.push(this.mapRegexp(pattern));
+    if (nonCaptureGroup && !pattern.endsWith("$") && !pattern.endsWith(")$")) {
+      parts.push(")$");
+    }
+    return parts.join("");
+  }
+
+  // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+  mapRegexp(pattern) {
+    let escaped = false;
+    let charClass = false;
+    const parts = [];
+    for (const ch of pattern) {
+      switch (ch) {
+        case ".":
+          if (!escaped && !charClass) {
+            parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+          } else {
+            parts.push(ch);
+            escaped = false;
+          }
+          break;
+        case "\\":
+          escaped = true;
+          parts.push(ch);
+          break;
+        case "[":
+          charClass = true;
+          escaped = false;
+          parts.push(ch);
+          break;
+        case "]":
+          charClass = false;
+          escaped = false;
+          parts.push(ch);
+          break;
+        default:
+          escaped = false;
+          parts.push(ch);
+          break;
+      }
+    }
     return parts.join("");
   }
 }
@@ -1147,7 +1191,7 @@ class Search {
       }
     }
     try {
-      const re = new RegExp(pattern, "u");
+      const re = new RegExp(this.mapRegexp(pattern), "u");
       if (this.cacheSize > 0) this.#cache.set(pattern, re);
       return !!s.match(re);
     } catch (error) {
@@ -1155,6 +1199,44 @@ class Search {
       return false;
     }
   }
+
+  // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+  mapRegexp(pattern) {
+    let escaped = false;
+    let charClass = false;
+    const parts = [];
+    for (const ch of pattern) {
+      switch (ch) {
+        case ".":
+          if (!escaped && !charClass) {
+            parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+          } else {
+            parts.push(ch);
+            escaped = false;
+          }
+          break;
+        case "\\":
+          escaped = true;
+          parts.push(ch);
+          break;
+        case "[":
+          charClass = true;
+          escaped = false;
+          parts.push(ch);
+          break;
+        case "]":
+          charClass = false;
+          escaped = false;
+          parts.push(ch);
+          break;
+        default:
+          escaped = false;
+          parts.push(ch);
+          break;
+      }
+    }
+    return parts.join("");
+  }
 }
 
 class Value {
@@ -1569,6 +1651,7 @@ function lexInsideBracketedSelection(l) {
       continue;
     }
     if (!l.environment.strict && l.acceptMatchRun(l.environment.keysPattern)) {
+      // FIXME: fall back to legacy behavior if keysPattern is not the default
       switch (l.peek()) {
         case "'":
           l.ignore(); // ~
@@ -1579,7 +1662,6 @@ function lexInsideBracketedSelection(l) {
           l.next();
           return lexDoubleQuoteKeyString(l);
         case "?":
-          l.ignore(); // ~
           l.next();
           l.emit(TokenKind.KEYS_FILTER);
           l.filterLevel += 1;
@@ -3684,7 +3766,7 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "1.3.0";
+const version = "1.3.1";
 
 exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
 exports.FunctionExpressionType = FunctionExpressionType;

package/dist/json-p3.esm.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 1.3.0
+ * json-p3 version 1.3.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -1114,9 +1114,53 @@ class Match {
   }
   fullMatch(pattern) {
     const parts = [];
-    if (!pattern.startsWith("^")) parts.push("^");
-    parts.push(pattern);
-    if (!pattern.endsWith("$")) parts.push("$");
+    let nonCaptureGroup = false;
+    if (!pattern.startsWith("^") && !pattern.startsWith("^(")) {
+      nonCaptureGroup = true;
+      parts.push("^(?:");
+    }
+    parts.push(this.mapRegexp(pattern));
+    if (nonCaptureGroup && !pattern.endsWith("$") && !pattern.endsWith(")$")) {
+      parts.push(")$");
+    }
+    return parts.join("");
+  }
+
+  // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+  mapRegexp(pattern) {
+    let escaped = false;
+    let charClass = false;
+    const parts = [];
+    for (const ch of pattern) {
+      switch (ch) {
+        case ".":
+          if (!escaped && !charClass) {
+            parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+          } else {
+            parts.push(ch);
+            escaped = false;
+          }
+          break;
+        case "\\":
+          escaped = true;
+          parts.push(ch);
+          break;
+        case "[":
+          charClass = true;
+          escaped = false;
+          parts.push(ch);
+          break;
+        case "]":
+          charClass = false;
+          escaped = false;
+          parts.push(ch);
+          break;
+        default:
+          escaped = false;
+          parts.push(ch);
+          break;
+      }
+    }
     return parts.join("");
   }
 }
@@ -1145,7 +1189,7 @@ class Search {
       }
     }
     try {
-      const re = new RegExp(pattern, "u");
+      const re = new RegExp(this.mapRegexp(pattern), "u");
       if (this.cacheSize > 0) this.#cache.set(pattern, re);
       return !!s.match(re);
     } catch (error) {
@@ -1153,6 +1197,44 @@ class Search {
       return false;
     }
   }
+
+  // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+  mapRegexp(pattern) {
+    let escaped = false;
+    let charClass = false;
+    const parts = [];
+    for (const ch of pattern) {
+      switch (ch) {
+        case ".":
+          if (!escaped && !charClass) {
+            parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+          } else {
+            parts.push(ch);
+            escaped = false;
+          }
+          break;
+        case "\\":
+          escaped = true;
+          parts.push(ch);
+          break;
+        case "[":
+          charClass = true;
+          escaped = false;
+          parts.push(ch);
+          break;
+        case "]":
+          charClass = false;
+          escaped = false;
+          parts.push(ch);
+          break;
+        default:
+          escaped = false;
+          parts.push(ch);
+          break;
+      }
+    }
+    return parts.join("");
+  }
 }
 
 class Value {
@@ -1567,6 +1649,7 @@ function lexInsideBracketedSelection(l) {
       continue;
     }
     if (!l.environment.strict && l.acceptMatchRun(l.environment.keysPattern)) {
+      // FIXME: fall back to legacy behavior if keysPattern is not the default
       switch (l.peek()) {
         case "'":
           l.ignore(); // ~
@@ -1577,7 +1660,6 @@ function lexInsideBracketedSelection(l) {
           l.next();
           return lexDoubleQuoteKeyString(l);
         case "?":
-          l.ignore(); // ~
           l.next();
           l.emit(TokenKind.KEYS_FILTER);
           l.filterLevel += 1;
@@ -3682,6 +3764,6 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "1.3.0";
+const version = "1.3.1";
 
 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 };

package/dist/json-p3.iife.js

@@ -1,5 +1,5 @@
 /*
- * json-p3 version 1.3.0
+ * json-p3 version 1.3.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
@@ -1117,9 +1117,53 @@ var json_p3 = (function (exports) {
     }
     fullMatch(pattern) {
       const parts = [];
-      if (!pattern.startsWith("^")) parts.push("^");
-      parts.push(pattern);
-      if (!pattern.endsWith("$")) parts.push("$");
+      let nonCaptureGroup = false;
+      if (!pattern.startsWith("^") && !pattern.startsWith("^(")) {
+        nonCaptureGroup = true;
+        parts.push("^(?:");
+      }
+      parts.push(this.mapRegexp(pattern));
+      if (nonCaptureGroup && !pattern.endsWith("$") && !pattern.endsWith(")$")) {
+        parts.push(")$");
+      }
+      return parts.join("");
+    }
+
+    // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+    mapRegexp(pattern) {
+      let escaped = false;
+      let charClass = false;
+      const parts = [];
+      for (const ch of pattern) {
+        switch (ch) {
+          case ".":
+            if (!escaped && !charClass) {
+              parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+            } else {
+              parts.push(ch);
+              escaped = false;
+            }
+            break;
+          case "\\":
+            escaped = true;
+            parts.push(ch);
+            break;
+          case "[":
+            charClass = true;
+            escaped = false;
+            parts.push(ch);
+            break;
+          case "]":
+            charClass = false;
+            escaped = false;
+            parts.push(ch);
+            break;
+          default:
+            escaped = false;
+            parts.push(ch);
+            break;
+        }
+      }
       return parts.join("");
     }
   }
@@ -1148,7 +1192,7 @@ var json_p3 = (function (exports) {
         }
       }
       try {
-        const re = new RegExp(pattern, "u");
+        const re = new RegExp(this.mapRegexp(pattern), "u");
         if (this.cacheSize > 0) this.#cache.set(pattern, re);
         return !!s.match(re);
       } catch (error) {
@@ -1156,6 +1200,44 @@ var json_p3 = (function (exports) {
         return false;
       }
     }
+
+    // See https://datatracker.ietf.org/doc/html/rfc9485#name-ecmascript-regexps
+    mapRegexp(pattern) {
+      let escaped = false;
+      let charClass = false;
+      const parts = [];
+      for (const ch of pattern) {
+        switch (ch) {
+          case ".":
+            if (!escaped && !charClass) {
+              parts.push("(?:(?![\r\n])\\P{Cs}|\\p{Cs}\\p{Cs})");
+            } else {
+              parts.push(ch);
+              escaped = false;
+            }
+            break;
+          case "\\":
+            escaped = true;
+            parts.push(ch);
+            break;
+          case "[":
+            charClass = true;
+            escaped = false;
+            parts.push(ch);
+            break;
+          case "]":
+            charClass = false;
+            escaped = false;
+            parts.push(ch);
+            break;
+          default:
+            escaped = false;
+            parts.push(ch);
+            break;
+        }
+      }
+      return parts.join("");
+    }
   }
 
   class Value {
@@ -1570,6 +1652,7 @@ var json_p3 = (function (exports) {
         continue;
       }
       if (!l.environment.strict && l.acceptMatchRun(l.environment.keysPattern)) {
+        // FIXME: fall back to legacy behavior if keysPattern is not the default
         switch (l.peek()) {
           case "'":
             l.ignore(); // ~
@@ -1580,7 +1663,6 @@ var json_p3 = (function (exports) {
             l.next();
             return lexDoubleQuoteKeyString(l);
           case "?":
-            l.ignore(); // ~
             l.next();
             l.emit(TokenKind.KEYS_FILTER);
             l.filterLevel += 1;
@@ -3685,7 +3767,7 @@ var json_p3 = (function (exports) {
     apply: apply
   });
 
-  const version = "1.3.0";
+  const version = "1.3.1";
 
   exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
   exports.FunctionExpressionType = FunctionExpressionType;