LibWeb: Move ExceptionOr bindings utils into own header

Userland/Libraries/LibWeb/Bindings/ExceptionOrUtils.h

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2021, the SerenityOS developers.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <AK/StdLibExtras.h>
+#include <LibJS/Runtime/VM.h>
+#include <LibWeb/Bindings/DOMExceptionWrapper.h>
+#include <LibWeb/DOM/ExceptionOr.h>
+
+namespace Web::Bindings {
+
+template<typename>
+struct IsExceptionOr : AK::FalseType {
+};
+
+template<typename T>
+struct IsExceptionOr<DOM::ExceptionOr<T>> : AK::TrueType {
+};
+
+template<typename T>
+ALWAYS_INLINE bool throw_dom_exception(JS::VM& vm, JS::GlobalObject& global_object, DOM::ExceptionOr<T>& result)
+{
+    if (result.is_exception()) {
+        vm.throw_exception(global_object, DOMExceptionWrapper::create(global_object, const_cast<DOM::DOMException&>(result.exception())));
+        return true;
+    }
+    return false;
+}
+
+template<typename F, typename T = decltype(declval<F>()()), typename Ret = typename Conditional<!IsExceptionOr<T>::value && !IsVoid<T>::value, T, JS::Value>::Type>
+Ret throw_dom_exception_if_needed(auto&& vm, auto&& global_object, F&& fn)
+{
+    if constexpr (IsExceptionOr<T>::value) {
+        auto&& result = fn();
+        if (throw_dom_exception(vm, global_object, result))
+            return JS::Value();
+        if constexpr (requires(T v) { v.value(); })
+            return result.value();
+        return JS::Value();
+    } else if constexpr (IsVoid<T>::value) {
+        fn();
+        return JS::js_undefined();
+    } else {
+        return fn();
+    }
+}
+
+template<typename T>
+bool should_return_empty(T&& value)
+{
+    if constexpr (IsSame<JS::Value, T>::value)
+        return value.is_empty();
+    return false;
+}
+
+}

Userland/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp

@@ -1091,7 +1091,6 @@ void generate_prototype_implementation(const IDL::Interface& interface)
 
     generator.append(R"~~~(
 #include <AK/Function.h>
-#include <AK/StdLibExtras.h>
 #include <LibJS/Runtime/Array.h>
 #include <LibJS/Runtime/Error.h>
 #include <LibJS/Runtime/Function.h>
@@ -1101,12 +1100,12 @@ void generate_prototype_implementation(const IDL::Interface& interface)
 #include <LibWeb/Bindings/@wrapper_class@.h>
 #include <LibWeb/Bindings/CanvasRenderingContext2DWrapper.h>
 #include <LibWeb/Bindings/CommentWrapper.h>
-#include <LibWeb/Bindings/DOMExceptionWrapper.h>
 #include <LibWeb/Bindings/DOMImplementationWrapper.h>
 #include <LibWeb/Bindings/DocumentFragmentWrapper.h>
 #include <LibWeb/Bindings/DocumentTypeWrapper.h>
 #include <LibWeb/Bindings/DocumentWrapper.h>
 #include <LibWeb/Bindings/EventTargetWrapperFactory.h>
+#include <LibWeb/Bindings/ExceptionOrUtils.h>
 #include <LibWeb/Bindings/HTMLCanvasElementWrapper.h>
 #include <LibWeb/Bindings/HTMLHeadElementWrapper.h>
 #include <LibWeb/Bindings/HTMLImageElementWrapper.h>
@@ -1117,7 +1116,6 @@ void generate_prototype_implementation(const IDL::Interface& interface)
 #include <LibWeb/Bindings/WindowObject.h>
 #include <LibWeb/DOM/Element.h>
 #include <LibWeb/DOM/EventListener.h>
-#include <LibWeb/DOM/ExceptionOr.h>
 #include <LibWeb/DOM/Window.h>
 #include <LibWeb/HTML/EventHandler.h>
 #include <LibWeb/HTML/HTMLElement.h>
@@ -1410,55 +1408,6 @@ JS_DEFINE_NATIVE_SETTER(@prototype_class@::@attribute.setter_callback@)
         function_generator.set("function.name:snakecase", snake_name(function.name));
 
         function_generator.append(R"~~~(
-#ifndef EXCEPTION_OR_TEMPLATES
-#define EXCEPTION_OR_TEMPLATES
-
-template<typename>
-struct IsExceptionOr : AK::FalseType {
-};
-
-template<typename T>
-struct IsExceptionOr<ExceptionOr<T>> : AK::TrueType {
-};
-
-template<typename T>
-ALWAYS_INLINE bool throw_dom_exception(JS::VM& vm, JS::GlobalObject& global_object, ExceptionOr<T>& result)
-{
-    if (result.is_exception()) {
-        vm.throw_exception(global_object, DOMExceptionWrapper::create(global_object, const_cast<DOM::DOMException&>(result.exception())));
-        return true;
-    }
-    return false;
-}
-
-template<typename F, typename T = decltype(declval<F>()()), typename Ret = typename Conditional<!IsExceptionOr<T>::value && !IsVoid<T>::value, T, JS::Value>::Type>
-Ret throw_dom_exception_if_needed(auto&& vm, auto&& global_object, F&& fn) {
-    if constexpr (IsExceptionOr<T>::value) {
-        auto&& result = fn();
-        if (throw_dom_exception(vm, global_object, result))
-            return JS::Value();
-        if constexpr (requires(T v) { v.value(); })
-            return result.value();
-        return JS::Value();
-    } else if constexpr (IsVoid<T>::value) {
-        fn();
-        return JS::js_undefined();
-    } else {
-        return fn();
-    }
-}
-
-template <typename T>
-bool should_return_empty(T&& value)
-{
-    if constexpr (IsSame<JS::Value, T>::value)
-        return value.is_empty();
-    return false;
-}
-
-
-#endif
-
 JS_DEFINE_NATIVE_FUNCTION(@prototype_class@::@function.name:snakecase@)
 {
     auto* impl = impl_from(vm, global_object);