sltcodec 2.2.0__tar.gz → 2.3.0__tar.gz

{sltcodec-2.2.0 → sltcodec-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sltcodec
-Version: 2.2.0
+Version: 2.3.0
 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
@@ -77,7 +77,7 @@ The public `PRIMITIVE_TYPES` set contains:
 {"bool", "signed int", "int", "unsigned int", "float", "bytearray", "bytes"}
 ```
 
-`FieldDef.type` may also be a nested `StructDef` or an expression string. Expressions can use values from previously processed fields, allowing dynamic types and sizes. Repeated fields, byte swapping, padding, ranges, and enum metadata are supported.
+`FieldDef.type` may also be a nested `StructDef` or an expression string. Expressions can use values from previously processed fields, allowing dynamic types, sizes, and repeat counts. Repeated fields, byte swapping, padding, ranges, and enum metadata are supported.
 
 ## Enums And Named Structures
 
@@ -180,7 +180,7 @@ internal implementation details and are omitted from the public method tables.
 | `size` | `InfoSize \| str` | Static size or expression. |
 | `type` | `str \| StructDef` | Primitive, named, or nested field type. |
 | `scale` | `float` | Numeric scale applied to the field. |
-| `repeat` | `int \| None` | Number of repeated field values. |
+| `repeat` | `int \| str \| None` | Number of repeated field values, or an expression that evaluates to the count. |
 | `description` | `str \| None` | Optional field description. |
 | `range_expression` | `str \| None` | Optional value-range expression. |
 | `enum_def_name` | `str \| None` | Name of the associated enum definition. |

{sltcodec-2.2.0 → sltcodec-2.3.0}/README_pypi.md

@@ -60,7 +60,7 @@ The public `PRIMITIVE_TYPES` set contains:
 {"bool", "signed int", "int", "unsigned int", "float", "bytearray", "bytes"}
 ```
 
-`FieldDef.type` may also be a nested `StructDef` or an expression string. Expressions can use values from previously processed fields, allowing dynamic types and sizes. Repeated fields, byte swapping, padding, ranges, and enum metadata are supported.
+`FieldDef.type` may also be a nested `StructDef` or an expression string. Expressions can use values from previously processed fields, allowing dynamic types, sizes, and repeat counts. Repeated fields, byte swapping, padding, ranges, and enum metadata are supported.
 
 ## Enums And Named Structures
 
@@ -163,7 +163,7 @@ internal implementation details and are omitted from the public method tables.
 | `size` | `InfoSize \| str` | Static size or expression. |
 | `type` | `str \| StructDef` | Primitive, named, or nested field type. |
 | `scale` | `float` | Numeric scale applied to the field. |
-| `repeat` | `int \| None` | Number of repeated field values. |
+| `repeat` | `int \| str \| None` | Number of repeated field values, or an expression that evaluates to the count. |
 | `description` | `str \| None` | Optional field description. |
 | `range_expression` | `str \| None` | Optional value-range expression. |
 | `enum_def_name` | `str \| None` | Name of the associated enum definition. |

{sltcodec-2.2.0 → sltcodec-2.3.0}/pyproject.toml

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

{sltcodec-2.2.0 → sltcodec-2.3.0}/src/sltcodec/codec.py

@@ -149,6 +149,13 @@ def _resolve_byte_swap(field_def: FieldDef, env: dict[str, Any]) -> bool:
     return field_def.byte_swap
 
 
+def _resolve_repeat(value: int | str | None, env: dict[str, Any]) -> int | None:
+    """Resolve a static or expression-based repeat count."""
+    if isinstance(value, str):
+        return int(SltEval(env).eval(value))
+    return value
+
+
 def _is_padding_field_def(field_def: FieldDef) -> bool:
     """Check whether a field definition represents padding."""
     return (field_def.name.startswith("padding[")
@@ -328,17 +335,18 @@ def encode(
 
     for field_value in struct_instance.field_instances:
         field_def = field_value.field_def
+        repeat = _resolve_repeat(field_def.repeat, env)
         if _is_padding_field_def(field_def):
             has_padding = True
         value = field_value.value
         if _is_padding_field_def(field_def):
             padding_size = _resolve_info_size(field_def.size, env)
             value = bytearray(padding_size.bytes)
-        if field_def.repeat is not None and field_def.repeat > 1:
+        if repeat is not None and repeat > 1:
             current_offset = _resolve_info_size(field_def.offset, env)
             values = list(value)
 
-            for i in range(field_def.repeat):
+            for i in range(repeat):
                 field_def_repeat = _repeated_field_def(field_def, i,
                                                        current_offset,
                                                        field_def.size)
@@ -530,8 +538,9 @@ def decode(
         current_position = target_offset
 
     for field_def in _as_field_defs(struct_def_obj):
+        repeat = _resolve_repeat(field_def.repeat, env)
         # Handle non-repeated fields
-        if field_def.repeat is None or field_def.repeat <= 1:
+        if repeat is None or repeat <= 1:
             resolved_offset = _resolve_info_size(field_def.offset, env)
             append_padding_until(resolved_offset)
             field_instance = decode_field(field_def, data, env, type_dict,
@@ -545,7 +554,7 @@ def decode(
         # Handle repeated fields
         current_offset = _resolve_info_size(field_def.offset, env)
         append_padding_until(current_offset)
-        for i in range(field_def.repeat):
+        for i in range(repeat):
             field_def_repeat = _repeated_field_def(field_def, i, current_offset,
                                                    field_def.size)
             field_instance = decode_field(field_def_repeat, data, env,

{sltcodec-2.2.0 → sltcodec-2.3.0}/src/sltcodec/types.py

@@ -98,7 +98,7 @@ class FieldDef:
                                     metadata={"desc": "The type of the field"})
     scale: float = field(default=1.0,
                          metadata={"desc": "The scale of the field"})
-    repeat: int | None = field(
+    repeat: int | str | None = field(
         default=None, metadata={"desc": "The repeat count of the field"})
     description: str | None = field(
         default=None, metadata={"desc": "The description of the field"})
@@ -231,7 +231,7 @@ class FieldDef:
             self.name,
             self._sortable_type(self.type),
             self.scale,
-            -1 if self.repeat is None else self.repeat,
+            self._sortable_repeat(self.repeat),
             "" if self.description is None else self.description,
             "" if self.range_expression is None else self.range_expression,
             "" if self.enum_def_name is None else self.enum_def_name,
@@ -245,6 +245,15 @@ class FieldDef:
             return (0, value.byte, value.bit)
         return (1, value)
 
+    @staticmethod
+    def _sortable_repeat(value: int | str | None) -> tuple[int, int | str]:
+        """Build a comparable key for static or expression repeat counts."""
+        if value is None:
+            return 0, -1
+        if isinstance(value, int):
+            return 1, value
+        return 2, value
+
     @staticmethod
     def _sortable_type(value: str | "StructDef") -> tuple[Any, ...]:
         """Build a comparable key for primitive or nested field types."""

{sltcodec-2.2.0 → sltcodec-2.3.0}/tests/test_codec.py

@@ -166,6 +166,38 @@ def test_encode_layout_handles_repeat():
     ]
 
 
+def test_expression_repeat_uses_previous_field_value():
+    """Test that repeat expressions are evaluated against the field env."""
+    seed_field = FieldDef(name="count",
+                          offset=InfoSize(0, 0),
+                          size=InfoSize(1, 0),
+                          type="unsigned int")
+    repeated_field = FieldDef(name="value",
+                              offset=InfoSize(1, 0),
+                              size=InfoSize(1, 0),
+                              type="unsigned int",
+                              repeat="count + 1")
+    struct_def = StructDef(fields=[seed_field, repeated_field])
+
+    encoded = encode(
+        layout_for(struct_def),
+        StructInstance(
+            struct_def=struct_def,
+            field_instances=[
+                FieldInstance(seed_field, 2),
+                FieldInstance(repeated_field, [5, 6, 7]),
+            ],
+        ),
+        bytearray(),
+    )
+
+    assert encoded == bytearray(b"\x02\x05\x06\x07")
+    decoded = decode(layout_for(struct_def), encoded)
+
+    assert [instance.value
+            for instance in decoded.field_instances] == [2, 5, 6, 7]
+
+
 def test_encode_recurses_for_nested_field_types():
     """Test that encoding a field with a nested field type works correctly."""
     child_field_defs = [

{sltcodec-2.2.0 → sltcodec-2.3.0}/tests/test_types.py

@@ -39,7 +39,7 @@ def test_field_def_to_json_from_json_round_trip():
                          size=InfoSize(1, 0),
                          type="unsigned int",
                          scale=2.0,
-                         repeat=3,
+                         repeat="count + 1",
                          description="A repeated value",
                          range_expression="0 <= value <= 255",
                          enum_def_name=enum_def.name)
@@ -48,6 +48,7 @@ def test_field_def_to_json_from_json_round_trip():
     restored = FieldDef.from_json(payload)
 
     assert restored == field_def
+    assert restored.repeat == "count + 1"
     assert restored.range_expression == "0 <= value <= 255"
     assert restored.enum_def_name == enum_def.name
     assert restored.to_dict()["enum_def_name"] == "ValueKind"

{sltcodec-2.2.0 → sltcodec-2.3.0}/uv.lock

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