diff options
60 files changed, 123 insertions, 163 deletions
diff --git a/.github/workflows/bun-linux-aarch64.yml b/.github/workflows/bun-linux-aarch64.yml index 89ea3622d..ef6a6260e 100644 --- a/.github/workflows/bun-linux-aarch64.yml +++ b/.github/workflows/bun-linux-aarch64.yml @@ -30,7 +30,7 @@ jobs: arch: aarch64 build_arch: arm64 runner: linux-arm64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-linux-arm64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-arm64-lto.tar.gz" webkit_basename: "bun-webkit-linux-arm64-lto" build_machine_arch: aarch64 diff --git a/.github/workflows/bun-linux-build.yml b/.github/workflows/bun-linux-build.yml index a448b3ac1..3eac15c5f 100644 --- a/.github/workflows/bun-linux-build.yml +++ b/.github/workflows/bun-linux-build.yml @@ -40,7 +40,7 @@ jobs: arch: x86_64 build_arch: amd64 runner: big-ubuntu - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-linux-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-amd64-lto.tar.gz" webkit_basename: "bun-webkit-linux-amd64-lto" build_machine_arch: x86_64 - cpu: nehalem @@ -48,7 +48,7 @@ jobs: arch: x86_64 build_arch: amd64 runner: big-ubuntu - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-linux-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-linux-amd64-lto.tar.gz" webkit_basename: "bun-webkit-linux-amd64-lto" build_machine_arch: x86_64 diff --git a/.github/workflows/bun-mac-aarch64.yml b/.github/workflows/bun-mac-aarch64.yml index f85c233a5..791116722 100644 --- a/.github/workflows/bun-mac-aarch64.yml +++ b/.github/workflows/bun-mac-aarch64.yml @@ -110,7 +110,7 @@ jobs: # obj: bun-obj-darwin-x64-baseline # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: true # compile_obj: false # - cpu: haswell @@ -119,7 +119,7 @@ jobs: # obj: bun-obj-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: true # compile_obj: false # - cpu: nehalem @@ -128,7 +128,7 @@ jobs: # obj: bun-obj-darwin-x64-baseline # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: false # compile_obj: true # - cpu: haswell @@ -137,7 +137,7 @@ jobs: # obj: bun-obj-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: false # compile_obj: true - cpu: native @@ -145,7 +145,7 @@ jobs: tag: bun-darwin-aarch64 obj: bun-obj-darwin-aarch64 artifact: bun-obj-darwin-aarch64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-arm64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz" runner: macos-arm64 dependencies: true compile_obj: true @@ -249,7 +249,7 @@ jobs: # package: bun-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # - cpu: haswell # arch: x86_64 # tag: bun-darwin-x64 @@ -257,14 +257,14 @@ jobs: # package: bun-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" - cpu: native arch: aarch64 tag: bun-darwin-aarch64 obj: bun-obj-darwin-aarch64 package: bun-darwin-aarch64 artifact: bun-obj-darwin-aarch64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-arm64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz" runner: macos-arm64 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/bun-mac-x64-baseline.yml b/.github/workflows/bun-mac-x64-baseline.yml index 7d127cab3..d8198e795 100644 --- a/.github/workflows/bun-mac-x64-baseline.yml +++ b/.github/workflows/bun-mac-x64-baseline.yml @@ -110,7 +110,7 @@ jobs: obj: bun-obj-darwin-x64-baseline runner: macos-11 artifact: bun-obj-darwin-x64-baseline - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" dependencies: true compile_obj: false # - cpu: haswell @@ -119,7 +119,7 @@ jobs: # obj: bun-obj-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: true # compile_obj: false - cpu: nehalem @@ -128,7 +128,7 @@ jobs: obj: bun-obj-darwin-x64-baseline runner: macos-11 artifact: bun-obj-darwin-x64-baseline - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" dependencies: false compile_obj: true # - cpu: haswell @@ -137,7 +137,7 @@ jobs: # obj: bun-obj-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: false # compile_obj: true # - cpu: native @@ -145,7 +145,7 @@ jobs: # tag: bun-darwin-aarch64 # obj: bun-obj-darwin-aarch64 # artifact: bun-obj-darwin-aarch64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # runner: macos-arm64 # dependencies: true # compile_obj: true @@ -250,7 +250,7 @@ jobs: package: bun-darwin-x64 runner: macos-11 artifact: bun-obj-darwin-x64-baseline - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # - cpu: haswell # arch: x86_64 # tag: bun-darwin-x64 @@ -258,14 +258,14 @@ jobs: # package: bun-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # - cpu: native # arch: aarch64 # tag: bun-darwin-aarch64 # obj: bun-obj-darwin-aarch64 # package: bun-darwin-aarch64 # artifact: bun-obj-darwin-aarch64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # runner: macos-arm64 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/bun-mac-x64.yml b/.github/workflows/bun-mac-x64.yml index 0d690916a..b46d29598 100644 --- a/.github/workflows/bun-mac-x64.yml +++ b/.github/workflows/bun-mac-x64.yml @@ -110,7 +110,7 @@ jobs: # obj: bun-obj-darwin-x64-baseline # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: true # compile_obj: false - cpu: haswell @@ -119,7 +119,7 @@ jobs: obj: bun-obj-darwin-x64 runner: macos-11 artifact: bun-obj-darwin-x64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" dependencies: true compile_obj: false # - cpu: nehalem @@ -128,7 +128,7 @@ jobs: # obj: bun-obj-darwin-x64-baseline # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # dependencies: false # compile_obj: true - cpu: haswell @@ -137,7 +137,7 @@ jobs: obj: bun-obj-darwin-x64 runner: macos-11 artifact: bun-obj-darwin-x64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" dependencies: false compile_obj: true # - cpu: native @@ -145,7 +145,7 @@ jobs: # tag: bun-darwin-aarch64 # obj: bun-obj-darwin-aarch64 # artifact: bun-obj-darwin-aarch64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-arm64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz" # runner: macos-arm64 # dependencies: true # compile_obj: true @@ -252,7 +252,7 @@ jobs: # package: bun-darwin-x64 # runner: macos-11 # artifact: bun-obj-darwin-x64-baseline - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" - cpu: haswell arch: x86_64 tag: bun-darwin-x64 @@ -260,14 +260,14 @@ jobs: package: bun-darwin-x64 runner: macos-11 artifact: bun-obj-darwin-x64 - webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-amd64-lto.tar.gz" + webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-amd64-lto.tar.gz" # - cpu: native # arch: aarch64 # tag: bun-darwin-aarch64 # obj: bun-obj-darwin-aarch64 # package: bun-darwin-aarch64 # artifact: bun-obj-darwin-aarch64 - # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/feb25/bun-webkit-macos-arm64-lto.tar.gz" + # webkit_url: "https://github.com/oven-sh/WebKit/releases/download/apr12-23/bun-webkit-macos-arm64-lto.tar.gz" # runner: macos-arm64 steps: - uses: actions/checkout@v3 diff --git a/.scripts/postinstall.sh b/.scripts/postinstall.sh index 3de8d5a29..05ecb3203 100755 --- a/.scripts/postinstall.sh +++ b/.scripts/postinstall.sh @@ -9,4 +9,5 @@ if [ -d ./node_modules/bun-webkit ]; then fi # sets up vscode C++ intellisense +rm -f .vscode/clang++ ln -s $(which clang++-15 || which clang++) .vscode/clang++ 2>/dev/null @@ -1109,10 +1109,10 @@ jsc-copy-headers: cp $(WEBKIT_DIR)/Source/JavaScriptCore/runtime/JSModuleNamespaceObject.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/JSModuleNamespaceObject.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/jit/JIT.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/JIT.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/StructureStubInfo.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/StructureStubInfo.h - cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/PolymorphicAccess.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/PolymorphicAccess.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/AccessCase.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/AccessCase.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/ObjectPropertyConditionSet.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/ObjectPropertyConditionSet.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/PolyProtoAccessChain.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/PolyProtoAccessChain.h + cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/InlineCacheCompiler.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/InlineCacheCompiler.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/PutKind.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/PutKind.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/StructureStubClearingWatchpoint.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/StructureStubClearingWatchpoint.h cp $(WEBKIT_DIR)/Source/JavaScriptCore/bytecode/AdaptiveInferredPropertyValueWatchpointBase.h $(WEBKIT_RELEASE_DIR)/JavaScriptCore/PrivateHeaders/JavaScriptCore/AdaptiveInferredPropertyValueWatchpointBase.h Binary files differdiff --git a/package.json b/package.json index 5045530dc..edd7d8003 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@types/react": "^18.0.25", "@typescript-eslint/eslint-plugin": "^5.31.0", "@typescript-eslint/parser": "^5.31.0", - "bun-webkit": "0.0.1-595dd33692e02001631f6c3ab6f2bbb199278d26" + "bun-webkit": "0.0.1-6bd997e38e30f50b3114b178f4d5e2fc5da6da25" }, "version": "0.0.0", "prettier": "./.prettierrc.cjs" diff --git a/src/bun.js/WebKit b/src/bun.js/WebKit -Subproject a74bf4b5fc4d87e25b935c843ab906e8d6f3d89 +Subproject a310140b2d16813a5b321cb88a3c48e14939bb2 diff --git a/src/bun.js/bindings/BunPlugin.cpp b/src/bun.js/bindings/BunPlugin.cpp index 6090ea7c0..ea1963c08 100644 --- a/src/bun.js/bindings/BunPlugin.cpp +++ b/src/bun.js/bindings/BunPlugin.cpp @@ -15,6 +15,8 @@ #include "JavaScriptCore/ObjectConstructor.h" #include "JavaScriptCore/SubspaceInlines.h" #include "JavaScriptCore/RegExpObject.h" +#include "JavaScriptCore/JSPromise.h" +#include "BunClientData.h" #include "JavaScriptCore/RegularExpression.h" diff --git a/src/bun.js/bindings/CallSite.h b/src/bun.js/bindings/CallSite.h index fe6b8ef5e..432725b8a 100644 --- a/src/bun.js/bindings/CallSite.h +++ b/src/bun.js/bindings/CallSite.h @@ -8,6 +8,7 @@ #include "ErrorStackTrace.h" #include <JavaScriptCore/JSObject.h> +#include "BunClientData.h" using namespace JSC; using namespace WebCore; diff --git a/src/bun.js/bindings/ImportMetaObject.h b/src/bun.js/bindings/ImportMetaObject.h index b9b7cce77..f43d01899 100644 --- a/src/bun.js/bindings/ImportMetaObject.h +++ b/src/bun.js/bindings/ImportMetaObject.h @@ -9,9 +9,9 @@ #include "JSDOMWrapperCache.h" extern "C" JSC_DECLARE_HOST_FUNCTION(functionImportMeta__resolveSync); -extern "C" EncodedJSValue Bun__resolve(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from, bool is_esm); -extern "C" EncodedJSValue Bun__resolveSync(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from, bool is_esm); -extern "C" EncodedJSValue Bun__resolveSyncWithSource(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, ZigString* from, bool is_esm); +extern "C" JSC::EncodedJSValue Bun__resolve(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from, bool is_esm); +extern "C" JSC::EncodedJSValue Bun__resolveSync(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, JSC::EncodedJSValue from, bool is_esm); +extern "C" JSC::EncodedJSValue Bun__resolveSyncWithSource(JSC::JSGlobalObject* global, JSC::EncodedJSValue specifier, ZigString* from, bool is_esm); namespace Zig { diff --git a/src/bun.js/bindings/JSBuffer.cpp b/src/bun.js/bindings/JSBuffer.cpp index 9b3854b95..9d66fa1db 100644 --- a/src/bun.js/bindings/JSBuffer.cpp +++ b/src/bun.js/bindings/JSBuffer.cpp @@ -56,6 +56,9 @@ // #include "JavaScriptCore/JSTypedArrayViewPrototype.h" #include "JavaScriptCore/JSArrayBufferViewInlines.h" +using namespace JSC; +using namespace WebCore; + JSC_DECLARE_HOST_FUNCTION(constructJSBuffer); static JSC_DECLARE_HOST_FUNCTION(jsBufferConstructorFunction_alloc); @@ -2172,5 +2175,5 @@ bool JSBuffer__isBuffer(JSC::JSGlobalObject* lexicalGlobalObject, JSC::EncodedJS return false; JSValue prototype = cell->getPrototype(vm, lexicalGlobalObject); - return prototype.inherits<JSBufferPrototype>(); + return prototype.inherits<WebCore::JSBufferPrototype>(); }
\ No newline at end of file diff --git a/src/bun.js/bindings/JSBufferList.cpp b/src/bun.js/bindings/JSBufferList.cpp index 504f662c8..409d50df6 100644 --- a/src/bun.js/bindings/JSBufferList.cpp +++ b/src/bun.js/bindings/JSBufferList.cpp @@ -5,6 +5,7 @@ #include "ZigGlobalObject.h" #include "JSDOMOperation.h" #include "headers.h" +#include "BunClientData.h" namespace WebCore { diff --git a/src/bun.js/bindings/JSEnvironmentVariableMap.cpp b/src/bun.js/bindings/JSEnvironmentVariableMap.cpp index 03c94d351..b90d9f44c 100644 --- a/src/bun.js/bindings/JSEnvironmentVariableMap.cpp +++ b/src/bun.js/bindings/JSEnvironmentVariableMap.cpp @@ -5,12 +5,16 @@ #include "JavaScriptCore/JSObject.h" #include "JavaScriptCore/ObjectConstructor.h" +#include "BunClientData.h" +using namespace JSC; extern "C" size_t Bun__getEnvNames(JSGlobalObject*, ZigString* names, size_t max); extern "C" bool Bun__getEnvValue(JSGlobalObject* globalObject, ZigString* name, ZigString* value); namespace Bun { +using namespace WebCore; + JSC_DEFINE_CUSTOM_GETTER(jsGetterEnvironmentVariable, (JSGlobalObject * globalObject, EncodedJSValue thisValue, PropertyName propertyName)) { VM& vm = globalObject->vm(); diff --git a/src/bun.js/bindings/JSReadableHelper.cpp b/src/bun.js/bindings/JSReadableHelper.cpp index 271bfb358..3a4de4637 100644 --- a/src/bun.js/bindings/JSReadableHelper.cpp +++ b/src/bun.js/bindings/JSReadableHelper.cpp @@ -12,6 +12,8 @@ #include "headers.h" #include "JSDOMConvertEnumeration.h" #include "JavaScriptCore/StrongInlines.h" +#include "BunClientData.h" + namespace WebCore { using namespace JSC; diff --git a/src/bun.js/bindings/JSReadableState.cpp b/src/bun.js/bindings/JSReadableState.cpp index d10556038..d09e30d44 100644 --- a/src/bun.js/bindings/JSReadableState.cpp +++ b/src/bun.js/bindings/JSReadableState.cpp @@ -8,6 +8,7 @@ #include "JSDOMAttribute.h" #include "headers.h" #include "JSDOMConvertEnumeration.h" +#include "BunClientData.h" namespace WebCore { diff --git a/src/bun.js/bindings/JSSink.cpp b/src/bun.js/bindings/JSSink.cpp index 3459a2b7e..c86d775dd 100644 --- a/src/bun.js/bindings/JSSink.cpp +++ b/src/bun.js/bindings/JSSink.cpp @@ -7,6 +7,8 @@ // #include "root.h" #include "headers.h" +#include "BunClientData.h" + #include "JSSink.h" #include "ActiveDOMObject.h" diff --git a/src/bun.js/bindings/JSStringDecoder.cpp b/src/bun.js/bindings/JSStringDecoder.cpp index 2bbebfbbe..5ec258522 100644 --- a/src/bun.js/bindings/JSStringDecoder.cpp +++ b/src/bun.js/bindings/JSStringDecoder.cpp @@ -8,6 +8,7 @@ #include "headers.h" #include "JSDOMConvertEnumeration.h" #include "JavaScriptCore/JSArrayBufferView.h" +#include "BunClientData.h" namespace WebCore { diff --git a/src/bun.js/bindings/Process.cpp b/src/bun.js/bindings/Process.cpp index ed7992b41..ad8e5d073 100644 --- a/src/bun.js/bindings/Process.cpp +++ b/src/bun.js/bindings/Process.cpp @@ -1,6 +1,7 @@ #include "Process.h" #include "JavaScriptCore/JSMicrotask.h" #include "JavaScriptCore/ObjectConstructor.h" +#include "JavaScriptCore/NumberPrototype.h" #include "node_api.h" #include <dlfcn.h> #include "ZigGlobalObject.h" @@ -8,6 +9,7 @@ #include "JSEnvironmentVariableMap.h" #include "ImportMetaObject.h" #include <sys/stat.h> +#include "ZigConsoleClient.h" #pragma mark - Node.js Process namespace Zig { diff --git a/src/bun.js/bindings/ZigGlobalObject.cpp b/src/bun.js/bindings/ZigGlobalObject.cpp index 303be6190..b969acf4c 100644 --- a/src/bun.js/bindings/ZigGlobalObject.cpp +++ b/src/bun.js/bindings/ZigGlobalObject.cpp @@ -1,7 +1,8 @@ #include "root.h" #include "ZigGlobalObject.h" - +#include <JavaScriptCore/GlobalObjectMethodTable.h> #include "helpers.h" +#include "BunClientData.h" #include "JavaScriptCore/AggregateError.h" #include "JavaScriptCore/BytecodeIndex.h" @@ -54,7 +55,6 @@ #include "JavaScriptCore/StackFrame.h" #include "JavaScriptCore/StackVisitor.h" #include "JavaScriptCore/VM.h" -#include "JavaScriptCore/VMEntryScope.h" #include "JavaScriptCore/WasmFaultSignalHandler.h" #include "wtf/Gigacage.h" #include "wtf/URL.h" @@ -111,6 +111,8 @@ #include "JavaScriptCore/DateInstance.h" #include "BunPlugin.h" +#include "JSEnvironmentVariableMap.h" +#include "DOMIsoSubspaces.h" #if ENABLE(REMOTE_INSPECTOR) #include "JavaScriptCore/RemoteInspectorServer.h" @@ -169,6 +171,11 @@ namespace JSCastingHelpers = JSC::JSCastingHelpers; #include "JSDOMFormData.h" +#include "ErrorStackTrace.h" +#include "CallSite.h" +#include "CallSitePrototype.h" +#include "DOMWrapperWorld-class.h" + constexpr size_t DEFAULT_ERROR_STACK_TRACE_LIMIT = 10; #ifdef __APPLE__ @@ -195,7 +202,7 @@ extern "C" void JSCInitialize(const char* envp[], size_t envc, void (*onCrash)(c JSC::Options::AllowUnfinalizedAccessScope scope; JSC::Options::useConcurrentJIT() = true; - JSC::Options::useSigillCrashAnalyzer() = true; + // JSC::Options::useSigillCrashAnalyzer() = true; JSC::Options::useWebAssembly() = true; JSC::Options::useSourceProviderCache() = true; // JSC::Options::useUnlinkedCodeBlockJettisoning() = false; @@ -3082,6 +3089,17 @@ JSC_DEFINE_HOST_FUNCTION(functionGetDirectStreamDetails, (JSC::JSGlobalObject * return JSC::JSValue::encode(resultObject); } +JSC::GCClient::IsoSubspace* GlobalObject::subspaceForImpl(JSC::VM& vm) +{ + return WebCore::subspaceForImpl<GlobalObject, WebCore::UseCustomHeapCellType::Yes>( + vm, + [](auto& spaces) { return spaces.m_clientSubspaceForWorkerGlobalScope.get(); }, + [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, + [](auto& spaces) { return spaces.m_subspaceForWorkerGlobalScope.get(); }, + [](auto& spaces, auto&& space) { spaces.m_subspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, + [](auto& server) -> JSC::HeapCellType& { return server.m_heapCellTypeForJSWorkerGlobalScope; }); +} + void GlobalObject::addBuiltinGlobals(JSC::VM& vm) { m_builtinInternalFunctions.initialize(*this); diff --git a/src/bun.js/bindings/ZigGlobalObject.h b/src/bun.js/bindings/ZigGlobalObject.h index cad68f79a..0bdfd1d82 100644 --- a/src/bun.js/bindings/ZigGlobalObject.h +++ b/src/bun.js/bindings/ZigGlobalObject.h @@ -1,3 +1,6 @@ +// This header is included in nearly every file. +// Be very cautious of sticking your #include in this file. +// TODO: rename this to BunGlobalObject #pragma once #ifndef ZIG_GLOBAL_OBJECT @@ -10,41 +13,38 @@ class LazyClassStructure; } // namespace JSC +namespace JSC { + +enum class JSPromiseRejectionOperation : unsigned; + +} + namespace WebCore { class ScriptExecutionContext; class DOMGuardedObject; class EventLoopTask; +class DOMWrapperWorld; } #include "root.h" #include "headers-handwritten.h" -#include "BunClientData.h" #include "JavaScriptCore/CatchScope.h" #include "JavaScriptCore/JSGlobalObject.h" #include "JavaScriptCore/JSTypeInfo.h" #include "JavaScriptCore/Structure.h" #include "WebCoreJSBuiltinInternals.h" -#include "JSEnvironmentVariableMap.h" - -#include "ZigConsoleClient.h" #include "DOMConstructors.h" -#include "DOMWrapperWorld-class.h" -#include "DOMIsoSubspaces.h" #include "BunPlugin.h" -#include "ErrorStackTrace.h" -#include "CallSite.h" -#include "CallSitePrototype.h" - namespace WebCore { class SubtleCrypto; } extern "C" void Bun__reportError(JSC__JSGlobalObject*, JSC__JSValue); -extern "C" void Bun__reportUnhandledError(JSGlobalObject*, EncodedJSValue); +extern "C" void Bun__reportUnhandledError(JSC__JSGlobalObject*, JSC::EncodedJSValue); // defined in ModuleLoader.cpp extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultResolve(JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame); extern "C" JSC::EncodedJSValue jsFunctionOnLoadObjectResultReject(JSC::JSGlobalObject* globalObject, JSC::CallFrame* callFrame); @@ -82,18 +82,13 @@ public: static const JSC::ClassInfo s_info; static const JSC::GlobalObjectMethodTable s_globalObjectMethodTable; - template<typename, SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm) + template<typename, JSC::SubspaceAccess mode> static JSC::GCClient::IsoSubspace* subspaceFor(JSC::VM& vm) { if constexpr (mode == JSC::SubspaceAccess::Concurrently) return nullptr; - return WebCore::subspaceForImpl<GlobalObject, WebCore::UseCustomHeapCellType::Yes>( - vm, - [](auto& spaces) { return spaces.m_clientSubspaceForWorkerGlobalScope.get(); }, - [](auto& spaces, auto&& space) { spaces.m_clientSubspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, - [](auto& spaces) { return spaces.m_subspaceForWorkerGlobalScope.get(); }, - [](auto& spaces, auto&& space) { spaces.m_subspaceForWorkerGlobalScope = std::forward<decltype(space)>(space); }, - [](auto& server) -> JSC::HeapCellType& { return server.m_heapCellTypeForJSWorkerGlobalScope; }); + return subspaceForImpl(vm); } + static JSC::GCClient::IsoSubspace* subspaceForImpl(JSC::VM& vm); ~GlobalObject(); static void destroy(JSC::JSCell*); diff --git a/src/bun.js/bindings/ZigSourceProvider.h b/src/bun.js/bindings/ZigSourceProvider.h index cd45a0217..5219bd2c1 100644 --- a/src/bun.js/bindings/ZigSourceProvider.h +++ b/src/bun.js/bindings/ZigSourceProvider.h @@ -65,7 +65,7 @@ private: SourceProvider(ResolvedSource resolvedSource, WTF::StringImpl& sourceImpl, const SourceOrigin& sourceOrigin, WTF::String&& sourceURL, const TextPosition& startPosition, JSC::SourceProviderSourceType sourceType) - : Base(sourceOrigin, WTFMove(sourceURL), startPosition, sourceType) + : Base(sourceOrigin, WTFMove(sourceURL), String(), startPosition, sourceType) , m_source(sourceImpl) { diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index 450c9bc28..0d4416535 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -153,11 +153,7 @@ static bool canPerformFastPropertyEnumerationForIterationBun(Structure* s) // https://bugs.webkit.org/show_bug.cgi?id=185358 if (hasIndexedProperties(s->indexingType())) return false; - if (s->hasGetterSetterProperties()) - return false; - if (s->hasReadOnlyOrGetterSetterPropertiesExcludingProto()) - return false; - if (s->hasCustomGetterSetterProperties()) + if (s->hasAnyKindOfGetterSetterProperties()) return false; if (s->isUncacheableDictionary()) return false; diff --git a/src/bun.js/bindings/blob.h b/src/bun.js/bindings/blob.h index 83d6ff3af..51e786ce0 100644 --- a/src/bun.js/bindings/blob.h +++ b/src/bun.js/bindings/blob.h @@ -2,6 +2,7 @@ #include "root.h" #include "JSDOMGlobalObject.h" +#include "BunClientData.h" namespace WebCore { diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h index dafdaed17..2b9349144 100644 --- a/src/bun.js/bindings/headers-cpp.h +++ b/src/bun.js/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1679200292 +//-- AUTOGENERATED FILE -- 1681365101 // clang-format off #pragma once diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h index 5c727f397..fbf902a8a 100644 --- a/src/bun.js/bindings/headers.h +++ b/src/bun.js/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format off -//-- AUTOGENERATED FILE -- 1679530947 +//-- AUTOGENERATED FILE -- 1681365101 #pragma once #include <stddef.h> diff --git a/src/bun.js/bindings/webcore/JSErrorHandler.cpp b/src/bun.js/bindings/webcore/JSErrorHandler.cpp index ee5df32b5..0b8b5ca90 100644 --- a/src/bun.js/bindings/webcore/JSErrorHandler.cpp +++ b/src/bun.js/bindings/webcore/JSErrorHandler.cpp @@ -42,7 +42,6 @@ // #include "JSExecState.h" // #include "JSExecStateInstrumentation.h" #include <JavaScriptCore/JSLock.h> -#include <JavaScriptCore/VMEntryScope.h> #include <wtf/Ref.h> namespace WebCore { @@ -101,7 +100,6 @@ void JSErrorHandler::handleEvent(ScriptExecutionContext& scriptExecutionContext, ASSERT(!args.hasOverflowed()); VM& vm = globalObject->vm(); - VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : globalObject); // JSExecState::instrumentFunction(&scriptExecutionContext, callData); diff --git a/src/bun.js/bindings/webcore/JSEventEmitterCustom.cpp b/src/bun.js/bindings/webcore/JSEventEmitterCustom.cpp index fd2a61822..1f4e84780 100644 --- a/src/bun.js/bindings/webcore/JSEventEmitterCustom.cpp +++ b/src/bun.js/bindings/webcore/JSEventEmitterCustom.cpp @@ -15,6 +15,7 @@ #include "JSDOMConvertNumbers.h" #include "JSDOMConvertSequences.h" #include "JSDOMConvertStrings.h" +#include "BunClientData.h" namespace WebCore { using namespace JSC; diff --git a/src/bun.js/bindings/webcore/JSEventListener.cpp b/src/bun.js/bindings/webcore/JSEventListener.cpp index 3d6be9cd0..7da394eae 100644 --- a/src/bun.js/bindings/webcore/JSEventListener.cpp +++ b/src/bun.js/bindings/webcore/JSEventListener.cpp @@ -38,7 +38,6 @@ // #include "WorkerGlobalScope.h" #include <JavaScriptCore/ExceptionHelpers.h> #include <JavaScriptCore/JSLock.h> -#include <JavaScriptCore/VMEntryScope.h> #include <JavaScriptCore/Watchdog.h> #include <wtf/Ref.h> #include <wtf/Scope.h> @@ -208,8 +207,6 @@ void JSEventListener::handleEvent(ScriptExecutionContext& scriptExecutionContext args.append(toJS(lexicalGlobalObject, globalObject, &event)); ASSERT(!args.hasOverflowed()); - VMEntryScope entryScope(vm, vm.entryScope ? vm.entryScope->globalObject() : lexicalGlobalObject); - // JSExecState::instrumentFunction(&scriptExecutionContext, callData); JSValue thisValue = handleEventFunction == jsFunction ? toJS(lexicalGlobalObject, globalObject, event.currentTarget()) : jsFunction; diff --git a/src/bun.js/bindings/webcore/JSTextEncoder.cpp b/src/bun.js/bindings/webcore/JSTextEncoder.cpp index 628516c05..5d764619b 100644 --- a/src/bun.js/bindings/webcore/JSTextEncoder.cpp +++ b/src/bun.js/bindings/webcore/JSTextEncoder.cpp @@ -61,6 +61,7 @@ #include "DOMJITIDLTypeFilter.h" #include "DOMJITHelpers.h" #include <JavaScriptCore/DFGAbstractHeap.h> +#include "BunClientData.h" namespace WebCore { using namespace JSC; diff --git a/src/bun.js/bindings/webcore/ReadableStreamSink.cpp b/src/bun.js/bindings/webcore/ReadableStreamSink.cpp index 960756a28..ff2f1ebe3 100644 --- a/src/bun.js/bindings/webcore/ReadableStreamSink.cpp +++ b/src/bun.js/bindings/webcore/ReadableStreamSink.cpp @@ -48,7 +48,7 @@ void ReadableStreamToSharedBufferSink::enqueue(const BufferSource& buffer) return; if (m_callback) { - Span chunk { buffer.data(), buffer.length() }; + Span<const uint8_t> chunk { buffer.data(), buffer.length() }; m_callback(&chunk); } } diff --git a/src/bun.js/bindings/webcore/SharedBuffer.h b/src/bun.js/bindings/webcore/SharedBuffer.h index 2c5051dab..5c2e70486 100644 --- a/src/bun.js/bindings/webcore/SharedBuffer.h +++ b/src/bun.js/bindings/webcore/SharedBuffer.h @@ -296,7 +296,7 @@ public: WEBCORE_EXPORT const uint8_t *data() const; const char *dataAsCharPtr() const { return reinterpret_cast<const char *>(data()); } - Span<const uint8_t> dataAsSpanForContiguousData() const { return Span(data(), isContiguous() ? size() : 0); } + Span<const uint8_t> dataAsSpanForContiguousData() const { return Span<const uint8_t>(data(), isContiguous() ? size() : 0); } WTF::Persistence::Decoder decoder() const; enum class MayUseFileMapping : bool { No, diff --git a/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp b/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp index 8fb7fb19c..6cc8f64fe 100644 --- a/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp +++ b/src/bun.js/builtins/WebCoreJSBuiltinInternals.cpp @@ -42,10 +42,7 @@ namespace Zig { class GlobalObject; } #include "JSDOMGlobalObject.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> -#include <JavaScriptCore/JSCJSValueInlines.h> #include <JavaScriptCore/JSObjectInlines.h> -#include <JavaScriptCore/SlotVisitorInlines.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp index 3bec31ac7..bea8d88c3 100644 --- a/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ByteLengthQueuingStrategyBuiltins.cpp @@ -37,13 +37,10 @@ #include "ByteLengthQueuingStrategyBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ConsoleObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ConsoleObjectBuiltins.cpp index 7d4fc6e2e..3c00ec702 100644 --- a/src/bun.js/builtins/cpp/ConsoleObjectBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ConsoleObjectBuiltins.cpp @@ -37,13 +37,10 @@ #include "ConsoleObjectBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp index ed428601a..10ec153ba 100644 --- a/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp +++ b/src/bun.js/builtins/cpp/CountQueuingStrategyBuiltins.cpp @@ -37,13 +37,10 @@ #include "CountQueuingStrategyBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp index a9ce25b04..ca1efe026 100644 --- a/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ImportMetaObjectBuiltins.cpp @@ -37,13 +37,10 @@ #include "ImportMetaObjectBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp index 958126784..11b3325dc 100644 --- a/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp +++ b/src/bun.js/builtins/cpp/JSBufferConstructorBuiltins.cpp @@ -37,13 +37,10 @@ #include "JSBufferConstructorBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp index 1ce441bb6..0b13457e4 100644 --- a/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp +++ b/src/bun.js/builtins/cpp/JSBufferPrototypeBuiltins.cpp @@ -37,13 +37,10 @@ #include "JSBufferPrototypeBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ProcessObjectInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/ProcessObjectInternalsBuiltins.cpp index bd496deff..63882fd9a 100644 --- a/src/bun.js/builtins/cpp/ProcessObjectInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ProcessObjectInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "ProcessObjectInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp index 3b38a593b..b55d1782a 100644 --- a/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableByteStreamControllerBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableByteStreamControllerBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp index f1732e48e..9b5d31790 100644 --- a/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableByteStreamInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableByteStreamInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp index 46dcf7f4e..28893061f 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBReaderBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamBYOBReaderBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp index 5e0cf16d4..30ff7eea1 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamBYOBRequestBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamBYOBRequestBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp index fe309eb9a..c8d329052 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp index 185d6cdee..27fcaba83 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultControllerBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamDefaultControllerBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp index 24b91037b..b8f617978 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamDefaultReaderBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamDefaultReaderBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp index 1b15e84e1..40f421b56 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "ReadableStreamInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp index 7a1f7f098..7663e93ef 100644 --- a/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/StreamInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "StreamInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp index 82319d8b9..ee31dd1aa 100644 --- a/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp +++ b/src/bun.js/builtins/cpp/TransformStreamBuiltins.cpp @@ -37,13 +37,10 @@ #include "TransformStreamBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp index aae09e51d..3584e70ef 100644 --- a/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp +++ b/src/bun.js/builtins/cpp/TransformStreamDefaultControllerBuiltins.cpp @@ -37,13 +37,10 @@ #include "TransformStreamDefaultControllerBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp index 2a0c48fa3..7a89bff99 100644 --- a/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/TransformStreamInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "TransformStreamInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp index fed47de16..90d672297 100644 --- a/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp +++ b/src/bun.js/builtins/cpp/WritableStreamDefaultControllerBuiltins.cpp @@ -37,13 +37,10 @@ #include "WritableStreamDefaultControllerBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp index 4a2088728..580e85d6f 100644 --- a/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp +++ b/src/bun.js/builtins/cpp/WritableStreamDefaultWriterBuiltins.cpp @@ -37,13 +37,10 @@ #include "WritableStreamDefaultWriterBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp index 73df2027d..44c3e05a4 100644 --- a/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp +++ b/src/bun.js/builtins/cpp/WritableStreamInternalsBuiltins.cpp @@ -37,13 +37,10 @@ #include "WritableStreamInternalsBuiltins.h" #include "WebCoreJSClientData.h" -#include <JavaScriptCore/HeapInlines.h> #include <JavaScriptCore/IdentifierInlines.h> #include <JavaScriptCore/ImplementationVisibility.h> #include <JavaScriptCore/Intrinsic.h> -#include <JavaScriptCore/JSCJSValueInlines.h> -#include <JavaScriptCore/JSCellInlines.h> -#include <JavaScriptCore/StructureInlines.h> +#include <JavaScriptCore/JSObjectInlines.h> #include <JavaScriptCore/VM.h> namespace WebCore { diff --git a/src/bun.js/modules/NodeModuleModule.cpp b/src/bun.js/modules/NodeModuleModule.cpp index eee9460ae..f11277709 100644 --- a/src/bun.js/modules/NodeModuleModule.cpp +++ b/src/bun.js/modules/NodeModuleModule.cpp @@ -29,7 +29,7 @@ JSC_DEFINE_HOST_FUNCTION(jsFunctionNodeModuleCreateRequire, auto nameStr = jsCast<JSFunction *>(requireFunction)->name(vm); JSC::JSBoundFunction *boundRequireFunction = JSC::JSBoundFunction::create(vm, globalObject, requireFunction, meta, - nullptr, 0, jsString(vm, nameStr)); + ArgList(), 0, jsString(vm, nameStr)); boundRequireFunction->putDirect( vm, clientData->builtinNames().resolvePublicName(), requireFunction->getDirect( diff --git a/src/bun.js/scripts/generate-jssink.js b/src/bun.js/scripts/generate-jssink.js index 292686923..4c34d9222 100644 --- a/src/bun.js/scripts/generate-jssink.js +++ b/src/bun.js/scripts/generate-jssink.js @@ -218,6 +218,8 @@ async function implementation() { // #include "root.h" #include "headers.h" +#include "BunClientData.h" + #include "JSSink.h" #include "ActiveDOMObject.h" diff --git a/test/js/node/net/node-net-server.test.ts b/test/js/node/net/node-net-server.test.ts index 88a77526c..f28513086 100644 --- a/test/js/node/net/node-net-server.test.ts +++ b/test/js/node/net/node-net-server.test.ts @@ -490,7 +490,7 @@ describe("tls.createServer events", () => { }); }); - it("should echo data", done => { + it.skip("should echo data", done => { const { mustCall, mustNotCall } = createCallCheckCtx(done); let timeout: Timer; let client: any = null; |