Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ReadableStream.from #19446

Merged
merged 6 commits into from
Jul 2, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 125 additions & 0 deletions ext/web/06_streams.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const {
// SharedArrayBufferPrototype,
Symbol,
SymbolAsyncIterator,
SymbolIterator,
SymbolFor,
TypeError,
TypedArrayPrototypeGetBuffer,
Expand Down Expand Up @@ -4780,6 +4781,93 @@ function initializeCountSizeFunction(globalObject) {
WeakMapPrototypeSet(countSizeFunctionWeakMap, globalObject, size);
}

// Ref: https://tc39.es/ecma262/#sec-createasyncfromsynciterator
function createAsyncFromSyncIterator(syncIterator) {
crowlKats marked this conversation as resolved.
Show resolved Hide resolved
return {
next(value) {
try {
// deno-lint-ignore prefer-primordials
const res = syncIterator.next(value);
const done = res.done;
return PromisePrototypeThen(PromiseResolve(res.value), (v) => ({
value: v,
done,
}));
} catch (e) {
return PromiseReject(e);
}
},
return(value) {
try {
const ret = syncIterator.return;
if (ret === undefined) {
return PromiseResolve({
value,
done: true,
});
} else {
const res = ret(value);
if (typeof res !== "object") {
return PromiseReject(
new TypeError("Return reult is not an object"),
);
} else {
const done = res.done;
return PromisePrototypeThen(PromiseResolve(res.value), (v) => ({
value: v,
done,
}));
}
}
} catch (e) {
return PromiseReject(e);
}
},
throw(value) {
try {
const ret = syncIterator.throw;
if (ret === undefined) {
return PromiseReject(value);
} else {
const res = ret(value);
if (typeof res !== "object") {
return PromiseReject(
new TypeError("Return reult is not an object"),
);
} else {
const done = res.done;
return PromisePrototypeThen(PromiseResolve(res.value), (v) => ({
value: v,
done,
}));
}
}
} catch (e) {
return PromiseReject(e);
}
},
};
}

// Ref: https://tc39.es/ecma262/#sec-getiterator
function getIterator(obj, async = false) {
if (async) {
if (obj[SymbolAsyncIterator] === undefined) {
if (obj[SymbolIterator] === undefined) {
throw new TypeError("No iterator found");
}
return createAsyncFromSyncIterator(obj[SymbolIterator]());
} else {
return obj[SymbolAsyncIterator]();
}
} else {
if (obj[SymbolIterator] === undefined) {
throw new TypeError("No iterator found");
}
return obj[SymbolIterator]();
}
}

const _resourceBacking = Symbol("[[resourceBacking]]");
// This distinction exists to prevent unrefable streams being used in
// regular fast streams that are unaware of refability
Expand Down Expand Up @@ -4863,6 +4951,43 @@ class ReadableStream {
}
}

static from(asyncIterable) {
webidl.requiredArguments(
arguments.length,
1,
"Failed to call 'ReadableStream.from'",
);
asyncIterable = webidl.converters.any(asyncIterable);

const iterator = getIterator(asyncIterable, true);

const stream = createReadableStream(() => undefined, async () => {
// deno-lint-ignore prefer-primordials
const res = await iterator.next();
if (typeof res !== "object") {
throw new TypeError("iterator.next value is not an object");
}
if (res.done) {
readableStreamDefaultControllerClose(stream[_controller]);
} else {
readableStreamDefaultControllerEnqueue(stream[_controller], res.value);
}
}, async (reason) => {
if (typeof iterator.return === "undefined") {
return undefined;
} else {
// deno-lint-ignore prefer-primordials
const res = await iterator.return(reason);
if (typeof res !== "object") {
throw new TypeError("iterator.return value is not an object");
} else {
return undefined;
}
}
}, 0);
return stream;
}

/** @returns {boolean} */
get locked() {
webidl.assertBranded(this, ReadableStreamPrototype);
Expand Down
6 changes: 4 additions & 2 deletions tools/wpt/expectation.json
Original file line number Diff line number Diff line change
Expand Up @@ -2496,7 +2496,9 @@
"owning-type-message-port.any.html": false,
"owning-type-message-port.any.worker.html": false,
"owning-type.any.html": false,
"owning-type.any.worker.html": false
"owning-type.any.worker.html": false,
"from.any.html": true,
"from.any.worker.html": true
},
"transform-streams": {
"backpressure.any.html": true,
Expand Down Expand Up @@ -9737,4 +9739,4 @@
"media-sniff.window.html": false
}
}
}
}