structtype 0.2.0__tar.gz → 0.3.0__tar.gz

{structtype-0.2.0 → structtype-0.3.0}/AGENTS.md

@@ -49,7 +49,7 @@ All commands go through `make`.
 - `obj.struct_dump_json(*, enc_hook=None, decimal_format=None, uuid_format=None, order=None)` — serialize to JSON bytes
 - `obj.struct_dump()` — convert to built-in Python types (uses `encode_name` for keys)
 - `obj.struct_force_setattr(name, value)` — set attr on frozen struct
-- `obj.struct_validate_self(*, strict=True, dec_hook=None)` — validate field values against types + constraints
+- `obj.struct_validate_self()` — validate field values against types + constraints
 - `cls.struct_validate_json(buf, *, strict=True, dec_hook=None)` — deserialize from JSON
 - `cls.struct_validate(obj, *, strict=True, from_attributes=False, dec_hook=None)` — convert built-in types to struct
 

{structtype-0.2.0 → structtype-0.3.0}/MANIFEST.in

@@ -5,4 +5,3 @@ prune docs
 prune examples
 prune scripts
 exclude .*
-include .cibuildwheel.toml

{structtype-0.2.0 → structtype-0.3.0}/Makefile

@@ -13,6 +13,10 @@ docs: ## build docs
 	rm -rf .doctrees site
 	uv run --group docs sphinx-build -d .doctrees -b html docs site --fail-on-warning
 
+.PHONY: wheels
+wheels: ## build wheels
+	uvx --from cibuildwheel==4.1.1 cibuildwheel
+
 ##@ Quality
 .PHONY: test-cov
 test-cov: ## Run tests with coverage

{structtype-0.2.0/src/structtype.egg-info → structtype-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structtype
-Version: 0.2.0
+Version: 0.3.0
 Summary: Fast Struct type with validation and JSON serialization for Python.
 Maintainer-email: Wolfgang Langner <tds333@mailbox.org>
 License-Expression: BSD-3-Clause

{structtype-0.2.0 → structtype-0.3.0}/pyproject.toml

@@ -80,3 +80,12 @@ parentdir_prefix_version = "structtype-"
 
 [tool.uv.config-settings]
 editable_mode = "compat"
+
+[tool.cibuildwheel]
+build = "cp3*"
+skip = ["pp*", "*-manylinux_i686", "*-musllinux*", "*-win32"]
+enable = ["cpython-prerelease"]
+test-command = "pip install pytest>=9 && pytest {project}/tests"
+
+[tool.ruff]
+target-version = "py310"

{structtype-0.2.0 → structtype-0.3.0}/setup.py

@@ -36,6 +36,12 @@ if DEBUG:
     extra_compile_args.extend(["-O0", "-g", "-UNDEBUG"])
 elif sys.platform != "win32":
     extra_compile_args.extend(["-g0"])
+    extra_compile_args.extend([
+        "-Wextra",
+        "-Wno-unused-parameter",
+        "-Wno-missing-field-initializers",
+        "-Wno-cast-function-type",
+    ])
     if sys.platform == "darwin" and platform.machine().lower() == "arm64":
         extra_compile_args.extend(["-flto=thin"])
         extra_link_args.extend(["-flto=thin"])
@@ -53,15 +59,15 @@ libraries = []
 if sys.platform != "win32":
     libraries.append("m")
 
-    ext_modules = [
-        Extension(
-            "structtype._core",
-            [os.path.join("src", "structtype", "_core.c")],
-            libraries=libraries,
-            extra_compile_args=extra_compile_args,
-            extra_link_args=extra_link_args,
-        )
-    ]
+ext_modules = [
+    Extension(
+        "structtype._core",
+        [os.path.join("src", "structtype", "_core.c")],
+        libraries=libraries,
+        extra_compile_args=extra_compile_args,
+        extra_link_args=extra_link_args,
+    )
+]
 
 setup(
     ext_modules=ext_modules,

{structtype-0.2.0 → structtype-0.3.0}/src/structtype/__init__.py

@@ -1,3 +1,4 @@
+from ._adapter import StrAdapter, StructAdapter
 from ._core import (
     NODEFAULT,
     UNSET,
@@ -11,7 +12,6 @@ from ._core import (
     UnsetType,
     ValidationError,
 )
-from ._adapter import StrAdapter, StructAdapter
 from ._inspect import FieldInfo, fields
-from ._json_schema import json_schema, json_schema_dump, json_schema_components
+from ._json_schema import json_schema, json_schema_components, json_schema_dump
 from ._version import __version__

{structtype-0.2.0 → structtype-0.3.0}/src/structtype/__init__.pyi

@@ -1,23 +1,11 @@
 import enum
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from inspect import Signature
-from typing import (
-    Any,
-    ClassVar,
-    Final,
-    Literal,
-    Optional,
-    Tuple,
-    Type,
-    TypeVar,
-    Union,
-    final,
-    overload,
-)
+from typing import Any, ClassVar, Final, Literal, TypeAlias, TypeVar, final, overload
 
-from typing_extensions import Buffer, Self, TypeAlias, dataclass_transform
+from typing_extensions import Buffer, Self, dataclass_transform
 
-from . import _inspect
+from . import StructConfig
 
 # PEP 673 explicitly rejects using Self in metaclass definitions:
 # https://peps.python.org/pep-0673/#valid-locations-for-self
@@ -34,7 +22,7 @@ class StructMeta(type):
     @property
     def __signature__(self) -> Signature: ...
     @property
-    def __struct_config__(self) -> structs.StructConfig: ...
+    def __struct_config__(self) -> StructConfig: ...
     def __new__(
         mcls: type[_SM],
         name: str,
@@ -85,6 +73,7 @@ class Struct(metaclass=StructMeta):
     __struct_fields__: ClassVar[tuple[str, ...]]
     __struct_config__: ClassVar[StructConfig]
     __struct_encode_fields__: ClassVar[tuple[str, ...]]
+    __struct_defaults__: ClassVar[tuple[Any, ...]]
     __match_args__: ClassVar[tuple[str, ...]]
     # A default __init__ so that Structs with unknown field types
     # won't error on every call to `__init__`
@@ -114,24 +103,30 @@ class Struct(metaclass=StructMeta):
         validate_on_init: bool = False,
     ) -> None: ...
     def __rich_repr__(self) -> list[tuple[str, Any]]: ...
+    def __copy__(self) -> Self: ...
+    def __reduce__(self) -> tuple: ...
     def __replace__(self, **changes: Any) -> Self: ...
     def __iter__(self) -> Iterator[tuple[str, Any]]: ...
     def struct_dump_json(
         self,
         *,
         enc_hook: Callable[[Any], Any] | None = None,
-        decimal_format: Literal["string", "number"] | Callable[[Any], Any] | None = None,
+        decimal_format: Literal["string", "number"]
+        | Callable[[Any], Any]
+        | None = None,
         uuid_format: Literal["canonical", "hex"] | None = None,
         order: Literal["deterministic", "sorted"] | None = None,
     ) -> bytes: ...
-    def struct_dump(self) -> dict[str, Any]: ...
-    def struct_force_setattr(self, name: str, value: Any) -> None: ...
-    def struct_validate_self(
+    def struct_dump(
         self,
         *,
-        strict: bool = True,
-        dec_hook: Callable[[type[Any], Any], Any] | None = None,
-    ) -> None: ...
+        enc_hook: Callable[[Any], Any] | None = None,
+        order: Literal["deterministic", "sorted"] | None = None,
+        str_keys: bool = False,
+        builtin_types: Iterable[type] | None = None,
+    ) -> dict[str, Any] | list[Any]: ...
+    def struct_force_setattr(self, name: str, value: Any) -> None: ...
+    def struct_validate_self(self) -> None: ...
     @classmethod
     def struct_validate_json(
         cls: type[_T],
@@ -321,7 +316,9 @@ class StructAdapter:
         obj: Any,
         *,
         enc_hook: Callable[[Any], Any] | None = None,
-        decimal_format: Literal["string", "number"] | Callable[[Any], Any] | None = None,
+        decimal_format: Literal["string", "number"]
+        | Callable[[Any], Any]
+        | None = None,
         uuid_format: Literal["canonical", "hex"] | None = None,
         order: Literal["deterministic", "sorted"] | None = None,
     ) -> bytes: ...
@@ -333,7 +330,15 @@ class StructAdapter:
         dec_hook: Callable[[type[Any], Any], Any] | None = None,
         from_attributes: bool = False,
     ) -> Any: ...
-    def struct_dump(self, obj: Any) -> Any: ...
+    def struct_dump(
+        self,
+        obj: Any,
+        *,
+        enc_hook: Callable[[Any], Any] | None = None,
+        order: Literal["deterministic", "sorted"] | None = None,
+        str_keys: bool = False,
+        builtin_types: Iterable[type] | None = None,
+    ) -> Any: ...
 
 class StrAdapter:
     def __new__(cls, type: type[Any]) -> type[str]: ...

{structtype-0.2.0 → structtype-0.3.0}/src/structtype/_adapter.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from ._core import _convert, json_decode, json_encode
+from ._core import _dump, _json_decode, _json_encode, _validate
 
 
 class StructAdapter:
@@ -32,9 +32,11 @@ class StructAdapter:
         dec_hook : callable, optional
             A callback for customizing decoding of specific types.
         """
-        return json_decode(buf, type=self._type, strict=strict, dec_hook=dec_hook)
+        return _json_decode(buf, type=self._type, strict=strict, dec_hook=dec_hook)
 
-    def struct_dump_json(self, obj, *, enc_hook=None, decimal_format=None, uuid_format=None, order=None):
+    def struct_dump_json(
+        self, obj, *, enc_hook=None, decimal_format=None, uuid_format=None, order=None
+    ):
         """Encode a validated object to JSON bytes.
 
         Parameters
@@ -50,7 +52,13 @@ class StructAdapter:
         order : str, optional
             Determines key ordering in JSON objects.
         """
-        return json_encode(obj, enc_hook=enc_hook, decimal_format=decimal_format, uuid_format=uuid_format, order=order)
+        return _json_encode(
+            obj,
+            enc_hook=enc_hook,
+            decimal_format=decimal_format,
+            uuid_format=uuid_format,
+            order=order,
+        )
 
     def struct_validate(
         self, obj, *, strict=True, dec_hook=None, from_attributes=False
@@ -68,7 +76,7 @@ class StructAdapter:
         from_attributes : bool, optional
             If True, accept objects with attributes instead of dict keys.
         """
-        return _convert(
+        return _validate(
             obj,
             self._type,
             strict=strict,
@@ -76,13 +84,17 @@ class StructAdapter:
             from_attributes=from_attributes,
         )
 
-    def struct_dump(self, obj):
+    def struct_dump(
+        self, obj, *, enc_hook=None, order=None, str_keys=False, builtin_types=None
+    ):
         """Convert a validated object to built-in Python types (``dict``, ``list``, etc.)."""
-        if hasattr(obj, "struct_dump"):
-            return obj.struct_dump()
-        if hasattr(obj, "model_dump"):
-            return obj.model_dump()
-        return obj
+        return _dump(
+            obj,
+            builtin_types=builtin_types,
+            str_keys=str_keys,
+            enc_hook=enc_hook,
+            order=order,
+        )
 
 
 class StrAdapter:
@@ -106,7 +118,11 @@ class StrAdapter:
     __slots__ = ()
 
     def __new__(cls, typ):
-        return type(f"_Wrapped_{typ.__name__}", (str,), {
-            "__slots__": (),
-            "__new__": lambda self, v: str.__new__(self, str(typ(v))),
-        })
+        return type(
+            f"_Wrapped_{typ.__name__}",
+            (str,),
+            {
+                "__slots__": (),
+                "__new__": lambda self, v: str.__new__(self, str(typ(v))),
+            },
+        )