diff options
author | 2023-06-01 19:48:37 -0400 | |
---|---|---|
committer | 2023-06-01 16:48:37 -0700 | |
commit | 42d8b7183ca55e546d207124e01ba01603a5f07b (patch) | |
tree | b325d2bc70b1c06f49be951dc22453b2445ec5e3 /src/bun.js/builtins/ts | |
parent | f9809f0044e59de10c9d64a89715c6008608358c (diff) | |
download | bun-42d8b7183ca55e546d207124e01ba01603a5f07b.tar.gz bun-42d8b7183ca55e546d207124e01ba01603a5f07b.tar.zst bun-42d8b7183ca55e546d207124e01ba01603a5f07b.zip |
random fixes that help vite/sveltekit (#3140)
* existsSync with invalid paths should return false
* partially support file urls (does not do percent encoding)
* add utf16 support for Path.isAbsoluteString
* Update src/resolver/resolver.zig
Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
* fixups
* revert
* prettier format
---------
Co-authored-by: Jarred Sumner <jarred@jarredsumner.com>
Diffstat (limited to 'src/bun.js/builtins/ts')
-rw-r--r-- | src/bun.js/builtins/ts/ReadableStream.ts | 17 | ||||
-rw-r--r-- | src/bun.js/builtins/ts/ReadableStreamInternals.ts | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/bun.js/builtins/ts/ReadableStream.ts b/src/bun.js/builtins/ts/ReadableStream.ts index e86b14f89..613f869e5 100644 --- a/src/bun.js/builtins/ts/ReadableStream.ts +++ b/src/bun.js/builtins/ts/ReadableStream.ts @@ -102,7 +102,7 @@ export function initializeReadableStream(this: any, underlyingSource: Underlying } $linkTimeConstant; -export function readableStreamToArray(stream) { +export function readableStreamToArray(stream: ReadableStream): Promise<unknown[]> { // this is a direct stream var underlyingSource = $getByIdDirectPrivate(stream, "underlyingSource"); if (underlyingSource !== undefined) { @@ -113,7 +113,7 @@ export function readableStreamToArray(stream) { } $linkTimeConstant; -export function readableStreamToText(stream) { +export function readableStreamToText(stream: ReadableStream): Promise<string> { // this is a direct stream var underlyingSource = $getByIdDirectPrivate(stream, "underlyingSource"); if (underlyingSource !== undefined) { @@ -124,7 +124,7 @@ export function readableStreamToText(stream) { } $linkTimeConstant; -export function readableStreamToArrayBuffer(stream) { +export function readableStreamToArrayBuffer(stream: ReadableStream<ArrayBuffer>): Promise<ArrayBuffer> | ArrayBuffer { // this is a direct stream var underlyingSource = $getByIdDirectPrivate(stream, "underlyingSource"); @@ -132,16 +132,21 @@ export function readableStreamToArrayBuffer(stream) { return $readableStreamToArrayBufferDirect(stream, underlyingSource); } - return Promise.resolve(Bun.readableStreamToArray(stream)).$then(Bun.concatArrayBuffers); + var array = Bun.readableStreamToArray(stream); + if ($isPromise(array)) { + return array.$then(Bun.concatArrayBuffers); + } + + return Bun.concatArrayBuffers(array); } $linkTimeConstant; -export function readableStreamToJSON(stream) { +export function readableStreamToJSON(stream: ReadableStream): unknown { return Bun.readableStreamToText(stream).$then(globalThis.JSON.parse); } $linkTimeConstant; -export function readableStreamToBlob(stream) { +export function readableStreamToBlob(stream: ReadableStream): Promise<Blob> { return Promise.resolve(Bun.readableStreamToArray(stream)).$then(array => new Blob(array)); } diff --git a/src/bun.js/builtins/ts/ReadableStreamInternals.ts b/src/bun.js/builtins/ts/ReadableStreamInternals.ts index c0867445f..0c4e816f4 100644 --- a/src/bun.js/builtins/ts/ReadableStreamInternals.ts +++ b/src/bun.js/builtins/ts/ReadableStreamInternals.ts @@ -1750,8 +1750,6 @@ export async function readableStreamToArrayDirect(stream, underlyingSource) { stream = undefined; reader = undefined; } - - return capability.$promise; } export function readableStreamDefineLazyIterators(prototype) { |