diff options
author | 2022-12-28 04:24:07 -0800 | |
---|---|---|
committer | 2022-12-28 04:24:07 -0800 | |
commit | 66234d9d575f71e190a2916f5326480db85c5160 (patch) | |
tree | 94c45a0cba8c700dc57610c471184dd0fddd6808 /src/bun.js | |
parent | 3d60b870ee0d206d79eb4dda22dec7da55d91184 (diff) | |
download | bun-66234d9d575f71e190a2916f5326480db85c5160.tar.gz bun-66234d9d575f71e190a2916f5326480db85c5160.tar.zst bun-66234d9d575f71e190a2916f5326480db85c5160.zip |
Move some code up
Diffstat (limited to 'src/bun.js')
-rw-r--r-- | src/bun.js/bindings/headers-cpp.h | 2 | ||||
-rw-r--r-- | src/bun.js/bindings/headers.h | 2 | ||||
-rw-r--r-- | src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp | 13 | ||||
-rw-r--r-- | src/bun.js/builtins/js/ReadableStream.js | 11 |
4 files changed, 11 insertions, 17 deletions
diff --git a/src/bun.js/bindings/headers-cpp.h b/src/bun.js/bindings/headers-cpp.h index 1c2fe28e5..ef5d7718b 100644 --- a/src/bun.js/bindings/headers-cpp.h +++ b/src/bun.js/bindings/headers-cpp.h @@ -1,4 +1,4 @@ -//-- AUTOGENERATED FILE -- 1672085644 +//-- AUTOGENERATED FILE -- 1672229965 // clang-format off #pragma once diff --git a/src/bun.js/bindings/headers.h b/src/bun.js/bindings/headers.h index 6bb3a6fb5..353b07c89 100644 --- a/src/bun.js/bindings/headers.h +++ b/src/bun.js/bindings/headers.h @@ -1,5 +1,5 @@ // clang-format off -//-- AUTOGENERATED FILE -- 1672085644 +//-- AUTOGENERATED FILE -- 1672229965 #pragma once #include <stddef.h> diff --git a/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp index e83da8d67..fe309eb9a 100644 --- a/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp +++ b/src/bun.js/builtins/cpp/ReadableStreamBuiltins.cpp @@ -479,14 +479,17 @@ const char* const s_readableStreamPipeThroughCode = const JSC::ConstructAbility s_readableStreamPipeToCodeConstructAbility = JSC::ConstructAbility::CannotConstruct; const JSC::ConstructorKind s_readableStreamPipeToCodeConstructorKind = JSC::ConstructorKind::None; const JSC::ImplementationVisibility s_readableStreamPipeToCodeImplementationVisibility = JSC::ImplementationVisibility::Public; -const int s_readableStreamPipeToCodeLength = 1624; +const int s_readableStreamPipeToCodeLength = 1522; static const JSC::Intrinsic s_readableStreamPipeToCodeIntrinsic = JSC::NoIntrinsic; const char* const s_readableStreamPipeToCode = "(function (destination)\n" \ "{\n" \ " \"use strict\";\n" \ " if (!@isReadableStream(this))\n" \ - " throw @makeTypeError(\"readable should be ReadableStream\");\n" \ + " return @Promise.@reject(@makeThisTypeError(\"ReadableStream\", \"pipeTo\"));\n" \ + "\n" \ + " if (@isReadableStreamLocked(this))\n" \ + " return @Promise.@reject(@makeTypeError(\"ReadableStream is locked\"));\n" \ "\n" \ " //\n" \ " //\n" \ @@ -518,12 +521,6 @@ const char* const s_readableStreamPipeToCode = " if (!@isWritableStream(internalDestination))\n" \ " return @Promise.@reject(@makeTypeError(\"ReadableStream pipeTo requires a WritableStream\"));\n" \ "\n" \ - " if (!@isReadableStream(this))\n" \ - " return @Promise.@reject(@makeThisTypeError(\"ReadableStream\", \"pipeTo\"));\n" \ - "\n" \ - " if (@isReadableStreamLocked(this))\n" \ - " return @Promise.@reject(@makeTypeError(\"ReadableStream is locked\"));\n" \ - "\n" \ " if (@isWritableStreamLocked(internalDestination))\n" \ " return @Promise.@reject(@makeTypeError(\"WritableStream is locked\"));\n" \ "\n" \ diff --git a/src/bun.js/builtins/js/ReadableStream.js b/src/bun.js/builtins/js/ReadableStream.js index cd5cf5a44..1449c836d 100644 --- a/src/bun.js/builtins/js/ReadableStream.js +++ b/src/bun.js/builtins/js/ReadableStream.js @@ -381,7 +381,10 @@ function pipeTo(destination) { "use strict"; if (!@isReadableStream(this)) - throw @makeTypeError("readable should be ReadableStream"); + return @Promise.@reject(@makeThisTypeError("ReadableStream", "pipeTo")); + + if (@isReadableStreamLocked(this)) + return @Promise.@reject(@makeTypeError("ReadableStream is locked")); // FIXME: https://bugs.webkit.org/show_bug.cgi?id=159869. // Built-in generator should be able to parse function signature to compute the function length correctly. @@ -413,12 +416,6 @@ function pipeTo(destination) if (!@isWritableStream(internalDestination)) return @Promise.@reject(@makeTypeError("ReadableStream pipeTo requires a WritableStream")); - if (!@isReadableStream(this)) - return @Promise.@reject(@makeThisTypeError("ReadableStream", "pipeTo")); - - if (@isReadableStreamLocked(this)) - return @Promise.@reject(@makeTypeError("ReadableStream is locked")); - if (@isWritableStreamLocked(internalDestination)) return @Promise.@reject(@makeTypeError("WritableStream is locked")); |