dotted-notation 0.49.3__tar.gz → 0.49.4__tar.gz

{dotted_notation-0.49.3 → dotted_notation-0.49.4}/CHANGELOG.md

@@ -3,6 +3,15 @@
 All notable changes to `dotted` are recorded here. Versions prior to
 the ones listed are omitted — browse git history for earlier entries.
 
+## [0.49.4]
+
+### Fixed
+- `update` through `~` around a filtered or recursive op,
+  `[(~*&k=v#, +)]` or `~*a.x`, raised `TypeError` once something
+  matched (#65). It now keeps what the `~` matches as it is and, as
+  elsewhere, still updates the path after it: `[(~*&k=1#, +)].x`
+  updates `x` in the matching items.
+
 ## [0.49.3]
 
 ### Added

{dotted_notation-0.49.3/dotted_notation.egg-info → dotted_notation-0.49.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotted_notation
-Version: 0.49.3
+Version: 0.49.4
 Summary: Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms
 Author-email: Frey Waid <logophage1@gmail.com>
 License-Expression: MIT

{dotted_notation-0.49.3 → dotted_notation-0.49.4}/dotted/recursive.py

@@ -400,7 +400,7 @@ class Recursive(BaseOp):
         node[k] = v
         return node
 
-    def _update_recursive(self, ops, node, val, has_defaults, _path, nop, depth=0, guard=None, seen=frozenset(), settings=base.SETTINGS):
+    def _update_recursive(self, ops, node, val, has_defaults, _path, nop, depth=0, guard=None, seen=frozenset(), settings=base.SETTINGS, nop_from_unwrap=False):
         node_id = id(node)
         if node_id in seen:
             return node
@@ -411,7 +411,8 @@ class Recursive(BaseOp):
 
         for acc, k, v in items:
             # Recurse first (bottom-up)
-            v = self._update_recursive(ops, v, val, has_defaults, _path, nop, depth + 1, guard, seen, settings=settings)
+            v = self._update_recursive(ops, v, val, has_defaults, _path, nop, depth + 1, guard, seen, settings=settings,
+                                       nop_from_unwrap=nop_from_unwrap)
             node = self._assign(acc, node, k, v)
             if self.filters and not any(True for _ in self.filtered((v,), settings)):
                 continue
@@ -421,13 +422,15 @@ class Recursive(BaseOp):
             if guard and not guard(v):
                 continue
             if ops:
-                node = self._assign(acc, node, k, engine.updates(ops, v, val, has_defaults, _path + [(self, k)], nop, settings=settings))
+                # a ~ on this op holds back only this op, not the ops after it
+                pass_nop = nop and not nop_from_unwrap
+                node = self._assign(acc, node, k, engine.updates(ops, v, val, has_defaults, _path + [(self, k)], pass_nop, settings=settings))
             elif not nop:
                 node = self._assign(acc, node, k, val)
         return node
 
-    def do_update(self, ops, node, val, has_defaults, _path, nop, settings=base.SETTINGS):
-        return self._update_recursive(ops, node, val, has_defaults, _path, nop, settings=settings)
+    def do_update(self, ops, node, val, has_defaults, _path, nop, nop_from_unwrap=False, settings=base.SETTINGS):
+        return self._update_recursive(ops, node, val, has_defaults, _path, nop, settings=settings, nop_from_unwrap=nop_from_unwrap)
 
     def _remove_recursive(self, ops, node, val, nop, depth=0, guard=None, seen=frozenset(), settings=base.SETTINGS):
         node_id = id(node)

{dotted_notation-0.49.3 → dotted_notation-0.49.4}/dotted/wrappers.py

@@ -314,7 +314,7 @@ class TransformWrap(Wrap):
                 val = self.apply(val, settings)
             except base.UnresolvedReference:
                 return node
-        return self.inner.do_update(ops, node, val, has_defaults, _path, nop, settings=settings)
+        return self.inner.do_update(ops, node, val, has_defaults, _path, nop, nop_from_unwrap=nop_from_unwrap, settings=settings)
 
     def do_remove(self, ops, node, val, nop, settings=base.SETTINGS):
         return self.inner.do_remove(ops, node, val, nop, settings=settings)
@@ -543,7 +543,8 @@ class ValueGuard(Wrap):
         nop = self._nop(nop)
         if self.inner.is_recursive():
             return self.inner._update_recursive(
-                ops, node, val, has_defaults, _path, nop, guard=self._guard(settings), settings=settings)
+                ops, node, val, has_defaults, _path, nop, guard=self._guard(settings), settings=settings,
+                nop_from_unwrap=nop_from_unwrap)
         if not ops and not nop:
             # the leaf: upsert() has no settings, and the guard needs them
             for k in list(self.keys(node, settings=settings)):
@@ -788,8 +789,9 @@ class FilterWrap(Wrap):
             return self
         return FilterWrap(new_inner, new_filters)
 
-    def do_update(self, ops, node, val, has_defaults, _path, nop, settings=base.SETTINGS):
-        return access.BaseOp.do_update(self, ops, node, val, has_defaults, _path, nop, settings=settings)
+    def do_update(self, ops, node, val, has_defaults, _path, nop, nop_from_unwrap=False, settings=base.SETTINGS):
+        return access.BaseOp.do_update(
+            self, ops, node, val, has_defaults, _path, nop, nop_from_unwrap=nop_from_unwrap, settings=settings)
 
     def do_remove(self, ops, node, val, nop, settings=base.SETTINGS):
         return access.BaseOp.do_remove(self, ops, node, val, nop, settings=settings)

{dotted_notation-0.49.3 → dotted_notation-0.49.4/dotted_notation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotted_notation
-Version: 0.49.3
+Version: 0.49.4
 Summary: Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms
 Author-email: Frey Waid <logophage1@gmail.com>
 License-Expression: MIT

{dotted_notation-0.49.3 → dotted_notation-0.49.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dotted_notation"
-version = "0.49.3"
+version = "0.49.4"
 description = "Dotted notation for safe nested data traversal with optional chaining, pattern matching, and transforms"
 readme = "README.md"
 requires-python = ">=3.6"