Revert last 3 commits that were wrongly pushed into main.

Revert "Update poetry and lock."
This reverts commit 44d33c6.

Revert "Replace default encoder lambdas with named functions to facilitate debugging."
This reverts commit 83ac429.

Revert "Allow JSONEncoder subclasses to have isolated namespaces to compose with their base class without impacting other subclasses."
This reverts commit 9e66fac.

Author: henriquebastos

jsonstar/default_encoders.py

@@ -18,11 +18,8 @@
 try:
     from pydantic import BaseModel
 
-    def pydantic_dict(o):
-        return o.dict()
-
     PYDANTIC_TYPED_ENCODERS = {
-        BaseModel: pydantic_dict,
+        BaseModel: lambda o: o.dict(),
     }
 except ImportError:
     PYDANTIC_TYPED_ENCODERS = {}
@@ -31,10 +28,7 @@ def pydantic_dict(o):
 try:
     import attrs
 
-    def attrs_dict(o):
-        return attrs.asdict(o)
-
-    ATTRS_FUNCTIONAL_ENCODERS = [attrs_dict]
+    ATTRS_FUNCTIONAL_ENCODERS = [lambda o: attrs.asdict(o)]
 except ImportError:
     ATTRS_FUNCTIONAL_ENCODERS = ()
 
@@ -50,12 +44,8 @@ def encode_timedelta_as_iso_string(duration):
     return f"{sign}P{days}DT{hours:02d}H{minutes:02d}M{seconds:02d}{ms}S"
 
 
-def dataclasses_asdict(o):
-    return dataclasses.asdict(o)
-
-
 DEFAULT_FUNCTIONAL_ENCODERS = [
-    dataclasses_asdict,
+    lambda o: dataclasses.asdict(o),
     *ATTRS_FUNCTIONAL_ENCODERS,
 ]
 

jsonstar/encoder.py

@@ -20,58 +20,26 @@ def __setitem__(self, type_, function):
                 self.move_to_end(base)
 
 
-class EncoderMeta(type):
-    def __new__(mcs, name, bases, namespace):
-        if "_default_functional_encoders" not in namespace:
-            namespace["_default_functional_encoders"] = []
-
-        if "_default_typed_encoders" not in namespace:
-            namespace["_default_typed_encoders"] = TypedEncoderRegistry()
-
-        return super().__new__(mcs, name, bases, namespace)
-
-
-class JSONEncoderStar(stdlib_json.JSONEncoder, metaclass=EncoderMeta):
+class JSONEncoderStar(stdlib_json.JSONEncoder):
     class FUNCTIONAL:
         """Sentinel type to register a functional encoder."""
 
-    _default_typed_encoders = TypedEncoderRegistry(DEFAULT_TYPED_ENCODERS)
-    _default_functional_encoders = DEFAULT_FUNCTIONAL_ENCODERS
+    default_typed_encoders = TypedEncoderRegistry(DEFAULT_TYPED_ENCODERS)
+    default_functional_encoders = DEFAULT_FUNCTIONAL_ENCODERS
 
     def __init__(self, *args, functional_encoders=(), typed_encoders: dict[type, callable] = NULL_DICT, **kwargs):
         super().__init__(*args, **kwargs)
 
         self._typed_encoders = TypedEncoderRegistry(typed_encoders)
         self._functional_encoders = [*functional_encoders]
 
-    @classmethod
-    def default_functional_encoders(cls):
-        if cls is JSONEncoderStar:
-            return cls._default_functional_encoders
-        else:
-            return cls._default_functional_encoders + cls.__base__.default_functional_encoders()
-
-    @classmethod
-    def default_typed_encoders(cls):
-        if cls is JSONEncoderStar:
-            return cls._default_typed_encoders
-        else:
-            a = cls._default_typed_encoders
-            b = cls.__base__.default_typed_encoders()
-            c = ChainMap(a, b)
-            d = TypedEncoderRegistry(c)
-            return d
-            # return TypedEncoderRegistry(ChainMap(cls.__base__.default_typed_encoders(), cls._default_typed_encoders))
-
     @property
     def functional_encoders(self):
-        return chain(self._functional_encoders, self.default_functional_encoders())
+        return chain(self._functional_encoders, self.default_functional_encoders)
 
     @property
     def typed_encoders(self):
-        i = self._typed_encoders
-        base = self.default_typed_encoders()
-        return ChainMap(i, base)
+        return ChainMap(self._typed_encoders, self.default_typed_encoders)
 
     def register(self, function, type_=FUNCTIONAL):
         if type_ is self.FUNCTIONAL:
@@ -82,9 +50,9 @@ def register(self, function, type_=FUNCTIONAL):
     @classmethod
     def register_default_encoder(cls, function, type_=FUNCTIONAL):
         if type_ is cls.FUNCTIONAL:
-            cls._default_functional_encoders.append(function)
+            cls.default_functional_encoders.append(function)
         else:
-            cls._default_typed_encoders[type_] = function
+            cls.default_typed_encoders[type_] = function
 
     def default(self, o) -> str:
         for base, encoder in self.typed_encoders.items():