attempt (unsuccessfully) to improve c++ build time

17 files changed, 152 insertions, 134 deletions

diff --git a/src/bun.js/bindings/BunClientData.h b/src/bun.js/bindings/BunClientData.h
index 90aadb2eb..122020c69 100644
--- a/src/bun.js/bindings/BunClientData.h
+++ b/src/bun.js/bindings/BunClientData.h
@@ -25,6 +25,9 @@ class DOMWrapperWorld;
 
 #include "WebCoreJSBuiltins.h"
 
+namespace Zig {
+}
+
 namespace WebCore {
 using namespace JSC;
 using namespace Zig;
diff --git a/src/bun.js/bindings/ImportMetaObject.cpp b/src/bun.js/bindings/ImportMetaObject.cpp
index bcd8f4be6..5838bde04 100644
--- a/src/bun.js/bindings/ImportMetaObject.cpp
+++ b/src/bun.js/bindings/ImportMetaObject.cpp
@@ -1,4 +1,6 @@
 #include "root.h"
+#include "headers.h"
+
 #include "ImportMetaObject.h"
 #include "ZigGlobalObject.h"
 #include "ActiveDOMObject.h"
diff --git a/src/bun.js/bindings/ImportMetaObject.h b/src/bun.js/bindings/ImportMetaObject.h
index 920d4f74f..3ce50ebbb 100644
--- a/src/bun.js/bindings/ImportMetaObject.h
+++ b/src/bun.js/bindings/ImportMetaObject.h
@@ -9,8 +9,8 @@
 #include "JSDOMWrapperCache.h"
 
 extern "C" JSC_DECLARE_HOST_FUNCTION(functionImportMeta__resolveSync);
-extern "C" JSC__JSValue Bun__resolve(JSC::JSGlobalObject* global, JSC__JSValue specifier, JSC__JSValue from);
-extern "C" JSC__JSValue Bun__resolveSync(JSC::JSGlobalObject* global, JSC__JSValue specifier, JSC__JSValue from);
+extern "C" EncodedJSValue Bun__resolve(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from);
+extern "C" EncodedJSValue Bun__resolveSync(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from);
 
 namespace Zig {
 
diff --git a/src/bun.js/bindings/JSSink.cpp b/src/bun.js/bindings/JSSink.cpp
index a93e4e298..9d3d5f16f 100644
--- a/src/bun.js/bindings/JSSink.cpp
+++ b/src/bun.js/bindings/JSSink.cpp
@@ -6,6 +6,7 @@
 //   make generate-sink
 //
 #include "root.h"
+#include "headers.h"
 #include "JSSink.h"
 
 #include "ActiveDOMObject.h"
diff --git a/src/bun.js/bindings/Path.cpp b/src/bun.js/bindings/Path.cpp
index bb8d4b887..808613b0c 100644
--- a/src/bun.js/bindings/Path.cpp
+++ b/src/bun.js/bindings/Path.cpp
@@ -1,6 +1,6 @@
 
 #include "root.h"
-
+#include "headers.h"
 #include "BunClientData.h"
 
 #include "JavaScriptCore/JSFunction.h"
diff --git a/src/bun.js/bindings/ZigConsoleClient.cpp b/src/bun.js/bindings/ZigConsoleClient.cpp
index d238c8eb7..a98c246de 100644
--- a/src/bun.js/bindings/ZigConsoleClient.cpp
+++ b/src/bun.js/bindings/ZigConsoleClient.cpp
@@ -1,4 +1,5 @@
 #include "helpers.h"
+#include "headers.h"
 
 #include "JavaScriptCore/ConsoleClient.h"
 #include "JavaScriptCore/ConsoleMessage.h"
@@ -17,7 +18,6 @@ using JSGlobalObject = JSC__JSGlobalObject;
 using String = WTF::String;
 
 extern "C" {
-
 }
 
 void Zig::ConsoleClient::messageWithTypeAndLevel(MessageType type, MessageLevel level,
diff --git a/src/bun.js/bindings/ZigGeneratedCode.cpp b/src/bun.js/bindings/ZigGeneratedCode.cpp
index d7b48aa04..29f92bab0 100644
--- a/src/bun.js/bindings/ZigGeneratedCode.cpp
+++ b/src/bun.js/bindings/ZigGeneratedCode.cpp
@@ -1,4 +1,5 @@
  #include "root.h"
+ #include "headers.h"
  
  #include <JavaScriptCore/DOMJITAbstractHeap.h>
  #include "DOMJITIDLConvert.h"
diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp
index 12401d8d1..10f76c15b 100644
--- a/src/bun.js/bindings/ZigGlobalObject.cpp
+++ b/src/bun.js/bindings/ZigGlobalObject.cpp
@@ -3690,6 +3690,61 @@ JSC::JSValue GlobalObject::moduleLoaderEvaluate(JSGlobalObject* globalObject,
     return result;
 }
 
+GlobalObject::PromiseFunctions GlobalObject::promiseHandlerID(EncodedJSValue (*handler)(JSC__JSGlobalObject* arg0, JSC__CallFrame* arg1))
+{
+    if (handler == Bun__HTTPRequestContext__onReject) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContext__onReject;
+    } else if (handler == Bun__HTTPRequestContext__onRejectStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContext__onRejectStream;
+    } else if (handler == Bun__HTTPRequestContext__onResolve) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContext__onResolve;
+    } else if (handler == Bun__HTTPRequestContext__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContext__onResolveStream;
+    } else if (handler == Bun__HTTPRequestContextTLS__onReject) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextTLS__onReject;
+    } else if (handler == Bun__HTTPRequestContextTLS__onRejectStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextTLS__onRejectStream;
+    } else if (handler == Bun__HTTPRequestContextTLS__onResolve) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextTLS__onResolve;
+    } else if (handler == Bun__HTTPRequestContextTLS__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextTLS__onResolveStream;
+    } else if (handler == Bun__HTTPRequestContextDebug__onReject) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebug__onReject;
+    } else if (handler == Bun__HTTPRequestContextDebug__onRejectStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebug__onRejectStream;
+    } else if (handler == Bun__HTTPRequestContextDebug__onResolve) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebug__onResolve;
+    } else if (handler == Bun__HTTPRequestContextDebug__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebug__onResolveStream;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onReject) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onReject;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onRejectStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onRejectStream;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolve) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolve;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
+    } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
+        return GlobalObject::PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
+    } else if (handler == jsFunctionOnLoadObjectResultResolve) {
+        return GlobalObject::PromiseFunctions::jsFunctionOnLoadObjectResultResolve;
+    } else if (handler == jsFunctionOnLoadObjectResultReject) {
+        return GlobalObject::PromiseFunctions::jsFunctionOnLoadObjectResultReject;
+    } else if (handler == Bun__TestScope__onReject) {
+        return GlobalObject::PromiseFunctions::Bun__TestScope__onReject;
+    } else if (handler == Bun__TestScope__onResolve) {
+        return GlobalObject::PromiseFunctions::Bun__TestScope__onResolve;
+    } else if (handler == CallbackJob__onResolve) {
+        return GlobalObject::PromiseFunctions::CallbackJob__onResolve;
+    } else if (handler == CallbackJob__onReject) {
+        return GlobalObject::PromiseFunctions::CallbackJob__onReject;
+    } else {
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+}
+
 #include "ZigGeneratedClasses+lazyStructureImpl.h"
 
 } // namespace Zig
diff --git a/src/bun.js/bindings/ZigGlobalObject.h b/src/bun.js/bindings/ZigGlobalObject.h
index f07c108dd..36c0356bc 100644
--- a/src/bun.js/bindings/ZigGlobalObject.h
+++ b/src/bun.js/bindings/ZigGlobalObject.h
@@ -298,60 +298,7 @@ public:
     };
     static constexpr size_t promiseFunctionsSize = 22;
 
-    static PromiseFunctions promiseHandlerID(EncodedJSValue (*handler)(JSC__JSGlobalObject* arg0, JSC__CallFrame* arg1))
-    {
-        if (handler == Bun__HTTPRequestContext__onReject) {
-            return PromiseFunctions::Bun__HTTPRequestContext__onReject;
-        } else if (handler == Bun__HTTPRequestContext__onRejectStream) {
-            return PromiseFunctions::Bun__HTTPRequestContext__onRejectStream;
-        } else if (handler == Bun__HTTPRequestContext__onResolve) {
-            return PromiseFunctions::Bun__HTTPRequestContext__onResolve;
-        } else if (handler == Bun__HTTPRequestContext__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContext__onResolveStream;
-        } else if (handler == Bun__HTTPRequestContextTLS__onReject) {
-            return PromiseFunctions::Bun__HTTPRequestContextTLS__onReject;
-        } else if (handler == Bun__HTTPRequestContextTLS__onRejectStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextTLS__onRejectStream;
-        } else if (handler == Bun__HTTPRequestContextTLS__onResolve) {
-            return PromiseFunctions::Bun__HTTPRequestContextTLS__onResolve;
-        } else if (handler == Bun__HTTPRequestContextTLS__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextTLS__onResolveStream;
-        } else if (handler == Bun__HTTPRequestContextDebug__onReject) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebug__onReject;
-        } else if (handler == Bun__HTTPRequestContextDebug__onRejectStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebug__onRejectStream;
-        } else if (handler == Bun__HTTPRequestContextDebug__onResolve) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebug__onResolve;
-        } else if (handler == Bun__HTTPRequestContextDebug__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebug__onResolveStream;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onReject) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onReject;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onRejectStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onRejectStream;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolve) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolve;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
-        } else if (handler == Bun__HTTPRequestContextDebugTLS__onResolveStream) {
-            return PromiseFunctions::Bun__HTTPRequestContextDebugTLS__onResolveStream;
-        } else if (handler == jsFunctionOnLoadObjectResultResolve) {
-            return PromiseFunctions::jsFunctionOnLoadObjectResultResolve;
-        } else if (handler == jsFunctionOnLoadObjectResultReject) {
-            return PromiseFunctions::jsFunctionOnLoadObjectResultReject;
-        } else if (handler == Bun__TestScope__onReject) {
-            return PromiseFunctions::Bun__TestScope__onReject;
-        } else if (handler == Bun__TestScope__onResolve) {
-            return PromiseFunctions::Bun__TestScope__onResolve;
-        } else if (handler == CallbackJob__onResolve) {
-            return PromiseFunctions::CallbackJob__onResolve;
-        } else if (handler == CallbackJob__onReject) {
-            return PromiseFunctions::CallbackJob__onReject;
-        } else {
-            RELEASE_ASSERT_NOT_REACHED();
-        }
-    }
+    static PromiseFunctions promiseHandlerID(EncodedJSValue (*handler)(JSC__JSGlobalObject* arg0, JSC__CallFrame* arg1));
 
     JSFunction* thenable(EncodedJSValue (*handler)(JSC__JSGlobalObject* arg0, JSC__CallFrame* arg1))
     {
@@ -507,66 +454,6 @@ private:
     WTF::Vector<JSC::Strong<JSC::JSFunction>> m_ffiFunctions;
 };
 
-class JSMicrotaskCallbackDefaultGlobal final : public RefCounted<JSMicrotaskCallbackDefaultGlobal> {
-public:
-    static Ref<JSMicrotaskCallbackDefaultGlobal> create(Ref<JSC::Microtask>&& task)
-    {
-        return adoptRef(*new JSMicrotaskCallbackDefaultGlobal(WTFMove(task).leakRef()));
-    }
-
-    void call(JSC::JSGlobalObject* globalObject)
-    {
-
-        JSC::VM& vm = globalObject->vm();
-        auto task = &m_task.leakRef();
-        task->run(globalObject);
-
-        delete this;
-    }
-
-private:
-    JSMicrotaskCallbackDefaultGlobal(Ref<JSC::Microtask>&& task)
-        : m_task { WTFMove(task) }
-    {
-    }
-
-    Ref<JSC::Microtask> m_task;
-};
-
-class JSMicrotaskCallback final : public RefCounted<JSMicrotaskCallback> {
-public:
-    static Ref<JSMicrotaskCallback> create(JSC::JSGlobalObject& globalObject,
-        Ref<JSC::Microtask>&& task)
-    {
-        return adoptRef(*new JSMicrotaskCallback(globalObject, WTFMove(task).leakRef()));
-    }
-
-    void call()
-    {
-        auto* globalObject = m_globalObject.get();
-        if (UNLIKELY(!globalObject)) {
-            delete this;
-            return;
-        }
-
-        JSC::VM& vm = m_globalObject->vm();
-        auto task = &m_task.leakRef();
-        task->run(globalObject);
-
-        delete this;
-    }
-
-private:
-    JSMicrotaskCallback(JSC::JSGlobalObject& globalObject, Ref<JSC::Microtask>&& task)
-        : m_globalObject { &globalObject }
-        , m_task { WTFMove(task) }
-    {
-    }
-
-    JSC::Weak<JSC::JSGlobalObject> m_globalObject;
-    Ref<JSC::Microtask> m_task;
-};
-
 } // namespace Zig
 
 #ifndef RENAMED_JSDOM_GLOBAL_OBJECT
diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp
index ec71c7108..eb0529e40 100644
--- a/src/bun.js/bindings/bindings.cpp
+++ b/src/bun.js/bindings/bindings.cpp
@@ -1,5 +1,7 @@
 #include "root.h"
 
+#include "headers.h"
+
 #include "BunClientData.h"
 #include "GCDefferalContext.h"
 
@@ -1460,14 +1462,74 @@ JSC__JSObject* JSC__JSString__toObject(JSC__JSString* arg0, JSC__JSGlobalObject*
 //     arg2->depen
 // }
 
+class JSMicrotaskCallbackDefaultGlobal final : public RefCounted<JSMicrotaskCallbackDefaultGlobal> {
+public:
+    static Ref<JSMicrotaskCallbackDefaultGlobal> create(Ref<JSC::Microtask>&& task)
+    {
+        return adoptRef(*new JSMicrotaskCallbackDefaultGlobal(WTFMove(task).leakRef()));
+    }
+
+    void call(JSC::JSGlobalObject* globalObject)
+    {
+
+        JSC::VM& vm = globalObject->vm();
+        auto task = &m_task.leakRef();
+        task->run(globalObject);
+
+        delete this;
+    }
+
+private:
+    JSMicrotaskCallbackDefaultGlobal(Ref<JSC::Microtask>&& task)
+        : m_task { WTFMove(task) }
+    {
+    }
+
+    Ref<JSC::Microtask> m_task;
+};
+
+class JSMicrotaskCallback final : public RefCounted<JSMicrotaskCallback> {
+public:
+    static Ref<JSMicrotaskCallback> create(JSC::JSGlobalObject& globalObject,
+        Ref<JSC::Microtask>&& task)
+    {
+        return adoptRef(*new JSMicrotaskCallback(globalObject, WTFMove(task).leakRef()));
+    }
+
+    void call()
+    {
+        auto* globalObject = m_globalObject.get();
+        if (UNLIKELY(!globalObject)) {
+            delete this;
+            return;
+        }
+
+        JSC::VM& vm = m_globalObject->vm();
+        auto task = &m_task.leakRef();
+        task->run(globalObject);
+
+        delete this;
+    }
+
+private:
+    JSMicrotaskCallback(JSC::JSGlobalObject& globalObject, Ref<JSC::Microtask>&& task)
+        : m_globalObject { &globalObject }
+        , m_task { WTFMove(task) }
+    {
+    }
+
+    JSC::Weak<JSC::JSGlobalObject> m_globalObject;
+    Ref<JSC::Microtask> m_task;
+};
+
 void Microtask__run(void* microtask, void* global)
 {
-    reinterpret_cast<Zig::JSMicrotaskCallback*>(microtask)->call();
+    reinterpret_cast<JSMicrotaskCallback*>(microtask)->call();
 }
 
 void Microtask__run_default(void* microtask, void* global)
 {
-    reinterpret_cast<Zig::JSMicrotaskCallbackDefaultGlobal*>(microtask)->call(reinterpret_cast<Zig::GlobalObject*>(global));
+    reinterpret_cast<JSMicrotaskCallbackDefaultGlobal*>(microtask)->call(reinterpret_cast<Zig::GlobalObject*>(global));
 }
 
 JSC__JSValue JSC__JSModuleLoader__evaluate(JSC__JSGlobalObject* globalObject, const unsigned char* arg1,
diff --git a/src/bun.js/bindings/header-gen.zig b/src/bun.js/bindings/header-gen.zig
index fcc0f60fd..294f0a095 100644
--- a/src/bun.js/bindings/header-gen.zig
+++ b/src/bun.js/bindings/header-gen.zig
@@ -929,6 +929,7 @@ pub fn HeaderGen(comptime first_import: type, comptime second_import: type, comp
 
             generated.writer().print(
                 \\ #include "root.h"
+                \\ #include "headers.h"
                 \\ 
                 \\ #include <JavaScriptCore/DOMJITAbstractHeap.h>
                 \\ #include "DOMJITIDLConvert.h"
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h
index 5fe2fcf1c..065fd8caa 100644
--- a/src/bun.js/bindings/headers-cpp.h
+++ b/src/bun.js/bindings/headers-cpp.h
@@ -1,4 +1,4 @@
-//-- AUTOGENERATED FILE -- 1673176089
+//-- AUTOGENERATED FILE -- 1673374722
 // clang-format off
 #pragma once
 
diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h
index 51f1ad00c..4e5dabe4e 100644
--- a/src/bun.js/bindings/headers.h
+++ b/src/bun.js/bindings/headers.h
@@ -1,5 +1,5 @@
 // clang-format off
-//-- AUTOGENERATED FILE -- 1673176089
+//-- AUTOGENERATED FILE -- 1673374722
 #pragma once
 
 #include <stddef.h>
diff --git a/src/bun.js/bindings/helpers.h b/src/bun.js/bindings/helpers.h
index da97b4797..382c760f3 100644
--- a/src/bun.js/bindings/helpers.h
+++ b/src/bun.js/bindings/helpers.h
@@ -2,16 +2,22 @@
 
 #include "root.h"
 
-#include "headers.h"
-
-#include "JavaScriptCore/Error.h"
-#include "JavaScriptCore/Exception.h"
-#include "JavaScriptCore/Identifier.h"
-#include "JavaScriptCore/JSGlobalObject.h"
-#include "JavaScriptCore/JSString.h"
-#include "JavaScriptCore/JSValueInternal.h"
-#include "JavaScriptCore/ThrowScope.h"
-#include "JavaScriptCore/VM.h"
+#include <JavaScriptCore/Error.h>
+#include <JavaScriptCore/Exception.h>
+#include <JavaScriptCore/Identifier.h>
+#include <JavaScriptCore/JSGlobalObject.h>
+#include <JavaScriptCore/JSString.h>
+#include <JavaScriptCore/JSValueInternal.h>
+#include <JavaScriptCore/ThrowScope.h>
+#include <JavaScriptCore/VM.h>
+
+using JSC__JSGlobalObject = JSC::JSGlobalObject;
+using JSC__JSValue = JSC::EncodedJSValue;
+using JSC__CallFrame = JSC::CallFrame;
+namespace Zig {
+}
+
+#include "headers-handwritten.h"
 
 template<class CppType, typename ZigType> class Wrap {
 public:
diff --git a/src/bun.js/builtins/BunBuiltinNames.h b/src/bun.js/builtins/BunBuiltinNames.h
index ba4e659ec..eb782597a 100644
--- a/src/bun.js/builtins/BunBuiltinNames.h
+++ b/src/bun.js/builtins/BunBuiltinNames.h
@@ -5,8 +5,6 @@
 #include "root.h"
 
 
-#include "helpers.h"
-
 #include "JavaScriptCore/BuiltinUtils.h"
 
 
diff --git a/src/bun.js/scripts/generate-classes.ts b/src/bun.js/scripts/generate-classes.ts
index 1a41bc146..fd9a1ed89 100644
--- a/src/bun.js/scripts/generate-classes.ts
+++ b/src/bun.js/scripts/generate-classes.ts
@@ -1677,6 +1677,7 @@ const GENERATED_CLASSES_IMPL_HEADER = `
 // GENERATED CODE - DO NOT MODIFY BY HAND
 // Generated by make codegen
 #include "root.h"
+#include "headers.h"
 
 #include "BunClientData.h"
 #include "ZigGlobalObject.h"
diff --git a/src/bun.js/scripts/generate-jssink.js b/src/bun.js/scripts/generate-jssink.js
index b9b6b2c17..57a849ba2 100644
--- a/src/bun.js/scripts/generate-jssink.js
+++ b/src/bun.js/scripts/generate-jssink.js
@@ -223,6 +223,7 @@ async function implementation() {
 //   make generate-sink
 //
 #include "root.h"
+#include "headers.h"
 #include "JSSink.h"
 
 #include "ActiveDOMObject.h"