json-p3 2.1.1 → 2.2.1

package/LICENCE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 James Prior
+Copyright (c) 2025 James Prior
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/dist/json-p3.cjs.js

@@ -1,10 +1,10 @@
 /*
- * json-p3 version 2.1.1
+ * json-p3 version 2.2.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
  * 
- * Copyright (c) 2024 James Prior
+ * Copyright (c) 2025 James Prior
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -1230,9 +1230,18 @@ function mapRegexp(pattern) {
   }
   return parts.join("");
 }
+function fullMatch(pattern) {
+  const parts = [];
+  const explicitCaret = pattern.startsWith("^");
+  const explicitDollar = pattern.endsWith("$");
+  if (!explicitCaret && !explicitDollar) parts.push("^(?:");
+  parts.push(mapRegexp(pattern));
+  if (!explicitCaret && !explicitDollar) parts.push(")$");
+  return parts.join("");
+}
 
 /*
- * iregexp-check version 0.1.1
+ * iregexp-check version 0.1.2
  * https://github.com/jg-rp/js-iregexp
  * 
  * MIT License
@@ -1675,7 +1684,7 @@ function peg$parse(input, options) {
     return s0;
   }
   function peg$parserange_quantifier() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
       s1 = peg$c1;
@@ -1687,15 +1696,32 @@ function peg$parse(input, options) {
       }
     }
     if (s1 !== peg$FAILED) {
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r1.test(s3)) {
         peg$currPos++;
       } else {
-        s2 = peg$FAILED;
+        s3 = peg$FAILED;
         if (peg$silentFails === 0) {
           peg$fail(peg$e3);
         }
       }
+      if (s3 !== peg$FAILED) {
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = input.charAt(peg$currPos);
+          if (peg$r1.test(s3)) {
+            peg$currPos++;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e3);
+            }
+          }
+        }
+      } else {
+        s2 = peg$FAILED;
+      }
       if (s2 !== peg$FAILED) {
         s3 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 44) {
@@ -1708,17 +1734,27 @@ function peg$parse(input, options) {
           }
         }
         if (s4 !== peg$FAILED) {
-          s5 = input.charAt(peg$currPos);
-          if (peg$r1.test(s5)) {
+          s5 = [];
+          s6 = input.charAt(peg$currPos);
+          if (peg$r1.test(s6)) {
             peg$currPos++;
           } else {
-            s5 = peg$FAILED;
+            s6 = peg$FAILED;
             if (peg$silentFails === 0) {
               peg$fail(peg$e3);
             }
           }
-          if (s5 === peg$FAILED) {
-            s5 = null;
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = input.charAt(peg$currPos);
+            if (peg$r1.test(s6)) {
+              peg$currPos++;
+            } else {
+              s6 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e3);
+              }
+            }
           }
           s4 = [s4, s5];
           s3 = s4;
@@ -2480,7 +2516,7 @@ class Match {
       return false;
     }
     try {
-      const re = new RegExp(this.fullMatch(pattern), "u");
+      const re = new RegExp(fullMatch(pattern), "u");
       if (this.cacheSize > 0) this.#cache.set(pattern, re);
       return re.test(s);
     } catch (error) {
@@ -2488,15 +2524,6 @@ class Match {
       return false;
     }
   }
-  fullMatch(pattern) {
-    const parts = [];
-    const explicitCaret = pattern.startsWith("^");
-    const explicitDollar = pattern.endsWith("$");
-    if (!explicitCaret && !explicitDollar) parts.push("^(?:");
-    parts.push(mapRegexp(pattern));
-    if (!explicitCaret && !explicitDollar) parts.push(")$");
-    return parts.join("");
-  }
 }
 
 class Search {
@@ -3070,6 +3097,11 @@ function lexInsideFilter(l) {
         l.emit(TokenKind.CURRENT);
         return lexSegment;
       case "#":
+        if (l.environment.strict) {
+          l.backup();
+          l.error(`unexpected filter selector token '${ch}'`);
+          return null;
+        }
         l.emit(TokenKind.CURRENT_KEY);
         return lexSegment;
       case ".":
@@ -4609,10 +4641,71 @@ class JSONPathEnvironment {
   }
 }
 
+/**
+ * A function extension that returns `true` if the first argument is an object
+ * value and it contains a property matching the second argument.
+ */
+class Has {
+  argTypes = (() => [FunctionExpressionType.ValueType, FunctionExpressionType.ValueType])();
+  returnType = (() => FunctionExpressionType.LogicalType)();
+  #cache;
+  constructor() {
+    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this.options = options;
+    this.cacheSize = options.cacheSize ?? 10;
+    this.throwErrors = options.throwErrors ?? false;
+    this.iRegexpCheck = options.iRegexpCheck ?? true;
+    this.search = options.search ?? true;
+    this.#cache = new LRUCache(this.cacheSize);
+  }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  call(value, pattern) {
+    if (this.cacheSize > 0) {
+      const re = this.#cache.get(pattern);
+      if (re) {
+        try {
+          if (isObject(value)) {
+            return Object.keys(value).some(k => !!k.match(re));
+          }
+          return false;
+        } catch (error) {
+          if (this.throwErrors) throw error;
+          return false;
+        }
+      }
+    }
+    if (!isString(pattern)) {
+      if (this.throwErrors) {
+        throw new IRegexpError(`match() expected a string pattern, found ${pattern}`);
+      }
+      return false;
+    }
+    if (this.iRegexpCheck && !check$1(pattern)) {
+      if (this.throwErrors) {
+        throw new IRegexpError(`pattern ${pattern} is not a valid I-Regexp pattern`);
+      }
+      return false;
+    }
+    try {
+      const re = this.search ? new RegExp(mapRegexp(pattern), "u") : new RegExp(mapRegexp(fullMatch(pattern)), "u");
+      if (this.cacheSize > 0) this.#cache.set(pattern, re);
+      if (isObject(value)) {
+        return Object.keys(value).some(k => !!k.match(re));
+      }
+      return false;
+    } catch (error) {
+      if (this.throwErrors) throw error;
+      return false;
+    }
+  }
+}
+
 var index$2 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   Count: Count,
   FunctionExpressionType: FunctionExpressionType,
+  Has: Has,
   Length: Length,
   Match: Match,
   Search: Search,
@@ -5206,7 +5299,7 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "2.1.1";
+const version = "2.2.1";
 
 exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
 exports.FunctionExpressionType = FunctionExpressionType;

package/dist/json-p3.esm.js

@@ -1,10 +1,10 @@
 /*
- * json-p3 version 2.1.1
+ * json-p3 version 2.2.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
  * 
- * Copyright (c) 2024 James Prior
+ * Copyright (c) 2025 James Prior
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -1228,9 +1228,18 @@ function mapRegexp(pattern) {
   }
   return parts.join("");
 }
+function fullMatch(pattern) {
+  const parts = [];
+  const explicitCaret = pattern.startsWith("^");
+  const explicitDollar = pattern.endsWith("$");
+  if (!explicitCaret && !explicitDollar) parts.push("^(?:");
+  parts.push(mapRegexp(pattern));
+  if (!explicitCaret && !explicitDollar) parts.push(")$");
+  return parts.join("");
+}
 
 /*
- * iregexp-check version 0.1.1
+ * iregexp-check version 0.1.2
  * https://github.com/jg-rp/js-iregexp
  * 
  * MIT License
@@ -1673,7 +1682,7 @@ function peg$parse(input, options) {
     return s0;
   }
   function peg$parserange_quantifier() {
-    var s0, s1, s2, s3, s4, s5;
+    var s0, s1, s2, s3, s4, s5, s6;
     s0 = peg$currPos;
     if (input.charCodeAt(peg$currPos) === 123) {
       s1 = peg$c1;
@@ -1685,15 +1694,32 @@ function peg$parse(input, options) {
       }
     }
     if (s1 !== peg$FAILED) {
-      s2 = input.charAt(peg$currPos);
-      if (peg$r1.test(s2)) {
+      s2 = [];
+      s3 = input.charAt(peg$currPos);
+      if (peg$r1.test(s3)) {
         peg$currPos++;
       } else {
-        s2 = peg$FAILED;
+        s3 = peg$FAILED;
         if (peg$silentFails === 0) {
           peg$fail(peg$e3);
         }
       }
+      if (s3 !== peg$FAILED) {
+        while (s3 !== peg$FAILED) {
+          s2.push(s3);
+          s3 = input.charAt(peg$currPos);
+          if (peg$r1.test(s3)) {
+            peg$currPos++;
+          } else {
+            s3 = peg$FAILED;
+            if (peg$silentFails === 0) {
+              peg$fail(peg$e3);
+            }
+          }
+        }
+      } else {
+        s2 = peg$FAILED;
+      }
       if (s2 !== peg$FAILED) {
         s3 = peg$currPos;
         if (input.charCodeAt(peg$currPos) === 44) {
@@ -1706,17 +1732,27 @@ function peg$parse(input, options) {
           }
         }
         if (s4 !== peg$FAILED) {
-          s5 = input.charAt(peg$currPos);
-          if (peg$r1.test(s5)) {
+          s5 = [];
+          s6 = input.charAt(peg$currPos);
+          if (peg$r1.test(s6)) {
             peg$currPos++;
           } else {
-            s5 = peg$FAILED;
+            s6 = peg$FAILED;
             if (peg$silentFails === 0) {
               peg$fail(peg$e3);
             }
           }
-          if (s5 === peg$FAILED) {
-            s5 = null;
+          while (s6 !== peg$FAILED) {
+            s5.push(s6);
+            s6 = input.charAt(peg$currPos);
+            if (peg$r1.test(s6)) {
+              peg$currPos++;
+            } else {
+              s6 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e3);
+              }
+            }
           }
           s4 = [s4, s5];
           s3 = s4;
@@ -2478,7 +2514,7 @@ class Match {
       return false;
     }
     try {
-      const re = new RegExp(this.fullMatch(pattern), "u");
+      const re = new RegExp(fullMatch(pattern), "u");
       if (this.cacheSize > 0) this.#cache.set(pattern, re);
       return re.test(s);
     } catch (error) {
@@ -2486,15 +2522,6 @@ class Match {
       return false;
     }
   }
-  fullMatch(pattern) {
-    const parts = [];
-    const explicitCaret = pattern.startsWith("^");
-    const explicitDollar = pattern.endsWith("$");
-    if (!explicitCaret && !explicitDollar) parts.push("^(?:");
-    parts.push(mapRegexp(pattern));
-    if (!explicitCaret && !explicitDollar) parts.push(")$");
-    return parts.join("");
-  }
 }
 
 class Search {
@@ -3068,6 +3095,11 @@ function lexInsideFilter(l) {
         l.emit(TokenKind.CURRENT);
         return lexSegment;
       case "#":
+        if (l.environment.strict) {
+          l.backup();
+          l.error(`unexpected filter selector token '${ch}'`);
+          return null;
+        }
         l.emit(TokenKind.CURRENT_KEY);
         return lexSegment;
       case ".":
@@ -4607,10 +4639,71 @@ class JSONPathEnvironment {
   }
 }
 
+/**
+ * A function extension that returns `true` if the first argument is an object
+ * value and it contains a property matching the second argument.
+ */
+class Has {
+  argTypes = (() => [FunctionExpressionType.ValueType, FunctionExpressionType.ValueType])();
+  returnType = (() => FunctionExpressionType.LogicalType)();
+  #cache;
+  constructor() {
+    let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    this.options = options;
+    this.cacheSize = options.cacheSize ?? 10;
+    this.throwErrors = options.throwErrors ?? false;
+    this.iRegexpCheck = options.iRegexpCheck ?? true;
+    this.search = options.search ?? true;
+    this.#cache = new LRUCache(this.cacheSize);
+  }
+
+  // eslint-disable-next-line sonarjs/cognitive-complexity
+  call(value, pattern) {
+    if (this.cacheSize > 0) {
+      const re = this.#cache.get(pattern);
+      if (re) {
+        try {
+          if (isObject(value)) {
+            return Object.keys(value).some(k => !!k.match(re));
+          }
+          return false;
+        } catch (error) {
+          if (this.throwErrors) throw error;
+          return false;
+        }
+      }
+    }
+    if (!isString(pattern)) {
+      if (this.throwErrors) {
+        throw new IRegexpError(`match() expected a string pattern, found ${pattern}`);
+      }
+      return false;
+    }
+    if (this.iRegexpCheck && !check$1(pattern)) {
+      if (this.throwErrors) {
+        throw new IRegexpError(`pattern ${pattern} is not a valid I-Regexp pattern`);
+      }
+      return false;
+    }
+    try {
+      const re = this.search ? new RegExp(mapRegexp(pattern), "u") : new RegExp(mapRegexp(fullMatch(pattern)), "u");
+      if (this.cacheSize > 0) this.#cache.set(pattern, re);
+      if (isObject(value)) {
+        return Object.keys(value).some(k => !!k.match(re));
+      }
+      return false;
+    } catch (error) {
+      if (this.throwErrors) throw error;
+      return false;
+    }
+  }
+}
+
 var index$2 = /*#__PURE__*/Object.freeze({
   __proto__: null,
   Count: Count,
   FunctionExpressionType: FunctionExpressionType,
+  Has: Has,
   Length: Length,
   Match: Match,
   Search: Search,
@@ -5204,6 +5297,6 @@ var index = /*#__PURE__*/Object.freeze({
   apply: apply
 });
 
-const version = "2.1.1";
+const version = "2.2.1";
 
 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,10 +1,10 @@
 /*
- * json-p3 version 2.1.1
+ * json-p3 version 2.2.1
  * https://github.com/jg-rp/json-p3
  * 
  * MIT License
  * 
- * Copyright (c) 2024 James Prior
+ * Copyright (c) 2025 James Prior
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -1231,9 +1231,18 @@ var json_p3 = (function (exports) {
     }
     return parts.join("");
   }
+  function fullMatch(pattern) {
+    const parts = [];
+    const explicitCaret = pattern.startsWith("^");
+    const explicitDollar = pattern.endsWith("$");
+    if (!explicitCaret && !explicitDollar) parts.push("^(?:");
+    parts.push(mapRegexp(pattern));
+    if (!explicitCaret && !explicitDollar) parts.push(")$");
+    return parts.join("");
+  }
 
   /*
-   * iregexp-check version 0.1.1
+   * iregexp-check version 0.1.2
    * https://github.com/jg-rp/js-iregexp
    * 
    * MIT License
@@ -1676,7 +1685,7 @@ var json_p3 = (function (exports) {
       return s0;
     }
     function peg$parserange_quantifier() {
-      var s0, s1, s2, s3, s4, s5;
+      var s0, s1, s2, s3, s4, s5, s6;
       s0 = peg$currPos;
       if (input.charCodeAt(peg$currPos) === 123) {
         s1 = peg$c1;
@@ -1688,15 +1697,32 @@ var json_p3 = (function (exports) {
         }
       }
       if (s1 !== peg$FAILED) {
-        s2 = input.charAt(peg$currPos);
-        if (peg$r1.test(s2)) {
+        s2 = [];
+        s3 = input.charAt(peg$currPos);
+        if (peg$r1.test(s3)) {
           peg$currPos++;
         } else {
-          s2 = peg$FAILED;
+          s3 = peg$FAILED;
           if (peg$silentFails === 0) {
             peg$fail(peg$e3);
           }
         }
+        if (s3 !== peg$FAILED) {
+          while (s3 !== peg$FAILED) {
+            s2.push(s3);
+            s3 = input.charAt(peg$currPos);
+            if (peg$r1.test(s3)) {
+              peg$currPos++;
+            } else {
+              s3 = peg$FAILED;
+              if (peg$silentFails === 0) {
+                peg$fail(peg$e3);
+              }
+            }
+          }
+        } else {
+          s2 = peg$FAILED;
+        }
         if (s2 !== peg$FAILED) {
           s3 = peg$currPos;
           if (input.charCodeAt(peg$currPos) === 44) {
@@ -1709,17 +1735,27 @@ var json_p3 = (function (exports) {
             }
           }
           if (s4 !== peg$FAILED) {
-            s5 = input.charAt(peg$currPos);
-            if (peg$r1.test(s5)) {
+            s5 = [];
+            s6 = input.charAt(peg$currPos);
+            if (peg$r1.test(s6)) {
               peg$currPos++;
             } else {
-              s5 = peg$FAILED;
+              s6 = peg$FAILED;
               if (peg$silentFails === 0) {
                 peg$fail(peg$e3);
               }
             }
-            if (s5 === peg$FAILED) {
-              s5 = null;
+            while (s6 !== peg$FAILED) {
+              s5.push(s6);
+              s6 = input.charAt(peg$currPos);
+              if (peg$r1.test(s6)) {
+                peg$currPos++;
+              } else {
+                s6 = peg$FAILED;
+                if (peg$silentFails === 0) {
+                  peg$fail(peg$e3);
+                }
+              }
             }
             s4 = [s4, s5];
             s3 = s4;
@@ -2481,7 +2517,7 @@ var json_p3 = (function (exports) {
         return false;
       }
       try {
-        const re = new RegExp(this.fullMatch(pattern), "u");
+        const re = new RegExp(fullMatch(pattern), "u");
         if (this.cacheSize > 0) this.#cache.set(pattern, re);
         return re.test(s);
       } catch (error) {
@@ -2489,15 +2525,6 @@ var json_p3 = (function (exports) {
         return false;
       }
     }
-    fullMatch(pattern) {
-      const parts = [];
-      const explicitCaret = pattern.startsWith("^");
-      const explicitDollar = pattern.endsWith("$");
-      if (!explicitCaret && !explicitDollar) parts.push("^(?:");
-      parts.push(mapRegexp(pattern));
-      if (!explicitCaret && !explicitDollar) parts.push(")$");
-      return parts.join("");
-    }
   }
 
   class Search {
@@ -3071,6 +3098,11 @@ var json_p3 = (function (exports) {
           l.emit(TokenKind.CURRENT);
           return lexSegment;
         case "#":
+          if (l.environment.strict) {
+            l.backup();
+            l.error(`unexpected filter selector token '${ch}'`);
+            return null;
+          }
           l.emit(TokenKind.CURRENT_KEY);
           return lexSegment;
         case ".":
@@ -4610,10 +4642,71 @@ var json_p3 = (function (exports) {
     }
   }
 
+  /**
+   * A function extension that returns `true` if the first argument is an object
+   * value and it contains a property matching the second argument.
+   */
+  class Has {
+    argTypes = (() => [FunctionExpressionType.ValueType, FunctionExpressionType.ValueType])();
+    returnType = (() => FunctionExpressionType.LogicalType)();
+    #cache;
+    constructor() {
+      let options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      this.options = options;
+      this.cacheSize = options.cacheSize ?? 10;
+      this.throwErrors = options.throwErrors ?? false;
+      this.iRegexpCheck = options.iRegexpCheck ?? true;
+      this.search = options.search ?? true;
+      this.#cache = new LRUCache(this.cacheSize);
+    }
+
+    // eslint-disable-next-line sonarjs/cognitive-complexity
+    call(value, pattern) {
+      if (this.cacheSize > 0) {
+        const re = this.#cache.get(pattern);
+        if (re) {
+          try {
+            if (isObject(value)) {
+              return Object.keys(value).some(k => !!k.match(re));
+            }
+            return false;
+          } catch (error) {
+            if (this.throwErrors) throw error;
+            return false;
+          }
+        }
+      }
+      if (!isString(pattern)) {
+        if (this.throwErrors) {
+          throw new IRegexpError(`match() expected a string pattern, found ${pattern}`);
+        }
+        return false;
+      }
+      if (this.iRegexpCheck && !check$1(pattern)) {
+        if (this.throwErrors) {
+          throw new IRegexpError(`pattern ${pattern} is not a valid I-Regexp pattern`);
+        }
+        return false;
+      }
+      try {
+        const re = this.search ? new RegExp(mapRegexp(pattern), "u") : new RegExp(mapRegexp(fullMatch(pattern)), "u");
+        if (this.cacheSize > 0) this.#cache.set(pattern, re);
+        if (isObject(value)) {
+          return Object.keys(value).some(k => !!k.match(re));
+        }
+        return false;
+      } catch (error) {
+        if (this.throwErrors) throw error;
+        return false;
+      }
+    }
+  }
+
   var index$2 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     Count: Count,
     FunctionExpressionType: FunctionExpressionType,
+    Has: Has,
     Length: Length,
     Match: Match,
     Search: Search,
@@ -5207,7 +5300,7 @@ var json_p3 = (function (exports) {
     apply: apply
   });
 
-  const version = "2.1.1";
+  const version = "2.2.1";
 
   exports.DEFAULT_ENVIRONMENT = DEFAULT_ENVIRONMENT;
   exports.FunctionExpressionType = FunctionExpressionType;