j-perm 0.2.1.1__tar.gz → 0.2.2__tar.gz

{j_perm-0.2.1.1 → j_perm-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: j-perm
-Version: 0.2.1.1
+Version: 0.2.2
 Summary: json permutation library
 Author-email: Roman <kuschanow@gmail.com>
 License: MIT

{j_perm-0.2.1.1 → j_perm-0.2.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "j-perm"
-version = "0.2.1.1"
+version = "0.2.2"
 description = "json permutation library"
 authors = [
     { name = "Roman", email = "kuschanow@gmail.com" },

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/constructs/ref.py

@@ -4,7 +4,6 @@ import copy
 from typing import Mapping, Any
 
 from ..special_resolver import _MISSING, SpecialRegistry
-from ..utils.pointers import maybe_slice
 
 
 @SpecialRegistry.register("$ref")
@@ -14,7 +13,7 @@ def of_ref(node: Mapping[str, Any], src: Mapping[str, Any], engine: "ActionEngin
 
     dflt = node.get("$default", _MISSING)
     try:
-        return copy.deepcopy(maybe_slice(ptr, src))
+        return copy.deepcopy(engine.pointer_manager.maybe_slice(ptr, src))
     except Exception:
         if dflt is not _MISSING:
             return copy.deepcopy(dflt)

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/engine.py

@@ -6,6 +6,7 @@ from typing import Any, List, Mapping, TypeAlias, MutableMapping, Union
 
 from .normalizer import Normalizer
 from .op_handler import Handlers
+from .pointers import PointerManager
 from .special_resolver import SpecialResolver
 from .subst import TemplateSubstitutor
 
@@ -48,6 +49,7 @@ class ActionEngine:
     special: SpecialResolver = field(default_factory=SpecialResolver)
     substitutor: TemplateSubstitutor = field(default_factory=TemplateSubstitutor)
     normalizer: Normalizer = field(default_factory=Normalizer)
+    pointer_manager: PointerManager = field(default_factory=PointerManager)
 
     def apply_actions(
             self,

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/normalizer.py

@@ -19,6 +19,7 @@ class ShorthandRegistry:
             cls._rules[name] = fn
             cls._default_priority[name] = priority
             return fn
+
         return deco
 
     @classmethod

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/_assert.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import jptr_get
 
 
 @OpRegistry.register("assert")
@@ -17,7 +16,7 @@ def op_assert(
     path = engine.substitutor.substitute(step["path"], src)
 
     try:
-        current = jptr_get(src, path)
+        current = engine.pointer_manager.get_pointer(src, path)
     except Exception:
         raise AssertionError(f"'{path}' does not exist in source")
 

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/_assert_d.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import jptr_get
 
 
 @OpRegistry.register("assertD")
@@ -17,7 +16,7 @@ def op_assert_d(
     path = engine.substitutor.substitute(step["path"], dest)
 
     try:
-        current = jptr_get(dest, path)
+        current = engine.pointer_manager.get_pointer(dest, path)
     except Exception:
         raise AssertionError(f"'{path}' does not exist in destination")
 

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/_exec.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice
 
 
 @OpRegistry.register("exec")
@@ -26,7 +25,7 @@ def op_exec(
     if has_from:
         actions_ptr = engine.substitutor.substitute(step["from"], src)
         try:
-            actions = maybe_slice(actions_ptr, src)
+            actions = engine.pointer_manager.maybe_slice(actions_ptr, src)
         except Exception:
             if "default" in step:
                 actions = engine.special.resolve(step["default"], src, engine)

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/_if.py

@@ -4,7 +4,6 @@ import copy
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice
 
 
 @OpRegistry.register("if")
@@ -18,7 +17,7 @@ def op_if(
     if "path" in step:
         try:
             ptr = engine.substitutor.substitute(step["path"], src)
-            current = maybe_slice(ptr, dest)
+            current = engine.pointer_manager.maybe_slice(ptr, dest)
             missing = False
         except Exception:
             current = None

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/copy.py

@@ -5,7 +5,6 @@ from typing import MutableMapping, Any, Mapping
 
 from .set import op_set
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice
 
 
 @OpRegistry.register("copy")
@@ -24,7 +23,7 @@ def op_copy(
     ignore = bool(step.get("ignore_missing", False))
 
     try:
-        value = copy.deepcopy(maybe_slice(ptr, src))
+        value = copy.deepcopy(engine.pointer_manager.maybe_slice(ptr, src))
     except Exception:
         if "default" in step:
             value = copy.deepcopy(step["default"])

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/copy_d.py

@@ -5,7 +5,6 @@ from typing import MutableMapping, Any, Mapping
 
 from .set import op_set
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice
 
 
 @OpRegistry.register("copyD")
@@ -23,7 +22,7 @@ def op_copy_d(
     ignore = bool(step.get("ignore_missing", False))
 
     try:
-        value = copy.deepcopy(maybe_slice(ptr, dest))
+        value = copy.deepcopy(engine.pointer_manager.maybe_slice(ptr, dest))
     except Exception:
         if "default" in step:
             value = copy.deepcopy(step["default"])

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/delete.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import jptr_ensure_parent
 
 
 @OpRegistry.register("delete")
@@ -18,7 +17,7 @@ def op_delete(
     ignore = bool(step.get("ignore_missing", True))
 
     try:
-        parent, leaf = jptr_ensure_parent(dest, path, create=False)
+        parent, leaf = engine.pointer_manager.ensure_parent(dest, path, create=False)
 
         if leaf == "-":
             raise ValueError("'-' not allowed in delete")

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/distinct.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import jptr_get
 
 
 @OpRegistry.register("distinct")
@@ -15,7 +14,7 @@ def op_distinct(
 ) -> MutableMapping[str, Any]:
     """Remove duplicates from a list at the given path, preserving order."""
     path = engine.substitutor.substitute(step["path"], src)
-    lst = jptr_get(dest, path)
+    lst = engine.pointer_manager.get_pointer(dest, path)
 
     if not isinstance(lst, list):
         raise TypeError(f"{path} is not a list (distinct)")
@@ -27,7 +26,7 @@ def op_distinct(
     unique = []
     for item in lst:
         if key is not None:
-            filter_item = jptr_get(item, key_path)
+            filter_item = engine.pointer_manager.get_pointer(item, key_path)
         else:
             filter_item = item
 

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/foreach.py

@@ -4,7 +4,6 @@ import copy
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice
 
 
 @OpRegistry.register("foreach")
@@ -21,7 +20,7 @@ def op_foreach(
     skip_empty = bool(step.get("skip_empty", True))
 
     try:
-        arr = maybe_slice(arr_ptr, src)
+        arr = engine.pointer_manager.maybe_slice(arr_ptr, src)
     except Exception:
         arr = default
 

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/set.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from typing import Any, Mapping, MutableMapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import jptr_ensure_parent
 
 
 @OpRegistry.register("set")
@@ -22,12 +21,12 @@ def op_set(
     if isinstance(value, (str, list, Mapping)):
         value = engine.substitutor.substitute(value, src)
 
-    parent, leaf = jptr_ensure_parent(dest, path, create=create)
+    parent, leaf = engine.pointer_manager.ensure_parent(dest, path, create=create)
 
     if leaf == "-":
         if not isinstance(parent, list):
             if create:
-                grand, last = jptr_ensure_parent(dest, path.rsplit("/", 1)[0], create=True)
+                grand, last = engine.pointer_manager.ensure_parent(dest, path.rsplit("/", 1)[0], create=True)
                 if not isinstance(grand[last], list):
                     if grand[last] == {}:
                         grand[last] = []

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/ops/update.py

@@ -4,7 +4,6 @@ import copy
 from typing import MutableMapping, Any, Mapping
 
 from ..op_handler import OpRegistry
-from ..utils.pointers import maybe_slice, jptr_ensure_parent
 
 
 @OpRegistry.register("update")
@@ -22,7 +21,7 @@ def op_update(
     if "from" in step:
         ptr = engine.substitutor.substitute(step["from"], src)
         try:
-            update_value = copy.deepcopy(maybe_slice(ptr, src))
+            update_value = copy.deepcopy(engine.pointer_manager.maybe_slice(ptr, src))
         except Exception:
             if "default" in step:
                 update_value = copy.deepcopy(step["default"])

j_perm-0.2.2/src/j_perm/pointers.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+
+import re
+from typing import Any, Mapping, MutableMapping, List, Tuple
+
+
+class PointerManager:
+    _SLICE_RE = re.compile(r"(.+)\[(-?\d*):(-?\d*)]$")
+
+    def _decode(self, tok: str) -> str:
+        """Decode a single JSON Pointer token, handling RFC6901-style escapes."""
+        return (
+            tok.replace("~0", "~")
+            .replace("~1", "/")
+            .replace("~2", "$")
+            .replace("~3", ".")
+        )
+
+    def get_pointer(self, doc: Any, ptr: str) -> Any:
+        """Read value by JSON Pointer, supporting root and '..' segments."""
+        if ptr in ("", "/", "."):
+            return doc
+
+        tokens = ptr.lstrip("/").split("/")
+        cur: Any = doc
+        parents: List[Tuple[Any, Any]] = []
+
+        for raw_tok in tokens:
+            if raw_tok == "..":
+                if parents:
+                    cur, _ = parents.pop()
+                else:
+                    cur = doc
+                continue
+
+            key = self._decode(raw_tok)
+
+            if isinstance(cur, (list, tuple)):
+                idx = int(key)
+                parents.append((cur, idx))
+                cur = cur[idx]
+            else:
+                parents.append((cur, key))
+                cur = cur[key]
+
+        return cur
+
+    def maybe_slice(self, ptr: str, src: Mapping[str, Any]) -> Any:
+        """Resolve a pointer and optional Python-style slice suffix '[start:end]' for arrays."""
+        m = self._SLICE_RE.match(ptr)
+        if m:
+            base, s, e = m.groups()
+            seq = self.get_pointer(src, base)
+            if not isinstance(seq, (list, tuple)):
+                raise TypeError(f"{base} is not a list (slice requested)")
+
+            start = int(s) if s else None
+            end = int(e) if e else None
+            return seq[start:end]
+
+        return self.get_pointer(src, ptr)
+
+    def ensure_parent(
+            self,
+            doc: MutableMapping[str, Any],
+            ptr: str,
+            *,
+            create: bool = False,
+    ):
+        """Return (container, leaf_key) for ptr, optionally creating intermediate nodes."""
+        raw_parts = ptr.lstrip("/").split("/")
+        parts: List[str] = []
+
+        for raw in raw_parts:
+            if raw == "..":
+                if parts:
+                    parts.pop()
+                continue
+            parts.append(raw)
+
+        if not parts:
+            return doc, ""
+
+        cur: Any = doc
+
+        for raw in parts[:-1]:
+            token = self._decode(raw)
+
+            if isinstance(cur, list):
+                idx = int(token)
+                if idx >= len(cur):
+                    if create:
+                        while idx >= len(cur):
+                            cur.append({})
+                    else:
+                        raise IndexError(f"{ptr}: index {idx} out of range")
+                cur = cur[idx]
+            else:
+                if token not in cur:
+                    if create:
+                        cur[token] = {}
+                    else:
+                        raise KeyError(f"{ptr}: missing key '{token}'")
+                cur = cur[token]
+
+        leaf = self._decode(parts[-1])
+        return cur, leaf

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm/subst.py

@@ -8,8 +8,6 @@ from typing import Any, Callable, Mapping
 import jmespath
 from jmespath import functions as _jp_funcs
 
-from j_perm.utils.pointers import maybe_slice
-
 # =============================================================================
 # Types
 # =============================================================================
@@ -295,6 +293,6 @@ class TemplateSubstitutor:
         # 4) JSON Pointer fallback
         pointer = "/" + expr.lstrip("/")
         try:
-            return maybe_slice(pointer, data)  # type: ignore[arg-type]
+            return engine.pointer_manager.maybe_slice(pointer, data)  # type: ignore[arg-type]
         except Exception:
             return None

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: j-perm
-Version: 0.2.1.1
+Version: 0.2.2
 Summary: json permutation library
 Author-email: Roman <kuschanow@gmail.com>
 License: MIT

{j_perm-0.2.1.1 → j_perm-0.2.2}/src/j_perm.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ src/j_perm/__init__.py
 src/j_perm/engine.py
 src/j_perm/normalizer.py
 src/j_perm/op_handler.py
+src/j_perm/pointers.py
 src/j_perm/special_resolver.py
 src/j_perm/subst.py
 src/j_perm.egg-info/PKG-INFO
@@ -38,6 +39,4 @@ src/j_perm/schema/__init__.py
 src/j_perm/shorthands/__init__.py
 src/j_perm/shorthands/_assert.py
 src/j_perm/shorthands/assign_or_append.py
-src/j_perm/shorthands/delete.py
-src/j_perm/utils/__init__.py
-src/j_perm/utils/pointers.py
+src/j_perm/shorthands/delete.py

j_perm-0.2.1.1/src/j_perm/utils/pointers.py

@@ -1,108 +0,0 @@
-from __future__ import annotations
-
-import re
-from typing import Any, Mapping, MutableMapping, List, Tuple
-
-_SLICE_RE = re.compile(r"(.+)\[(-?\d*):(-?\d*)]$")
-
-
-def _decode(tok: str) -> str:
-    """Decode a single JSON Pointer token, handling RFC6901-style escapes."""
-    return (
-        tok.replace("~0", "~")
-        .replace("~1", "/")
-        .replace("~2", "$")
-        .replace("~3", ".")
-    )
-
-
-def jptr_get(doc: Any, ptr: str) -> Any:
-    """Read value by JSON Pointer, supporting root and '..' segments."""
-    if ptr in ("", "/", "."):
-        return doc
-
-    tokens = ptr.lstrip("/").split("/")
-    cur: Any = doc
-    parents: List[Tuple[Any, Any]] = []
-
-    for raw_tok in tokens:
-        if raw_tok == "..":
-            if parents:
-                cur, _ = parents.pop()
-            else:
-                cur = doc
-            continue
-
-        key = _decode(raw_tok)
-
-        if isinstance(cur, (list, tuple)):
-            idx = int(key)
-            parents.append((cur, idx))
-            cur = cur[idx]
-        else:
-            parents.append((cur, key))
-            cur = cur[key]
-
-    return cur
-
-
-def maybe_slice(ptr: str, src: Mapping[str, Any]) -> Any:
-    """Resolve a pointer and optional Python-style slice suffix '[start:end]' for arrays."""
-    m = _SLICE_RE.match(ptr)
-    if m:
-        base, s, e = m.groups()
-        seq = jptr_get(src, base)
-        if not isinstance(seq, (list, tuple)):
-            raise TypeError(f"{base} is not a list (slice requested)")
-
-        start = int(s) if s else None
-        end = int(e) if e else None
-        return seq[start:end]
-
-    return jptr_get(src, ptr)
-
-
-def jptr_ensure_parent(
-        doc: MutableMapping[str, Any],
-        ptr: str,
-        *,
-        create: bool = False,
-):
-    """Return (container, leaf_key) for ptr, optionally creating intermediate nodes."""
-    raw_parts = ptr.lstrip("/").split("/")
-    parts: List[str] = []
-
-    for raw in raw_parts:
-        if raw == "..":
-            if parts:
-                parts.pop()
-            continue
-        parts.append(raw)
-
-    if not parts:
-        return doc, ""
-
-    cur: Any = doc
-
-    for raw in parts[:-1]:
-        token = _decode(raw)
-
-        if isinstance(cur, list):
-            idx = int(token)
-            if idx >= len(cur):
-                if create:
-                    while idx >= len(cur):
-                        cur.append({})
-                else:
-                    raise IndexError(f"{ptr}: index {idx} out of range")
-            cur = cur[idx]
-        else:
-            if token not in cur:
-                if create:
-                    cur[token] = {}
-                else:
-                    raise KeyError(f"{ptr}: missing key '{token}'")
-            cur = cur[token]
-
-    leaf = _decode(parts[-1])
-    return cur, leaf