sltcodec 1.2.0__tar.gz → 1.2.1__tar.gz

{sltcodec-1.2.0 → sltcodec-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sltcodec
-Version: 1.2.0
+Version: 1.2.1
 Summary: Decode and encode bytearrays according to struct layout definitions using sltcore.
 Project-URL: Homepage, https://github.com/fangface-hub/StructLayoutToolkitCodec
 Project-URL: Documentation, https://readthedocs.org
@@ -145,7 +145,7 @@ Output:
 ```python
 bytearray(b"\x03\x04")
 StructInstance(struct_def=StructDef(...), field_instances=[...])
-[FieldInstance(field_def=FieldDef(name='pair', offset=InfoSize(byte=0, bit=0), size=InfoSize(byte=2, bit=0), type=[...], scale=1.0, repeat=None),
+[FieldInstance(field_def=FieldDef(name='pair', offset=InfoSize(byte=0, bit=0), size=InfoSize(byte=2, bit=0), type=StructDef(...), scale=1.0, repeat=None),
                value=StructInstance(struct_def=StructDef(...), field_instances=[...]))]
 ```
 
@@ -204,6 +204,10 @@ print(encoded_float, decoded_float)
 You can persist reusable structure definitions by name with
 `save_struct_def_dict` / `load_struct_def_dict`.
 
+`InfoSize` values in `offset` and `size` are saved as typed dictionaries in
+JSON. Expression-based offsets and sizes remain strings and are resolved when
+the definition is used.
+
 ```python
 from pathlib import Path
 
@@ -232,8 +236,8 @@ print(loaded["Header"].description)
 Example output:
 
 ```python
-bytearray(b"\x01\x07") StructInstance(struct_def=StructDef(...), field_instances=[...])
-bytearray(b"\x02?\xc0\x00\x00") StructInstance(struct_def=StructDef(...), field_instances=[...])
+Header
+Simple header
 ```
 
 ## Enum Definitions

{sltcodec-1.2.0 → sltcodec-1.2.1}/README.md

@@ -128,7 +128,7 @@ Output:
 ```python
 bytearray(b"\x03\x04")
 StructInstance(struct_def=StructDef(...), field_instances=[...])
-[FieldInstance(field_def=FieldDef(name='pair', offset=InfoSize(byte=0, bit=0), size=InfoSize(byte=2, bit=0), type=[...], scale=1.0, repeat=None),
+[FieldInstance(field_def=FieldDef(name='pair', offset=InfoSize(byte=0, bit=0), size=InfoSize(byte=2, bit=0), type=StructDef(...), scale=1.0, repeat=None),
                value=StructInstance(struct_def=StructDef(...), field_instances=[...]))]
 ```
 
@@ -187,6 +187,10 @@ print(encoded_float, decoded_float)
 You can persist reusable structure definitions by name with
 `save_struct_def_dict` / `load_struct_def_dict`.
 
+`InfoSize` values in `offset` and `size` are saved as typed dictionaries in
+JSON. Expression-based offsets and sizes remain strings and are resolved when
+the definition is used.
+
 ```python
 from pathlib import Path
 
@@ -215,8 +219,8 @@ print(loaded["Header"].description)
 Example output:
 
 ```python
-bytearray(b"\x01\x07") StructInstance(struct_def=StructDef(...), field_instances=[...])
-bytearray(b"\x02?\xc0\x00\x00") StructInstance(struct_def=StructDef(...), field_instances=[...])
+Header
+Simple header
 ```
 
 ## Enum Definitions

{sltcodec-1.2.0 → sltcodec-1.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sltcodec"
-version = "1.2.0"
+version = "1.2.1"
 description = "Decode and encode bytearrays according to struct layout definitions using sltcore."
 readme = "README.md"
 requires-python = ">=3.12"

{sltcodec-1.2.0 → sltcodec-1.2.1}/src/sltcodec/types.py

@@ -159,17 +159,19 @@ class FieldDef:
 
     def to_dict(self) -> dict[str, Any]:
         """Convert this field definition to a JSON-serializable dictionary."""
+
+        def _serialize_info_like(value: Any) -> Any:
+            if isinstance(value, (Info, InfoSize)):
+                return json.loads(value.to_json())
+            return value
+
         return {
             "name":
             self.name,
             "offset":
-            self.offset.serialize() if isinstance(self.offset,
-                                                  (Info,
-                                                   InfoSize)) else self.offset,
+            _serialize_info_like(self.offset),
             "size":
-            self.size.serialize() if isinstance(self.size,
-                                                (Info,
-                                                 InfoSize)) else self.size,
+            _serialize_info_like(self.size),
             "type": {
                 "__type__": "StructDef",
                 "fields": self.type.to_dict(),

{sltcodec-1.2.0 → sltcodec-1.2.1}/tests/test_codec.py

@@ -1,4 +1,5 @@
 """Tests for the sltcodec module."""
+import json
 from enum import Enum
 from pathlib import Path
 
@@ -473,6 +474,10 @@ def test_struct_def_dict_load_and_save(tmp_path: Path):
     path = tmp_path / "field_defs.json"
 
     save_struct_def_dict(path, {"value": struct_def})
+    saved_field = json.loads(path.read_text())["value"]["fields"][0]
+
+    assert isinstance(saved_field["offset"], dict)
+    assert isinstance(saved_field["size"], dict)
     loaded = load_struct_def_dict(path)
 
     assert loaded["value"] == struct_def

{sltcodec-1.2.0 → sltcodec-1.2.1}/uv.lock

@@ -74,7 +74,7 @@ wheels = [
 
 [[package]]
 name = "sltcodec"
-version = "1.1.0"
+version = "1.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "sltcalc" },