Skip to content

Commit f8f2e8c

Browse files
committed
fix(graalvm): correct name for queuing strategies
Signed-off-by: Dario Valdespino <dvaldespino00@gmail.com>
1 parent 4e8918d commit f8f2e8c

File tree

13 files changed

+62
-58
lines changed

13 files changed

+62
-58
lines changed

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/ReadableByteStream.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ internal class ReadableByteStream(
4444
/** Underlying source for this stream. */
4545
private val source: ReadableStreamSource,
4646
/** Queueing strategy used to manage backpressure. */
47-
private val strategy: QueueingStrategy,
47+
private val strategy: QueuingStrategy,
4848
override val executor: GuestExecutor
4949
) : ReadableStreamBase() {
5050
/**
@@ -890,8 +890,8 @@ internal class ReadableByteStream(
890890
override fun cancel(reason: Any?): JsPromise<Unit> = cancelBranch(reason, forBranch2 = true)
891891
}
892892

893-
branch1.set(ReadableByteStream(source1, QueueingStrategy.DefaultReadStrategy, executor))
894-
branch2.set(ReadableByteStream(source2, QueueingStrategy.DefaultReadStrategy, executor))
893+
branch1.set(ReadableByteStream(source1, QueuingStrategy.DefaultReadStrategy, executor))
894+
branch2.set(ReadableByteStream(source2, QueuingStrategy.DefaultReadStrategy, executor))
895895
reader.get().forwardReaderError()
896896

897897
return arrayOf(branch1.get(), branch2.get())

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/ReadableDefaultStream.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import elide.runtime.intrinsics.js.JsPromise
2424
import elide.runtime.intrinsics.js.ReadableStream
2525
import elide.runtime.intrinsics.js.ReadableStream.ReadResult
2626
import elide.runtime.intrinsics.js.err.TypeError
27-
import elide.runtime.intrinsics.js.stream.QueueingStrategy
27+
import elide.runtime.intrinsics.js.stream.QueuingStrategy
2828
import elide.runtime.intrinsics.js.stream.ReadableStreamController
2929
import elide.runtime.intrinsics.js.stream.ReadableStreamReader
3030
import elide.runtime.intrinsics.js.stream.ReadableStreamSource
@@ -39,7 +39,7 @@ internal class ReadableDefaultStream(
3939
/** Underlying source for this stream. */
4040
private val source: ReadableStreamSource,
4141
/** Queueing strategy used to manage backpressure. */
42-
private val strategy: QueueingStrategy,
42+
private val strategy: QueuingStrategy,
4343
override val executor: GuestExecutor
4444
) : ReadableStreamBase() {
4545
/** Simple chunk type allowing an arbitrary untyped value to be enqueued with a computed size. */
@@ -308,8 +308,8 @@ internal class ReadableDefaultStream(
308308
override fun cancel(reason: Any?): JsPromise<Unit> = cancel2(reason)
309309
}
310310

311-
branch1.set(ReadableDefaultStream(source1, QueueingStrategy.DefaultReadStrategy, executor))
312-
branch2.set(ReadableDefaultStream(source2, QueueingStrategy.DefaultReadStrategy, executor))
311+
branch1.set(ReadableDefaultStream(source1, QueuingStrategy.DefaultReadStrategy, executor))
312+
branch2.set(ReadableDefaultStream(source2, QueuingStrategy.DefaultReadStrategy, executor))
313313

314314
reader.closed.catch {
315315
branch1.get().error(it)

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/ReadableStreamIntrinsic.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ import elide.runtime.gvm.internals.intrinsics.js.AbstractJsIntrinsic
1919
import elide.runtime.gvm.js.JsSymbol.JsSymbols.asPublicJsSymbol
2020
import elide.runtime.intrinsics.GuestIntrinsic
2121
import elide.runtime.intrinsics.js.ReadableStream
22-
import elide.runtime.intrinsics.js.stream.ByteLengthQueueingStrategy
23-
import elide.runtime.intrinsics.js.stream.CountQueueingStrategy
22+
import elide.runtime.intrinsics.js.stream.ByteLengthQueuingStrategy
23+
import elide.runtime.intrinsics.js.stream.CountQueuingStrategy
2424
import elide.runtime.intrinsics.js.stream.ReadableStreamBYOBReader
2525
import elide.runtime.intrinsics.js.stream.ReadableStreamDefaultReader
2626

2727
/** Implementation of readable streams (via the Web Streams standard). */
28-
@Intrinsic(global = "ReadableStream") @Singleton internal class ReadableStreamIntrinsic : AbstractJsIntrinsic() {
28+
@Intrinsic(internal = false) @Singleton internal class ReadableStreamIntrinsic : AbstractJsIntrinsic() {
2929
@OptIn(DelicateElideApi::class)
3030
override fun install(bindings: GuestIntrinsic.MutableIntrinsicBindings) {
3131
bindings[READABLE_STREAM_SYMBOL.asPublicJsSymbol()] = ReadableStream
32-
bindings[BYTE_LENGTH_STRATEGY_SYMBOL.asPublicJsSymbol()] = ByteLengthQueueingStrategy
33-
bindings[COUNT_STRATEGY_SYMBOL.asPublicJsSymbol()] = CountQueueingStrategy
32+
bindings[BYTE_LENGTH_STRATEGY_SYMBOL.asPublicJsSymbol()] = ByteLengthQueuingStrategy
33+
bindings[COUNT_STRATEGY_SYMBOL.asPublicJsSymbol()] = CountQueuingStrategy
3434
bindings[DEFAULT_READER_SYMBOL.asPublicJsSymbol()] = ReadableStreamDefaultReader
3535
bindings[BYOB_READER_SYMBOL.asPublicJsSymbol()] = ReadableStreamBYOBReader
3636
}

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/TransformDefaultStream.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ import elide.vm.annotations.Polyglot
2929
internal class TransformDefaultStream(
3030
val transformer: TransformStreamTransformer,
3131
executor: GuestExecutor,
32-
writableStrategy: QueueingStrategy = QueueingStrategy.DefaultReadStrategy,
33-
readableStrategy: QueueingStrategy = QueueingStrategy.DefaultReadStrategy,
32+
writableStrategy: QueuingStrategy = QueuingStrategy.DefaultReadStrategy,
33+
readableStrategy: QueuingStrategy = QueuingStrategy.DefaultReadStrategy,
3434
) : TransformStream, ReadOnlyProxyObject {
3535
@JvmInline private value class DelegatingSource(private val stream: TransformDefaultStream) : ReadableStreamSource {
3636
override fun pull(controller: ReadableStreamController): JsPromise<Unit> {

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/TransformStreamIntrinsic.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import elide.runtime.intrinsics.js.TransformStream
2222
import elide.runtime.intrinsics.js.WritableStream
2323

2424
/** Implementation of transform streams (via the Web Streams standard). */
25-
@Intrinsic(global = "TransformStream") @Singleton internal class TransformStreamIntrinsic : AbstractJsIntrinsic() {
25+
@Intrinsic(internal = false) @Singleton internal class TransformStreamIntrinsic : AbstractJsIntrinsic() {
2626
@OptIn(DelicateElideApi::class)
2727
override fun install(bindings: GuestIntrinsic.MutableIntrinsicBindings) {
2828
bindings[TRANSFORM_STREAM_SYMBOL.asPublicJsSymbol()] = TransformStream

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/WritableDefaultStream.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import elide.runtime.intrinsics.js.CompletableJsPromise
2828
import elide.runtime.intrinsics.js.JsPromise
2929
import elide.runtime.intrinsics.js.WritableStream
3030
import elide.runtime.intrinsics.js.err.TypeError
31-
import elide.runtime.intrinsics.js.stream.QueueingStrategy
31+
import elide.runtime.intrinsics.js.stream.QueuingStrategy
3232
import elide.runtime.intrinsics.js.stream.WritableStreamDefaultController
3333
import elide.runtime.intrinsics.js.stream.WritableStreamDefaultWriter
3434
import elide.runtime.intrinsics.js.stream.WritableStreamSink
@@ -42,7 +42,7 @@ internal class WritableDefaultStream(
4242
/** Underlying sink this stream writes to. */
4343
private val sink: WritableStreamSink,
4444
/** Queueing strategy used to control backpressure. */
45-
private val strategy: QueueingStrategy = QueueingStrategy.DefaultWriteStrategy,
45+
private val strategy: QueuingStrategy = QueuingStrategy.DefaultWriteStrategy,
4646
) : WritableStream, ReadOnlyProxyObject {
4747
/** Inline wrapper for the stream providing the controller API by delegation. */
4848
@JvmInline private value class ControllerToken(

packages/graalvm/src/main/kotlin/elide/runtime/gvm/internals/intrinsics/js/webstreams/WritableStreamIntrinsic.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import elide.runtime.intrinsics.js.WritableStream
2222
import elide.runtime.intrinsics.js.stream.WritableStreamDefaultWriter
2323

2424
/** Implementation of writable streams (via the Web Streams standard). */
25-
@Intrinsic(global = "WritableStream") @Singleton internal class WritableStreamIntrinsic : AbstractJsIntrinsic() {
25+
@Intrinsic(internal = false) @Singleton internal class WritableStreamIntrinsic : AbstractJsIntrinsic() {
2626
@OptIn(DelicateElideApi::class)
2727
override fun install(bindings: GuestIntrinsic.MutableIntrinsicBindings) {
2828
bindings[WRITABLE_STREAM_SYMBOL.asPublicJsSymbol()] = WritableStream

packages/graalvm/src/main/kotlin/elide/runtime/gvm/intrinsics/BuildTimeIntrinsicsResolver.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ import elide.runtime.gvm.internals.intrinsics.js.fetch.FetchIntrinsic
3535
import elide.runtime.gvm.internals.intrinsics.js.url.URLIntrinsic
3636
import elide.runtime.gvm.internals.intrinsics.js.url.URLSearchParamsIntrinsic
3737
import elide.runtime.gvm.internals.intrinsics.js.webstreams.ReadableStreamIntrinsic
38+
import elide.runtime.gvm.internals.intrinsics.js.webstreams.TransformStreamIntrinsic
39+
import elide.runtime.gvm.internals.intrinsics.js.webstreams.WritableStreamIntrinsic
3840
import elide.runtime.gvm.internals.js.JsTimersIntrinsic
3941
import elide.runtime.gvm.internals.sqlite.ElideSqliteModule
4042
import elide.runtime.gvm.internals.testing.ElideTestingModule
@@ -143,7 +145,6 @@ import elide.runtime.plugins.env.EnvConfig
143145
@JvmStatic private val zlib = NodeZlibModule()
144146
@JvmStatic private val webCrypto = WebCryptoIntrinsic()
145147
@JvmStatic private val inspector = NodeInspectorModule()
146-
@JvmStatic private val readableStream = ReadableStreamIntrinsic()
147148
@JvmStatic private val childProcess = NodeChildProcessModule(fs, execProvider)
148149
@JvmStatic private val queueMicrotaskCallable = QueueMicrotaskCallable(execProvider)
149150
@JvmStatic private val messageChannel = MessageChannelBuiltin()
@@ -155,6 +156,9 @@ import elide.runtime.plugins.env.EnvConfig
155156
@JvmStatic private val elideSqlite = ElideSqliteModule()
156157
@JvmStatic private val elideLlm = ElideLLMModule(execProvider)
157158
@JvmStatic private val elideBuiltin = ElideIntrinsic()
159+
@JvmStatic private val readableStream = ReadableStreamIntrinsic()
160+
@JvmStatic private val writableStream = WritableStreamIntrinsic()
161+
@JvmStatic private val transformStream = TransformStreamIntrinsic()
158162

159163
// All built-ins and intrinsics.
160164
@JvmStatic private val all = arrayOf(
@@ -198,6 +202,8 @@ import elide.runtime.plugins.env.EnvConfig
198202
webCrypto,
199203
inspector,
200204
readableStream,
205+
writableStream,
206+
transformStream,
201207
childProcess,
202208
queueMicrotaskCallable,
203209
messageChannel,

packages/graalvm/src/main/kotlin/elide/runtime/intrinsics/js/ReadableStream.kt

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import java.nio.ByteBuffer
2323
import elide.annotations.API
2424
import elide.runtime.exec.GuestExecution
2525
import elide.runtime.gvm.internals.intrinsics.js.webstreams.*
26-
import elide.runtime.interop.ReadOnlyProxyObject
2726
import elide.runtime.intrinsics.js.ReadableStream.ReaderMode.BYOB
2827
import elide.runtime.intrinsics.js.ReadableStream.ReaderMode.Default
2928
import elide.runtime.intrinsics.js.stream.*
@@ -120,14 +119,14 @@ import elide.vm.annotations.Polyglot
120119
*/
121120
public interface Factory<Impl> : ProxyInstantiable where Impl : ReadableStream {
122121
/**
123-
* Constructor for a custom [ReadableStream], which implements the provided [source] and [queueingStrategy], if
122+
* Constructor for a custom [ReadableStream], which implements the provided [source] and [queuingStrategy], if
124123
* provided.
125124
*
126125
* @param source Source for the [ReadableStream].
127-
* @param queueingStrategy Optional [QueueingStrategy] for the [ReadableStream].
126+
* @param queuingStrategy Optional [QueuingStrategy] for the [ReadableStream].
128127
* @return A new [ReadableStream] instance.
129128
*/
130-
@Polyglot public fun create(source: ReadableStreamSource, queueingStrategy: QueueingStrategy?): ReadableStream
129+
@Polyglot public fun create(source: ReadableStreamSource, queuingStrategy: QueuingStrategy?): ReadableStream
131130

132131
/**
133132
* Constructor for a custom [ReadableStream], which implements the provided [source].
@@ -185,25 +184,25 @@ import elide.vm.annotations.Polyglot
185184
return create(ReadableStreamAsyncIteratorSource(asyncIterable.iterator))
186185
}
187186

188-
override fun create(source: ReadableStreamSource, queueingStrategy: QueueingStrategy?): ReadableStream {
187+
override fun create(source: ReadableStreamSource, queuingStrategy: QueuingStrategy?): ReadableStream {
189188
return when (source.type) {
190189
Type.Default -> ReadableDefaultStream(
191190
source,
192-
queueingStrategy ?: QueueingStrategy.DefaultReadStrategy,
191+
queuingStrategy ?: QueuingStrategy.DefaultReadStrategy,
193192
streamExecutor,
194193
)
195194

196195
Type.BYOB -> ReadableByteStream(
197196
source,
198-
queueingStrategy ?: QueueingStrategy.DefaultReadStrategy,
197+
queuingStrategy ?: QueuingStrategy.DefaultReadStrategy,
199198
streamExecutor,
200199
)
201200
}
202201
}
203202

204203
override fun newInstance(vararg arguments: Value?): Any {
205204
val source = arguments.getOrNull(0)?.let(::GuestReadableStreamSource) ?: ReadableStreamSource.Empty
206-
val strategy = arguments.getOrNull(1)?.let(GuestQueueingStrategy::from) ?: QueueingStrategy.DefaultReadStrategy
205+
val strategy = arguments.getOrNull(1)?.let(GuestQueuingStrategy::from) ?: QueuingStrategy.DefaultReadStrategy
207206

208207
return create(source, strategy)
209208
}

packages/graalvm/src/main/kotlin/elide/runtime/intrinsics/js/TransformStream.kt

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ import org.graalvm.polyglot.proxy.ProxyObject
1818
import elide.annotations.API
1919
import elide.runtime.exec.GuestExecution
2020
import elide.runtime.gvm.internals.intrinsics.js.webstreams.TransformDefaultStream
21-
import elide.runtime.interop.ReadOnlyProxyObject
22-
import elide.runtime.intrinsics.js.stream.GuestQueueingStrategy
21+
import elide.runtime.intrinsics.js.stream.GuestQueuingStrategy
2322
import elide.runtime.intrinsics.js.stream.GuestTransformStreamTransformer
24-
import elide.runtime.intrinsics.js.stream.QueueingStrategy
23+
import elide.runtime.intrinsics.js.stream.QueuingStrategy
2524
import elide.runtime.intrinsics.js.stream.TransformStreamTransformer
2625
import elide.vm.annotations.Polyglot
2726

@@ -44,8 +43,8 @@ import elide.vm.annotations.Polyglot
4443
public interface Factory<Impl> where Impl : TransformStream {
4544
public fun create(
4645
transformer: TransformStreamTransformer,
47-
writableStrategy: QueueingStrategy? = null,
48-
readableStrategy: QueueingStrategy? = null,
46+
writableStrategy: QueuingStrategy? = null,
47+
readableStrategy: QueuingStrategy? = null,
4948
): Impl
5049
}
5150

@@ -57,21 +56,21 @@ import elide.vm.annotations.Polyglot
5756

5857
override fun create(
5958
transformer: TransformStreamTransformer,
60-
writableStrategy: QueueingStrategy?,
61-
readableStrategy: QueueingStrategy?
59+
writableStrategy: QueuingStrategy?,
60+
readableStrategy: QueuingStrategy?
6261
): TransformStream {
6362
return TransformDefaultStream(
6463
transformer = transformer,
6564
executor = streamExecutor,
66-
writableStrategy = writableStrategy ?: QueueingStrategy.DefaultWriteStrategy,
67-
readableStrategy = readableStrategy ?: QueueingStrategy.DefaultReadStrategy,
65+
writableStrategy = writableStrategy ?: QueuingStrategy.DefaultWriteStrategy,
66+
readableStrategy = readableStrategy ?: QueuingStrategy.DefaultReadStrategy,
6867
)
6968
}
7069

7170
override fun newInstance(vararg arguments: Value?): Any {
7271
val transformer = arguments.getOrNull(0)?.let(::GuestTransformStreamTransformer)
73-
val writableStrategy = arguments.getOrNull(1)?.let(GuestQueueingStrategy::from)
74-
val readableStrategy = arguments.getOrNull(2)?.let(GuestQueueingStrategy::from)
72+
val writableStrategy = arguments.getOrNull(1)?.let(GuestQueuingStrategy::from)
73+
val readableStrategy = arguments.getOrNull(2)?.let(GuestQueuingStrategy::from)
7574

7675
return create(transformer ?: TransformStreamTransformer.Identity, writableStrategy, readableStrategy)
7776
}

0 commit comments

Comments
 (0)