refactor: removed old_value and new_value from Change classes (#366)

Author: 15r10nk

src/inline_snapshot/_change.py

@@ -5,7 +5,6 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import TYPE_CHECKING
-from typing import Any
 from typing import DefaultDict
 from typing import Tuple
 from typing import cast
@@ -125,7 +124,6 @@ class RequiredImport(Change):
 @dataclass()
 class Delete(Change):
     node: ast.AST | None
-    old_value: Any
 
 
 @dataclass()
@@ -134,7 +132,6 @@ class ListInsert(Change):
     position: int
 
     new_code: list[str]
-    new_values: list[Any]
 
     def __post_init__(self):
         self.new_code = [self.file.format_expression(v) for v in self.new_code]
@@ -146,7 +143,6 @@ class DictInsert(Change):
     position: int
 
     new_code: list[tuple[str, str]]
-    new_values: list[tuple[Any, Any]]
 
     def __post_init__(self):
         self.new_code = [
@@ -160,8 +156,6 @@ class Replace(Change):
     node: ast.AST
 
     new_code: str
-    old_value: Any
-    new_value: Any
 
     def apply(self, recorder: ChangeRecorder):
         change = recorder.new_change()
@@ -179,7 +173,6 @@ class CallArg(Change):
     arg_name: str | None
 
     new_code: str
-    new_value: Any
 
     def __post_init__(self):
         self.new_code = self.file.format_expression(self.new_code)

src/inline_snapshot/_external/_external.py

@@ -94,7 +94,6 @@ def _changes(self):
                     0,
                     None,
                     f'"{new_name}"',
-                    new_name,
                 )
 
             else:
@@ -107,8 +106,6 @@ def _changes(self):
                     self._context.file,
                     node.args[0] if node else None,
                     f'"{new_name}"',
-                    self._original_name,
-                    new_name,
                 )
 
         yield from super()._changes()

src/inline_snapshot/_inline_snapshot.py

@@ -127,7 +127,6 @@ def _changes(self) -> Iterator[ChangeBase]:
                 arg_pos=0,
                 arg_name=None,
                 new_code=new_code,
-                new_value=self._value._new_value,
             )
 
         else:

src/inline_snapshot/_new_adapter.py

@@ -222,8 +222,6 @@ def compare_CustomCode(
             file=self.context.file,
             new_code=new_code,
             flag=flag,
-            old_value=old_value._eval(),
-            new_value=new_value,
         )
 
         return new_value
@@ -264,27 +262,20 @@ def compare_CustomList(
                 new_value_element = next(new)
                 new_code = yield from new_value_element._code_repr(self.context)
                 result.append(new_value_element)
-                to_insert[old_position].append((new_code, new_value_element))
+                to_insert[old_position].append(new_code)
             elif c == "d":
                 old_value_element, old_node_element = next(old)
                 yield Delete(
                     "fix",
                     self.context.file,
                     old_node_element,
-                    old_value_element,
                 )
                 old_position += 1
             else:
                 assert False
 
         for position, code_values in to_insert.items():
-            yield ListInsert(
-                "fix",
-                self.context.file,
-                old_node,
-                position,
-                *zip(*code_values),  # type: ignore
-            )
+            yield ListInsert("fix", self.context.file, old_node, position, code_values)
 
         return type(new_value)(result)
 
@@ -310,22 +301,23 @@ def compare_CustomTuple(
             result.append(v)
 
         # delete surplus old elements
-        for old_elem, old_node_elem in zip(old_elts[common:], old_nodes[common:]):
-            yield Delete("fix", self.context.file, old_node_elem, old_elem)
+        for old_node_elem in old_nodes[common:]:
+            yield Delete("fix", self.context.file, old_node_elem)
 
         # insert extra new elements
         if len(new_elts) > common:
             to_insert = []
             for new_elem in new_elts[common:]:
                 new_code = yield from new_elem._code_repr(self.context)
-                to_insert.append((new_code, new_elem))
+                to_insert.append(new_code)
                 result.append(new_elem)
+
             yield ListInsert(
                 "fix",
                 self.context.file,
                 old_node,
                 common,
-                *zip(*to_insert),  # type: ignore
+                to_insert,
             )
 
         return CustomTuple(result)
@@ -360,7 +352,7 @@ def compare_CustomDict(
         ):
             if key2 not in new_value.value:
                 # delete entries
-                yield Delete("fix", self.context.file, node2, old_value.value[key2])
+                yield Delete("fix", self.context.file, node2)
 
         to_insert = []
         insert_pos = 0
@@ -392,7 +384,6 @@ def compare_CustomDict(
                         old_node,
                         insert_pos,
                         new_code,
-                        to_insert,
                     )
                     to_insert = []
 
@@ -416,7 +407,6 @@ def compare_CustomDict(
                 old_node,
                 len(old_value.value),
                 new_code,
-                to_insert,
             )
 
         return CustomDict(value=result)
@@ -465,7 +455,6 @@ def intercept(change):
                         flag,
                         self.context.file,
                         node,
-                        old_value.argument(arg_pos),
                     )
 
         if old_args_len < len(new_args):
@@ -478,7 +467,6 @@ def intercept(change):
                     arg_pos=insert_pos,
                     arg_name=None,
                     new_code=new_code,
-                    new_value=insert_value,
                 )
                 result_args.append(insert_value)
 
@@ -504,7 +492,6 @@ def intercept(change):
                     ),
                     self.context.file,
                     kw_value,
-                    old_value.argument(kw_arg),
                 )
 
         to_insert = []
@@ -535,7 +522,6 @@ def intercept(change):
                             arg_pos=insert_pos,
                             arg_name=insert_key,
                             new_code=new_code,
-                            new_value=value,
                         )
                     to_insert = []
 
@@ -553,7 +539,6 @@ def intercept(change):
                     arg_pos=None,
                     arg_name=key,
                     new_code=new_code,
-                    new_value=value,
                 )
 
         return CustomCall(

src/inline_snapshot/_snapshot/collection_value.py

@@ -55,7 +55,6 @@ def _get_changes(self) -> Iterator[ChangeBase]:
                     flag="trim",
                     file=self._file,
                     node=old_node,
-                    old_value=old_value,
                 )
                 continue
 
@@ -71,17 +70,13 @@ def _get_changes(self) -> Iterator[ChangeBase]:
                     file=self._file,
                     new_code=new_code,
                     flag="update",
-                    old_value=old_value,
-                    new_value=old_value,
                 )
 
         new_codes = []
-        new_values = []
         for v in self._new_value.value:
             if v not in self._old_value.value:
                 new_code = yield from v._code_repr(self._context)
                 new_codes.append(new_code)
-                new_values.append(v._eval())
 
         if new_codes:
             yield ListInsert(
@@ -90,5 +85,4 @@ def _get_changes(self) -> Iterator[ChangeBase]:
                 node=self._ast_node,
                 position=len(self._old_value.value),
                 new_code=new_codes,
-                new_values=new_values,
             )

src/inline_snapshot/_snapshot/dict_value.py

@@ -84,20 +84,18 @@ def _get_changes(self) -> Iterator[ChangeBase]:
                 yield from self._new_value.value[key]._get_changes()  # type: ignore
             else:
                 # delete entries
-                yield Delete("trim", self._file, node, self._old_value.value[key])
+                yield Delete("trim", self._file, node)
 
         to_insert = []
-        to_insert_values = []
         for key, new_value_element in self._new_value.value.items():
             if key not in self._old_value.value and not isinstance(
                 new_value_element, UndecidedValue
             ):
                 # add new values
-                new_value = yield from new_value_element._new_code()  # type: ignore
+                new_code = yield from new_value_element._new_code()  # type: ignore
                 new_key = yield from key._code_repr(self._context)
 
-                to_insert.append((new_key, new_value))
-                to_insert_values.append((key, new_value_element))
+                to_insert.append((new_key, new_code))
 
         if to_insert:
             yield DictInsert(
@@ -106,5 +104,4 @@ def _get_changes(self) -> Iterator[ChangeBase]:
                 self._ast_node,
                 len(self._old_value.value),
                 to_insert,
-                to_insert_values,
             )

src/inline_snapshot/_snapshot/min_max_value.py

@@ -53,8 +53,6 @@ def _get_changes(self) -> Iterator[ChangeBase]:
             file=self._file,
             new_code=new_code,
             flag=flag,
-            old_value=self._old_value._eval(),
-            new_value=self._new_value._eval(),
         )
 
 

src/inline_snapshot/_snapshot_arg.py

@@ -292,7 +292,6 @@ def _changes(self) -> Iterator[ChangeBase]:
                     arg_pos=0,
                     arg_name=None,
                     new_code=new_code,
-                    new_value=self._value._new_value,
                 )
             else:
 
@@ -303,13 +302,12 @@ def _changes(self) -> Iterator[ChangeBase]:
                     arg_pos=None,
                     arg_name=self._name,
                     new_code=new_code,
-                    new_value=self._value._new_value,
                 )
         else:
             changes = list(self._value._get_changes())
             if is_default and not isinstance(self._value._old_value, CustomUnmanaged):
                 yield Delete(
-                    "fix" if changes else "trim", self._value._file, self._node, None
+                    "fix" if changes else "trim", self._value._file, self._node
                 )
             else:
                 yield from changes

tests/test_change.py

@@ -54,8 +54,6 @@ def test_change_function_args(check_change):
                 file=source,
                 node=call.args[0],
                 new_code="22",
-                old_value=0,
-                new_value=0,
             )
         ],
         snapshot("f(22,b=2)"),
@@ -68,7 +66,6 @@ def test_change_function_args(check_change):
                 flag="fix",
                 file=source,
                 node=call.args[0],
-                old_value=0,
             )
         ],
         snapshot("f(b=2)"),
@@ -84,7 +81,6 @@ def test_change_function_args(check_change):
                 arg_pos=0,
                 arg_name=None,
                 new_code="22",
-                new_value=22,
             )
         ],
         snapshot("f(22, a,b=2)"),