soia-client 1.0.9__tar.gz → 1.0.10__tar.gz

{soia_client-1.0.9 → soia_client-1.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.0.9
+Version: 1.0.10
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.0.9 → soia_client-1.0.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "soia-client"
-version = "1.0.9"
+version = "1.0.10"
 description = ""
 readme = "README.md"
 authors = [{ name = "Tyler Fibonacci", email = "gepheum@gmail.com" }]

{soia_client-1.0.9 → soia_client-1.0.10}/soia_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soia-client
-Version: 1.0.9
+Version: 1.0.10
 Author-email: Tyler Fibonacci <gepheum@gmail.com>
 License: MIT License
         

{soia_client-1.0.9 → soia_client-1.0.10}/soialib/impl/arrays.py

@@ -118,14 +118,14 @@ def _new_listuple_class() -> type:
     return Listuple
 
 
-def _new_keyed_items_class(attributes: tuple[str, ...], default_expr: ExprLike):
+def _new_keyed_items_class(key_attributes: tuple[str, ...], default_expr: ExprLike):
     key_items = make_function(
         name="key_items",
         params=["items"],
         body=[
             "ret = {}",
             "for item in items:",
-            f"  ret[item.{'.'.join(attributes)}] = item",
+            f"  ret[item.{'.'.join(key_attributes)}] = item",
             "return ret",
         ],
     )

{soia_client-1.0.9 → soia_client-1.0.10}/soialib/impl/structs.py

@@ -457,6 +457,8 @@ def _make_eq_fn(
     """
 
     builder = BodyBuilder()
+    builder.append_ln("if other is self:")
+    builder.append_ln("  return True")
     builder.append_ln("if other.__class__ is self.__class__:")
     operands: list[ExprLike]
     if fields:

{soia_client-1.0.9 → soia_client-1.0.10}/tests/test_module_initializer.py

@@ -294,6 +294,21 @@ class ModuleInitializerTestCase(unittest.TestCase):
                         ),
                     ),
                 ),
+                spec.Struct(
+                    id="my/module.soia:Rec",
+                    fields=(
+                        spec.Field(
+                            name="r",
+                            number=0,
+                            type="my/module.soia:Rec",
+                        ),
+                        spec.Field(
+                            name="x",
+                            number=1,
+                            type=spec.PrimitiveType.INT32,
+                        ),
+                    ),
+                ),
                 spec.Struct(
                     id="my/module.soia:Foobar",
                     fields=(
@@ -530,6 +545,14 @@ class ModuleInitializerTestCase(unittest.TestCase):
         self.assertEqual(serializer.to_json_code(foobar), "[0,0,0,0,[2.0]]")
         self.assertEqual(serializer.from_json_code("[0,0,0,0,[2.0]]"), foobar)
 
+    def test_recursive_struct(self):
+        rec_cls = self.init_test_module()["Rec"]
+        r = rec_cls(r=rec_cls(r=rec_cls.DEFAULT, x=1))
+        serializer = rec_cls.SERIALIZER
+        self.assertEqual(serializer.to_json_code(r), "[[[],1]]")
+        self.assertEqual(serializer.from_json_code("[[[],1]]"), r)
+        self.assertEqual(str(r), "Rec(\n  r=Rec(x=1),\n)")
+
     def test_struct_ctor_accepts_mutable_struct(self):
         module = self.init_test_module()
         segment_cls = module["Segment"]