structtype 0.10.0__tar.gz → 0.11.0__tar.gz

{structtype-0.10.0 → structtype-0.11.0}/Makefile

@@ -18,8 +18,8 @@ docs-serve: ## Open built docs in browser
 	uv run python -m webbrowser site/index.html
 
 .PHONY: wheels
-wheels: ## build wheels
-	uvx --from cibuildwheel==4.2.0 cibuildwheel
+wheels: ## build wheels (musllinux skipped; unset CIBW_SKIP or run cibuildwheel directly to include it)
+	CIBW_SKIP='*-musllinux_*' uvx --from cibuildwheel==4.2.0 cibuildwheel
 
 ##@ Quality
 .PHONY: test-cov

{structtype-0.10.0/src/structtype.egg-info → structtype-0.11.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: structtype
-Version: 0.10.0
+Version: 0.11.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.10.0 → structtype-0.11.0}/pyproject.toml

@@ -69,12 +69,15 @@ editable_mode = "compat"
 
 [tool.cibuildwheel]
 build = "cp3*"
-skip = ["pp*", "*-manylinux_i686", "*-musllinux*", "*-win32"]
+skip = ["pp*", "*-manylinux_i686", "*-win32"]
 test-command = "pip install pytest>=9 && pytest {project}/tests"
 
 [tool.ruff]
 target-version = "py310"
 
+[tool.ruff.lint.isort]
+combine-as-imports = true
+
 [tool.coverage.report]
 exclude_lines = [
   'pragma: no cover',

{structtype-0.10.0 → structtype-0.11.0}/src/structtype/__init__.py

@@ -12,7 +12,6 @@ from ._core import (  # type: ignore
     Factory,
     Field,
     NumericConstraint,
-    Raw,
     Serializer,
     StrConstraint,
     Struct,
@@ -38,7 +37,6 @@ __all__ = [
     "Field",
     "FieldInfo",
     "NumericConstraint",
-    "Raw",
     "Serializer",
     "StrConstraint",
     "Struct",

{structtype-0.10.0 → structtype-0.11.0}/src/structtype/__init__.pyi

@@ -1,4 +1,4 @@
-# ruff: noqa: PYI041, PYI015, PYI020, UP037
+# ruff: noqa: PYI041, PYI015
 import enum
 from collections.abc import Callable, Iterable, Iterator, Mapping
 from inspect import Signature
@@ -109,16 +109,6 @@ class Struct(metaclass=StructMeta):
         from_attributes: bool = False,
     ) -> Self: ...
 
-# Lie and say `Raw` is a subclass of `bytes`, so mypy will accept it in most
-# places where an object that implements the buffer protocol is valid
-@final
-class Raw(bytes):
-    @overload
-    def __new__(cls) -> "Raw": ...
-    @overload
-    def __new__(cls, msg: Buffer | str) -> "Raw": ...
-    def copy(self) -> "Raw": ...
-
 #: We can't represent this in types, only via a name:
 _NonNegativeInt: TypeAlias = int
 

{structtype-0.10.0 → structtype-0.11.0}/src/structtype/_adapter.py

@@ -1,12 +1,8 @@
 from typing import Any, get_args
 
-from ._core import (
+from ._core import (  # type: ignore
     JSONDecoder as _JSONDecoder,
-)
-from ._core import (
     Serializer as _Serializer,
-)
-from ._core import (  # type: ignore
     _dump,
     _json_encode,
     _validate,

{structtype-0.10.0 → structtype-0.11.0}/src/structtype/_core.c

@@ -1417,242 +1417,6 @@ static PyTypeObject StrLookup_Type = {
     .tp_traverse = (traverseproc) StrLookup_traverse,
 };
 
-/*************************************************************************
- * Raw                                                                   *
- *************************************************************************/
-
-static PyTypeObject Raw_Type;
-
-typedef struct Raw {
-    PyObject_HEAD
-    PyObject *base;
-    char *buf;
-    Py_ssize_t len;
-    bool is_view;
-    Py_buffer view;
-} Raw;
-
-static PyObject *
-Raw_New(PyObject *msg) {
-    Raw *out = (Raw *)Raw_Type.tp_alloc(&Raw_Type, 0);
-    if (out == NULL) return NULL;
-    if (PyBytes_CheckExact(msg)) {
-        Py_INCREF(msg);
-        out->base = msg;
-        out->buf = PyBytes_AS_STRING(msg);
-        out->len = PyBytes_GET_SIZE(msg);
-        out->is_view = false;
-    }
-    else if (PyUnicode_CheckExact(msg)) {
-        out->base = msg;
-        out->buf = (char *)unicode_str_and_size(msg, &out->len);
-        if (out->buf == NULL) return NULL;
-        Py_INCREF(msg);
-        out->is_view = false;
-    }
-    else {
-        Py_buffer buffer;
-        if (PyObject_GetBuffer(msg, &buffer, PyBUF_CONTIG_RO) < 0) {
-            Py_DECREF(out);
-            return NULL;
-        }
-        out->view = buffer;
-        out->base = buffer.obj;
-        out->buf = buffer.buf;
-        out->len = buffer.len;
-        out->is_view = true;
-    }
-    return (PyObject *)out;
-}
-
-PyDoc_STRVAR(Raw__doc__,
-"Raw(msg="", /)\n"
-"--\n"
-"\n"
-"A buffer containing an encoded message.\n"
-"\n"
-"Raw objects have two common uses:\n"
-"\n"
-"- During decoding. Fields annotated with the ``Raw`` type won't be decoded\n"
-"  immediately, but will instead return a ``Raw`` object with a view into the\n"
-"  original message where that field is encoded. This is useful for decoding\n"
-"  fields whose type may only be inferred after decoding other fields.\n"
-"- During encoding. Raw objects wrap pre-encoded messages. These can be added\n"
-"  as components of larger messages without having to pay the cost of decoding\n"
-"  and re-encoding them.\n"
-"\n"
-"Parameters\n"
-"----------\n"
-"msg: bytes, bytearray, memoryview, or str, optional\n"
-"    A buffer containing an encoded message. One of bytes, bytearray, memoryview,\n"
-"    str, or any object that implements the buffer protocol. If not present,\n"
-"    defaults to an empty buffer."
-);
-static PyObject *
-Raw_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) {
-    PyObject *msg;
-    Py_ssize_t nargs, nkwargs;
-
-    nargs = PyTuple_GET_SIZE(args);
-    nkwargs = (kwargs == NULL) ? 0 : PyDict_GET_SIZE(kwargs);
-
-    if (nkwargs != 0) {
-        PyErr_SetString(
-            PyExc_TypeError,
-            "Raw takes no keyword arguments"
-        );
-        return NULL;
-    }
-    else if (nargs == 0) {
-        msg = PyBytes_FromStringAndSize(NULL, 0);
-        if (msg == NULL) return NULL;
-        /* This looks weird, but is safe since the empty bytes object is an
-         * immortal singleton */
-        Py_DECREF(msg);
-    }
-    else if (nargs == 1) {
-        msg = PyTuple_GET_ITEM(args, 0);
-    }
-    else {
-        PyErr_Format(
-            PyExc_TypeError,
-            "Raw expected at most 1 arguments, got %zd",
-            nargs
-        );
-        return NULL;
-    }
-    return Raw_New(msg);
-}
-
-static void
-Raw_dealloc(Raw *self)
-{
-    if (self->base != NULL) {
-        if (!self->is_view) {
-            Py_DECREF(self->base);
-        }
-        else {
-            ms_release_buffer(&self->view);
-        }
-    }
-    Py_TYPE(self)->tp_free((PyObject *)self);
-}
-
-static PyObject *
-Raw_FromView(PyObject *buffer_obj, char *data, Py_ssize_t len) {
-    Raw *out = (Raw *)Raw_Type.tp_alloc(&Raw_Type, 0);
-    if (out == NULL) return NULL;
-
-    Py_buffer buffer;
-    if (ms_get_buffer(buffer_obj, &buffer) < 0) {
-        Py_DECREF(out);
-        return NULL;
-    }
-    out->view = buffer;
-    out->base = buffer.obj;
-    out->buf = data;
-    out->len = len;
-    out->is_view = true;
-    return (PyObject *)out;
-}
-
-static PyObject *
-Raw_richcompare(Raw *self, PyObject *other, int op) {
-    if (Py_TYPE(other) != &Raw_Type) {
-        Py_RETURN_NOTIMPLEMENTED;
-    }
-    if (op != Py_EQ && op != Py_NE) {
-        Py_RETURN_NOTIMPLEMENTED;
-    }
-
-    Raw *raw_other = (Raw *)other;
-    bool equal = (
-        self == raw_other || (
-            (self->len == raw_other->len) &&
-            (memcmp(self->buf, raw_other->buf, self->len) == 0)
-        )
-    );
-    bool result = (op == Py_EQ) ? equal : !equal;
-    if (result) {
-        Py_RETURN_TRUE;
-    }
-    Py_RETURN_FALSE;
-}
-
-static int
-Raw_buffer_getbuffer(Raw *self, Py_buffer *view, int flags)
-{
-    return PyBuffer_FillInfo(view, (PyObject *)self, self->buf, self->len, 1, flags);
-}
-
-static PyBufferProcs Raw_as_buffer = {
-    .bf_getbuffer = (getbufferproc)Raw_buffer_getbuffer
-};
-
-static Py_ssize_t
-Raw_length(Raw *self) {
-    return self->len;
-}
-
-static PySequenceMethods Raw_as_sequence = {
-    .sq_length = (lenfunc)Raw_length
-};
-
-static PyObject *
-Raw_reduce(Raw *self, PyObject *unused)
-{
-    if (!self->is_view) {
-        return Py_BuildValue("O(O)", &Raw_Type, self->base);
-    }
-    return Py_BuildValue("O(y#)", &Raw_Type, self->buf, self->len);
-}
-
-PyDoc_STRVAR(Raw_copy__doc__,
-"copy(self)\n"
-"--\n"
-"\n"
-"Copy a Raw object.\n"
-"\n"
-"If the raw message is backed by a memoryview into a larger buffer (as happens\n"
-"during decoding), the message is copied and the reference to the larger buffer\n"
-"released. This may be useful to reduce memory usage if a Raw object created\n"
-"during decoding will be kept in memory for a while rather than immediately\n"
-"decoded and dropped."
-);
-static PyObject *
-Raw_copy(Raw *self, PyObject *unused)
-{
-    if (!self->is_view) {
-        Py_INCREF(self);
-        return (PyObject *)self;
-    }
-    PyObject *buf = PyBytes_FromStringAndSize(self->buf, self->len);
-    if (buf == NULL) return NULL;
-    PyObject *out = Raw_New(buf);
-    Py_DECREF(buf);
-    return out;
-}
-
-static PyMethodDef Raw_methods[] = {
-    {"__reduce__", (PyCFunction)Raw_reduce, METH_NOARGS},
-    {"copy", (PyCFunction)Raw_copy, METH_NOARGS, Raw_copy__doc__},
-    {NULL, NULL},
-};
-
-static PyTypeObject Raw_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    .tp_name = "structtype.Raw",
-    .tp_doc = Raw__doc__,
-    .tp_basicsize = sizeof(Raw),
-    .tp_itemsize = sizeof(char),
-    .tp_flags = Py_TPFLAGS_DEFAULT,
-    .tp_new = Raw_new,
-    .tp_dealloc = (destructor) Raw_dealloc,
-    .tp_as_buffer = &Raw_as_buffer,
-    .tp_as_sequence = &Raw_as_sequence,
-    .tp_methods = Raw_methods,
-    .tp_richcompare = (richcmpfunc) Raw_richcompare,
-};
 
 static bool
 ensure_is_string(PyObject *val, const char *param) {
@@ -6855,9 +6619,6 @@ typenode_collect_type(TypeNodeCollectState *state, PyObject *obj) {
     else if (t == state->mod->DecimalType) {
         state->types |= MS_TYPE_DECIMAL;
     }
-    else if (t == (PyObject *)(&Raw_Type)) {
-        /* Raw is marked with a typecode of 0, nothing to do */
-    }
     else if (Py_TYPE(t) == (PyTypeObject *)(state->mod->typing_typevar)) {
         out = typenode_collect_typevar(state, t);
     }
@@ -10380,7 +10141,7 @@ PyDoc_STRVAR(Struct_dump__doc__,
 "struct_dump(self, *, sort_keys=False, str_keys=False, builtin_types=None)\n"
 "--\n"
 "\n"
-"Convert this struct to built-in Python types.\n"
+"Convert this struct to built-in Python types compatible with JSON basic types.\n"
 "\n"
 "This applies the same semantics as ``struct_dump_json`` but produces\n"
 "Python objects instead of JSON bytes:\n"
@@ -10430,8 +10191,7 @@ PyDoc_STRVAR(Struct_validate__doc__,
 "strict : bool, optional\n"
 "    Whether type coercion rules should be strict. If ``False``, enables a\n"
 "    wider set of coercion rules from string to non-string types for all\n"
-"    values. Setting ``strict=False`` implies ``str_keys=True`` and\n"
-"    ``builtin_types=None``. Default is ``True``.\n"
+"    values, including dict keys. Default is ``True``.\n"
 "from_attributes : bool, optional\n"
 "    If ``True``, input objects may be coerced to struct, dataclass, or\n"
 "    attrs types by extracting attributes matching output field names.\n"
@@ -14491,13 +14251,6 @@ json_encode_memoryview(EncoderState *self, PyObject *obj)
     return out;
 }
 
-static int
-json_encode_raw(EncoderState *self, PyObject *obj)
-{
-    Raw *raw = (Raw *)obj;
-    return ms_write(self, raw->buf, raw->len);
-}
-
 static int json_encode_dict_key_noinline(EncoderState *, PyObject *);
 
 /* Extract an enum member's value. Enum members store their value as a plain
@@ -14779,8 +14532,8 @@ json_encode_dict_key_noinline(EncoderState *self, PyObject *obj) {
     else if (type == &PyFloat_Type) {
         return json_encode_float_as_str(self, obj);
     }
-    else if (PyType_IsSubtype(Py_TYPE(type), self->mod->EnumMetaType)) {
-        return json_encode_enum(self, obj, true);
+    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
+        return json_encode_decimal(self, obj);
     }
     else if (type == PyDateTimeAPI->DateTimeType) {
         return json_encode_datetime(self, obj);
@@ -14794,15 +14547,15 @@ json_encode_dict_key_noinline(EncoderState *self, PyObject *obj) {
     else if (type == PyDateTimeAPI->DeltaType) {
         return json_encode_timedelta(self, obj);
     }
-    else if (type == &PyBytes_Type) {
-        return json_encode_bytes(self, obj);
-    }
-    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
-        return json_encode_decimal(self, obj);
+    else if (PyType_IsSubtype(Py_TYPE(type), self->mod->EnumMetaType)) {
+        return json_encode_enum(self, obj, true);
     }
     else if (PyType_IsSubtype(type, (PyTypeObject *)(self->mod->UUIDType))) {
         return json_encode_uuid(self, obj);
     }
+    else if (type == &PyBytes_Type) {
+        return json_encode_bytes(self, obj);
+    }
     if (self->codecs != NULL) {
         PyObject *dump = codecs_lookup(self->codecs, type);
         if (dump != NULL) {
@@ -15160,18 +14913,12 @@ json_encode_struct(EncoderState *self, PyObject *obj)
 
 static MS_NOINLINE int
 json_encode_uncommon(EncoderState *self, PyTypeObject *type, PyObject *obj) {
-    if (obj == Py_None) {
-        return ms_write(self, "null", 4);
-    }
-    else if (obj == Py_True) {
-        return ms_write(self, "true", 4);
-    }
-    else if (obj == Py_False) {
-        return ms_write(self, "false", 5);
-    }
-    else if (PyTuple_Check(obj)) {
+    if (PyTuple_Check(obj)) {
         return json_encode_tuple(self, obj);
     }
+    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
+        return json_encode_decimal(self, obj);
+    }
     else if (type == PyDateTimeAPI->DateTimeType) {
         return json_encode_datetime(self, obj);
     }
@@ -15184,30 +14931,24 @@ json_encode_uncommon(EncoderState *self, PyTypeObject *type, PyObject *obj) {
     else if (type == PyDateTimeAPI->DeltaType) {
         return json_encode_timedelta(self, obj);
     }
-    else if (type == &PyBytes_Type) {
-        return json_encode_bytes(self, obj);
-    }
-    else if (type == &PyByteArray_Type) {
-        return json_encode_bytearray(self, obj);
-    }
-    else if (type == &PyMemoryView_Type) {
-        return json_encode_memoryview(self, obj);
-    }
-    else if (type == &Raw_Type) {
-        return json_encode_raw(self, obj);
-    }
     else if (PyType_IsSubtype(Py_TYPE(type), self->mod->EnumMetaType)) {
         return json_encode_enum(self, obj, false);
     }
     else if (PyType_IsSubtype(type, (PyTypeObject *)(self->mod->UUIDType))) {
         return json_encode_uuid(self, obj);
     }
-    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
-        return json_encode_decimal(self, obj);
-    }
     else if (PyAnySet_Check(obj)) {
         return json_encode_set(self, obj);
     }
+    else if (type == &PyBytes_Type) {
+        return json_encode_bytes(self, obj);
+    }
+    else if (type == &PyByteArray_Type) {
+        return json_encode_bytearray(self, obj);
+    }
+    else if (type == &PyMemoryView_Type) {
+        return json_encode_memoryview(self, obj);
+    }
     if (self->codecs != NULL) {
         PyObject *dump = codecs_lookup(self->codecs, type);
         if (dump != NULL) {
@@ -15299,7 +15040,16 @@ json_encode_inline(EncoderState *self, PyObject *obj)
 {
     PyTypeObject *type = Py_TYPE(obj);
 
-    if (PyUnicode_Check(obj)) {
+    if (obj == Py_None) {
+        return ms_write(self, "null", 4);
+    }
+    else if (obj == Py_True) {
+        return ms_write(self, "true", 4);
+    }
+    else if (obj == Py_False) {
+        return ms_write(self, "false", 5);
+    }
+    else if (PyUnicode_Check(obj)) {
         return json_encode_str(self, obj);
     }
     else if (type == &PyLong_Type) {
@@ -17572,16 +17322,6 @@ json_maybe_decode_number(JSONDecoderState *self, TypeNode *type, PathNode *path)
     return out;
 }
 
-static MS_NOINLINE PyObject *
-json_decode_raw(JSONDecoderState *self) {
-    unsigned char c;
-    if (MS_UNLIKELY(!json_peek_skip_ws(self, &c))) return NULL;
-    const unsigned char *start = self->input_pos;
-    if (json_skip(self) < 0) return NULL;
-    Py_ssize_t size = self->input_pos - start;
-    return Raw_FromView(self->buffer_obj, (char *)start, size);
-}
-
 /* Fast path for the common `str`/`Any` string decode, inlined so the hot path
  * avoids the large non-inline `json_decode_string` (which also handles
  * datetime, uuid, decimal, bytes, enum, ...). */
@@ -17631,9 +17371,6 @@ static PyObject *
 json_decode(
     JSONDecoderState *self, TypeNode *type, PathNode *path
 ) {
-    if (MS_UNLIKELY(type->types == 0)) {
-        return json_decode_raw(self);
-    }
     PyObject *obj = json_decode_nocustom(self, type, path);
     if (MS_UNLIKELY(type->types & (MS_TYPE_CUSTOM | MS_TYPE_CUSTOM_GENERIC))) {
         return ms_decode_custom(obj, type, path);
@@ -18574,26 +18311,26 @@ dump_obj(DumpState *self, PyObject *obj, bool is_key) {
     ) {
         goto builtin;
     }
-    else if (type == &PyBytes_Type) {
-        if (self->builtin_types & MS_BUILTIN_BYTES) goto builtin;
-        return dump_binary(
-            self, PyBytes_AS_STRING(obj), PyBytes_GET_SIZE(obj)
-        );
+    else if (PyList_Check(obj)) {
+        return dump_list(self, obj);
     }
-    else if (type == &PyByteArray_Type) {
-        if (self->builtin_types & MS_BUILTIN_BYTEARRAY) goto builtin;
-        return dump_binary(
-            self, PyByteArray_AS_STRING(obj), PyByteArray_GET_SIZE(obj)
-        );
+    else if (PyTuple_Check(obj)) {
+        return dump_tuple(self, obj, is_key);
     }
-    else if (type == &PyMemoryView_Type) {
-        if (self->builtin_types & MS_BUILTIN_MEMORYVIEW) goto builtin;
-        PyObject *out;
-        Py_buffer buffer;
-        if (PyObject_GetBuffer(obj, &buffer, PyBUF_CONTIG_RO) < 0) return NULL;
-        out = dump_binary(self, buffer.buf, buffer.len);
-        PyBuffer_Release(&buffer);
-        return out;
+    else if (PyDict_Check(obj)) {
+        return dump_dict(self, obj);
+    }
+#if PY315_PLUS
+    else if (PyFrozenDict_Check(obj)) {
+        return dump_frozendict(self, obj);
+    }
+#endif
+    else if (ms_is_struct_type(type)) {
+        return dump_struct(self, obj, is_key);
+    }
+    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
+        if (self->builtin_types & MS_BUILTIN_DECIMAL) goto builtin;
+        return dump_decimal(self, obj);
     }
     else if (type == PyDateTimeAPI->DateTimeType) {
         if (self->builtin_types & MS_BUILTIN_DATETIME) goto builtin;
@@ -18611,38 +18348,10 @@ dump_obj(DumpState *self, PyObject *obj, bool is_key) {
         if (self->builtin_types & MS_BUILTIN_TIMEDELTA) goto builtin;
         return dump_timedelta(self, obj);
     }
-    else if (type == (PyTypeObject *)(self->mod->DecimalType)) {
-        if (self->builtin_types & MS_BUILTIN_DECIMAL) goto builtin;
-        return dump_decimal(self, obj);
-    }
-    else if (PyList_Check(obj)) {
-        return dump_list(self, obj);
-    }
-    else if (PyTuple_Check(obj)) {
-        return dump_tuple(self, obj, is_key);
-    }
-    else if (PyDict_Check(obj)) {
-        return dump_dict(self, obj);
-    }
-#if PY315_PLUS
-    else if (PyFrozenDict_Check(obj)) {
-        return dump_frozendict(self, obj);
-    }
-#endif
-    else if (ms_is_struct_type(type)) {
-        return dump_struct(self, obj, is_key);
-    }
-    else if (!ms_is_struct_inst(obj) && PyObject_HasAttr(obj, self->mod->str___struct_fields__)) {
-        /* External struct type (e.g. msgspec) — use Python-level attribute access */
-        return dump_external_struct(self, obj);
-    }
     else if (PyType_IsSubtype(Py_TYPE(type), self->mod->EnumMetaType)) {
         if (self->builtin_types & MS_BUILTIN_ENUM) goto builtin;
         return dump_enum(self, obj);
     }
-    else if (is_key & PyUnicode_Check(obj)) {
-        return PyObject_Str(obj);
-    }
     else if (PyType_IsSubtype(type, (PyTypeObject *)(self->mod->UUIDType))) {
         if (self->builtin_types & MS_BUILTIN_UUID) goto builtin;
         return dump_uuid(self, obj);
@@ -18650,6 +18359,27 @@ dump_obj(DumpState *self, PyObject *obj, bool is_key) {
     else if (PyAnySet_Check(obj)) {
         return dump_set(self, obj, is_key);
     }
+    else if (type == &PyBytes_Type) {
+        if (self->builtin_types & MS_BUILTIN_BYTES) goto builtin;
+        return dump_binary(
+            self, PyBytes_AS_STRING(obj), PyBytes_GET_SIZE(obj)
+        );
+    }
+    else if (type == &PyByteArray_Type) {
+        if (self->builtin_types & MS_BUILTIN_BYTEARRAY) goto builtin;
+        return dump_binary(
+            self, PyByteArray_AS_STRING(obj), PyByteArray_GET_SIZE(obj)
+        );
+    }
+    else if (type == &PyMemoryView_Type) {
+        if (self->builtin_types & MS_BUILTIN_MEMORYVIEW) goto builtin;
+        PyObject *out;
+        Py_buffer buffer;
+        if (PyObject_GetBuffer(obj, &buffer, PyBUF_CONTIG_RO) < 0) return NULL;
+        out = dump_binary(self, buffer.buf, buffer.len);
+        PyBuffer_Release(&buffer);
+        return out;
+    }
     if (self->codecs != NULL) {
         PyObject *dump = codecs_lookup(self->codecs, type);
         if (dump != NULL) {
@@ -18682,6 +18412,10 @@ dump_obj(DumpState *self, PyObject *obj, bool is_key) {
         Py_DECREF(dict);
         return result;
     }
+    else if (!ms_is_struct_inst(obj) && PyObject_HasAttr(obj, self->mod->str___struct_fields__)) {
+        /* External struct type (e.g. msgspec) — use Python-level attribute access */
+        return dump_external_struct(self, obj);
+    }
     else if (!PyType_Check(obj) && type->tp_dict != NULL) {
         PyObject *fields = PyObject_GetAttr(obj, self->mod->str___dataclass_fields__);
         if (fields != NULL) {
@@ -19247,16 +18981,6 @@ validate_immutable(
     return ms_validation_error(expected, type, path);
 }
 
-static PyObject *
-validate_raw(
-    ValidateState *self, PyObject *obj, TypeNode *type, PathNode *path
-) {
-    if (type->types == 0) {
-        Py_INCREF(obj);
-        return obj;
-    }
-    return ms_validation_error("raw", type, path);
-}
 
 static PyObject *
 validate_seq_to_list(
@@ -20403,9 +20127,6 @@ validate_obj_dispatch(
     else if (PyType_IsSubtype(Py_TYPE(pytype), self->mod->EnumMetaType)) {
         return validate_enum(self, obj, type, path);
     }
-    else if (pytype == &Raw_Type) {
-        return validate_raw(self, obj, type, path);
-    }
     else if (PyAnySet_Check(obj)) {
         return validate_any_set(self, obj, type, path);
     }
@@ -21084,8 +20805,6 @@ PyInit__core(void)
         return NULL;
     if (PyType_Ready(&StructMixinType) < 0)
         return NULL;
-    if (PyType_Ready(&Raw_Type) < 0)
-        return NULL;
     if (PyType_Ready(&JSONEncoder_Type) < 0)
         return NULL;
     if (PyType_Ready(&JSONDecoder_Type) < 0)
@@ -21116,8 +20835,6 @@ PyInit__core(void)
     if (PyModule_AddObjectRef(m, "TimezoneConstraint", (PyObject *)&TimezoneConstraint_Type) < 0)
         return NULL;
 
-    if (PyModule_AddObjectRef(m, "Raw", (PyObject *)&Raw_Type) < 0)
-        return NULL;
     if (PyModule_AddObjectRef(m, "JSONEncoder", (PyObject *)&JSONEncoder_Type) < 0)
         return NULL;
     if (PyModule_AddObjectRef(m, "JSONDecoder", (PyObject *)&JSONDecoder_Type) < 0)