openrewrite-remote 0.5.5__tar.gz → 0.11.0__tar.gz

{openrewrite_remote-0.5.5 → openrewrite_remote-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openrewrite-remote
-Version: 0.5.5
+Version: 0.11.0
 Summary: Remoting functionality for the OpenRewrite library.
 License: Moderne, Inc. Commercial License
 Author: Moderne Inc.

{openrewrite_remote-0.5.5 → openrewrite_remote-0.11.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openrewrite-remote"
-version = "0.5.5"  # This will be replaced by the GitHub Actions workflow
+version = "0.11.0"  # This will be replaced by the GitHub Actions workflow
 description = "Remoting functionality for the OpenRewrite library."
 authors = ["Moderne Inc. <support@moderne.io>"]
 license = "Moderne, Inc. Commercial License"

{openrewrite_remote-0.5.5 → openrewrite_remote-0.11.0}/rewrite/remote/sender.py

@@ -9,7 +9,7 @@ from uuid import UUID
 
 import cbor2
 from cbor2 import CBOREncoder
-from rewrite import Tree, Markers, Marker, ParseErrorVisitor, Cursor
+from rewrite import Tree, Markers, Marker, ParseErrorVisitor, Cursor, Style
 from rewrite.remote.type_utils import to_java_type_name, to_java_field_name, to_java_type_name_from_value
 from rewrite.visitor import TreeVisitor
 
@@ -335,7 +335,7 @@ class ValueSerializer(ABC):
             encoder.encode_int(id)
 
         for field in fields(value):
-            if field.name[0] == '_' and not hasattr(field.type, '__origin__') or field.type.__origin__ is not ClassVar:
+            if field.name[0] == '_' and (not hasattr(field.type, '__origin__') or field.type.__origin__ is not ClassVar):
                 encoder.encode_string(to_java_field_name(field))
                 context.serialize(getattr(value, field.name), None, encoder)
         encoder.write(BREAK_MARKER)
@@ -353,7 +353,7 @@ class DefaultValueSerializer(ValueSerializer):
             encoder.encode(value.value)
         elif isinstance(value, Path):
             encoder.encode(str(value))
-        elif isinstance(value, list):
+        elif isinstance(value, (list, set, tuple)):
             encoder.encode_length(4, len(value))
             for item in value:
                 context.serialize(item, None, encoder)
@@ -371,7 +371,7 @@ class DefaultValueSerializer(ValueSerializer):
                 encoder.encode_length(4, len(value.markers))
                 for marker in value.markers:
                     context.serialize(marker, None, encoder)
-        elif isinstance(value, Marker):
+        elif isinstance(value, (Marker, Style)):
             if (id := context.remoting_context.try_get_id(value)):
                 encoder.encode_int(id)
             else:
@@ -382,8 +382,8 @@ class DefaultValueSerializer(ValueSerializer):
                 encoder.encode_string('@ref')
                 encoder.encode_int(id)
                 for field in fields(value):
-                    if field.name[0] == '_' and not hasattr(field.type,
-                                                            '__origin__') or field.type.__origin__ is not ClassVar:
+                    if field.name[0] == '_' and (not hasattr(field.type,
+                                                            '__origin__') or field.type.__origin__ is not ClassVar):
                         encoder.encode_string(to_java_field_name(field))
                         context.serialize(getattr(value, field.name), None, encoder)
                 encoder.write(BREAK_MARKER)

{openrewrite_remote-0.5.5 → openrewrite_remote-0.11.0}/rewrite/remote/type_utils.py

@@ -63,6 +63,8 @@ def to_java_type_name(t: typing.Type) -> str:
             return 'org.openrewrite.python.tree.PyContainer'
     if t.__module__.startswith('rewrite.python.markers'):
         return 'org.openrewrite.python.marker.' + t.__qualname__
+    if t.__module__.startswith('rewrite.python.style'):
+        return 'org.openrewrite.python.style.' + t.__qualname__
     if t.__module__.startswith('rewrite.python.tree'):
         return 'org.openrewrite.python.tree.Py$' + t.__qualname__.replace('.', '$')
     if t.__module__.startswith('rewrite.marker'):
@@ -71,6 +73,8 @@ def to_java_type_name(t: typing.Type) -> str:
         return 'org.openrewrite.marker.' + t.__qualname__.replace('.', '$')
     if t.__module__ == 'rewrite.parser' and t.__name__ == 'ParseError':
         return 'org.openrewrite.tree.ParseError'
+    if t.__module__.startswith('rewrite.style'):
+        return 'org.openrewrite.style.' + t.__qualname__
     if t.__module__.startswith('rewrite.') and t.__module__.endswith('.tree'):
         model = t.__module__.split('.')[1]
         return 'org.openrewrite.' + model + '.tree.' + model.capitalize() + '$' + t.__qualname__.replace('.', '$')