python-jsonpath 1.3.2__py3-none-any.whl → 2.0.1__py3-none-any.whl

jsonpath/patch.py

@@ -7,6 +7,7 @@ import json
 from abc import ABC
 from abc import abstractmethod
 from io import IOBase
+from typing import Any
 from typing import Dict
 from typing import Iterable
 from typing import List
@@ -70,7 +71,11 @@ class OpAdd(Op):
                 if target == "-":
                     parent.append(self.value)
                 else:
-                    raise JSONPatchError("index out of range")
+                    index = self.path._index(target)  # noqa: SLF001
+                    if index == len(parent):
+                        parent.append(self.value)
+                    else:
+                        raise JSONPatchError("index out of range")
             else:
                 parent.insert(int(target), self.value)
         elif isinstance(parent, MutableMapping):
@@ -628,7 +633,7 @@ class JSONPatch:
 
     def apply(
         self,
-        data: Union[str, IOBase, MutableSequence[object], MutableMapping[str, object]],
+        data: Union[str, IOBase, MutableSequence[Any], MutableMapping[str, Any]],
     ) -> object:
         """Apply all operations from this patch to _data_.
 
@@ -676,7 +681,7 @@ class JSONPatch:
 
 def apply(
     patch: Union[str, IOBase, Iterable[Mapping[str, object]], None],
-    data: Union[str, IOBase, MutableSequence[object], MutableMapping[str, object]],
+    data: Union[str, IOBase, MutableSequence[Any], MutableMapping[str, Any]],
     *,
     unicode_escape: bool = True,
     uri_decode: bool = False,

jsonpath/path.py

@@ -1,15 +1,13 @@
-# noqa: D100
+"""A compiled JSONPath ready to be applied to a JSON string or Python object."""
+
 from __future__ import annotations
 
 import itertools
 from typing import TYPE_CHECKING
-from typing import Any
 from typing import AsyncIterable
 from typing import Iterable
 from typing import List
-from typing import Mapping
 from typing import Optional
-from typing import Sequence
 from typing import Tuple
 from typing import TypeVar
 from typing import Union
@@ -18,15 +16,15 @@ from jsonpath._data import load_data
 from jsonpath.fluent_api import Query
 from jsonpath.match import FilterContextVars
 from jsonpath.match import JSONPathMatch
+from jsonpath.segments import JSONPathRecursiveDescentSegment
 from jsonpath.selectors import IndexSelector
-from jsonpath.selectors import ListSelector
-from jsonpath.selectors import PropertySelector
+from jsonpath.selectors import NameSelector
 
 if TYPE_CHECKING:
-    from io import IOBase
+    from jsonpath._types import JSONData
 
     from .env import JSONPathEnvironment
-    from .selectors import JSONPathSelector
+    from .segments import JSONPathSegment
 
 
 class JSONPath:
@@ -34,9 +32,9 @@ class JSONPath:
 
     Arguments:
         env: The `JSONPathEnvironment` this path is bound to.
-        selectors: An iterable of `JSONPathSelector` objects, as generated by
+        segments: An iterable of `JSONPathSegment` instances, as generated by
             a `Parser`.
-        fake_root: Indicates if target JSON values should be wrapped in a single-
+        pseudo_root: Indicates if target JSON values should be wrapped in a single-
             element array, so as to make the target root value selectable.
 
 
@@ -45,35 +43,30 @@ class JSONPath:
         selectors: The `JSONPathSelector` instances that make up this path.
     """
 
-    __slots__ = ("env", "fake_root", "selectors")
+    __slots__ = ("env", "pseudo_root", "segments")
 
     def __init__(
         self,
         *,
         env: JSONPathEnvironment,
-        selectors: Iterable[JSONPathSelector],
-        fake_root: bool = False,
+        segments: Iterable[JSONPathSegment],
+        pseudo_root: bool = False,
     ) -> None:
         self.env = env
-        self.selectors = tuple(selectors)
-        self.fake_root = fake_root
+        self.segments = tuple(segments)
+        self.pseudo_root = pseudo_root
 
     def __str__(self) -> str:
-        return self.env.root_token + "".join(
-            str(selector) for selector in self.selectors
-        )
+        return self.env.root_token + "".join(str(segment) for segment in self.segments)
 
     def __eq__(self, __value: object) -> bool:
-        return isinstance(__value, JSONPath) and self.selectors == __value.selectors
+        return isinstance(__value, JSONPath) and self.segments == __value.segments
 
     def __hash__(self) -> int:
-        return hash(self.selectors)
+        return hash(self.segments)
 
     def findall(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> List[object]:
         """Find all objects in `data` matching the given JSONPath `path`.
 
@@ -100,10 +93,7 @@ class JSONPath:
         ]
 
     def finditer(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Iterable[JSONPathMatch]:
         """Generate `JSONPathMatch` objects for each match.
 
@@ -125,27 +115,26 @@ class JSONPath:
                 an incompatible way.
         """
         _data = load_data(data)
+        path = self.env.pseudo_root_token if self.pseudo_root else self.env.root_token
+
         matches: Iterable[JSONPathMatch] = [
             JSONPathMatch(
                 filter_context=filter_context or {},
-                obj=[_data] if self.fake_root else _data,
+                obj=[_data] if self.pseudo_root else _data,
                 parent=None,
-                path=self.env.root_token,
+                path=path,
                 parts=(),
                 root=_data,
             )
         ]
 
-        for selector in self.selectors:
-            matches = selector.resolve(matches)
+        for segment in self.segments:
+            matches = segment.resolve(matches)
 
         return matches
 
     async def findall_async(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> List[object]:
         """An async version of `findall()`."""
         return [
@@ -156,36 +145,31 @@ class JSONPath:
         ]
 
     async def finditer_async(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> AsyncIterable[JSONPathMatch]:
         """An async version of `finditer()`."""
         _data = load_data(data)
+        path = self.env.pseudo_root_token if self.pseudo_root else self.env.root_token
 
         async def root_iter() -> AsyncIterable[JSONPathMatch]:
             yield self.env.match_class(
                 filter_context=filter_context or {},
-                obj=[_data] if self.fake_root else _data,
+                obj=[_data] if self.pseudo_root else _data,
                 parent=None,
-                path=self.env.root_token,
+                path=path,
                 parts=(),
                 root=_data,
             )
 
         matches: AsyncIterable[JSONPathMatch] = root_iter()
 
-        for selector in self.selectors:
-            matches = selector.resolve_async(matches)
+        for segment in self.segments:
+            matches = segment.resolve_async(matches)
 
         return matches
 
     def match(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Union[JSONPathMatch, None]:
         """Return a `JSONPathMatch` instance for the first object found in _data_.
 
@@ -212,10 +196,7 @@ class JSONPath:
             return None
 
     def query(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Query:
         """Return a `Query` iterator over matches found by applying this path to _data_.
 
@@ -237,20 +218,21 @@ class JSONPath:
 
     def empty(self) -> bool:
         """Return `True` if this path has no selectors."""
-        return not bool(self.selectors)
+        return not bool(self.segments)
 
     def singular_query(self) -> bool:
         """Return `True` if this JSONPath query is a singular query."""
-        for selector in self.selectors:
-            if isinstance(selector, (PropertySelector, IndexSelector)):
-                continue
-            if (
-                isinstance(selector, ListSelector)
-                and len(selector.items) == 1
-                and isinstance(selector.items[0], (PropertySelector, IndexSelector))
+        for segment in self.segments:
+            if isinstance(segment, JSONPathRecursiveDescentSegment):
+                return False
+
+            if len(segment.selectors) == 1 and isinstance(
+                segment.selectors[0], (NameSelector, IndexSelector)
             ):
                 continue
+
             return False
+
         return True
 
 
@@ -288,10 +270,7 @@ class CompoundJSONPath:
         return hash((self.path, self.paths))
 
     def findall(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> List[object]:
         """Find all objects in `data` matching the given JSONPath `path`.
 
@@ -326,10 +305,7 @@ class CompoundJSONPath:
         return objs
 
     def finditer(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Iterable[JSONPathMatch]:
         """Generate `JSONPathMatch` objects for each match.
 
@@ -364,10 +340,7 @@ class CompoundJSONPath:
         return matches
 
     def match(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Union[JSONPathMatch, None]:
         """Return a `JSONPathMatch` instance for the first object found in _data_.
 
@@ -394,10 +367,7 @@ class CompoundJSONPath:
             return None
 
     async def findall_async(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> List[object]:
         """An async version of `findall()`."""
         objs = await self.path.findall_async(data, filter_context=filter_context)
@@ -413,10 +383,7 @@ class CompoundJSONPath:
         return objs
 
     async def finditer_async(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> AsyncIterable[JSONPathMatch]:
         """An async version of `finditer()`."""
         matches = await self.path.finditer_async(data, filter_context=filter_context)
@@ -433,10 +400,7 @@ class CompoundJSONPath:
         return matches
 
     def query(
-        self,
-        data: Union[str, IOBase, Sequence[Any], Mapping[str, Any]],
-        *,
-        filter_context: Optional[FilterContextVars] = None,
+        self, data: JSONData, *, filter_context: Optional[FilterContextVars] = None
     ) -> Query:
         """Return a `Query` iterator over matches found by applying this path to _data_.
 

jsonpath/pointer.py

@@ -10,6 +10,7 @@ from typing import TYPE_CHECKING
 from typing import Any
 from typing import Iterable
 from typing import Mapping
+from typing import Optional
 from typing import Sequence
 from typing import Tuple
 from typing import Union
@@ -58,14 +59,14 @@ class JSONPointer:
         max_int_index (int): The maximum integer allowed when resolving array
             items by index. Defaults to `(2**53) - 1`.
         min_int_index (int): The minimum integer allowed when resolving array
-            items by index. Defaults to `-(2**53) + 1`.
+            items by index. Defaults to `0`.
     """
 
     __slots__ = ("_s", "parts")
 
     keys_selector = "~"
     max_int_index = (2**53) - 1
-    min_int_index = -(2**53) + 1
+    min_int_index = 0
 
     def __init__(
         self,
@@ -75,11 +76,15 @@ class JSONPointer:
         unicode_escape: bool = True,
         uri_decode: bool = False,
     ) -> None:
-        self.parts = parts or self._parse(
-            pointer,
-            unicode_escape=unicode_escape,
-            uri_decode=uri_decode,
-        )
+        if parts:
+            self.parts = tuple(str(part) for part in parts)
+        else:
+            self.parts = self._parse(
+                pointer,
+                unicode_escape=unicode_escape,
+                uri_decode=uri_decode,
+            )
+
         self._s = self._encode(self.parts)
 
     def __str__(self) -> str:
@@ -91,7 +96,7 @@ class JSONPointer:
         *,
         unicode_escape: bool,
         uri_decode: bool,
-    ) -> Tuple[Union[int, str], ...]:
+    ) -> Tuple[str, ...]:
         if uri_decode:
             s = unquote(s)
         if unicode_escape:
@@ -103,43 +108,49 @@ class JSONPointer:
                 "pointer must start with a slash or be the empty string"
             )
 
-        return tuple(
-            self._index(p.replace("~1", "/").replace("~0", "~")) for p in s.split("/")
-        )[1:]
+        return tuple(p.replace("~1", "/").replace("~0", "~") for p in s.split("/"))[1:]
 
-    def _index(self, s: str) -> Union[str, int]:
-        # Reject non-zero ints that start with a zero.
-        if len(s) > 1 and s.startswith("0"):
-            return s
+    def _index(self, key: str) -> Optional[int]:
+        """Return an array index for `key`.
+
+        Return `None` if key can't be converted to an index.
+        """
+        # Reject indexes that start with a zero.
+        if len(key) > 1 and key.startswith("0"):
+            return None
 
         try:
-            index = int(s)
-            if index < self.min_int_index or index > self.max_int_index:
-                raise JSONPointerError("index out of range")
-            return index
+            index = int(key)
         except ValueError:
-            return s
+            return None
 
-    def _getitem(self, obj: Any, key: Any) -> Any:
+        if index < self.min_int_index or index > self.max_int_index:
+            raise JSONPointerIndexError(
+                f"array indices must be between {self.min_int_index}"
+                f" and {self.max_int_index}"
+            )
+
+        return index
+
+    def _getitem(self, obj: Any, key: str) -> Any:
         try:
             # Handle the most common cases. A mapping with a string key, or a sequence
             # with an integer index.
-            #
-            # Note that `obj` does not have to be a Mapping or Sequence here. Any object
-            # implementing `__getitem__` will do.
+            if isinstance(obj, Sequence) and not isinstance(obj, str):
+                index = self._index(key)
+                if isinstance(index, int):
+                    return getitem(obj, index)
             return getitem(obj, key)
         except KeyError as err:
             return self._handle_key_error(obj, key, err)
         except TypeError as err:
             return self._handle_type_error(obj, key, err)
         except IndexError as err:
-            raise JSONPointerIndexError(f"index out of range: {key}") from err
-
-    def _handle_key_error(self, obj: Any, key: Any, err: Exception) -> object:
-        if isinstance(key, int):
-            # Try a string repr of the index-like item as a mapping key.
-            return self._getitem(obj, str(key))
+            if not isinstance(err, JSONPointerIndexError):
+                raise JSONPointerIndexError(f"index out of range: {key}") from err
+            raise
 
+    def _handle_key_error(self, obj: Any, key: str, err: Exception) -> object:
         # Handle non-standard key/property selector/pointer.
         #
         # For the benefit of `RelativeJSONPointer.to()` and `JSONPathMatch.pointer()`,
@@ -149,8 +160,7 @@ class JSONPointer:
         # Note that if a key with a leading `#`/`~` exists in `obj`, it will have been
         # handled by `_getitem`.
         if (
-            isinstance(key, str)
-            and isinstance(obj, Mapping)
+            isinstance(obj, Mapping)
             and key.startswith((self.keys_selector, "#"))
             and key[1:] in obj
         ):
@@ -158,17 +168,10 @@ class JSONPointer:
 
         raise JSONPointerKeyError(key) from err
 
-    def _handle_type_error(self, obj: Any, key: Any, err: Exception) -> object:
-        if (
-            isinstance(obj, str)
-            or not isinstance(obj, Sequence)
-            or not isinstance(key, str)
-        ):
+    def _handle_type_error(self, obj: Any, key: str, err: Exception) -> object:
+        if not isinstance(obj, Sequence) or not isinstance(key, str):
             raise JSONPointerTypeError(f"{key}: {err}") from err
 
-        # `obj` is array-like
-        # `key` is a string
-
         if key == "-":
             # "-" is a valid index when appending to a JSON array with JSON Patch, but
             # not when resolving a JSON Pointer.
@@ -185,11 +188,6 @@ class JSONPointer:
                 raise JSONPointerIndexError(f"index out of range: {_index}") from err
             return _index
 
-        # Try int index. Reject non-zero ints that start with a zero.
-        index = self._index(key)
-        if isinstance(index, int):
-            return self._getitem(obj, index)
-
         raise JSONPointerTypeError(f"{key}: {err}") from err
 
     def resolve(
@@ -349,13 +347,13 @@ class JSONPointer:
         )
 
     def __eq__(self, other: object) -> bool:
-        return isinstance(other, JSONPointer) and self.parts == other.parts
+        return isinstance(other, self.__class__) and self.parts == other.parts
 
     def __hash__(self) -> int:
-        return hash(self.parts)  # pragma: no cover
+        return hash((self.__class__, self.parts))  # pragma: no cover
 
     def __repr__(self) -> str:
-        return f"JSONPointer({self._s!r})"  # pragma: no cover
+        return f"{self.__class__.__name__}({self._s!r})"  # pragma: no cover
 
     def exists(
         self, data: Union[str, IOBase, Sequence[object], Mapping[str, object]]
@@ -391,7 +389,7 @@ class JSONPointer:
         if not self.parts:
             return self
         parent_parts = self.parts[:-1]
-        return JSONPointer(
+        return self.__class__(
             self._encode(parent_parts),
             parts=parent_parts,
             unicode_escape=False,
@@ -415,14 +413,13 @@ class JSONPointer:
 
         other = self._unicode_escape(other.lstrip())
         if other.startswith("/"):
-            return JSONPointer(other, unicode_escape=False, uri_decode=False)
+            return self.__class__(other, unicode_escape=False, uri_decode=False)
 
         parts = self.parts + tuple(
-            self._index(p.replace("~1", "/").replace("~0", "~"))
-            for p in other.split("/")
+            p.replace("~1", "/").replace("~0", "~") for p in other.split("/")
         )
 
-        return JSONPointer(
+        return self.__class__(
             self._encode(parts), parts=parts, unicode_escape=False, uri_decode=False
         )
 
@@ -612,7 +609,7 @@ class RelativeJSONPointer:
                 raise RelativeJSONPointerIndexError(
                     f"index offset out of range {new_index}"
                 )
-            parts[-1] = int(parts[-1]) + self.index
+            parts[-1] = str(int(parts[-1]) + self.index)
 
         # Pointer or index/property
         if isinstance(self.pointer, JSONPointer):

jsonpath/segments.py

@@ -0,0 +1,131 @@
+"""JSONPath child and descendant segment definitions."""
+
+from __future__ import annotations
+
+from abc import ABC
+from abc import abstractmethod
+from typing import TYPE_CHECKING
+from typing import AsyncIterable
+from typing import Iterable
+from typing import Mapping
+from typing import Sequence
+from typing import Tuple
+
+from .exceptions import JSONPathRecursionError
+
+if TYPE_CHECKING:
+    from .env import JSONPathEnvironment
+    from .match import JSONPathMatch
+    from .selectors import JSONPathSelector
+    from .token import Token
+
+
+class JSONPathSegment(ABC):
+    """Base class for all JSONPath segments."""
+
+    __slots__ = ("env", "token", "selectors")
+
+    def __init__(
+        self,
+        *,
+        env: JSONPathEnvironment,
+        token: Token,
+        selectors: Tuple[JSONPathSelector, ...],
+    ) -> None:
+        self.env = env
+        self.token = token
+        self.selectors = selectors
+
+    @abstractmethod
+    def resolve(self, nodes: Iterable[JSONPathMatch]) -> Iterable[JSONPathMatch]:
+        """Apply this segment to each `JSONPathMatch` in _nodes_."""
+
+    @abstractmethod
+    def resolve_async(
+        self, nodes: AsyncIterable[JSONPathMatch]
+    ) -> AsyncIterable[JSONPathMatch]:
+        """An async version of `resolve`."""
+
+
+class JSONPathChildSegment(JSONPathSegment):
+    """The JSONPath child selection segment."""
+
+    def resolve(self, nodes: Iterable[JSONPathMatch]) -> Iterable[JSONPathMatch]:
+        """Select children of each node in _nodes_."""
+        for node in nodes:
+            for selector in self.selectors:
+                yield from selector.resolve(node)
+
+    async def resolve_async(
+        self, nodes: AsyncIterable[JSONPathMatch]
+    ) -> AsyncIterable[JSONPathMatch]:
+        """An async version of `resolve`."""
+        async for node in nodes:
+            for selector in self.selectors:
+                async for match in selector.resolve_async(node):
+                    yield match
+
+    def __str__(self) -> str:
+        return f"[{', '.join(str(itm) for itm in self.selectors)}]"
+
+    def __eq__(self, __value: object) -> bool:
+        return (
+            isinstance(__value, JSONPathChildSegment)
+            and self.selectors == __value.selectors
+            and self.token == __value.token
+        )
+
+    def __hash__(self) -> int:
+        return hash((self.selectors, self.token))
+
+
+class JSONPathRecursiveDescentSegment(JSONPathSegment):
+    """The JSONPath recursive descent segment."""
+
+    def resolve(self, nodes: Iterable[JSONPathMatch]) -> Iterable[JSONPathMatch]:
+        """Select descendants of each node in _nodes_."""
+        for node in nodes:
+            for _node in self._visit(node):
+                for selector in self.selectors:
+                    yield from selector.resolve(_node)
+
+    async def resolve_async(
+        self, nodes: AsyncIterable[JSONPathMatch]
+    ) -> AsyncIterable[JSONPathMatch]:
+        """An async version of `resolve`."""
+        async for node in nodes:
+            for _node in self._visit(node):
+                for selector in self.selectors:
+                    async for match in selector.resolve_async(_node):
+                        yield match
+
+    def _visit(self, node: JSONPathMatch, depth: int = 1) -> Iterable[JSONPathMatch]:
+        """Depth-first, pre-order node traversal."""
+        if depth > self.env.max_recursion_depth:
+            raise JSONPathRecursionError("recursion limit exceeded", token=self.token)
+
+        yield node
+
+        if isinstance(node.obj, Mapping):
+            for name, val in node.obj.items():
+                if isinstance(val, (Mapping, Sequence)):
+                    _node = node.new_child(val, name)
+                    yield from self._visit(_node, depth + 1)
+        elif isinstance(node.obj, Sequence) and not isinstance(node.obj, str):
+            for i, item in enumerate(node.obj):
+                if isinstance(item, (Mapping, Sequence)):
+                    _node = node.new_child(item, i)
+                    yield from self._visit(_node, depth + 1)
+
+    def __str__(self) -> str:
+        return f"..[{', '.join(str(itm) for itm in self.selectors)}]"
+
+    def __eq__(self, __value: object) -> bool:
+        return (
+            isinstance(__value, JSONPathRecursiveDescentSegment)
+            and self.selectors == __value.selectors
+            and self.token == __value.token
+        )
+
+    def __hash__(self) -> int:
+        return hash(("..", self.selectors, self.token))