Merge pull request #5597 from cloudflare/jasnell/simplify-some-wrapper-mixins

Author: jasnell

src/workerd/jsg/buffersource.h

@@ -462,7 +462,6 @@ class BufferSource {
 };
 
 // TypeWrapper implementation for the BufferSource type.
-template <typename TypeWrapper>
 class BufferSourceWrapper {
  public:
   static constexpr const char* getName(BufferSource*) {

src/workerd/jsg/jsg.h

@@ -1545,7 +1545,6 @@ class Name final {
 
   kj::OneOf<kj::StringPtr, v8::Local<v8::Symbol>> getUnwrapped(v8::Isolate* isolate);
 
-  template <typename TypeWrapper>
   friend class NameWrapper;
 
   void visitForGc(GcVisitor& visitor);

src/workerd/jsg/type-wrapper.h

@@ -386,7 +386,7 @@ template <typename Self, typename... T>
 class TypeWrapper: public DynamicResourceTypeMap<Self>,
                    public TypeWrapperBase<Self, T>...,
                    public PrimitiveWrapper,
-                   public NameWrapper<Self>,
+                   public NameWrapper,
                    public StringWrapper,
                    public OptionalWrapper<Self>,
                    public LenientOptionalWrapper<Self>,
@@ -396,16 +396,16 @@ class TypeWrapper: public DynamicResourceTypeMap<Self>,
                    public SetWrapper<Self>,
                    public SequenceWrapper<Self>,
                    public GeneratorWrapper<Self>,
-                   public ArrayBufferWrapper<Self>,
+                   public ArrayBufferWrapper,
                    public DictWrapper<Self>,
-                   public DateWrapper<Self>,
-                   public BufferSourceWrapper<Self>,
+                   public DateWrapper,
+                   public BufferSourceWrapper,
                    public FunctionWrapper<Self>,
                    public PromiseWrapper<Self>,
                    public NonCoercibleWrapper<Self>,
                    public MemoizedIdentityWrapper<Self>,
                    public IdentifiedWrapper<Self>,
-                   public SelfRefWrapper<Self>,
+                   public SelfRefWrapper,
                    public ExceptionWrapper<Self>,
                    public ObjectWrapper<Self>,
                    public V8HandleWrapper,
@@ -451,7 +451,7 @@ class TypeWrapper: public DynamicResourceTypeMap<Self>,
   using Name::tryUnwrap
 
   USING_WRAPPER(PrimitiveWrapper);
-  USING_WRAPPER(NameWrapper<Self>);
+  USING_WRAPPER(NameWrapper);
   USING_WRAPPER(StringWrapper);
   USING_WRAPPER(OptionalWrapper<Self>);
   USING_WRAPPER(LenientOptionalWrapper<Self>);
@@ -461,16 +461,16 @@ class TypeWrapper: public DynamicResourceTypeMap<Self>,
   USING_WRAPPER(SetWrapper<Self>);
   USING_WRAPPER(SequenceWrapper<Self>);
   USING_WRAPPER(GeneratorWrapper<Self>);
-  USING_WRAPPER(ArrayBufferWrapper<Self>);
+  USING_WRAPPER(ArrayBufferWrapper);
   USING_WRAPPER(DictWrapper<Self>);
-  USING_WRAPPER(DateWrapper<Self>);
-  USING_WRAPPER(BufferSourceWrapper<Self>);
+  USING_WRAPPER(DateWrapper);
+  USING_WRAPPER(BufferSourceWrapper);
   USING_WRAPPER(FunctionWrapper<Self>);
   USING_WRAPPER(PromiseWrapper<Self>);
   USING_WRAPPER(NonCoercibleWrapper<Self>);
   USING_WRAPPER(MemoizedIdentityWrapper<Self>);
   USING_WRAPPER(IdentifiedWrapper<Self>);
-  USING_WRAPPER(SelfRefWrapper<Self>);
+  USING_WRAPPER(SelfRefWrapper);
   USING_WRAPPER(ExceptionWrapper<Self>);
   USING_WRAPPER(ObjectWrapper<Self>);
   USING_WRAPPER(V8HandleWrapper);

src/workerd/jsg/value.h

@@ -401,7 +401,6 @@ class PrimitiveWrapper {
 
 // =======================================================================================
 // Name
-template <typename TypeWrapper>
 class NameWrapper {
  public:
   static constexpr const char* getName(Name*) {
@@ -414,8 +413,7 @@ class NameWrapper {
       Name value) {
     KJ_SWITCH_ONEOF(value.getUnwrapped(js.v8Isolate)) {
       KJ_CASE_ONEOF(string, kj::StringPtr) {
-        auto& wrapper = static_cast<TypeWrapper&>(*this);
-        return wrapper.wrap(js.v8Isolate, creator, kj::str(string));
+        return js.str(string);
       }
       KJ_CASE_ONEOF(symbol, v8::Local<v8::Symbol>) {
         return symbol;
@@ -435,12 +433,7 @@ class NameWrapper {
 
     // Since most things are coercible to a string, this ought to catch pretty much
     // any value other than symbol
-    auto& wrapper = static_cast<TypeWrapper&>(*this);
-    KJ_IF_SOME(string, wrapper.tryUnwrap(js, context, handle, (kj::String*)nullptr, parentObject)) {
-      return Name(kj::mv(string));
-    }
-
-    return kj::none;
+    return Name(js.toString(handle));
   }
 };
 
@@ -1000,7 +993,6 @@ class SetWrapper {
 //   - use `jsg::asBytes()` as a quick way to get a `kj::ArrayPtr<kj::byte>` view onto it.
 //
 // 3. If a method returns an ArrayBuffer, create and return a `kj::Array<kj::byte>`.
-template <typename TypeWrapper>
 class ArrayBufferWrapper {
  public:
   static constexpr const char* getName(kj::ArrayPtr<byte>*) {
@@ -1183,7 +1175,6 @@ class DictWrapper {
 // =======================================================================================
 // Dates
 
-template <typename TypeWrapper>
 class DateWrapper {
  public:
   static constexpr const char* getName(kj::Date*) {
@@ -1383,7 +1374,6 @@ class IdentifiedWrapper {
 // =======================================================================================
 // SelfRef
 
-template <typename TypeWrapper>
 class SelfRefWrapper {
  public:
   static auto getName(SelfRef*) {